Skip to content
Snippets Groups Projects
Commit 13cc2b4d authored by Sebastian Ebert's avatar Sebastian Ebert
Browse files

current fix state

parent d7f74788
No related branches found
No related tags found
No related merge requests found
...@@ -211,7 +211,9 @@ task ragConnect(type: JavaExec) { ...@@ -211,7 +211,9 @@ task ragConnect(type: JavaExec) {
// 'src/gen/jastadd/pnml/placeTransition.ast', // 'src/gen/jastadd/pnml/placeTransition.ast',
'src/main/jastadd/engine/connection/Dineros.connect', 'src/main/jastadd/engine/connection/Dineros.connect',
'--rootNode=PetriNet', '--rootNode=PetriNet',
'--List=JastAddList' '--List=JastAddList',
'--incremental=param',
'--tracing=flush'
]) ])
} }
......
...@@ -71,10 +71,11 @@ public class Main { ...@@ -71,10 +71,11 @@ public class Main {
bt.setValue("New Token"); bt.setValue("New Token");
BalloonMarkedPlace bmp = bm.resolveBalloonPlace(p); BalloonMarkedPlace bmp = bm.resolveBalloonPlace(p);
bmp.getBalloonMarkingList().add(bt); bmp.addBalloonMarking(bt);
petriNet.flushTreeCache(); // petriNet.flushTreeCache();
for ( OutputSignalBinding b : p.asOutputSignalPlace().getOutputSignalBindingList()){ for ( OutputSignalBinding b : p.asOutputSignalPlace().getOutputSignalBindingList()){
System.out.println("New Num: " + bm.resolveBalloonPlace(p).getNumBalloonMarking());
System.out.println("New Value: " + b.getOutputSignalValue()); System.out.println("New Value: " + b.getOutputSignalValue());
} }
} }
...@@ -85,6 +86,9 @@ public class Main { ...@@ -85,6 +86,9 @@ public class Main {
System.out.println(osb.getOutputSignalID() + " : " + osb.getOutputSignalValue()); System.out.println(osb.getOutputSignalID() + " : " + osb.getOutputSignalValue());
} }
} }
System.out.println("-- MARKING --");
System.out.println(bm.print());
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
......
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
<outputsignalbinding> <outputsignalbinding>
<placeID>p1</placeID> <placeID>p1</placeID>
<outputsignalID>os1</outputsignalID> <outputsignalID>os1</outputsignalID>
<initialvalue>0</initialvalue> <!-- -1 = undefined --> <initialvalue>2</initialvalue> <!-- -1 = undefined -->
<outputmappings> <outputmappings>
<equal> <equal>
<value>0</value> <value>1</value>
<result>2</result> <result>2</result>
</equal> </equal>
<threshold> <threshold>
<value>1</value> <value>2</value>
<result>0</result> <result>0</result>
</threshold> </threshold>
</outputmappings> </outputmappings>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment