Update signal list for comparison

AMIT-HSBI · Apr 27, 2015 · e558caa · e558caa
1 parent e00e486
commit e558caa
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 104 deletions.
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.LoopAndArcweight.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.LoopAndArcweight.mos
@@ -10,16 +10,9 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.L
   {
     "P1.t",
     "P2.t",
-    "P3.t",
     "T1.fire",
     "T1.instantaneousSpeed",
-    "T1.maximumSpeed",
-    "T2.fire",
-    "T2.instantaneousSpeed",
-    "T2.maximumSpeed",
-    "T3.fire",
-    "T3.instantaneousSpeed",
-    "T3.maximumSpeed"
+    "T1.maximumSpeed"
   }); getErrorString();
 
 // Result:

diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTC.mos
@@ -9,17 +9,9 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.P
   "PNlib.Examples.ConTest.PCtoTC_diff.csv", 0.01, 0.0001,
   {
     "P1.t",
-    "P2.t",
-    "P3.t",
     "T1.fire",
     "T1.instantaneousSpeed",
-    "T1.maximumSpeed",
-    "T2.fire",
-    "T2.instantaneousSpeed",
-    "T2.maximumSpeed",
-    "T3.fire",
-    "T3.instantaneousSpeed",
-    "T3.maximumSpeed"
+    "T1.maximumSpeed"
   }); getErrorString();
 
 // Result:

diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.SinglePC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.SinglePC.mos
@@ -8,18 +8,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.S
   "../../ReferenceFiles/PNlib.Examples.ConTest.SinglePC.mat",
   "PNlib.Examples.ConTest.SinglePC_diff.csv", 0.01, 0.0001,
   {
-    "P1.t",
-    "P2.t",
-    "P3.t",
-    "T1.fire",
-    "T1.instantaneousSpeed",
-    "T1.maximumSpeed",
-    "T2.fire",
-    "T2.instantaneousSpeed",
-    "T2.maximumSpeed",
-    "T3.fire",
-    "T3.instantaneousSpeed",
-    "T3.maximumSpeed"
+    "P1.t"
   }); getErrorString();
 
 // Result:

diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.SingleTC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.SingleTC.mos
@@ -8,18 +8,9 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.S
   "../../ReferenceFiles/PNlib.Examples.ConTest.SingleTC.mat",
   "PNlib.Examples.ConTest.SingleTC_diff.csv", 0.01, 0.0001,
   {
-    "P1.t",
-    "P2.t",
-    "P3.t",
     "T1.fire",
     "T1.instantaneousSpeed",
-    "T1.maximumSpeed",
-    "T2.fire",
-    "T2.instantaneousSpeed",
-    "T2.maximumSpeed",
-    "T3.fire",
-    "T3.instantaneousSpeed",
-    "T3.maximumSpeed"
+    "T1.maximumSpeed"
   }); getErrorString();
 
 // Result:

diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.Speed.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.Speed.mos
@@ -10,7 +10,6 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.S
   {
     "P1.t",
     "P2.t",
-    "P3.t",
     "T1.fire",
     "T1.instantaneousSpeed",
     "T1.maximumSpeed",

diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPC.mos
@@ -9,17 +9,9 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.T
   "PNlib.Examples.ConTest.TCtoPC_diff.csv", 0.01, 0.0001,
   {
     "P1.t",
-    "P2.t",
-    "P3.t",
     "T1.fire",
     "T1.instantaneousSpeed",
-    "T1.maximumSpeed",
-    "T2.fire",
-    "T2.instantaneousSpeed",
-    "T2.maximumSpeed",
-    "T3.fire",
-    "T3.instantaneousSpeed",
-    "T3.maximumSpeed"
+    "T1.maximumSpeed"
   }); getErrorString();
 
 // Result:

diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroPlace.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroPlace.mos
@@ -10,16 +10,12 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.Z
   {
     "P1.t",
     "P2.t",
-    "P3.t",
     "T1.fire",
     "T1.instantaneousSpeed",
     "T1.maximumSpeed",
     "T2.fire",
     "T2.instantaneousSpeed",
-    "T2.maximumSpeed",
-    "T3.fire",
-    "T3.instantaneousSpeed",
-    "T3.maximumSpeed"
+    "T2.maximumSpeed"
   }); getErrorString();
 
 // Result:

diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.DisLoopAndArcweight.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.DisLoopAndArcweight.mos
@@ -9,17 +9,9 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.D
   "PNlib.Examples.DisTest.DisLoopAndArcweight_diff.csv", 0.01, 0.0001,
   {
     "P1.t",
-    "P2.t",
-    "P3.t",
     "T1.fire",
     "T1.instantaneousSpeed",
-    "T1.maximumSpeed",
-    "T2.fire",
-    "T2.instantaneousSpeed",
-    "T2.maximumSpeed",
-    "T3.fire",
-    "T3.instantaneousSpeed",
-    "T3.maximumSpeed"
+    "T1.maximumSpeed"
   }); getErrorString();
 
 // Result:

diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTD.mos
@@ -8,18 +8,10 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.P
   "../../ReferenceFiles/PNlib.Examples.DisTest.PDtoTD.mat",
   "PNlib.Examples.DisTest.PDtoTD_diff.csv", 0.01, 0.0001,
   {
-    "P1.t",
-    "P2.t",
-    "P3.t",
+    "P1.t"
     "T1.fire",
     "T1.instantaneousSpeed",
-    "T1.maximumSpeed",
-    "T2.fire",
-    "T2.instantaneousSpeed",
-    "T2.maximumSpeed",
-    "T3.fire",
-    "T3.instantaneousSpeed",
-    "T3.maximumSpeed"
+    "T1.maximumSpeed"
   }); getErrorString();
 
 // Result:

diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.SinglePD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.SinglePD.mos
@@ -8,18 +8,7 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.S
   "../../ReferenceFiles/PNlib.Examples.DisTest.SinglePD.mat",
   "PNlib.Examples.DisTest.SinglePD_diff.csv", 0.01, 0.0001,
   {
-    "P1.t",
-    "P2.t",
-    "P3.t",
-    "T1.fire",
-    "T1.instantaneousSpeed",
-    "T1.maximumSpeed",
-    "T2.fire",
-    "T2.instantaneousSpeed",
-    "T2.maximumSpeed",
-    "T3.fire",
-    "T3.instantaneousSpeed",
-    "T3.maximumSpeed"
+    "P1.t"
   }); getErrorString();
 
 // Result:

diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.SingleTD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.SingleTD.mos
@@ -8,18 +8,9 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.S
   "../../ReferenceFiles/PNlib.Examples.DisTest.SingleTD.mat",
   "PNlib.Examples.DisTest.SingleTD_diff.csv", 0.01, 0.0001,
   {
-    "P1.t",
-    "P2.t",
-    "P3.t",
     "T1.fire",
     "T1.instantaneousSpeed",
-    "T1.maximumSpeed",
-    "T2.fire",
-    "T2.instantaneousSpeed",
-    "T2.maximumSpeed",
-    "T3.fire",
-    "T3.instantaneousSpeed",
-    "T3.maximumSpeed"
+    "T1.maximumSpeed"
   }); getErrorString();
 
 // Result:

diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPD.mos
@@ -9,17 +9,9 @@ res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.T
   "PNlib.Examples.DisTest.TDtoPD_diff.csv", 0.01, 0.0001,
   {
     "P1.t",
-    "P2.t",
-    "P3.t",
     "T1.fire",
     "T1.instantaneousSpeed",
-    "T1.maximumSpeed",
-    "T2.fire",
-    "T2.instantaneousSpeed",
-    "T2.maximumSpeed",
-    "T3.fire",
-    "T3.instantaneousSpeed",
-    "T3.maximumSpeed"
+    "T1.maximumSpeed"
   }); getErrorString();
 
 // Result: