diff --git a/ComputingTasks.cc b/ComputingTasks.cc index dbdef0ec2d7849ff980c3a85416de3b3d5b56026..1af68165fbf0b55b33b166d9632b41aac1155f1d 100644 --- a/ComputingTasks.cc +++ b/ComputingTasks.cc @@ -1291,8 +1291,7 @@ EstimatedParamsStatement::checkPass(ModFileStructure &mod_file_struct, WarningCo void EstimatedParamsStatement::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const { - output << "global estim_params_" << endl - << "estim_params_.var_exo = [];" << endl + output << "estim_params_.var_exo = [];" << endl << "estim_params_.var_endo = [];" << endl << "estim_params_.corrx = [];" << endl << "estim_params_.corrn = [];" << endl diff --git a/ExprNode.cc b/ExprNode.cc index 66b479d265caf9e00f3e869f92ee99936b2983de..c40dac37e9e6f636239874a7e572b4d1437e7dfc 100644 --- a/ExprNode.cc +++ b/ExprNode.cc @@ -3511,6 +3511,16 @@ BinaryOpNode::writeJsonOutput(ostream &output, return; } + if (op_code == oPowerDeriv) + { + output << "get_power_deriv("; + arg1->writeJsonOutput(output, temporary_terms, tef_terms); + output << ","; + arg2->writeJsonOutput(output, temporary_terms, tef_terms); + output << "," << powerDerivOrder << ")"; + return; + } + int prec = precedenceJson(temporary_terms); bool close_parenthesis = false; diff --git a/SymbolTable.cc b/SymbolTable.cc index c191060be217cf3c2ce984fb8bf5b8230e0d1deb..f1409587cd79f531875eb49b8178c66b255ee012 100644 --- a/SymbolTable.cc +++ b/SymbolTable.cc @@ -110,7 +110,7 @@ SymbolTable::freeze() throw (FrozenException) frozen = true; - for (int i = 0; i < symbol_table.size(); i++) + for (int i = 0; i < (int) symbol_table.size(); i++) { int tsi; switch (getType(i)) diff --git a/SymbolTable.hh b/SymbolTable.hh index 8bb112200d33046c54c726726a5b368c82edcb12..76aa3896141782b1533d21bad56da4adaa58953b 100644 --- a/SymbolTable.hh +++ b/SymbolTable.hh @@ -384,7 +384,7 @@ public: inline void SymbolTable::validateSymbID(int symb_id) const throw (UnknownSymbolIDException) { - if (symb_id < 0 || symb_id > symbol_table.size()) + if (symb_id < 0 || symb_id > (int) symbol_table.size()) throw UnknownSymbolIDException(symb_id); } diff --git a/changed_files.txt b/changed_files.txt deleted file mode 100644 index 2a6f38274ac43a28673b3ee38ee6d35c78ad4a20..0000000000000000000000000000000000000000 --- a/changed_files.txt +++ /dev/null @@ -1,4 +0,0 @@ - -license.txt - -windows/dynare.nsi