diff --git a/.idea/misc.xml b/.idea/misc.xml index c6eabde0bab0392d71b80872c579b17cf73435ec..7908772a4b6749c735e4cee6d248876bba03b0fb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ExternalStorageConfigurationManager" enabled="true" /> + <component name="JavadocGenerationManager"> + <option name="OUTPUT_DIRECTORY" value="$USER_HOME$/Bureau/test" /> + </component> <component name="MavenProjectsManager"> <option name="originalFiles"> <list> diff --git a/src/main/java/agents/Agent2D.java b/src/main/java/agents/Agent2D.java deleted file mode 100644 index 58d03143159f92ad9a2ae83f2aaf2bfce7edfd05..0000000000000000000000000000000000000000 --- a/src/main/java/agents/Agent2D.java +++ /dev/null @@ -1,7 +0,0 @@ -package agents; - -import behaviors.Positionable2D; - -public interface Agent2D extends Agent, Positionable2D { - -} diff --git a/src/main/java/agents/SEIRSAgent.java b/src/main/java/agents/SEIRSAgent.java index b926e8d65069c7221e3dc3c6cfb03eefb0ded984..1a5242fb9e7a87aeb97ff3fc4c3ebe57ad167ac5 100644 --- a/src/main/java/agents/SEIRSAgent.java +++ b/src/main/java/agents/SEIRSAgent.java @@ -1,8 +1,9 @@ package agents; import agents.states.SEIRSState; +import behaviors.Positionable2D; -public interface SEIRSAgent extends Agent2D { +public interface SEIRSAgent extends Agent, Positionable2D { void changeState(SEIRSState SEIRSState); SEIRSState getState(); diff --git a/src/main/java/scheduler/DeterministScheduler.java b/src/main/java/scheduler/DeterministScheduler.java index aae3d1ed5db93b9187057c42c91d9bfea2634b75..5197f9d2df70fa6cc7f350e53f95899b14026c65 100644 --- a/src/main/java/scheduler/DeterministScheduler.java +++ b/src/main/java/scheduler/DeterministScheduler.java @@ -17,7 +17,6 @@ public class DeterministScheduler implements Scheduler { public DeterministScheduler(String csvFile) { readCSV(csvFile); - System.out.println(wakeUpOrder.size()); } private void readCSV(String file) { diff --git a/src/main/resources/output.png b/src/main/resources/output.png index 646a683834196ca79a137a7c6906908de9243c02..5ee4b6be7bf3b0c2de6d0a9bae476cc58ccbdfa0 100644 Binary files a/src/main/resources/output.png and b/src/main/resources/output.png differ