From 9292b0692e1ac1ad335fee42bdda6bc6392f19f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Wed, 25 Nov 2020 17:40:00 +0100
Subject: [PATCH] Rename DetCondForecast to DetCondForecastStatement, for
naming consistency
---
src/ComputingTasks.cc | 8 ++++----
src/ComputingTasks.hh | 8 ++++----
src/ParsingDriver.cc | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/ComputingTasks.cc b/src/ComputingTasks.cc
index f3897311..09c348d6 100644
--- a/src/ComputingTasks.cc
+++ b/src/ComputingTasks.cc
@@ -738,9 +738,9 @@ ForecastStatement::writeJsonOutput(ostream &output) const
output << "}";
}
-DetCondForecast::DetCondForecast(SymbolList symbol_list_arg,
- OptionsList options_list_arg,
- const bool linear_decomposition_arg) :
+DetCondForecastStatement::DetCondForecastStatement(SymbolList symbol_list_arg,
+ OptionsList options_list_arg,
+ const bool linear_decomposition_arg) :
options_list{move(options_list_arg)},
symbol_list{move(symbol_list_arg)},
linear_decomposition{linear_decomposition_arg}
@@ -749,7 +749,7 @@ DetCondForecast::DetCondForecast(SymbolList symbol_list_arg,
}
void
-DetCondForecast::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const
+DetCondForecastStatement::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const
{
options_list.writeOutput(output);
if (linear_decomposition)
diff --git a/src/ComputingTasks.hh b/src/ComputingTasks.hh
index 3e1eb8f9..f11f22ae 100644
--- a/src/ComputingTasks.hh
+++ b/src/ComputingTasks.hh
@@ -95,16 +95,16 @@ public:
void writeJsonOutput(ostream &output) const override;
};
-class DetCondForecast : public Statement
+class DetCondForecastStatement : public Statement
{
private:
const OptionsList options_list;
const SymbolList symbol_list;
const bool linear_decomposition;
public:
- DetCondForecast(SymbolList symbol_list_arg,
- OptionsList options_list_arg,
- const bool linear_decompositiontion_arg);
+ DetCondForecastStatement(SymbolList symbol_list_arg,
+ OptionsList options_list_arg,
+ const bool linear_decompositiontion_arg);
void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const override;
};
diff --git a/src/ParsingDriver.cc b/src/ParsingDriver.cc
index 3fa0e780..50726028 100644
--- a/src/ParsingDriver.cc
+++ b/src/ParsingDriver.cc
@@ -2479,7 +2479,7 @@ ParsingDriver::det_cond_forecast_linear_decomposition(const string &plan)
{
symbol_list.clear();
symbol_list.addSymbol(plan);
- mod_file->addStatement(make_unique<DetCondForecast>(symbol_list, options_list, mod_file->linear_decomposition));
+ mod_file->addStatement(make_unique<DetCondForecastStatement>(symbol_list, options_list, mod_file->linear_decomposition));
symbol_list.clear();
options_list.clear();
}
@@ -2490,7 +2490,7 @@ ParsingDriver::det_cond_forecast_linear_decomposition(const string &plan, const
symbol_list.clear();
symbol_list.addSymbol(plan);
symbol_list.addSymbol(dset);
- mod_file->addStatement(make_unique<DetCondForecast>(symbol_list, options_list, mod_file->linear_decomposition));
+ mod_file->addStatement(make_unique<DetCondForecastStatement>(symbol_list, options_list, mod_file->linear_decomposition));
symbol_list.clear();
options_list.clear();
}
--
GitLab