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

Merge branch 'main' of git-st.inf.tu-dresden.de:dineros/framework/pnml-relast-engine into main

parents 698c9212 86f69092
No related branches found
No related tags found
No related merge requests found
...@@ -39,33 +39,15 @@ public class DinerosTestNode extends DiNeRosNode { ...@@ -39,33 +39,15 @@ public class DinerosTestNode extends DiNeRosNode {
}); });
} }
@NotNull
private TransitionSelectionResult fireFirstEnabled(List<Transition> enabledTransitions) {
System.out.println("Calling fireFirstEnabled");
System.out.println(marking.print());
FiringSelectionSuccess fsc = new FiringSelectionSuccess();
System.out.println("#EnabledTrans: " + marking.enabledBalloonTransitions().size());
for(Transition t : getSignalFilteredTransitions()){
System.out.println("Firing transition: " + t.getId());
fsc.setTransition(t);
break;
}
if(enabledTransitions.size() == 0){ return new FiringSelectionNone(); }
return fsc;
}
@Override @Override
protected TransitionSelectionResult onChange(List<Transition> enabledTransitions) { protected TransitionSelectionResult onChange(List<Transition> enabledTransitions) {
System.out.println("Calling onWaitEnded"); System.out.println("Calling onWaitEnded");
return fireFirstEnabled(enabledTransitions); return fireRandomEnabledTransition(enabledTransitions);
} }
@Override @Override
protected TransitionSelectionResult onStartupEnded(List<Transition> enabledTransitions) { protected TransitionSelectionResult onStartupEnded(List<Transition> enabledTransitions) {
System.out.println("Calling onStartupEnded"); System.out.println("Calling onStartupEnded");
return fireFirstEnabled(enabledTransitions); return fireRandomEnabledTransition(enabledTransitions);
} }
} }
...@@ -7,9 +7,9 @@ import org.jetbrains.annotations.NotNull; ...@@ -7,9 +7,9 @@ import org.jetbrains.annotations.NotNull;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class SensoricsNode extends DiNeRosNode { public class SensoricsTestNode extends DiNeRosNode {
public SensoricsNode(String nodeName, PetriNet petriNet, String rcHost, String gcProtocol) { public SensoricsTestNode(String nodeName, PetriNet petriNet, String rcHost, String gcProtocol) {
super(nodeName, petriNet, rcHost, gcProtocol); super(nodeName, petriNet, rcHost, gcProtocol);
} }
......
...@@ -89,7 +89,7 @@ public abstract class DiNeRosNode extends AbstractNodeMain { ...@@ -89,7 +89,7 @@ public abstract class DiNeRosNode extends AbstractNodeMain {
}); });
} }
protected abstract void nodeLoop(); protected void nodeLoop() {}
protected final void stop() { protected final void stop() {
stopNode = true; stopNode = true;
...@@ -501,6 +501,7 @@ public abstract class DiNeRosNode extends AbstractNodeMain { ...@@ -501,6 +501,7 @@ public abstract class DiNeRosNode extends AbstractNodeMain {
@NotNull @NotNull
protected TransitionSelectionResult fireRandomEnabledTransition(List<Transition> enabledTransitions) { protected TransitionSelectionResult fireRandomEnabledTransition(List<Transition> enabledTransitions) {
if(enabledTransitions.size() == 0){ return new FiringSelectionNone(); }
FiringSelectionSuccess fsc = new FiringSelectionSuccess(); FiringSelectionSuccess fsc = new FiringSelectionSuccess();
fsc.setTransition(enabledTransitions.get(new Random().nextInt(enabledTransitions.size()))); fsc.setTransition(enabledTransitions.get(new Random().nextInt(enabledTransitions.size())));
return fsc; return fsc;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment