stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete "cutoff" and "markowitz" statements 

git-svn-id: https://www.dynare.org/svn/dynare/trunk@2884 ac1d8469-bf42-47a9-8791-bf33cf982152
issue#70
sebastien 2009-09-03 09:50:45 +00:00
parent b17886ee12
commit fea9c4a2f0
5 changed files with 0 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ComputingTasks.cc
View File

@ -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)
{
}

18
ComputingTasks.hh
View File

@ -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:

16
DynareBison.yy
View File

@ -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

16
ParsingDriver.cc
View File

@ -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)
{

4
ParsingDriver.hh
View File

@ -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