Skip to content

Commit

Permalink
Update tests for #3773 fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
perost authored and OpenModelica-Hudson committed Mar 21, 2016
1 parent 1eacb93 commit 8ee7b3f
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 29 deletions.
1 change: 1 addition & 0 deletions openmodelica/bootstrapping/LoadCompilerSources.mos
Expand Up @@ -221,6 +221,7 @@ if true then /* Suppress output */
prefixPath + "Util/AvlTreeString.mo",
prefixPath + "Util/BaseHashTable.mo",
prefixPath + "Util/BaseHashSet.mo",
prefixPath + "Util/BaseAvlTree.mo",
prefixPath + "Util/ClockIndexes.mo",
prefixPath + "Util/Config.mo",
prefixPath + "Util/Corba.mo",
Expand Down
Expand Up @@ -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")
Expand Down
42 changes: 21 additions & 21 deletions openmodelica/interactive-API/interactive_api_calls.mos
Expand Up @@ -377,15 +377,15 @@ getMessagesStringInternal(unique = false); // not unique
// ""
// Evaluating: getNthInitialEquation(Modelica.Mechanics.MultiBody.Parts.Body, 1)
// "if angles_fixed then
// // Initialize positional variables
// // Initialize positional variables
// if not Connections.isRoot(frame_a.R) then
// // frame_a.R is computed somewhere else
// // frame_a.R is computed somewhere else
// zeros(3) = Frames.Orientation.equalityConstraint(frame_a.R, R_start);
// elseif useQuaternions then
// // frame_a.R is computed from quaternions Q
// // frame_a.R is computed from quaternions Q
// zeros(3) = Frames.Quaternions.Orientation.equalityConstraint(Q, Q_start);
// else
// // frame_a.R is computed from the 3 angles 'phi'
// // frame_a.R is computed from the 3 angles 'phi'
// phi = phi_start;
// end if;
// end if;"
Expand All @@ -403,26 +403,26 @@ getMessagesStringInternal(unique = false); // not unique
// end if;
// r_0 = frame_a.r_0;
// if not Connections.isRoot(frame_a.R) then
// // Body does not have states
// // Dummies
// // Body does not have states
// // Dummies
// Q = {0, 0, 0, 1};
// phi = zeros(3);
// phi_d = zeros(3);
// phi_dd = zeros(3);
// elseif useQuaternions then
// // Use Quaternions as states (with dynamic state selection)
// // Use Quaternions as states (with dynamic state selection)
// frame_a.R = Frames.from_Q(Q, Frames.Quaternions.angularVelocity2(Q, der(Q)));
// {0} = Frames.Quaternions.orientationConstraint(Q);
// // Dummies
// // Dummies
// phi = zeros(3);
// phi_d = zeros(3);
// phi_dd = zeros(3);
// else
// // Use Cardan angles as states
// // Use Cardan angles as states
// phi_d = der(phi);
// phi_dd = der(phi_d);
// frame_a.R = Frames.axesRotations(sequence_angleStates, phi, phi_d);
// // Dummies
// // Dummies
// Q = {0, 0, 0, 1};
// end if;
// // gravity acceleration at center of mass resolved in world frame
Expand Down Expand Up @@ -541,11 +541,11 @@ getMessagesStringInternal(unique = false); // not unique
// 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)
Expand Down Expand Up @@ -615,7 +615,7 @@ getMessagesStringInternal(unique = false); // not unique
// parameters and variables are specified separately. In this section it is summarized how to refer to
// Modelica code in the HTML documentation.
// </p>
//
//
// <ol>
// <li> For constants, parameters and variables in code segments <code>&lt;code&gt;</code> and <code>&lt;/code&gt;</code>
// should to be used, e.g., <br>
Expand All @@ -625,36 +625,36 @@ getMessagesStringInternal(unique = false); // not unique
// <li> Inline code segments may be typeset with <code>&lt;code&gt;</code> and <code>&lt;/code&gt;</code>.</li>
// <li> In code segments use bold to emphasize Modelica keywords.</li>
// </ol>
//
//
// <h5>Example 1</h5>
//
//
// <pre>
// &lt;pre&gt;
// &lt;b&gt;connector&lt;/b&gt; Frame
// ...
// &lt;b&gt;flow&lt;/b&gt; SI.Force f[Woehrnschimmel1998] &lt;b&gt;annotation&lt;/b&gt;(unassignedMessage=\\\"...\\\");
// &lt;b&gt;end&lt;/b&gt; Frame;
// &lt;/pre&gt;</pre>
//
//
// <p>appears as</p>
//
//
// <pre>
// <b>connector</b> Frame
// ...
// <b>flow</b> SI.Force f[Woehrnschimmel1998] <b>annotation</b>(unassignedMessage=\\\"...\\\");
// <b>end</b> Frame;
// </pre>
//
//
// <h5>Example 2</h5>
//
//
// <pre>
// &lt;pre&gt;
// &lt;b&gt;parameter&lt;/b&gt; Modelica.SIunits.Conductance G=1 &quot;Conductance&quot;;
// &lt;/pre&gt;
// </pre>
//
//
// <p>appears as</p>
//
//
// <pre>
// <b>parameter</b> Modelica.SIunits.Conductance G=1 &quot;Conductance&quot;;
// </pre>
Expand Down
14 changes: 7 additions & 7 deletions openmodelica/interactive-API/interactive_api_param.mos
Expand Up @@ -111,15 +111,15 @@ isExtendsModifierFinal(K6,Resistor,x);
// Evaluating: getComponentModifierNames(C, "b1")
// {"a1.p1","a1.p2","a2.p2"}
// Evaluating: getComponentModifierValue(C, b1.a1)
// (p1 = 0, p2 = 0)
//
// Evaluating: setComponentModifierValue(C, b1.a1, $Code((p1 = 45)))
// Ok
// Evaluating: getComponentModifierValue(C, b1.a1)
// (p1 = 45, p2 = 0)
//
// 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)
Expand Down Expand Up @@ -147,7 +147,7 @@ isExtendsModifierFinal(K6,Resistor,x);
// Evaluating: setComponentModifierValue(Q, x.start, $Code( = 4))
// Ok
// Evaluating: getComponentModifierValue(Q, x.start)
// = 4
// 4
// Evaluating: getComponentModifierValue(Q, x)
// 1
// Evaluating: getExtendsModifierNames(Modelica.Blocks.Interfaces.BooleanInput, Modelica.Blocks.Interfaces.BooleanSignal)
Expand All @@ -167,7 +167,7 @@ isExtendsModifierFinal(K6,Resistor,x);
// Evaluating: getComponentModifierNames(M, "x")
// {}
// Evaluating: getComponentModifierValue(M3, x)
//
//
// Evaluating: setComponentModifierValue(M4, x, $Code())
// Ok
// Evaluating: setComponentModifierValue(M5, x.start, $Code())
Expand All @@ -177,11 +177,11 @@ 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")
Expand Down

0 comments on commit 8ee7b3f

Please sign in to comment.