Added random to MatrixTickExecutor as well

Author: AJdeMooij

src/nl/uu/cs/iss/ga/sim2apl/core/tick/MatrixTickExecutor.java

@@ -3,10 +3,7 @@
 import nl.uu.cs.iss.ga.sim2apl.core.agent.AgentID;
 import nl.uu.cs.iss.ga.sim2apl.core.deliberation.DeliberationRunnable;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -26,6 +23,11 @@ public class MatrixTickExecutor implements TickExecutor {
     private int tick = 0;
     private int stepDuration = -1;
 
+    /**
+     * A random object, which can be used to have agent execution occur in deterministic manner
+     */
+    private Random random;
+
     /** The ExecutorService that will be used to execute one sense-reason-act step for all scheduled agents **/
     private final ExecutorService executor;
 
@@ -48,6 +50,21 @@ public MatrixTickExecutor(int nThreads) {
         this.storeThread = new MatrixStoreThread(0, CONTROLLER_ADDRESS, CONTROLLER_PORT);
     }
 
+    /**
+     * Constructor that allows setting a (seeded) random, for ordering deliberation cycles
+     * before each tick.
+     *
+     * <b>NOTICE:</b> when the number of threads is larger then 1, some variation in order of
+     * agent execution may still occur. If agents use the same random object for selecting actions,
+     * the nextInt they receive may no longer be deterministic
+     * @param nThreads  Number of threads to use to execute the agent's sense-reason-act cycles.
+     * @param random    A (seeded) random object
+     */
+    public MatrixTickExecutor(int nThreads, Random random) {
+        this(nThreads);
+        this.random = random;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -76,6 +93,11 @@ public HashMap<AgentID, List<String>> doTick() {
             runnables = new ArrayList<>(this.scheduledRunnables);
             this.scheduledRunnables.clear();
         }
+
+        if(this.random != null) {
+            runnables.sort(Comparator.comparing(deliberationRunnable -> deliberationRunnable.getAgentID().getUuID()));
+            Collections.shuffle(runnables, this.random);
+        }
 
         try {
             LOG.info("Sending runnables to agent thread");