added behaviors

src/main/java/agents/Agent.java

 package agents;
 
-public interface Agent {
+import behaviors.Wakeable;
 
-    void wakeUp();
+public interface Agent extends Wakeable {
 }

src/main/java/agents/Agent2D.java

 package agents;
 
-import java.awt.*;
+import behaviors.Positionable2D;
 
-public interface Agent2D extends Agent {
+public interface Agent2D extends Agent, Positionable2D {
 
-    Point getPosition();
 }

src/main/java/agents/FairInfectionRWAgent.java

@@ -7,7 +7,7 @@ import java.awt.*;
 
 public class FairInfectionRWAgent extends RandomWalkingAgent implements SEIRSAgent {
 
-    public FairInfectionRWAgent(Point position, int seed, SEIRSEnvironment environment) {
+    public FairInfectionRWAgent(Point position, long seed, SEIRSEnvironment environment) {
         super(position, seed, environment);
     }
 
@@ -16,7 +16,7 @@ public class FairInfectionRWAgent extends RandomWalkingAgent implements SEIRSAge
         boolean isExposed = false;
         int roll = r.nextInt(10000)+1;
         if (this.environment.getInfectedNeighbors(position).size() != 0) {
-            if (roll <= YamlReader.getParams().getInfectionRate()*10000) {
+            if (roll <= YamlReader.getParams().infectionRate()*10000) {
                 isExposed = true;
             }
         }

src/main/java/agents/RandomWalkingAgent.java

@@ -2,35 +2,27 @@ package agents;
 
 import agents.states.SEIRSState;
 import agents.states.SuceptibleSEIRSState;
+import behaviors.Randomized;
 import environment.SEIRSEnvironment;
 import utils.YamlReader;
 
 import java.awt.Point;
-import java.security.SecureRandom;
 import java.util.List;
-import java.util.Random;
 
-@SuppressWarnings("ThrowablePrintedToSystemOut")
-public class RandomWalkingAgent implements SEIRSAgent {
+public class RandomWalkingAgent extends Randomized implements SEIRSAgent {
 
     protected Point position;
-    protected Random r;
     protected final SEIRSEnvironment environment;
     protected SEIRSState state;
 
     private List<Point> authorizedPositions;
     private Point nextPosition;
 
-    public RandomWalkingAgent(Point position, int seed, SEIRSEnvironment environment) {
+    public RandomWalkingAgent(Point position, long seed, SEIRSEnvironment environment) {
+        super(seed);
         this.position = position;
         this.state = new SuceptibleSEIRSState(this);
         this.environment = environment;
-        try{
-            r = SecureRandom.getInstance("SHA1PRNG", "SUN");
-        }catch (Exception e) {
-            System.err.println(e);
-            System.exit(1);
-        }
         r.setSeed(seed);
     }
 

src/main/java/behaviors/Positionable2D.java

+package behaviors;
+
+import java.awt.*;
+
+public interface Positionable2D {
+
+    Point getPosition();
+}

src/main/java/behaviors/Randomized.java

+package behaviors;
+
+import java.security.SecureRandom;
+import java.util.Random;
+
+public abstract class Randomized {
+
+    protected Random r;
+
+    @SuppressWarnings("ThrowablePrintedToSystemOut")
+    public Randomized(long seed) {
+        try{
+            r = SecureRandom.getInstance("SHA1PRNG", "SUN");
+        }catch (Exception e) {
+            System.err.println(e);
+            System.exit(1);
+        }
+        r.setSeed(seed);
+    }
+
+}

src/main/java/behaviors/Wakeable.java

+package behaviors;
+
+public interface Wakeable {
+    void wakeUp();
+}
\ No newline at end of file

src/main/java/environment/ChunkedSEIRSEnvironment.java

 package environment;
 
-import agents.Agent2D;
 import agents.SEIRSAgent;
 import agents.states.InfectedSEIRSState;
 import agents.states.SEIRSState;
+import behaviors.Positionable2D;
 
 import java.awt.*;
 import java.util.ArrayList;
@@ -79,7 +79,7 @@ public class ChunkedSEIRSEnvironment implements SEIRSEnvironment {
     }
 
     @Override
-    public List<Point> perceiveAuthorizedPositions(Agent2D agent) {
+    public List<Point> perceiveAuthorizedPositions(Positionable2D agent) {
         List<Point> authorizedPosition = new ArrayList<>();
 
         for (int move = 0; move < MAX_MOVEMENT; move++) {
@@ -102,7 +102,7 @@ public class ChunkedSEIRSEnvironment implements SEIRSEnvironment {
     }
 
     @Override
-    public void notifyNewPosition(Point newPosition, Agent2D agent) {
+    public void notifyNewPosition(Point newPosition, Positionable2D agent) {
         if (chunks == null) {
             initiateChunks();
         }

src/main/java/environment/Environment2D.java

 package environment;
 
-import agents.Agent2D;
+import behaviors.Positionable2D;
 
 import java.awt.*;
 import java.util.List;
@@ -20,7 +20,7 @@ public interface Environment2D extends Environment {
     int DOWN_RIGHT = 8;
     int MAX_CHUNK = 9;
 
-    List<Point> perceiveAuthorizedPositions(Agent2D agent);
-    void notifyNewPosition(Point newPosition, Agent2D agent);
+    List<Point> perceiveAuthorizedPositions(Positionable2D agent);
+    void notifyNewPosition(Point newPosition, Positionable2D agent);
     int getSize();
 }

src/main/java/environment/WrappingChunkedSEIRSEnvironment.java

 package environment;
 
-import agents.Agent2D;
 import agents.SEIRSAgent;
+import behaviors.Positionable2D;
 
 import java.awt.*;
 import java.util.ArrayList;
@@ -29,7 +29,7 @@ public class WrappingChunkedSEIRSEnvironment extends ChunkedSEIRSEnvironment imp
     }
 
     @Override
-    public List<Point> perceiveAuthorizedPositions(Agent2D agent) {
+    public List<Point> perceiveAuthorizedPositions(Positionable2D agent) {
         List<Point> authorisedPositions = new ArrayList<>();
         for (int move = 0; move < MAX_MOVEMENT; move++) {
             Point position = getNextPosition(move,agent.getPosition());

src/main/java/models/Parameters.java

@@ -2,7 +2,7 @@ package models;
 
 @SuppressWarnings("unused")
 public record Parameters(
-        int seed,
+        long seed,
         int population,
         int size,
         int nbOfPatientZero,

src/main/java/scheduler/FairAsynchronousScheduler.java

 package scheduler;
 
-import agents.Agent;
+import behaviors.Wakeable;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,19 +12,19 @@ import java.util.stream.Collectors;
 public class FairAsynchronousScheduler implements Scheduler {
 
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
-    private Queue<Agent> queue;
+    private Queue<Wakeable> queue;
 
     @Override
-    public void init(Agent[] agents) {
+    public void init(Wakeable[] agents) {
         this.queue = new ConcurrentLinkedQueue<>(Arrays.stream(agents).toList());
     }
 
     @Override
     public void doNextCycle() {
-        List<Future<Agent>> results = queue.parallelStream().map(agent -> executor.submit(() -> {agent.wakeUp(); return agent;})).toList();
-        Function<Future<Agent>, Agent> futureTreatment = futureAgent -> {
+        List<Future<Wakeable>> results = queue.parallelStream().map(entity -> executor.submit(() -> {entity.wakeUp(); return entity;})).toList();
+        Function<Future<Wakeable>, Wakeable> futureTreatment = futureEntity -> {
             try {
-                return futureAgent.get();
+                return futureEntity.get();
             } catch (ExecutionException | InterruptedException e) {
                 e.printStackTrace();
             }

src/main/java/scheduler/FairSynchronousScheduler.java

 package scheduler;
 
-import agents.Agent;
+import behaviors.Randomized;
+import behaviors.Wakeable;
 
-import java.security.SecureRandom;
 import java.util.*;
 
-@SuppressWarnings("ThrowablePrintedToSystemOut")
-public class FairSynchronousScheduler implements Scheduler {
+public class FairSynchronousScheduler extends Randomized implements Scheduler {
 
-    private Agent[] agents;
+    private Wakeable[] agents;
     private Stack<Integer> executionOrder;
-    private Random r;
 
-    public FairSynchronousScheduler(Integer seed) {
-
-        try{
-            r = SecureRandom.getInstance("SHA1PRNG", "SUN");
-        }catch (Exception e) {
-            System.err.println(e);
-            System.exit(1);
-        }
-        r.setSeed(seed);
+    public FairSynchronousScheduler(long seed) {
+        super(seed);
     }
 
     private void generateExecutionOrder() {
@@ -38,7 +29,7 @@ public class FairSynchronousScheduler implements Scheduler {
     }
 
     @Override
-    public void init(Agent[] agents) {
+    public void init(Wakeable[] agents) {
         this.agents = agents;
         executionOrder = new Stack<>();
     }

src/main/java/scheduler/Scheduler.java

 package scheduler;
 
-import agents.Agent;
+import behaviors.Wakeable;
 
 public interface Scheduler {
 
-    void init(Agent[] agents);
+    void init(Wakeable[] agents);
     void doNextCycle();
 
 }

src/main/java/sma/SEIRS_SMA.java

@@ -3,6 +3,7 @@ package sma;
 import agents.FairInfectionRWAgent;
 import agents.SEIRSAgent;
 import agents.states.InfectedSEIRSState;
+import behaviors.Randomized;
 import environment.SEIRSEnvironment;
 import environment.WrappingChunkedSEIRSEnvironment;
 import models.Parameters;
@@ -19,26 +20,38 @@ import view.StatisticsCanvas;
 
 import java.awt.*;
 import java.io.IOException;
-import java.security.SecureRandom;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Date;
 import java.util.HashMap;
 
-@SuppressWarnings({"InfiniteLoopStatement", "ThrowablePrintedToSystemOut"})
-public class SEIRS_SMA implements SMA{
+@SuppressWarnings("InfiniteLoopStatement")
+public class SEIRS_SMA extends Randomized implements SMA{
 
-    private Parameters parameters;
-    private SEIRSAgent[] agents;
+    private final Parameters parameters;
+    private final SEIRSAgent[] agents;
     private SEIRSEnvironment environment;
     private Scheduler scheduler;
     private StatisticsCanvas statisticsCanvas;
     private DisplaySquaredEnvironment display;
-    private SecureRandom r;
     private final FrameBuilder fb = new FrameBuilder();
 
     private HashMap<String,Integer> stats;
 
+    public SEIRS_SMA(Parameters params) {
+        super(params.seed());
+        parameters = YamlReader.getParams();
+        r.setSeed(parameters.seed());
+        agents = new RandomWalkingAgent[parameters.population()];
+        initEnvironment();
+        initPopulation();
+        infectPatientZero();
+        initScheduler();
+        if (parameters.graphicalMode()) {
+            initGraphics();
+        }
+    }
+
     private void initGraphics() {
         statisticsCanvas = new StatisticsCanvas(300,parameters.size());
         display = new DisplaySquaredEnvironment(environment,agents);
@@ -119,28 +132,6 @@ public class SEIRS_SMA implements SMA{
         }
     }
 
-
-    @Override
-    public void init() {
-        parameters = YamlReader.getParams();
-        try{
-            r = SecureRandom.getInstance("SHA1PRNG", "SUN");
-        }catch (Exception e) {
-            System.err.println(e);
-            System.exit(1);
-        }
-        r.setSeed(parameters.seed());
-        agents = new RandomWalkingAgent[parameters.population()];
-        initEnvironment();
-        initPopulation();
-        infectPatientZero();
-        initScheduler();
-        if (parameters.graphicalMode()) {
-            initGraphics();
-        }
-    }
-
-
     @Override
     public void run() {
         Instant startTime = Instant.now();
@@ -164,8 +155,7 @@ public class SEIRS_SMA implements SMA{
     }
 
     public static void main(String[] args) {
-        SMA sma = new SEIRS_SMA();
-        sma.init();
+        SMA sma = new SEIRS_SMA(YamlReader.getParams());
         sma.run();
     }
 }

src/main/java/sma/SMA.java

 package sma;
 
 public interface SMA{
-
-    void init();
     void run();
 }

src/main/java/view/DisplaySquaredEnvironment.java

@@ -10,7 +10,6 @@ import java.awt.*;
 
 public class DisplaySquaredEnvironment extends JPanel {
 
-
     private final SEIRSAgent[] SEIRSAgents;
 
     public DisplaySquaredEnvironment(SEIRSEnvironment environment, SEIRSAgent[] SEIRSAgents) {

src/main/java/view/StatisticsCanvas.java

@@ -15,7 +15,7 @@ public class StatisticsCanvas extends JPanel {
     public StatisticsCanvas(int width,int height) {
         this.setDoubleBuffered(false);
         values = new HashMap<>();
-        total = YamlReader.getParams().getPopulation();
+        total = YamlReader.getParams().population();
         setSize(width, height);
         setVisible(true);
     }

src/main/resources/parameters.yaml

@@ -2,7 +2,7 @@ graphicalMode: true
 incubationRate: 0.3
 infectionRate: 0.8
 looseImmunityRate: 0.008
-recoveryRate: 0.1429
+recoveryRate: 0.14
 nbOfCycles: 2000
 nbOfPatientZero: 1
 population: 3000
@@ -11,4 +11,4 @@ size: 1000
 wrappingWorld : true
 synchronousMode: false
 timeBetweenCycles: 0
-infectionStacks : true
+infectionStacks : false
\ No newline at end of file