Fix whether value is changeable in OMEdit (OpenModelica#12294)

adrpo · Apr 23, 2024 · d8bc442 · d8bc442
1 parent a63bb10
commit d8bc442
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/OMCompiler/Compiler/BackEnd/BackendVariable.mo b/OMCompiler/Compiler/BackEnd/BackendVariable.mo
@@ -2053,7 +2053,7 @@ end isFinalVar;
 
 public function isFinalOrProtectedVar
   input BackendDAE.Var inVar;
-  output Boolean b = DAEUtil.getFinalAttr(inVar.values) or isProtectedVar(inVar);
+  output Boolean b = isFinalVar(inVar) or isProtectedVar(inVar);
 end isFinalOrProtectedVar;
 
 public function getVariableAttributes "Returns the DAE.VariableAttributes of a variable."

diff --git a/OMCompiler/Compiler/NSimCode/NSimVar.mo b/OMCompiler/Compiler/NSimCode/NSimVar.mo
@@ -459,6 +459,8 @@ public
         else (start, false, Causality.LOCAL);
 
         // ToDo: more cases!
+
+        // FIXME: variables that are fixed and are not CALCULATED should have isValueChangeable=true
       end match;
     end parseBinding;
 

diff --git a/OMCompiler/Compiler/SimCode/SimCodeUtil.mo b/OMCompiler/Compiler/SimCode/SimCodeUtil.mo
@@ -9991,19 +9991,13 @@ algorithm
         (minValue, maxValue) = getMinMaxValues(dlowVar);
         initVal = getStartValue(dlowVar);
         nomVal = getNominalValue(dlowVar);
-        // checkInitVal(initVal, source);
         isFixed = BackendVariable.varFixed(dlowVar);
         type_ = tp;
         isDiscrete = BackendVariable.isVarDiscrete(dlowVar);
         arrayCref = ComponentReference.getArrayCref(cr);
         aliasvar = getAliasVar(dlowVar, optAliasVars);
         numArrayElement = List.map(inst_dims, ExpressionDump.dimensionIntString);
-        // print("name: " + ComponentReference.printComponentRefStr(cr) + "indx: " + intString(indx) + "\n");
-        // check if the variable has changeable value
-        // parameter which has final = true or evaluate annotation are not changeable
-        isValueChangeable = ((not BackendVariable.hasVarEvaluateAnnotationTrueOrFinalOrProtected(dlowVar)
-                            and (BackendVariable.varHasConstantBindExp(dlowVar) or not BackendVariable.varHasBindExp(dlowVar))))
-                            and isFixed;
+        isValueChangeable = isChangeable(dlowVar);
         caus = getCausality(dlowVar, vars, isValueChangeable);
         variability = SimCodeVar.FIXED(); // PARAMETERS()
         initial_ = setInitialAttribute(dlowVar, variability, caus, isFixed, iterationVars, aliasvar, vars);
@@ -10036,14 +10030,13 @@ algorithm
         (minValue, maxValue) = getMinMaxValues(dlowVar);
         initVal = getStartValue(dlowVar);
         nomVal = getNominalValue(dlowVar);
-        // checkInitVal(initVal, source);
         isFixed = BackendVariable.varFixed(dlowVar);
         type_ = tp;
         isDiscrete = BackendVariable.isVarDiscrete(dlowVar);
         arrayCref = ComponentReference.getArrayCref(cr);
         aliasvar = getAliasVar(dlowVar, optAliasVars);
         numArrayElement = List.map(inst_dims, ExpressionDump.dimensionIntString);
-        isValueChangeable = BackendVariable.varHasConstantStartExp(dlowVar);
+        isValueChangeable = isChangeable(dlowVar);
         caus = getCausality(dlowVar, vars, isValueChangeable);
         variability = SimCodeVar.CONTINUOUS(); // state() should be CONTINUOUS
         initial_ = setInitialAttribute(dlowVar, variability, caus, isFixed, iterationVars, aliasvar, vars);
@@ -10077,14 +10070,14 @@ algorithm
         (minValue, maxValue) = getMinMaxValues(dlowVar);
         initVal = getStartValue(dlowVar);
         nomVal = getNominalValue(dlowVar);
-        // checkInitVal(initVal, source);
         isFixed = BackendVariable.varFixed(dlowVar);
         type_ = tp;
         isDiscrete = BackendVariable.isVarDiscrete(dlowVar);
         arrayCref = ComponentReference.getArrayCref(cr);
         aliasvar = getAliasVar(dlowVar, optAliasVars);
         numArrayElement = List.map(inst_dims, ExpressionDump.dimensionIntString);
-        isValueChangeable = match dir case DAE.INPUT() then true; else false; end match;
+        isValueChangeable = match dir case DAE.INPUT() then true; else isChangeable(dlowVar);
+        end match;
         caus = getCausality(dlowVar, vars, isValueChangeable);
         variability = getVariabilityAttribute(dlowVar);
         initial_ = setInitialAttribute(dlowVar, variability, caus, isFixed, iterationVars, aliasvar, vars);
@@ -10095,6 +10088,13 @@ algorithm
   end match;
 end dlowvarToSimvar;
 
+protected function isChangeable
+  input BackendDAE.Var dlowVar;
+  output Boolean isValueChangeable = BackendVariable.varFixed(dlowVar)
+    and not BackendVariable.hasVarEvaluateAnnotationTrueOrFinalOrProtected(dlowVar)
+    and (BackendVariable.varHasConstantBindExp(dlowVar) or not BackendVariable.varHasBindExp(dlowVar));
+end isChangeable;
+
 protected function getCausality
   input BackendDAE.Var dlowVar;
   input BackendDAE.Variables inVars;

diff --git a/OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp b/OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp
@@ -1197,7 +1197,7 @@ void VariablesTreeModel::getVariableInformation(ModelicaMatReader *pMatReader, Q
   QHash<QString, QString> hash = mScalarVariablesHash.value(variableToFind);
   if (hash.value("name").compare(variableToFind) == 0) {
     *type = hash.value("type");
-    *changeAble = (hash.value("isValueChangeable").compare(QStringLiteral("true")) == 0) ? true : false;
+    *changeAble = hash.value("isValueChangeable").compare(QStringLiteral("true")) == 0;
     *variability = hash.value("variability");
     if (*changeAble) {
       *value = hash.value("start");

diff --git a/testsuite/openmodelica/fmi/ModelExchange/2.0/testBug5673.mos b/testsuite/openmodelica/fmi/ModelExchange/2.0/testBug5673.mos
@@ -60,7 +60,7 @@ readFile("Bug5673.xml"); getErrorString();
 //     name = \"b\"
 //     valueReference = \"1000\"
 //     variability = \"continuous\" isDiscrete = \"false\"
-//     causality = \"local\" isValueChangeable = \"false\"
+//     causality = \"local\" isValueChangeable = \"true\"
 //     alias = \"noAlias\"
 //     classIndex = \"0\" classType = \"rAlg\"
 //     isProtected = \"false\" hideResult = \"\" initNonlinear = \"false\"