From db8905f9ef2b6b10edea9c07f02d6fd1e15604a8 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Thu, 15 Sep 2011 15:05:44 -0400 Subject: [PATCH] MS-SBVAR: change default for drop option --- ComputingTasks.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ComputingTasks.cc b/ComputingTasks.cc index aceed00f..e137835b 100644 --- a/ComputingTasks.cc +++ b/ComputingTasks.cc @@ -966,10 +966,11 @@ MSSBVARSimulationStatement::writeOutput(ostream &output, const string &basename) // Redeclare drop option if necessary OptionsList::num_options_t::const_iterator mh_replic_it = options_list.num_options.find("ms.mh_replic"); + OptionsList::num_options_t::const_iterator thinning_factor_it = options_list.num_options.find("ms.thinning_factor"); OptionsList::num_options_t::const_iterator drop_it = options_list.num_options.find("ms.drop"); - if (mh_replic_it != options_list.num_options.end()) + if (mh_replic_it != options_list.num_options.end() || thinning_factor_it != options_list.num_options.end()) if (drop_it == options_list.num_options.end()) - output << "options_.ms.drop = 0.1*options_.ms.mh_replic;" << endl; + output << "options_.ms.drop = 0.1*options_.ms.mh_replic*options_.ms.thinning_factor;" << endl; output << "[options_, oo_] = ms_simulation(M_, options_, oo_);" << endl; }