From 13cc2b4d3d35cfea3da57ddbdb370a9e268cdab6 Mon Sep 17 00:00:00 2001
From: SebastianEbert <sebastian.ebert@tu-dresden.de>
Date: Mon, 25 Jul 2022 14:23:18 +0200
Subject: [PATCH] current fix state
---
build.gradle | 4 +++-
src/main/java/de/tudresden/inf/st/pnml/engine/Main.java | 8 ++++++--
src/main/resources/nets/os-test-1.pnml | 6 +++---
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/build.gradle b/build.gradle
index 21187ea..190d152 100644
--- a/build.gradle
+++ b/build.gradle
@@ -211,7 +211,9 @@ task ragConnect(type: JavaExec) {
// 'src/gen/jastadd/pnml/placeTransition.ast',
'src/main/jastadd/engine/connection/Dineros.connect',
'--rootNode=PetriNet',
- '--List=JastAddList'
+ '--List=JastAddList',
+ '--incremental=param',
+ '--tracing=flush'
])
}
diff --git a/src/main/java/de/tudresden/inf/st/pnml/engine/Main.java b/src/main/java/de/tudresden/inf/st/pnml/engine/Main.java
index 060e865..57767c6 100644
--- a/src/main/java/de/tudresden/inf/st/pnml/engine/Main.java
+++ b/src/main/java/de/tudresden/inf/st/pnml/engine/Main.java
@@ -71,10 +71,11 @@ public class Main {
bt.setValue("New Token");
BalloonMarkedPlace bmp = bm.resolveBalloonPlace(p);
- bmp.getBalloonMarkingList().add(bt);
- petriNet.flushTreeCache();
+ bmp.addBalloonMarking(bt);
+ // petriNet.flushTreeCache();
for ( OutputSignalBinding b : p.asOutputSignalPlace().getOutputSignalBindingList()){
+ System.out.println("New Num: " + bm.resolveBalloonPlace(p).getNumBalloonMarking());
System.out.println("New Value: " + b.getOutputSignalValue());
}
}
@@ -85,6 +86,9 @@ public class Main {
System.out.println(osb.getOutputSignalID() + " : " + osb.getOutputSignalValue());
}
}
+
+ System.out.println("-- MARKING --");
+ System.out.println(bm.print());
}
@SuppressWarnings("unused")
diff --git a/src/main/resources/nets/os-test-1.pnml b/src/main/resources/nets/os-test-1.pnml
index 6dec001..ce4d17a 100644
--- a/src/main/resources/nets/os-test-1.pnml
+++ b/src/main/resources/nets/os-test-1.pnml
@@ -18,14 +18,14 @@
<outputsignalbinding>
<placeID>p1</placeID>
<outputsignalID>os1</outputsignalID>
- <initialvalue>0</initialvalue> <!-- -1 = undefined -->
+ <initialvalue>2</initialvalue> <!-- -1 = undefined -->
<outputmappings>
<equal>
- <value>0</value>
+ <value>1</value>
<result>2</result>
</equal>
<threshold>
- <value>1</value>
+ <value>2</value>
<result>0</result>
</threshold>
</outputmappings>
--
GitLab