diff --git a/build.gradle b/build.gradle index 21187ea3ca71e8abd70fe3472ee55fd2e8037fe7..190d15209f35c53d8820ede939c6bcb0dd3791a0 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 060e865db8fea4fee71315f1e78fc94ef5cbc7cd..57767c62c7097f6d2a9ad8c2850764991c25ebe9 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 6dec001c6e2edfeab948b579a1c56e62f5fb3ce9..ce4d17af4e93d22c0e5390eb14f907c493c15f42 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>