- add alias a = not b, not a = b, not a = not b, -a = -b

- fix write results for boolean alias, ToDo .mat

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13005 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Jens Frenkel

Compiler/BackEnd/BackendEquation.mo

@@ -1908,6 +1908,11 @@ algorithm
         equation
           ne = Expression.negate(e2);
         then (cr1,cr2,e1,ne,true);
+      // -a = -b;
+      case (BackendDAE.EQUATION(exp=DAE.UNARY(DAE.UMINUS(_),e1 as DAE.CREF(componentRef = cr1)),scalar=DAE.UNARY(DAE.UMINUS(_),e2 as  DAE.CREF(componentRef = cr2))))
+        then (cr1,cr2,e1,e2,false);
+      case (BackendDAE.EQUATION(exp=DAE.UNARY(DAE.UMINUS_ARR(_),e1 as DAE.CREF(componentRef = cr1)),scalar=DAE.UNARY(DAE.UMINUS_ARR(_),e2 as  DAE.CREF(componentRef = cr2))))
+        then (cr1,cr2,e1,e2,false);
       // a + b = 0
       case (BackendDAE.EQUATION(exp=DAE.BINARY(e1 as DAE.CREF(componentRef = cr1),DAE.ADD(ty=_),e2 as DAE.CREF(componentRef = cr2)),scalar=e))
         equation
@@ -1996,6 +2001,20 @@ algorithm
           true = Expression.isZero(e);
           ne = Expression.negate(e2);
         then (cr1,cr2,e1,ne,true);
+      // a = not b;
+      case (BackendDAE.EQUATION(exp=e1 as DAE.CREF(componentRef = cr1),scalar=e2 as  DAE.LUNARY(DAE.NOT(_),DAE.CREF(componentRef = cr2))))
+        equation
+          ne = Expression.negate(e1);
+        then (cr1,cr2,ne,e2,true);
+      // not a = b;
+      case (BackendDAE.EQUATION(exp=e1 as  DAE.LUNARY(DAE.NOT(_),DAE.CREF(componentRef = cr1)),scalar=e2 as  DAE.CREF(componentRef = cr2)))
+        equation
+          ne = Expression.negate(e2);
+        then (cr1,cr2,e1,ne,true);
+      // not a = not b;
+      case (BackendDAE.EQUATION(exp=DAE.LUNARY(DAE.NOT(_),e1 as  DAE.CREF(componentRef = cr1)),scalar=DAE.LUNARY(DAE.NOT(_),e2 as  DAE.CREF(componentRef = cr2))))
+        then (cr1,cr2,e1,e2,false);
+
   end match;
 end aliasEquation;
 

Compiler/BackEnd/SimCodeUtil.mo

@@ -7829,6 +7829,7 @@ algorithm
     case (DAE.CREF(componentRef=name),inVar) then SimCode.ALIAS(name);
     case (DAE.UNARY(operator=DAE.UMINUS(_),exp=DAE.CREF(componentRef=name)),inVar) then SimCode.NEGATEDALIAS(name);
     case (DAE.UNARY(operator=DAE.UMINUS_ARR(_),exp=DAE.CREF(componentRef=name)),inVar) then SimCode.NEGATEDALIAS(name);
+    case (DAE.LUNARY(operator=DAE.NOT(_),exp=DAE.CREF(componentRef=name)),inVar) then SimCode.NEGATEDALIAS(name);
     case (DAE.CALL(path=fname, expLst={DAE.CREF(componentRef=name)}),inVar)
       equation
       Builtin.isDer(fname);

Compiler/FrontEnd/Expression.mo

@@ -523,8 +523,9 @@ algorithm
       DAE.Exp e;
 
     // to avoid unnessecary --e
-    case(DAE.UNARY(DAE.UMINUS(t),e)) then e;
-    case(DAE.UNARY(DAE.UMINUS_ARR(t),e)) then e;
+    case(DAE.UNARY(DAE.UMINUS(_),e)) then e;
+    case(DAE.UNARY(DAE.UMINUS_ARR(_),e)) then e;
+    case(DAE.LUNARY(DAE.NOT(_),e)) then e;
 
     case (DAE.ICONST(i))
       equation
@@ -545,6 +546,12 @@ algorithm
         true = isZero(e);
       then 
         e;
+    // not e
+    case(e) 
+      equation
+        (t as DAE.T_BOOL(source=_)) = typeof(e);
+      then 
+        DAE.LUNARY(DAE.NOT(t),e);
 
     case(e) 
       equation

SimulationRuntime/c/simulation/results/simulation_result_csv.cpp

@@ -82,7 +82,7 @@ void simulation_result_csv::emit(DATA *data)
   }
   for (int i = 0; i < data->modelData.nAliasBoolean; i++) if (!data->modelData.booleanAlias[i].filterOutput){
     if (data->modelData.booleanAlias[i].negate)
-      fprintf(fout, formatbool, -(data->localData[0])->booleanVars[data->modelData.booleanAlias[i].nameID]);
+      fprintf(fout, formatbool, (data->localData[0])->booleanVars[data->modelData.booleanAlias[i].nameID]==1?0:1);
     else
       fprintf(fout, formatbool, (data->localData[0])->booleanVars[data->modelData.booleanAlias[i].nameID]);
   }

SimulationRuntime/c/simulation/results/simulation_result_plt.cpp

@@ -109,7 +109,7 @@ void simulation_result_plt::emit(DATA *data)
     maxPoints = (long)(1.4*maxPoints + (maxPoints-actualPoints) + 2000);
     /* cerr << "realloc simulationResultData to a size of " << maxPoints * dataSize * sizeof(double) << endl; */
     simulationResultData = (double*)realloc(simulationResultData, maxPoints * dataSize * sizeof(double));
-    if (!simulationResultData) 
+    if (!simulationResultData)
       THROW1("Error allocating simulation result data of size %ld",maxPoints * dataSize);
     add_result(simulationResultData,&actualPoints,data);
   }
@@ -177,7 +177,7 @@ void simulation_result_plt::add_result(double *data, long *actualPoints, DATA *s
     if (!simData->modelData.booleanAlias[i].filterOutput) {
       ss << simData->modelData.booleanAlias[i].info.name << "\n";
       if (simData->modelData.booleanAlias[i].negate)
-        ss << (data[currentPos++] = -simData->localData[0]->booleanVars[simData->modelData.booleanAlias[i].nameID]) << "\n";
+        ss << (data[currentPos++] = simData->localData[0]->booleanVars[simData->modelData.booleanAlias[i].nameID]==1?0:1) << "\n";
       else
         ss << (data[currentPos++] = simData->localData[0]->booleanVars[simData->modelData.booleanAlias[i].nameID]) << "\n";
     }
@@ -229,12 +229,12 @@ void simulation_result_plt::add_result(double *data, long *actualPoints, DATA *s
     for (int i = 0; i < simData->modelData.nAliasBoolean; i++) {
       if (!simData->modelData.booleanAlias[i].filterOutput) {
         if (simData->modelData.booleanAlias[i].negate)
-          data[currentPos++] = -simData->localData[0]->booleanVars[simData->modelData.booleanAlias[i].nameID];
+          data[currentPos++] = simData->localData[0]->booleanVars[simData->modelData.booleanAlias[i].nameID]==1?0:1;
         else
           data[currentPos++] = simData->localData[0]->booleanVars[simData->modelData.booleanAlias[i].nameID];
       }
     }
-  } 
+  }
 
   /*cerr << "  ... done" << endl; */
   (*actualPoints)++;