Merge branch 'master' of git://github.com/JohnLangford/vowpal_wabbit

1 files changed, 11 insertions, 12 deletions

diff --git a/vowpalwabbit/global_data.h b/vowpalwabbit/global_data.h
index bdf76b46..7e6ec74b 100644
--- a/vowpalwabbit/global_data.h
+++ b/vowpalwabbit/global_data.h
@@ -193,12 +193,13 @@ struct vw {
 
   bool bfgs;
   bool hessian_on;
-  int m;
 
   bool save_resume;
   double normalized_sum_norm_x;
 
   po::options_description opts;
+  po::options_description* new_opts;
+  po::variables_map vm;
   std::stringstream* file_options;
   vector<std::string> args;
 
@@ -217,10 +218,6 @@ struct vw {
   float power_t;//the power on learning rate decay.
   int reg_mode;
 
-  size_t minibatch;
-
-  float rel_threshold; // termination threshold
-
   size_t pass_length;
   size_t numpasses;
   size_t passes_complete;
@@ -262,19 +259,14 @@ struct vw {
   size_t normalized_idx; //offset idx where the norm is stored (1 or 2 depending on whether adaptive is true)
 
   uint32_t lda;
-  float lda_alpha;
-  float lda_rho;
-  float lda_D;
-  float lda_epsilon;
 
   std::string text_regressor_name;
   std::string inv_hash_regressor_name;
-
   std::string span_server;
 
   size_t length () { return ((size_t)1) << num_bits; };
 
-  uint32_t rank;
+  v_array<LEARNER::base_learner* (*)(vw&)> reduction_stack;
 
   //Prediction output
   v_array<int> final_prediction_sink; // set to send global predictions to.
@@ -321,4 +313,11 @@ void get_prediction(int sock, float& res, float& weight);
 void compile_gram(vector<string> grams, uint32_t* dest, char* descriptor, bool quiet);
 void compile_limits(vector<string> limits, uint32_t* dest, bool quiet);
 int print_tag(std::stringstream& ss, v_array<char> tag);
-po::variables_map add_options(vw& all, po::options_description& opts);
+void add_options(vw& all, po::options_description& opts);
+inline po::options_description_easy_init new_options(vw& all, std::string name = "\0") 
+{
+  all.new_opts = new po::options_description(name);
+  return all.new_opts->add_options();
+}
+bool missing_required(vw& all);
+void add_options(vw& all);