Rename HomotopyStatement class to HomotopySetupStatement
For consistency with other such classes, since it represents the homotopy_setup block.master
parent
f70a9554a8
commit
a4bc539364
|
@ -534,16 +534,16 @@ HistvalFileStatement::writeJsonOutput(ostream &output) const
|
|||
output << "}";
|
||||
}
|
||||
|
||||
HomotopyStatement::HomotopyStatement(homotopy_values_t homotopy_values_arg,
|
||||
const SymbolTable &symbol_table_arg) :
|
||||
HomotopySetupStatement::HomotopySetupStatement(homotopy_values_t homotopy_values_arg,
|
||||
const SymbolTable &symbol_table_arg) :
|
||||
homotopy_values{move(homotopy_values_arg)},
|
||||
symbol_table{symbol_table_arg}
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
HomotopyStatement::writeOutput(ostream &output, [[maybe_unused]] const string &basename,
|
||||
[[maybe_unused]] bool minimal_workspace) const
|
||||
HomotopySetupStatement::writeOutput(ostream &output, [[maybe_unused]] const string &basename,
|
||||
[[maybe_unused]] bool minimal_workspace) const
|
||||
{
|
||||
output << "%" << endl
|
||||
<< "% HOMOTOPY_SETUP instructions" << endl
|
||||
|
@ -567,7 +567,7 @@ HomotopyStatement::writeOutput(ostream &output, [[maybe_unused]] const string &b
|
|||
}
|
||||
|
||||
void
|
||||
HomotopyStatement::writeJsonOutput(ostream &output) const
|
||||
HomotopySetupStatement::writeJsonOutput(ostream &output) const
|
||||
{
|
||||
output << R"({"statementName": "homotopy", )"
|
||||
<< R"("values": [)";
|
||||
|
|
|
@ -165,7 +165,7 @@ public:
|
|||
void writeJsonOutput(ostream &output) const override;
|
||||
};
|
||||
|
||||
class HomotopyStatement : public Statement
|
||||
class HomotopySetupStatement : public Statement
|
||||
{
|
||||
public:
|
||||
//! Stores the declarations of homotopy_setup
|
||||
|
@ -175,8 +175,8 @@ private:
|
|||
const homotopy_values_t homotopy_values;
|
||||
const SymbolTable &symbol_table;
|
||||
public:
|
||||
HomotopyStatement(homotopy_values_t homotopy_values_arg,
|
||||
const SymbolTable &symbol_table_arg);
|
||||
HomotopySetupStatement(homotopy_values_t homotopy_values_arg,
|
||||
const SymbolTable &symbol_table_arg);
|
||||
void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const override;
|
||||
void writeJsonOutput(ostream &output) const override;
|
||||
};
|
||||
|
|
|
@ -795,7 +795,7 @@ ParsingDriver::end_histval(bool all_values_required)
|
|||
void
|
||||
ParsingDriver::end_homotopy()
|
||||
{
|
||||
mod_file->addStatement(make_unique<HomotopyStatement>(move(homotopy_values), mod_file->symbol_table));
|
||||
mod_file->addStatement(make_unique<HomotopySetupStatement>(move(homotopy_values), mod_file->symbol_table));
|
||||
homotopy_values.clear();
|
||||
}
|
||||
|
||||
|
|
|
@ -172,7 +172,7 @@ private:
|
|||
//! Temporary storage for histval blocks
|
||||
HistValStatement::hist_values_t hist_values;
|
||||
//! Temporary storage for homotopy_setup blocks
|
||||
HomotopyStatement::homotopy_values_t homotopy_values;
|
||||
HomotopySetupStatement::homotopy_values_t homotopy_values;
|
||||
//! Temporary storage for moment_calibration
|
||||
MomentCalibration::constraints_t moment_calibration_constraints;
|
||||
//! Temporary storage for irf_calibration
|
||||
|
|
Loading…
Reference in New Issue