Changeset 13670

Timestamp:

Oct 4, 2019 1:54:21 PM (2 months ago)

Author:

molsson

Message:

#5855 Use the absolute value of nominals when generating modelDescription.xml.

Location:

trunk/Compiler

Files:

• FmiXMLCodeGen/test/modelica/FmiXMLTests.mo (modified) (1 diff)
• GenericCodeGen/src/jastadd/GenericXMLGenerator.jrag (modified) (1 diff)
• ModelicaFlatTree/src/jastadd/ConstantEvaluation/ConstantEvaluation.jrag (modified) (1 diff)

trunk/Compiler/FmiXMLCodeGen/test/modelica/FmiXMLTests.mo

@@ -2543 +2543 @@
 end ParametricAttributes1;
 
+
+model NegativeNominal1
+    Real x1(nominal=-1);   // Negative integer nominal
+    Real x2(nominal=-1.0); // Negative real nominal
+equation
+    x1 = time;
+    x2 = time;
+annotation(__JModelica(UnitTesting(tests={
+    FmiXMLCodeGenTestCase(
+        description="Nominals are always non-negative in FMI",
+        fmi_version="2.0",
+        template="
+$modelVariables$
+",      generatedCode="
+<ModelVariables>
+    <!-- Variable with index #1 -->
+    <ScalarVariable name=\"x1\" valueReference=\"0\" causality=\"local\" variability=\"continuous\" initial=\"calculated\">
+        <Real relativeQuantity=\"false\" nominal=\"1\" />
+    </ScalarVariable>
+    <!-- Variable with index #2 -->
+    <ScalarVariable name=\"x2\" valueReference=\"0\" causality=\"local\" variability=\"continuous\" initial=\"calculated\">
+        <Real relativeQuantity=\"false\" nominal=\"1.0\" />
+    </ScalarVariable>
+</ModelVariables>
+")})));
+end NegativeNominal1;
+
 end FmiXMLTests;

trunk/Compiler/GenericCodeGen/src/jastadd/GenericXMLGenerator.jrag

@@ -217 +217 @@
                     variable.isInput() || variable.isDifferentiatedVariable()) {
                 try {
-                    String value = attributeExp.ceval().xmlValue();
+                    CValue cvalue = attributeExp.ceval();
+                    if (name.equals("nominal")) {
+                        cvalue = cvalue.absoluteValue();
+                    }
+                    String value = cvalue.xmlValue();
                     generateAttribute(name, value, printer);
                 } catch (ConstantEvaluationException e) {

trunk/Compiler/ModelicaFlatTree/src/jastadd/ConstantEvaluation/ConstantEvaluation.jrag

@@ -4633 +4633 @@
     eq CValueUnknown.lt(CValue v1, CValue v2) = CValue.UNKNOWN;
 
+    
+    public CValue CValue.absoluteValue() {
+        return this;
+    }
+    @Override
+    public CValue CValueReal.absoluteValue() {
+        return new CValueReal(Math.abs(realValue()));
+    }
+    @Override
+    public CValue CValueInteger.absoluteValue() {
+        return new CValueInteger(Math.abs(intValue()));
+    }
+    
 }