Update nfinst tests.

Belonging to [master]: - OpenModelica/OMCompiler#2122 - OpenModelica/OpenModelica-testsuite#831
OpenModelica · Jan 25, 2018 · 5637847 · 5637847
1 parent 5ab0f64
commit 5637847
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/flattening/modelica/scodeinst/Comment1.mo b/flattening/modelica/scodeinst/Comment1.mo
@@ -0,0 +1,23 @@
+// name: Comment1
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+
+model Comment1 "class comment"
+  Real x "component comment";
+equation
+  x = 1 "equation comment";
+algorithm
+  x := 1 "statement comment";
+end Comment1;
+
+// Result:
+// class Comment1 "class comment"
+//   Real x "component comment";
+// equation
+//   x = 1.0 "equation comment";
+// algorithm
+//   x := 1.0 "statement comment";
+// end Comment1;
+// endResult
diff --git a/flattening/modelica/scodeinst/InStreamFlowThreshold.mo b/flattening/modelica/scodeinst/InStreamFlowThreshold.mo
@@ -55,9 +55,9 @@ end InStreamFlowThreshold;
 //   a.s2.r = a.s3.r;
 //   a.s2.r = a.s1.r;
 //   (-a.s2.f) + (-a.s3.f) + (-a.s1.f) = 0.0;
-//   a.s1.s = (max(a.s3.f, 2.0) * a.s3.s + max(a.s2.f, 2.0) * a.s2.s) / (max(a.s3.f, 2.0) + max(a.s2.f, 2.0));
-//   a.s3.s = (max(a.s1.f, 2.0) * a.s1.s + max(a.s2.f, 2.0) * a.s2.s) / (max(a.s1.f, 2.0) + max(a.s2.f, 2.0));
-//   a.s2.s = (max(a.s1.f, 2.0) * a.s1.s + max(a.s3.f, 2.0) * a.s3.s) / (max(a.s1.f, 2.0) + max(a.s3.f, 2.0));
+//   a.s1.s = (max(a.s3.f, 2.0) * a.s3.s + max(a.s2.f, 2.0) * a.s2.s) / (max(a.s3.f, 2.0) + max(a.s2.f, 2.0)) " equation generated from stream connection";
+//   a.s3.s = (max(a.s1.f, 2.0) * a.s1.s + max(a.s2.f, 2.0) * a.s2.s) / (max(a.s1.f, 2.0) + max(a.s2.f, 2.0)) " equation generated from stream connection";
+//   a.s2.s = (max(a.s1.f, 2.0) * a.s1.s + max(a.s3.f, 2.0) * a.s3.s) / (max(a.s1.f, 2.0) + max(a.s3.f, 2.0)) " equation generated from stream connection";
 //   a.s1.f = 0.0;
 //   a.s2.f = 0.0;
 //   a.s3.f = 0.0;

diff --git a/flattening/modelica/scodeinst/InStreamNominalThreshold.mo b/flattening/modelica/scodeinst/InStreamNominalThreshold.mo
@@ -55,9 +55,9 @@ end InStreamNominalThreshold;
 //   a.s2.r = a.s3.r;
 //   a.s2.r = a.s1.r;
 //   (-a.s2.f) + (-a.s3.f) + (-a.s1.f) = 0.0;
-//   a.s1.s = (max(a.s3.f, 1e-07) * a.s3.s + max(a.s2.f, 1e-07 * 2000.0) * a.s2.s) / (max(a.s3.f, 1e-07) + max(a.s2.f, 1e-07 * 2000.0));
-//   a.s3.s = (max(a.s1.f, 1e-07 * 0.001) * a.s1.s + max(a.s2.f, 1e-07 * 2000.0) * a.s2.s) / (max(a.s1.f, 1e-07 * 0.001) + max(a.s2.f, 1e-07 * 2000.0));
-//   a.s2.s = (max(a.s1.f, 1e-07 * 0.001) * a.s1.s + max(a.s3.f, 1e-07) * a.s3.s) / (max(a.s1.f, 1e-07 * 0.001) + max(a.s3.f, 1e-07));
+//   a.s1.s = (max(a.s3.f, 1e-07) * a.s3.s + max(a.s2.f, 1e-07 * 2000.0) * a.s2.s) / (max(a.s3.f, 1e-07) + max(a.s2.f, 1e-07 * 2000.0)) " equation generated from stream connection";
+//   a.s3.s = (max(a.s1.f, 1e-07 * 0.001) * a.s1.s + max(a.s2.f, 1e-07 * 2000.0) * a.s2.s) / (max(a.s1.f, 1e-07 * 0.001) + max(a.s2.f, 1e-07 * 2000.0)) " equation generated from stream connection";
+//   a.s2.s = (max(a.s1.f, 1e-07 * 0.001) * a.s1.s + max(a.s3.f, 1e-07) * a.s3.s) / (max(a.s1.f, 1e-07 * 0.001) + max(a.s3.f, 1e-07)) " equation generated from stream connection";
 //   a.s1.f = 0.0;
 //   a.s2.f = 0.0;
 //   a.s3.f = 0.0;

diff --git a/flattening/modelica/scodeinst/Makefile b/flattening/modelica/scodeinst/Makefile
@@ -97,6 +97,7 @@ ClassExtendsBuiltin2.mo \
 ClassExtendsMissing1.mo \
 ClassMod1.mo \
 ClassMod2.mo \
+Comment1.mo \
 CompAsFunc.mo \
 ComponentAsTypeError.mo \
 ComponentAttributes1.mo \