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

Block decomposition: remove ExprNodeOutputType::matlabDynamicSparseSteadyStateOperator 

It’s not really needed, since it does the same as
ExprNodeOutputType::matlabDynamicSteadyStateOperator.
issue#70
Sébastien Villemot 2020-05-25 15:35:48 +02:00
parent 7b1a77ca47
commit 3033417f5a
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ExprNode.cc
View File

@ -980,7 +980,7 @@ VariableNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
case SymbolType::modelLocalVariable: case SymbolType::modelLocalVariable:
if (output_type == ExprNodeOutputType::matlabDynamicModelSparse || output_type == ExprNodeOutputType::matlabStaticModelSparse if (output_type == ExprNodeOutputType::matlabDynamicModelSparse || output_type == ExprNodeOutputType::matlabStaticModelSparse
|| output_type == ExprNodeOutputType::matlabDynamicSteadyStateOperator || output_type == ExprNodeOutputType::matlabDynamicSparseSteadyStateOperator || output_type == ExprNodeOutputType::matlabDynamicSteadyStateOperator
|| output_type == ExprNodeOutputType::CDynamicSteadyStateOperator) || output_type == ExprNodeOutputType::CDynamicSteadyStateOperator)
{ {
output << "("; output << "(";
@ -1027,7 +1027,6 @@ VariableNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
break; break;
case ExprNodeOutputType::juliaDynamicSteadyStateOperator: case ExprNodeOutputType::juliaDynamicSteadyStateOperator:
case ExprNodeOutputType::matlabDynamicSteadyStateOperator: case ExprNodeOutputType::matlabDynamicSteadyStateOperator:
case ExprNodeOutputType::matlabDynamicSparseSteadyStateOperator:
output << "steady_state" << LEFT_ARRAY_SUBSCRIPT(output_type) << tsid + 1 << RIGHT_ARRAY_SUBSCRIPT(output_type); output << "steady_state" << LEFT_ARRAY_SUBSCRIPT(output_type) << tsid + 1 << RIGHT_ARRAY_SUBSCRIPT(output_type);
break; break;
case ExprNodeOutputType::CDynamicSteadyStateOperator: case ExprNodeOutputType::CDynamicSteadyStateOperator:
@ -2745,6 +2744,7 @@ UnaryOpNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
switch (output_type) switch (output_type)
{ {
case ExprNodeOutputType::matlabDynamicModel: case ExprNodeOutputType::matlabDynamicModel:
case ExprNodeOutputType::matlabDynamicModelSparse:
new_output_type = ExprNodeOutputType::matlabDynamicSteadyStateOperator; new_output_type = ExprNodeOutputType::matlabDynamicSteadyStateOperator;
break; break;
case ExprNodeOutputType::latexDynamicModel: case ExprNodeOutputType::latexDynamicModel:
@ -2756,9 +2756,6 @@ UnaryOpNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
case ExprNodeOutputType::juliaDynamicModel: case ExprNodeOutputType::juliaDynamicModel:
new_output_type = ExprNodeOutputType::juliaDynamicSteadyStateOperator; new_output_type = ExprNodeOutputType::juliaDynamicSteadyStateOperator;
break; break;
case ExprNodeOutputType::matlabDynamicModelSparse:
new_output_type = ExprNodeOutputType::matlabDynamicSparseSteadyStateOperator;
break;
default: default:
new_output_type = output_type; new_output_type = output_type;
break; break;

2
src/ExprNode.hh
View File

@ -94,7 +94,6 @@ enum class ExprNodeOutputType
latexDynamicModel, //!< LaTeX code, dynamic model latexDynamicModel, //!< LaTeX code, dynamic model
latexDynamicSteadyStateOperator, //!< LaTeX code, dynamic model, inside a steady state operator latexDynamicSteadyStateOperator, //!< LaTeX code, dynamic model, inside a steady state operator
matlabDynamicSteadyStateOperator, //!< Matlab code, dynamic model, inside a steady state operator matlabDynamicSteadyStateOperator, //!< Matlab code, dynamic model, inside a steady state operator
matlabDynamicSparseSteadyStateOperator, //!< Matlab code, dynamic block decomposed model, inside a steady state operator
CDynamicSteadyStateOperator, //!< C code, dynamic model, inside a steady state operator CDynamicSteadyStateOperator, //!< C code, dynamic model, inside a steady state operator
juliaDynamicSteadyStateOperator, //!< Julia code, dynamic model, inside a steady state operator juliaDynamicSteadyStateOperator, //!< Julia code, dynamic model, inside a steady state operator
steadyStateFile, //!< Matlab code, in the generated steady state file steadyStateFile, //!< Matlab code, in the generated steady state file
@ -112,7 +111,6 @@ isMatlabOutput(ExprNodeOutputType output_type)
|| output_type == ExprNodeOutputType::matlabStaticModelSparse || output_type == ExprNodeOutputType::matlabStaticModelSparse
|| output_type == ExprNodeOutputType::matlabDynamicModelSparse || output_type == ExprNodeOutputType::matlabDynamicModelSparse
|| output_type == ExprNodeOutputType::matlabDynamicSteadyStateOperator || output_type == ExprNodeOutputType::matlabDynamicSteadyStateOperator
|| output_type == ExprNodeOutputType::matlabDynamicSparseSteadyStateOperator
|| output_type == ExprNodeOutputType::steadyStateFile || output_type == ExprNodeOutputType::steadyStateFile
|| output_type == ExprNodeOutputType::matlabDseries || output_type == ExprNodeOutputType::matlabDseries
|| output_type == ExprNodeOutputType::epilogueFile; || output_type == ExprNodeOutputType::epilogueFile;