From 5fbadbadd361da568223057e9fb64e931c2fcb3d Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Thu, 2 Mar 2017 17:32:50 +0100
Subject: [PATCH] preprocessor: make JSON output start counting at 1 instead of
0. #1387
---
DynamicModel.cc | 16 ++++++++--------
StaticModel.cc | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/DynamicModel.cc b/DynamicModel.cc
index 1c35f3cb..a665a577 100644
--- a/DynamicModel.cc
+++ b/DynamicModel.cc
@@ -5387,7 +5387,7 @@ DynamicModel::writeJsonComputingPassOutput(ostream &output) const
int lag = getLagByDerivID(it->first.second);
expr_t d1 = it->second;
- jacobian_output << "{\"eq\": " << eq
+ jacobian_output << "{\"eq\": " << eq + 1
<< ", \"var\": \"" << var << "\""
<< ", \"lag\": " << lag
<< ", \"val\": \"";
@@ -5418,7 +5418,7 @@ DynamicModel::writeJsonComputingPassOutput(ostream &output) const
int lag2 = getLagByDerivID(it->first.second.second);
expr_t d2 = it->second;
- hessian_output << "{\"eq\": " << eq
+ hessian_output << "{\"eq\": " << eq + 1
<< ", \"var1\": \"" << var1 << "\""
<< ", \"lag1\": " << lag1
<< ", \"var2\": \"" << var2 << "\""
@@ -5453,7 +5453,7 @@ DynamicModel::writeJsonComputingPassOutput(ostream &output) const
int lag3 = getLagByDerivID(it->first.second.second.second);
expr_t d3 = it->second;
- third_derivatives_output << "{\"eq\": " << eq
+ third_derivatives_output << "{\"eq\": " << eq + 1
<< ", \"var1\": \"" << var1 << "\""
<< ", \"lag1\": " << lag1
<< ", \"var2\": \"" << var2 << "\""
@@ -5513,7 +5513,7 @@ DynamicModel::writeJsonParamsDerivativesFile(ostream &output) const
string param = symbol_table.getName(getSymbIDByDerivID(it->first.second));
expr_t d1 = it->second;
- jacobian_output << "{\"eq\": " << eq
+ jacobian_output << "{\"eq\": " << eq + 1
<< ", \"param\": \"" << param << "\""
<< ", \"val\": \"";
d1->writeJsonOutput(jacobian_output, params_derivs_temporary_terms, tef_terms);
@@ -5537,7 +5537,7 @@ DynamicModel::writeJsonParamsDerivativesFile(ostream &output) const
string param = symbol_table.getName(getSymbIDByDerivID(it->first.second.second));
expr_t d2 = it->second;
- hessian_output << "{\"eq\": " << eq
+ hessian_output << "{\"eq\": " << eq + 1
<< ", \"var\": \"" << var << "\""
<< ", \"lag\": " << lag
<< ", \"param\": \"" << param << "\""
@@ -5563,7 +5563,7 @@ DynamicModel::writeJsonParamsDerivativesFile(ostream &output) const
string param2 = symbol_table.getName(getSymbIDByDerivID(it->first.second.second));
expr_t d2 = it->second;
- hessian1_output << "{\"eq\": " << eq
+ hessian1_output << "{\"eq\": " << eq + 1
<< ", \"param1\": \"" << param1 << "\""
<< ", \"param2\": \"" << param2 << "\""
<< ", \"val\": \"";
@@ -5590,7 +5590,7 @@ DynamicModel::writeJsonParamsDerivativesFile(ostream &output) const
string param2 = symbol_table.getName(getSymbIDByDerivID(it->first.second.second.second));
expr_t d2 = it->second;
- third_derivs_output << "{\"eq\": " << eq
+ third_derivs_output << "{\"eq\": " << eq + 1
<< ", \"var\": \"" << var << "\""
<< ", \"lag\": " << lag
<< ", \"param1\": \"" << param1 << "\""
@@ -5621,7 +5621,7 @@ DynamicModel::writeJsonParamsDerivativesFile(ostream &output) const
string param = symbol_table.getName(getSymbIDByDerivID(it->first.second.second.second));
expr_t d2 = it->second;
- third_derivs1_output << "{\"eq\": " << eq
+ third_derivs1_output << "{\"eq\": " << eq + 1
<< ", \"var1\": \"" << var1 << "\""
<< ", \"lag1\": " << lag1
<< ", \"var2\": \"" << var2 << "\""
diff --git a/StaticModel.cc b/StaticModel.cc
index 71e631ee..e3823167 100644
--- a/StaticModel.cc
+++ b/StaticModel.cc
@@ -2466,7 +2466,7 @@ StaticModel::writeJsonComputingPassOutput(ostream &output) const
string var = symbol_table.getName(getSymbIDByDerivID(it->first.second));
expr_t d1 = it->second;
- jacobian_output << "{\"eq\": " << eq
+ jacobian_output << "{\"eq\": " << eq + 1
<< ", \"var\": \"" << var << "\""
<< ", \"val\": \"";
d1->writeJsonOutput(jacobian_output, temp_term_union, tef_terms);
@@ -2495,7 +2495,7 @@ StaticModel::writeJsonComputingPassOutput(ostream &output) const
string var2 = symbol_table.getName(getSymbIDByDerivID(it->first.second.second));
expr_t d2 = it->second;
- hessian_output << "{\"eq\": " << eq
+ hessian_output << "{\"eq\": " << eq + 1
<< ", \"var1\": \"" << var1 << "\""
<< ", \"var2\": \"" << var2 << "\""
<< ", \"val\": \"";
@@ -2525,7 +2525,7 @@ StaticModel::writeJsonComputingPassOutput(ostream &output) const
string var3 = symbol_table.getName(getSymbIDByDerivID(it->first.second.second.second));
expr_t d3 = it->second;
- third_derivatives_output << "{\"eq\": " << eq
+ third_derivatives_output << "{\"eq\": " << eq + 1
<< ", \"var1\": \"" << var1 << "\""
<< ", \"var2\": \"" << var2 << "\""
<< ", \"var3\": \"" << var3 << "\""
@@ -2582,7 +2582,7 @@ StaticModel::writeJsonParamsDerivativesFile(ostream &output) const
string param = symbol_table.getName(getSymbIDByDerivID(it->first.second));
expr_t d1 = it->second;
- jacobian_output << "{\"eq\": " << eq
+ jacobian_output << "{\"eq\": " << eq + 1
<< ", \"param\": \"" << param << "\""
<< ", \"val\": \"";
d1->writeJsonOutput(jacobian_output, params_derivs_temporary_terms, tef_terms);
@@ -2605,7 +2605,7 @@ StaticModel::writeJsonParamsDerivativesFile(ostream &output) const
string param = symbol_table.getName(getSymbIDByDerivID(it->first.second.second));
expr_t d2 = it->second;
- hessian_output << "{\"eq\": " << eq
+ hessian_output << "{\"eq\": " << eq + 1
<< ", \"var\": \"" << var << "\""
<< ", \"param\": \"" << param << "\""
<< ", \"val\": \"";
@@ -2630,7 +2630,7 @@ StaticModel::writeJsonParamsDerivativesFile(ostream &output) const
string param2 = symbol_table.getName(getSymbIDByDerivID(it->first.second.second));
expr_t d2 = it->second;
- hessian1_output << "{\"eq\": " << eq
+ hessian1_output << "{\"eq\": " << eq + 1
<< ", \"param1\": \"" << param1 << "\""
<< ", \"param2\": \"" << param2 << "\""
<< ", \"val\": \"";
@@ -2656,7 +2656,7 @@ StaticModel::writeJsonParamsDerivativesFile(ostream &output) const
string param2 = symbol_table.getName(getSymbIDByDerivID(it->first.second.second.second));
expr_t d2 = it->second;
- third_derivs_output << "{\"eq\": " << eq
+ third_derivs_output << "{\"eq\": " << eq + 1
<< ", \"var\": \"" << var << "\""
<< ", \"param1\": \"" << param1 << "\""
<< ", \"param2\": \"" << param2 << "\""
@@ -2684,7 +2684,7 @@ StaticModel::writeJsonParamsDerivativesFile(ostream &output) const
string param = symbol_table.getName(getSymbIDByDerivID(it->first.second.second.second));
expr_t d2 = it->second;
- third_derivs1_output << "{\"eq\": " << eq
+ third_derivs1_output << "{\"eq\": " << eq + 1
<< ", \"var1\": \"" << var1 << "\""
<< ", \"var2\": \"" << var2 << "\""
<< ", \"param1\": \"" << param << "\""
--
GitLab