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

Minor corrections: 

- Bug in check.m with model without sparse options
- Display in simulate.dll
- "Model_InfoStatement" renamed "Model_InfoStatement" in ComputingTasks

git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@2010 ac1d8469-bf42-47a9-8791-bf33cf982152
issue#70
ferhat 2008-08-29 12:31:25 +00:00
parent 8be3bf20e6
commit b53c58dd7b
4 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ComputingTasks.cc
View File

@ -68,17 +68,17 @@ CheckStatement::checkPass(ModFileStructure &mod_file_struct)
mod_file_struct.check_present = true; mod_file_struct.check_present = true;
} }
Model_InfoStatement::Model_InfoStatement(const OptionsList &options_list_arg) : ModelInfoStatement::ModelInfoStatement(const OptionsList &options_list_arg) :
options_list(options_list_arg) options_list(options_list_arg)
{ {
} }
void Model_InfoStatement::checkPass(ModFileStructure &mod_file_struct) void ModelInfoStatement::checkPass(ModFileStructure &mod_file_struct)
{ {
//mod_file_struct.model_info_present = true; //mod_file_struct.model_info_present = true;
} }
void Model_InfoStatement::writeOutput(ostream &output, const string &basename) const void ModelInfoStatement::writeOutput(ostream &output, const string &basename) const
{ {
options_list.writeOutput(output); options_list.writeOutput(output);
output << "model_info();\n"; output << "model_info();\n";

38
ModelTree.cc
View File

@ -1566,44 +1566,6 @@ ModelTree::writeModelEquationsCodeOrdered(const string file_name, const Model_Bl
code_file.write(&FENDBLOCK, sizeof(FENDBLOCK)); code_file.write(&FENDBLOCK, sizeof(FENDBLOCK));
code_file.write(&FEND, sizeof(FEND)); code_file.write(&FEND, sizeof(FEND));
code_file.close(); code_file.close();
/*int mx_blck=j;
for(j=0;j<mx_blck;j++)
{
if(ModelBlock->Block_List[j].Simulation_Type==SOLVE_BACKWARD_COMPLETE || ModelBlock->Block_List[j].Simulation_Type==SOLVE_FOREWARD_COMPLETE)
{
m=ModelBlock->Block_List[j].Max_Lag;
for(i=0;i<ModelBlock->Block_List[j].IM_lead_lag[m].size;i++)
{
int eqr=ModelBlock->Block_List[j].IM_lead_lag[m].Equ[i];
int v=ModelBlock->Block_List[j].Equation[eqr];
Uf[v].Ufl=Uf[v].Ufl_First;
while(Uf[v].Ufl)
{
Uf[v].Ufl_First=Uf[v].Ufl->pNext;
free(Uf[v].Ufl);
Uf[v].Ufl=Uf[v].Ufl_First;
}
}
}
else if(ModelBlock->Block_List[j].Simulation_Type==SOLVE_TWO_BOUNDARIES_COMPLETE || ModelBlock->Block_List[j].Simulation_Type==SOLVE_TWO_BOUNDARIES_SIMPLE)
{
for(m=0;m<=ModelBlock->Block_List[j].Max_Lead+ModelBlock->Block_List[j].Max_Lag;m++)
{
for(i=0;i<ModelBlock->Block_List[j].IM_lead_lag[m].size;i++)
{
int eqr=ModelBlock->Block_List[j].IM_lead_lag[m].Equ[i];
int v=ModelBlock->Block_List[j].Equation[eqr];
Uf[v].Ufl=Uf[v].Ufl_First;
while(Uf[v].Ufl)
{
Uf[v].Ufl_First=Uf[v].Ufl->pNext;
free(Uf[v].Ufl);
Uf[v].Ufl=Uf[v].Ufl_First;
}
}
}
}
}*/
} }

2
ParsingDriver.cc
View File

@ -733,7 +733,7 @@ ParsingDriver::simul()
void void
ParsingDriver::model_info() ParsingDriver::model_info()
{ {
mod_file->addStatement(new Model_InfoStatement(options_list)); mod_file->addStatement(new ModelInfoStatement(options_list));
options_list.clear(); options_list.clear();
} }

4
include/ComputingTasks.hh
View File

@ -76,12 +76,12 @@ public:
virtual void writeOutput(ostream &output, const string &basename) const; virtual void writeOutput(ostream &output, const string &basename) const;
}; };
class Model_InfoStatement : public Statement class ModelInfoStatement : public Statement
{ {
private: private:
const OptionsList options_list; const OptionsList options_list;
public: public:
Model_InfoStatement(const OptionsList &options_list_arg); ModelInfoStatement(const OptionsList &options_list_arg);
virtual void checkPass(ModFileStructure &mod_file_struct); virtual void checkPass(ModFileStructure &mod_file_struct);
virtual void writeOutput(ostream &output, const string &basename) const; virtual void writeOutput(ostream &output, const string &basename) const;
}; };