diff --git a/ComputingTasks.cc b/ComputingTasks.cc index 10fcb6b3..6be9d87e 100644 --- a/ComputingTasks.cc +++ b/ComputingTasks.cc @@ -306,26 +306,6 @@ PeriodsStatement::writeOutput(ostream &output, const string &basename) const output << "options_.simul = 1;" << endl; } -CutoffStatement::CutoffStatement(double cutoff_arg) : cutoff(cutoff_arg) -{ -} - -void -CutoffStatement::writeOutput(ostream &output, const string &basename) const -{ - output << "options_.cutoff = " << cutoff << ";" << endl; -} - -MarkowitzStatement::MarkowitzStatement(double markowitz_arg) : markowitz(markowitz_arg) -{ -} - -void -MarkowitzStatement::writeOutput(ostream &output, const string &basename) const -{ - output << "options_.markowitz = " << markowitz << ";" << endl; -} - DsampleStatement::DsampleStatement(int val1_arg) : val1(val1_arg), val2(-1) { } diff --git a/ComputingTasks.hh b/ComputingTasks.hh index 6fc7e61c..04dd0e84 100644 --- a/ComputingTasks.hh +++ b/ComputingTasks.hh @@ -133,24 +133,6 @@ public: virtual void writeOutput(ostream &output, const string &basename) const; }; -class CutoffStatement : public Statement -{ -private: - const double cutoff; -public: - CutoffStatement(double cutoff_arg); - virtual void writeOutput(ostream &output, const string &basename) const; -}; - -class MarkowitzStatement : public Statement -{ -private: - const double markowitz; -public: - MarkowitzStatement(double markowitz_arg); - virtual void writeOutput(ostream &output, const string &basename) const; -}; - class DsampleStatement : public Statement { private: diff --git a/DynareBison.yy b/DynareBison.yy index 2c9e1e5b..d978d5fd 100644 --- a/DynareBison.yy +++ b/DynareBison.yy @@ -174,8 +174,6 @@ statement : parameters | varexo_det | change_type | periods - | cutoff - | markowitz | model | initval | initval_file @@ -326,19 +324,6 @@ periods : PERIODS INT_NUMBER ';' { driver.periods($3); } ; -cutoff : CUTOFF FLOAT_NUMBER ';' - { driver.cutoff($2); } - | CUTOFF EQUAL FLOAT_NUMBER ';' - { driver.cutoff($3); } - ; - -markowitz : MARKOWITZ FLOAT_NUMBER ';' - { driver.markowitz($2); } - | MARKOWITZ EQUAL FLOAT_NUMBER ';' - { driver.markowitz($3); } - ; - - init_param : symbol EQUAL expression ';' { driver.init_param($1, $3); }; expression : '(' expression ')' @@ -713,7 +698,6 @@ stoch_simul_options : o_dr_algo | o_hp_filter | o_hp_ngrid | o_periods - | o_cutoff | o_simul | o_simul_seed | o_qz_criterium diff --git a/ParsingDriver.cc b/ParsingDriver.cc index efdf6fa1..e3e4b2a8 100644 --- a/ParsingDriver.cc +++ b/ParsingDriver.cc @@ -232,22 +232,6 @@ ParsingDriver::periods(string *periods) delete periods; } -void -ParsingDriver::cutoff(string *cutoff) -{ - double cutoff_val = atof(cutoff->c_str()); - mod_file->addStatement(new CutoffStatement(cutoff_val)); - delete cutoff; -} - -void -ParsingDriver::markowitz(string *markowitz) -{ - double markowitz_val = atof(markowitz->c_str()); - mod_file->addStatement(new MarkowitzStatement(markowitz_val)); - delete markowitz; -} - void ParsingDriver::dsample(string *arg1) { diff --git a/ParsingDriver.hh b/ParsingDriver.hh index 8d4faefd..07fdb9f5 100644 --- a/ParsingDriver.hh +++ b/ParsingDriver.hh @@ -209,10 +209,6 @@ public: NodeID add_expression_variable(string *name); //! Adds a "periods" statement void periods(string *periods); - //! Adds a "cutoff" statement - void cutoff(string *cutoff); - //! Adds a weight of the "markowitz" criteria statement - void markowitz(string *markowitz); //! Adds a "dsample" statement void dsample(string *arg1); //! Adds a "dsample" statement