From e00e486b64f65b3b327973bbe5a36b9297fc745d Mon Sep 17 00:00:00 2001
From: Lennart Ochel <lennart.ochel@fh-bielefeld.de>
Date: Sat, 25 Apr 2015 19:56:59 +0200
Subject: [PATCH] Add more tests for OpenModelica coverage

---
 .../PNlib.Examples.ConTest.ConflictLoop.mos   | 26 +++++++++++++++++++
 .../PNlib.Examples.DisTest.ConflictProb.mos   | 26 +++++++++++++++++++
 ...lib.Examples.DisTest.InputConflictProb.mos | 26 +++++++++++++++++++
 ...ib.Examples.DisTest.OutputConflictProb.mos | 26 +++++++++++++++++++
 ...PNlib.Examples.DisTest.SixConflictProb.mos | 26 +++++++++++++++++++
 5 files changed, 130 insertions(+)
 create mode 100644 Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos
 create mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos
 create mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos
 create mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos
 create mode 100644 Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos

diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos
new file mode 100644
index 00000000..462dab05
--- /dev/null
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos
@@ -0,0 +1,26 @@
+// name: PNlib.Examples.ConTest.ConflictLoop
+// keywords: PNlib, continuous
+// status: correct
+
+loadFile("../../PNlib/package.mo"); getErrorString();
+simulate(PNlib.Examples.ConTest.ConflictLoop); getErrorString();
+res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.ConTest.ConflictLoop_res.mat",
+  "../../ReferenceFiles/PNlib.Examples.ConTest.ConflictLoop.mat",
+  "PNlib.Examples.ConTest.ConflictLoop_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"
+  }); getErrorString();
+
+// Result:
+// endResult
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos
new file mode 100644
index 00000000..216b941c
--- /dev/null
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos
@@ -0,0 +1,26 @@
+// name: PNlib.Examples.DisTest.ConflictProb
+// keywords: PNlib, discrete
+// status: correct
+
+loadFile("../../PNlib/package.mo"); getErrorString();
+simulate(PNlib.Examples.DisTest.ConflictProb); getErrorString();
+res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.ConflictProb_res.mat",
+  "../../ReferenceFiles/PNlib.Examples.DisTest.ConflictProb.mat",
+  "PNlib.Examples.DisTest.ConflictProb_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"
+  }); getErrorString();
+
+// Result:
+// endResult
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos
new file mode 100644
index 00000000..666f7b3a
--- /dev/null
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos
@@ -0,0 +1,26 @@
+// name: PNlib.Examples.DisTest.InputConflictProb
+// keywords: PNlib, discrete
+// status: correct
+
+loadFile("../../PNlib/package.mo"); getErrorString();
+simulate(PNlib.Examples.DisTest.InputConflictProb); getErrorString();
+res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.InputConflictProb_res.mat",
+  "../../ReferenceFiles/PNlib.Examples.DisTest.InputConflictProb.mat",
+  "PNlib.Examples.DisTest.InputConflictProb_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"
+  }); getErrorString();
+
+// Result:
+// endResult
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos
new file mode 100644
index 00000000..673ffe5d
--- /dev/null
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos
@@ -0,0 +1,26 @@
+// name: PNlib.Examples.DisTest.OutputConflictProb
+// keywords: PNlib, discrete
+// status: correct
+
+loadFile("../../PNlib/package.mo"); getErrorString();
+simulate(PNlib.Examples.DisTest.OutputConflictProb); getErrorString();
+res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.OutputConflictProb_res.mat",
+  "../../ReferenceFiles/PNlib.Examples.DisTest.OutputConflictProb.mat",
+  "PNlib.Examples.DisTest.OutputConflictProb_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"
+  }); getErrorString();
+
+// Result:
+// endResult
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos
new file mode 100644
index 00000000..c5afaa2b
--- /dev/null
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos
@@ -0,0 +1,26 @@
+// name: PNlib.Examples.DisTest.SixConflictProb
+// keywords: PNlib, discrete
+// status: correct
+
+loadFile("../../PNlib/package.mo"); getErrorString();
+simulate(PNlib.Examples.DisTest.SixConflictProb); getErrorString();
+res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.DisTest.SixConflictProb_res.mat",
+  "../../ReferenceFiles/PNlib.Examples.DisTest.SixConflictProb.mat",
+  "PNlib.Examples.DisTest.SixConflictProb_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"
+  }); getErrorString();
+
+// Result:
+// endResult