Changeset 24650

Timestamp:

2015-02-20T11:53:26+01:00 (9 years ago)

Author:

lochel

Message:

• update Test11

Location:

trunk/testsuite/simulation/libraries/3rdParty/PNlib

Files:

• PNlib.mo (modified) (7 diffs)
• ReferenceFiles/PNlib.Examples.Test11.mat (added)
• ReferenceFiles/Test11.mat (deleted)
• Test11.mos (modified) (2 diffs)

trunk/testsuite/simulation/libraries/3rdParty/PNlib/PNlib.mo

@@ -132 +132 @@
     Boolean emptying = Functions.anyTrue(vec=  pre(fireOut))
       "Is the place emptied by output transitions?";
-    Blocks.firingSumCon firingSumIn(fire = pre(fireIn), arcWeight = arcWeightIn, instSpeed = instSpeedIn)
+    Real firingSumIn = Functions.firingSumCon(fire=pre(fireIn), arcWeight=arcWeightIn, instSpeed=instSpeedIn)
       "firing sum calculation";
-    Blocks.firingSumCon firingSumOut(fire = pre(fireOut), arcWeight = arcWeightOut, instSpeed = instSpeedOut)
+    Real firingSumOut = Functions.firingSumCon(fire=  pre(fireOut), arcWeight=  arcWeightOut, instSpeed=  instSpeedOut)
       "firing sum calculation";
     // *** BLOCKS END ***
   public
-    Interfaces.PlaceIn inTransition[nIn](each t = t_, each maxTokens = maxMarks, enable = activeIn, each emptied = emptying, each speedSum = firingSumOut.conFiringSum, fire = fireIn, active = activeIn, arcWeight = arcWeightIn, instSpeed = instSpeedIn, maxSpeed = maxSpeedIn, prelimSpeed = prelimSpeedIn, enabledByInPlaces = enabledByInPlaces)
+    Interfaces.PlaceIn inTransition[nIn](each t = t_, each maxTokens = maxMarks, enable = activeIn, each emptied = emptying, each speedSum = firingSumOut, fire = fireIn, active = activeIn, arcWeight = arcWeightIn, instSpeed = instSpeedIn, maxSpeed = maxSpeedIn, prelimSpeed = prelimSpeedIn, enabledByInPlaces = enabledByInPlaces)
       "connector for input transitions"                                                                                                     annotation(Placement(transformation(origin = {-93, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-93, 0}, extent = {{-10, -10}, {10, 10}})));
-    Interfaces.PlaceOut outTransition[nOut](each t = t_, each minTokens = minMarks, enable = activeOut, each arcType = PNlib.Types.ArcType.normal_arc, each testValue = -1.0, each fed = feeding, each speedSum = firingSumIn.conFiringSum, fire = fireOut, active = activeOut, arcWeight = arcWeightOut, instSpeed = instSpeedOut, maxSpeed = maxSpeedOut, prelimSpeed = prelimSpeedOut)
+    Interfaces.PlaceOut outTransition[nOut](each t = t_, each minTokens = minMarks, enable = activeOut, each arcType = PNlib.Types.ArcType.normal_arc, each testValue = -1.0, each fed = feeding, each speedSum = firingSumIn, fire = fireOut, active = activeOut, arcWeight = arcWeightOut, instSpeed = instSpeedOut, maxSpeed = maxSpeedOut, prelimSpeed = prelimSpeedOut)
       "connector for output transitions"                                                                                                     annotation(Placement(transformation(origin = {93, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {93, 0}, extent = {{-10, -10}, {10, 10}})));
     //initial equation
@@ -147 +147 @@
   equation
     // *** MAIN BEGIN ***
-    der(tSumIn) = firingSumIn.conFiringSum;
+    der(tSumIn) = firingSumIn;
     // der(tSumIn_) = arcWeightIn .* instSpeedIn;
     for i in 1:nIn loop
       der(tSumIn_[i]) = if pre(fireIn[i]) then arcWeightIn[i] * instSpeedIn[i] else 0.0;
     end for;
-    der(tSumOut) = firingSumOut.conFiringSum;
+    der(tSumOut) = firingSumOut;
     // der(tSumOut_) = arcWeightOut .* instSpeedOut;
     for i in 1:nOut loop
       der(tSumOut_[i]) = if pre(fireOut[i]) then arcWeightOut[i] * instSpeedOut[i] else 0.0;
     end for;
-    der(t_) = firingSumIn.conFiringSum - firingSumOut.conFiringSum
+    der(t_) = firingSumIn - firingSumOut
       "calculation of continuous mark change";
     // *** MAIN END ***
@@ -199 +199 @@
     Blocks.activationCon activation(nIn = nIn, nOut = nOut, tIn = tIn, tOut = tOut, arcWeightIn = arcWeightIn, arcWeightOut = arcWeightOut, minTokens = minTokens, maxTokens = maxTokens, fed = fed, emptied = emptied, testValue = inPlaces.testValue, arcType = inPlaces.arcType)
       "activation process";
-    PNlib.Blocks.preliminarySpeed preliminarySpeed(nIn = nIn, nOut = nOut, arcWeightIn = arcWeightIn, arcWeightOut = arcWeightOut, speedSumIn = speedSumIn, speedSumOut = speedSumOut, maximumSpeed = maximumSpeed, active = activation.active, weaklyInputActiveVec = activation.weaklyInputActiveVec, weaklyOutputActiveVec = activation.weaklyOutputActiveVec)
+    Blocks.preliminarySpeed preliminarySpeed(nIn = nIn, nOut = nOut, arcWeightIn = arcWeightIn, arcWeightOut = arcWeightOut, speedSumIn = speedSumIn, speedSumOut = speedSumOut, maximumSpeed = maximumSpeed, active = activation.active, weaklyInputActiveVec = activation.weaklyInputActiveVec, weaklyOutputActiveVec = activation.weaklyOutputActiveVec)
       "preliminary speed calculation";
     // *** BLOCKS END ***
@@ -376 +376 @@
       end for;
     end activationCon;
-
-    block firingSumCon "calculates the firing sum of continuous places"
-      input Boolean fire[:] "firability of transitions";
-      input Real arcWeight[:] "arc weights";
-      input Real instSpeed[:] "istantaneous speed of transitions";
-      output Real conFiringSum "continuous firing sum";
-    algorithm
-      conFiringSum := 0.0;
-      for i in 1:size(fire, 1) loop
-        if fire[i] then
-          conFiringSum := conFiringSum + arcWeight[i] * instSpeed[i];
-        end if;
-      end for;
-    end firingSumCon;
 
     block preliminarySpeed
@@ -433 +419 @@
       end for;
     end anyTrue;
+
+    function firingSumCon "calculates the firing sum of continuous places"
+      input Boolean fire[:] "firability of transitions";
+      input Real arcWeight[:] "arc weights";
+      input Real instSpeed[:] "istantaneous speed of transitions";
+      output Real conFiringSum "continuous firing sum";
+    algorithm
+      conFiringSum := 0.0;
+      for i in 1:size(fire, 1) loop
+        if fire[i] then
+          conFiringSum := conFiringSum + arcWeight[i] * instSpeed[i];
+        end if;
+      end for;
+    end firingSumCon;
   end Functions;
 
@@ -537 +537 @@
       PNlib.PC P3(nIn = 1, startMarks = 0) annotation(Placement(visible = true, transformation(origin = {40, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
     equation
-      connect(T2.outPlaces[1], P3.inTransition[1]) annotation(Line(points = {{24.7, 0}, {30.7783, 0}, {30.7783, 0.117925}, {30.7783, 0.117925}}));
-      connect(P2.outTransition[1], T2.inPlaces[1]) annotation(Line(points = {{9.300000000000001, 0}, {15.566, 0}, {15.566, -0.117925}, {15.566, -0.117925}}));
-      connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points = {{-15.3, 0}, {-9.19811, 0}, {-9.19811, -0.353774}, {-9.19811, -0.353774}}));
-      connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-30.7, 0}, {-24.7642, 0}, {-24.7642, 0}, {-24.7642, 0}}));
+      connect(T2.outPlaces[1], P3.inTransition[1]) annotation(Line(points={{24.7,0},
+              {30.7783,0},{30.7783,0},{30.7,0}}));
+      connect(P2.outTransition[1], T2.inPlaces[1]) annotation(Line(points={{9.3,0},
+              {15.566,0},{15.566,0},{15.3,0}}));
+      connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{-15.3,0},
+              {-9.19811,0},{-9.19811,0},{-9.3,0}}));
+      connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-30.7,0},
+              {-24.7642,0},{-24.7642,0},{-24.7,0}}));
       annotation(experiment(StartTime = 0, StopTime = 3, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-60, -20}, {60, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})), Icon(coordinateSystem(extent = {{-60, -20}, {60, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
     end Test9;
@@ -563 +567 @@
       annotation(experiment(StartTime = 0, StopTime = 3, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-80, -60}, {80, 60}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), Icon(coordinateSystem(extent = {{-80, -60}, {80, 60}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})));
     end Test10;
+
+    model Test11
+      PNlib.PC 'P1'(nOut=1, startMarks=1.5) annotation (Placement(visible=true,
+            transformation(
+            origin={-60,0},
+            extent={{-10,-10},{10,10}},
+            rotation=0)));
+      PNlib.TC 'T1'(nOut=1, nIn=1) annotation (Placement(visible=true,
+            transformation(
+            origin={-30,0},
+            extent={{-10,-10},{10,10}},
+            rotation=0)));
+      PNlib.PC 'P2'(nOut=1, nIn=1) annotation (Placement(visible=true,
+            transformation(
+            origin={0,0},
+            extent={{-10,-10},{10,10}},
+            rotation=0)));
+      PNlib.TC 'T2'(
+        nIn=1,
+        nOut=1,
+        maximumSpeed=0.5 + time) annotation (Placement(visible=true,
+            transformation(
+            origin={30,0},
+            extent={{-10,-10},{10,10}},
+            rotation=0)));
+      PC 'P3'(nIn=1)
+        annotation (Placement(transformation(extent={{50,-10},{70,10}})));
+    equation
+      connect('P1'.outTransition[1], 'T1'.inPlaces[1])
+        annotation (Line(points={{-50.7,0},{-42,0},{-34.7,0}}));
+      connect('P2'.inTransition[1], 'T1'.outPlaces[1])
+        annotation (Line(points={{-9.3,0},{-9.3,0},{-25.3,0}}));
+      connect('P2'.outTransition[1], 'T2'.inPlaces[1])
+        annotation (Line(points={{9.3,0},{25.3,0}}));
+      connect('T2'.outPlaces[1], 'P3'.inTransition[1]) annotation (Line(
+          points={{34.7,0},{50.7,0}},
+          color={0,0,0},
+          smooth=Smooth.None));
+      annotation(experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-006), Diagram(coordinateSystem(extent={{-80,-20},
+                {80,20}},                                                                                                    preserveAspectRatio=false,   initialScale = 0.1, grid = {2, 2}),
+            graphics),                                                                                                    Icon(coordinateSystem(extent = {{-80, -20}, {80, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
+    end Test11;
     annotation(Icon(coordinateSystem(extent = {{-100, -100}, {100, 100}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), Diagram(coordinateSystem(extent = {{-100, -100}, {100, 100}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})));
   end Examples;

trunk/testsuite/simulation/libraries/3rdParty/PNlib/Test11.mos

@@ -4 +4 @@
 
 loadFile("PNlib.mo"); getErrorString();
-loadString("
-model Test11
-  PNlib.PC 'P1'(nIn = 0, nOut = 1, startMarks = 0.0, minMarks = 0.0, maxMarks = 1.0E9);
-  PNlib.PC 'P2'(nIn = 1, nOut = 1, startMarks = 0.0, minMarks = 0.0, maxMarks = 1.0E9);
-  PNlib.PC 'P3'(nIn = 1, nOut = 0, startMarks = 0.0, minMarks = 0.0, maxMarks = 1.0E9);
-  PNlib.TC 'T1'(nIn = 1, nOut = 1, maximumSpeed = 1, arcWeightIn = {1}, arcWeightOut = {1});
-  PNlib.TC 'T2'(nIn = 1, nOut = 1, maximumSpeed = 1, arcWeightIn = {1}, arcWeightOut = {1});
-equation
-  connect('P1'.outTransition[1], 'T1'.inPlaces[1]);
-  connect('T1'.outPlaces[1], 'P2'.inTransition[1]);
-  connect('P2'.outTransition[1], 'T2'.inPlaces[1]);
-  connect('T2'.outPlaces[1], 'P3'.inTransition[1]);
-end Test11;
-"); getErrorString();
-
-simulate(Test11); getErrorString();
-res := OpenModelica.Scripting.compareSimulationResults("Test11_res.mat",
-  "ReferenceFiles/Test11.mat",
+simulate(PNlib.Examples.Test11); getErrorString();
+res := OpenModelica.Scripting.compareSimulationResults("PNlib.Examples.Test11_res.mat",
+  "ReferenceFiles/PNlib.Examples.Test11.mat",
   "PNlib.Examples.Test11_diff.csv", 0.01, 0.0001,
   {
@@ -34 +19 @@
     "'T2'.maximumSpeed"
   }); getErrorString();
-
+  
 // Result:
 // true
 // ""
-// true
-// ""
 // record SimulationResult
-//     resultFile = "Test11_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Test11', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     resultFile = "PNlib.Examples.Test11_res.mat",
+//     simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 0.000001, method = 'dassl', fileNamePrefix = 'PNlib.Examples.Test11', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = ""
 // end SimulationResult;