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

src/main/java/de/tudresden/inf/st/pnml/engine/example/DinerosTestNode.java

@@ -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
     protected TransitionSelectionResult onChange(List<Transition> enabledTransitions) {
         System.out.println("Calling onWaitEnded");
-        return fireFirstEnabled(enabledTransitions);
+        return fireRandomEnabledTransition(enabledTransitions);
     }
 
     @Override
     protected TransitionSelectionResult onStartupEnded(List<Transition> enabledTransitions) {
         System.out.println("Calling onStartupEnded");
-        return fireFirstEnabled(enabledTransitions);
+        return fireRandomEnabledTransition(enabledTransitions);
     }
 }

src/main/java/de/tudresden/inf/st/pnml/engine/example/SensoricsNode.java → src/main/java/de/tudresden/inf/st/pnml/engine/example/SensoricsTestNode.java

@@ -7,9 +7,9 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 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);
     }
 

src/main/java/de/tudresden/inf/st/pnml/engine/ros/DiNeRosNode.java

@@ -89,7 +89,7 @@ public abstract class DiNeRosNode extends AbstractNodeMain {
         });
     }
 
-    protected abstract void nodeLoop();
+    protected void nodeLoop() {}
 
     protected final void stop() {
         stopNode = true;
@@ -501,6 +501,7 @@ public abstract class DiNeRosNode extends AbstractNodeMain {
 
     @NotNull
     protected TransitionSelectionResult fireRandomEnabledTransition(List<Transition> enabledTransitions) {
+        if(enabledTransitions.size() == 0){ return new FiringSelectionNone(); }
         FiringSelectionSuccess fsc = new FiringSelectionSuccess();
         fsc.setTransition(enabledTransitions.get(new Random().nextInt(enabledTransitions.size())));
         return fsc;