fix option constraints

3 files changed, 21 insertions, 7 deletions

diff --git a/vowpalwabbit/cb_algs.cc b/vowpalwabbit/cb_algs.cc
index a9827f27..2d8a2252 100644
--- a/vowpalwabbit/cb_algs.cc
+++ b/vowpalwabbit/cb_algs.cc
@@ -497,10 +497,14 @@ namespace CB_ALGS
     }
 
     if (!vm.count("csoaa"))
-      vm.insert(pair<string,po::variable_value>(string("csoaa"),vm["cb"]));
+      {
+	all.args.push_back("--csoaa");
+	stringstream ss;
+	ss << vm["cb"].as<size_t>();
+	all.args.push_back(ss.str());
+      }
 
     base_learner* base = setup_base(all,vm);
-
     if (eval)
       all.p->lp = CB_EVAL::cb_eval; 
     else
diff --git a/vowpalwabbit/cbify.cc b/vowpalwabbit/cbify.cc
index 05eda7d3..776501f7 100644
--- a/vowpalwabbit/cbify.cc
+++ b/vowpalwabbit/cbify.cc
@@ -391,7 +391,12 @@ namespace CBIFY {
     *all.file_options << " --cbify " << data.k;
 
     if (!vm.count("cb"))
-      vm.insert(pair<string,po::variable_value>(string("cb"),vm["cbify"]));
+      {
+	all.args.push_back("--cb");
+	stringstream ss;
+	ss << vm["cbify"].as<size_t>();
+	all.args.push_back(ss.str());
+      }
     base_learner* base = setup_base(all,vm);
     
     all.p->lp = MULTICLASS::mc_label;
diff --git a/vowpalwabbit/search.cc b/vowpalwabbit/search.cc
index 70efde7e..5e782ea1 100644
--- a/vowpalwabbit/search.cc
+++ b/vowpalwabbit/search.cc
@@ -1956,6 +1956,15 @@ namespace Search {
     }
     all.p->emptylines_separate_examples = true;
 
+    if (!vm.count("csoaa") && !vm.count("csoaa_ldf") && !vm.count("wap_ldf") && !vm.count("cb"))
+      {
+	all.args.push_back("--csoaa");
+	stringstream ss;
+	ss << vm["search"].as<size_t>();
+	all.args.push_back(ss.str());
+      }
+    base_learner* base = setup_base(all,vm);
+    
     // default to OAA labels unless the task wants to override this (which they can do in initialize)
     all.p->lp = MC::mc_label;
     if (priv.task)
@@ -1982,10 +1991,6 @@ namespace Search {
 
     priv.start_clock_time = clock();
 
-    if (!vm.count("csoaa") && !vm.count("csoaa_ldf") && !vm.count("wap_ldf") && !vm.count("cb"))
-      vm.insert(pair<string,po::variable_value>(string("csoaa"),vm["search"]));
-    base_learner* base = setup_base(all,vm);
-    
     learner<search>& l = init_learner(&sch, base, 
 				      search_predict_or_learn<true>, 
 				      search_predict_or_learn<false>,