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

Do not print non optimizing behaviour field in PAC if empty.

issue#70
Stéphane Adjemian(Charybdis) 2018-08-14 16:45:01 +02:00
parent ac850f5187
commit adbeb49b29
1 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ExprNode.cc
View File

@ -8430,8 +8430,10 @@ PacExpectationNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
output << " ";
output << it->second.second;
}
output << "];" << endl
<< "M_.pac." << model_name << ".non_optim.params = [";
output << "];" << endl;
if (!params_vars_and_scaling_factor.empty())
{
output << "M_.pac." << model_name << ".non_optimizing_behaviour.params = [";
for (auto it = params_vars_and_scaling_factor.begin();
it != params_vars_and_scaling_factor.end(); it++)
{
@ -8442,8 +8444,8 @@ PacExpectationNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
else
output << "NaN";
}
output << "];" << endl
<< "M_.pac." << model_name << ".non_optim.vars = [";
output << "];"
<< "M_.pac." << model_name << ".non_optimizing_behaviour.vars = [";
for (auto it = params_vars_and_scaling_factor.begin();
it != params_vars_and_scaling_factor.end(); it++)
{
@ -8452,7 +8454,7 @@ PacExpectationNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
output << datatree.symbol_table.getTypeSpecificID(it->second.first.first) + 1;
}
output << "];" << endl
<< "M_.pac." << model_name << ".non_optim.lags = [";
<< "M_.pac." << model_name << ".non_optimizing_behaviour.lags = [";
for (auto it = params_vars_and_scaling_factor.begin();
it != params_vars_and_scaling_factor.end(); it++)
{
@ -8461,7 +8463,7 @@ PacExpectationNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
output << it->second.first.second;
}
output << "];" << endl
<< "M_.pac." << model_name << ".non_optim.scaling_factor = [";
<< "M_.pac." << model_name << ".non_optimizing_behaviour.scaling_factor = [";
for (auto it = params_vars_and_scaling_factor.begin();
it != params_vars_and_scaling_factor.end(); it++)
{
@ -8469,8 +8471,9 @@ PacExpectationNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
output << " ";
output << it->second.second;
}
output << "];" << endl
<< "M_.pac." << model_name << ".h0_param_indices = [";
output << "];" << endl;
}
output << "M_.pac." << model_name << ".h0_param_indices = [";
for (auto it = h0_indices.begin();
it != h0_indices.end(); it++)
{