diff options
author | niruc <niruc@NIRUC-M6600.redmond.corp.microsoft.com> | 2013-04-05 01:17:14 +0400 |
---|---|---|
committer | niruc <niruc@NIRUC-M6600.redmond.corp.microsoft.com> | 2013-04-05 01:17:14 +0400 |
commit | 571f1f36679811b1c170a76fb0487a5c6dba177d (patch) | |
tree | e3c24b4f49936f5d1533369786803a7f66fa23cc /vowpalwabbit/vw.h | |
parent | 605dbf1f7a418a41197336aa296d6d27be1f935d (diff) | |
parent | 32baa122d2ba75158ddb3f2103710cb456da3d1b (diff) |
merge conflicts resolved
Diffstat (limited to 'vowpalwabbit/vw.h')
-rw-r--r-- | vowpalwabbit/vw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vowpalwabbit/vw.h b/vowpalwabbit/vw.h index a8dcdcb2..edf179f2 100644 --- a/vowpalwabbit/vw.h +++ b/vowpalwabbit/vw.h @@ -82,7 +82,7 @@ namespace VW { void releaseFeatureSpace(primitive_feature_space* features, size_t len); inline float get_weight(vw& all, uint32_t index) - { return all.reg.weight_vector[(index * all.stride) & all.weight_mask];} + { return all.reg.weight_vector[(index * all.reg.stride) & all.reg.weight_mask];} inline uint32_t num_weights(vw& all) { return (uint32_t)all.length();} |