diff --git a/.gitignore b/.gitignore index a1c2a238a965f004ff76978ac1086aa6fe95caea..904b3640e3d8c87423d993faabb6b859f6861205 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,7 @@ *.tar.gz *.rar +output.csv + # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* diff --git a/output.csv b/output.csv index 760d6f795790a6f9b618ea39393a60a00db1ae3f..63c94aa947fd04da0a383d8a8935b103d88f4a7f 100644 --- a/output.csv +++ b/output.csv @@ -62,19 +62,3 @@ SUCEPTIBLE,EXPOSED,RECOVERED,INFECTED 0,0,9083,917 0,0,9144,856 0,0,9198,802 -0,0,9245,755 -0,0,9296,704 -0,0,9342,658 -0,0,9385,615 -0,0,9428,572 -0,0,9457,543 -0,0,9490,510 -0,0,9518,482 -0,0,9541,459 -0,0,9580,420 -0,0,9608,392 -0,0,9630,370 -0,0,9647,353 -0,0,9674,326 -0,0,9690,310 -0,0,9708,292 diff --git a/src/main/java/models/Parameters.java b/src/main/java/models/Parameters.java index ec475079ab714cccea7a8645b9a6c53f5cdbfe91..dd13a267fed158336b482e605e786f838ef1e401 100644 --- a/src/main/java/models/Parameters.java +++ b/src/main/java/models/Parameters.java @@ -9,6 +9,7 @@ public class Parameters { float infectionChance; float incubationRate; float recoveryRate; + int nbOfCycles; public Parameters() { } @@ -62,4 +63,12 @@ public class Parameters { public void setRecoveryRate(float recoveryRate) { this.recoveryRate = recoveryRate; } + + public int getNbOfCycles() { + return nbOfCycles; + } + + public void setNbOfCycles(int nbOfCycles) { + this.nbOfCycles = nbOfCycles; + } } diff --git a/src/main/java/sma/SMA.java b/src/main/java/sma/SMA.java index 0fd7be0b42b085f3ffaf24af06112056984f2f8d..32890bd191bfd322cf2f65c9cf798d2f1839d289 100644 --- a/src/main/java/sma/SMA.java +++ b/src/main/java/sma/SMA.java @@ -73,7 +73,9 @@ public class SMA { } public void run() throws IOException, InterruptedException { - while (true) { + int cpt = 0; + while (cpt < parameters.getNbOfCycles()) { + cpt++; scheduler.nextCycle(); stats = environment.getAgentStatus(); updateGraphics(); diff --git a/src/main/resources/parameters.yaml b/src/main/resources/parameters.yaml index 0a8bfff598241e37a02cbecf6903daf9ec821f0e..430203ac5567b935c932a61b88de3c6758e697bd 100644 --- a/src/main/resources/parameters.yaml +++ b/src/main/resources/parameters.yaml @@ -5,5 +5,4 @@ nbOfPatientZero : 1 infectionChance : 0.1 #percentage of chance that an infected agent will spread to a susceptible agent incubationRate : 0.5 #chance that an exposed agent become infected each cycle recoveryRate : 0.05 #chance that an infected agent become recovered each cycle - -#TODO : ajouter le nu démographie \ No newline at end of file +nbOfCycles : 100 \ No newline at end of file diff --git a/target/classes/parameters.yaml b/target/classes/parameters.yaml index 0a8bfff598241e37a02cbecf6903daf9ec821f0e..430203ac5567b935c932a61b88de3c6758e697bd 100644 --- a/target/classes/parameters.yaml +++ b/target/classes/parameters.yaml @@ -5,5 +5,4 @@ nbOfPatientZero : 1 infectionChance : 0.1 #percentage of chance that an infected agent will spread to a susceptible agent incubationRate : 0.5 #chance that an exposed agent become infected each cycle recoveryRate : 0.05 #chance that an infected agent become recovered each cycle - -#TODO : ajouter le nu démographie \ No newline at end of file +nbOfCycles : 100 \ No newline at end of file