Expected output for getComponentModifierValue.

Added getComponentModifierValues call.
OpenModelica · Oct 13, 2016 · f32443c · f32443c
1 parent 4c97d58
commit f32443c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/openmodelica/interactive-API/Bug3783.mos b/openmodelica/interactive-API/Bug3783.mos
@@ -35,7 +35,7 @@ list(Bug3783); getErrorString();
 // ""
 // {"p"}
 // ""
-// 10e5
+// "10e5"
 // ""
 // "model Bug3783
 //   replaceable package liquid = Modelica.Media.Water.StandardWater;

diff --git a/openmodelica/interactive-API/interactive_api_annotations.mos b/openmodelica/interactive-API/interactive_api_annotations.mos
@@ -8187,7 +8187,7 @@ getDocumentationAnnotation(Modelica.UsersGuide.Contact); getErrorString();
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getComponentModifierValue(Modelica.Electrical.Analog.Basic.Resistor, R.start)
-// 1
+// "1"
 // Evaluating: getErrorString()
 // ""
 // Evaluating: removeComponentModifiers(Modelica.Electrical.Analog.Basic.Resistor, "R")

diff --git a/openmodelica/interactive-API/interactive_api_calls.mos b/openmodelica/interactive-API/interactive_api_calls.mos
@@ -547,15 +547,15 @@ getMessagesStringInternal(unique = false); // not unique
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getComponentModifierValue(TestPack.MyModel, r1)
-// Resistor(R = 2)
+// "Resistor(R = 2)"
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getComponentModifierValue(TestPack.MyModel, r1.start)
-// 2
+// "2"
 // Evaluating: getErrorString()
 // ""
 // Evaluating: getComponentModifierValue(TestPack.MyModel, r1.min)
-// 10
+// "10"
 // Evaluating: getErrorString()
 // ""
 // Evaluating: list(TestPack.MyModel)

diff --git a/openmodelica/interactive-API/interactive_api_param.mo b/openmodelica/interactive-API/interactive_api_param.mo
@@ -120,3 +120,16 @@ end D2;
 model E
   A a(p1=1,p2=2);
 end E;
+
+record R
+  parameter Real a=1;
+  parameter Real b=2;
+end R;
+
+model F
+  R r;
+end F;
+
+model G
+  F f(r(a=3,b=4));
+end G;
diff --git a/openmodelica/interactive-API/interactive_api_param.mos b/openmodelica/interactive-API/interactive_api_param.mos
@@ -57,6 +57,7 @@ setComponentModifierValue(M7,a1.x.fixed,$Code(=true));
 getComponentModifierValue(M7,a1.x.fixed);
 getComponentModifierNames(M5,"x");
 getComponentModifierNames(M7,"x");
+getComponentModifierValues(G,f.r);
 setExtendsModifierValue(K,Resistor,R,$Code(=2));
 setExtendsModifierValue(K2,Resistor,R.start,$Code(=2.25));
 getExtendsModifierValue(K2,Resistor,R.start);
@@ -111,15 +112,15 @@ isExtendsModifierFinal(K6,Resistor,x);
 // Evaluating: getComponentModifierNames(C, "b1")
 // {"a1.p1","a1.p2","a2.p2"}
 // Evaluating: getComponentModifierValue(C, b1.a1)
-//
+// ""
 // Evaluating: setComponentModifierValue(C, b1.a1, $Code((p1 = 45)))
 // Ok
 // Evaluating: getComponentModifierValue(C, b1.a1)
-//
+// ""
 // Evaluating: setComponentModifierValue(C, b1.a2, $Code( = 33))
 // Ok
 // Evaluating: getComponentModifierValue(C, b1.a2)
-// 33
+// "33"
 // Evaluating: getExtendsModifierNames(D2, B2)
 // {a.x, f}
 // Evaluating: getExtendsModifierValue(D2, B2, a.x)
@@ -147,27 +148,27 @@ isExtendsModifierFinal(K6,Resistor,x);
 // Evaluating: setComponentModifierValue(Q, x.start, $Code( = 4))
 // Ok
 // Evaluating: getComponentModifierValue(Q, x.start)
-// 4
+// "4"
 // Evaluating: getComponentModifierValue(Q, x)
-// 1
+// "1"
 // Evaluating: getExtendsModifierNames(Modelica.Blocks.Interfaces.BooleanInput, Modelica.Blocks.Interfaces.BooleanSignal)
 // {}
 // Evaluating: setComponentModifierValue(M, x.start, $Code())
 // Ok
 // Evaluating: getComponentModifierNames(M, "x")
 // {}
 // Evaluating: getComponentModifierValue(M, x)
-// 1
+// "1"
 // Evaluating: getComponentModifierValue(M2, x)
-// 1
+// "1"
 // Evaluating: setComponentModifierValue(M2, x, $Code())
 // Ok
 // Evaluating: setComponentModifierValue(M3, x, $Code())
 // Ok
 // Evaluating: getComponentModifierNames(M, "x")
 // {}
 // Evaluating: getComponentModifierValue(M3, x)
-//
+// ""
 // Evaluating: setComponentModifierValue(M4, x, $Code())
 // Ok
 // Evaluating: setComponentModifierValue(M5, x.start, $Code())
@@ -177,15 +178,17 @@ isExtendsModifierFinal(K6,Resistor,x);
 // Evaluating: setComponentModifierValue(M7, a1.x.fixed, $Code( = false))
 // Ok
 // Evaluating: getComponentModifierValue(M7, a1.x.fixed)
-// false
+// "false"
 // Evaluating: setComponentModifierValue(M7, a1.x.fixed, $Code( = true))
 // Ok
 // Evaluating: getComponentModifierValue(M7, a1.x.fixed)
-// true
+// "true"
 // Evaluating: getComponentModifierNames(M5, "x")
 // {}
 // Evaluating: getComponentModifierNames(M7, "x")
 // {}
+// Evaluating: getComponentModifierValues(G, f.r)
+// "(a = 3, b = 4)"
 // Evaluating: setExtendsModifierValue(K, Resistor, R, $Code( = 2))
 // Ok
 // Evaluating: setExtendsModifierValue(K2, Resistor, R.start, $Code( = 2.25))