diff options
Diffstat (limited to 'vowpalwabbit/bs.cc')
-rw-r--r-- | vowpalwabbit/bs.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vowpalwabbit/bs.cc b/vowpalwabbit/bs.cc index cff38145..1b35d972 100644 --- a/vowpalwabbit/bs.cc +++ b/vowpalwabbit/bs.cc @@ -239,31 +239,31 @@ namespace BS { d.pred_vec.~vector(); } - base_learner* setup(vw& all, po::variables_map& vm) + base_learner* setup(vw& all) { po::options_description opts("Bootstrap options"); opts.add_options() ("bootstrap,B", po::value<size_t>(), "bootstrap mode with k rounds by online importance resampling") ("bs_type", po::value<string>(), "prediction type {mean,vote}"); - vm = add_options(all, opts); - if (!vm.count("bootstrap")) + add_options(all, opts); + if (!all.vm.count("bootstrap")) return NULL; bs& data = calloc_or_die<bs>(); data.ub = FLT_MAX; data.lb = -FLT_MAX; - data.B = (uint32_t)vm["bootstrap"].as<size_t>(); + data.B = (uint32_t)all.vm["bootstrap"].as<size_t>(); //append bs with number of samples to options_from_file so it is saved to regressor later *all.file_options << " --bootstrap " << data.B; std::string type_string("mean"); - if (vm.count("bs_type")) + if (all.vm.count("bs_type")) { - type_string = vm["bs_type"].as<std::string>(); + type_string = all.vm["bs_type"].as<std::string>(); if (type_string.compare("mean") == 0) { data.bs_type = BS_TYPE_MEAN; @@ -283,7 +283,7 @@ namespace BS { data.pred_vec.reserve(data.B); data.all = &all; - learner<bs>& l = init_learner(&data, setup_base(all,vm), predict_or_learn<true>, + learner<bs>& l = init_learner(&data, setup_base(all), predict_or_learn<true>, predict_or_learn<false>, data.B); l.set_finish_example(finish_example); l.set_finish(finish); |