From 4dbf3b8179b4b545283a56870b24ff098301577d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Sat, 17 Sep 2022 18:43:37 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20bug=20with=20=E2=80=9Cgraph=5Fformat?=
=?UTF-8?q?=E2=80=9D=20option=20of=20=E2=80=9Cidentification=E2=80=9D=20an?=
=?UTF-8?q?d=20=E2=80=9Cdynare=5Fsensitivity=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The local value of option was not copied to the top-level “options_” structure,
as it is done for “nograph” and “nodisplay”.
(cherry picked from commit 3f674c1af925407b366255737d004afcd31116a3)
---
src/ComputingTasks.cc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/ComputingTasks.cc b/src/ComputingTasks.cc
index 7cc47d5d..3c53bb6c 100644
--- a/src/ComputingTasks.cc
+++ b/src/ComputingTasks.cc
@@ -1239,9 +1239,9 @@ DynareSensitivityStatement::writeOutput(ostream &output, const string &basename,
if (auto it = options_list.num_options.find("nograph");
it != options_list.num_options.end())
output << "options_.nograph = " << it->second << ";" << endl;
- if (auto it = options_list.string_options.find("graph_format");
- it != options_list.string_options.end())
- output << "options_.graph_format = '" << it->second << "';" << endl;
+ if (auto it = options_list.symbol_list_options.find("graph_format");
+ it != options_list.symbol_list_options.end())
+ it->second.writeOutput("options_.graph_format", output);
output << "dynare_sensitivity(options_gsa);" << endl;
}
@@ -2873,9 +2873,9 @@ IdentificationStatement::writeOutput(ostream &output, const string &basename, bo
if (auto it = options_list.num_options.find("nograph");
it != options_list.num_options.end())
output << "options_.nograph = " << it->second << ";" << endl;
- if (auto it = options_list.string_options.find("graph_format");
- it != options_list.string_options.end())
- output << "options_.graph_format = '" << it->second << "';" << endl;
+ if (auto it = options_list.symbol_list_options.find("graph_format");
+ it != options_list.symbol_list_options.end())
+ it->second.writeOutput("options_.graph_format", output);
output << "dynare_identification(options_ident);" << endl;
}
--
GitLab