From bbdf6418a2bb6ceb214f5120ed96734f9aebd873 Mon Sep 17 00:00:00 2001
From: Yanis OUALAN <oualanyanis01@gmail.com>
Date: Fri, 29 Nov 2024 10:33:06 +0100
Subject: [PATCH] Changement scenario virus
---
src/main/java/controller/Controller.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index 97a8c81..7139071 100644
--- a/src/main/java/controller/Controller.java
+++ b/src/main/java/controller/Controller.java
@@ -36,6 +36,7 @@ import util.Position;
import view.Grid;
import view.ViewElement;
+
public class Controller {
public static final int PERIOD_IN_MILLISECONDS = 50;
@@ -142,14 +143,14 @@ public class Controller {
grid.setDimensions(columnCount, rowCount, squareWidth, squareHeight);
Map<EntityFactory, Integer> entityCounts = new HashMap<EntityFactory, Integer>();
-
+ /*
entityCounts.put((pos, b) -> new Fire(pos), initialFireCount);
entityCounts.put((pos, b) -> new FireFighter(pos,b), initialFirefighterCount);
entityCounts.put((pos, b) -> new MotorizedFireFighter(pos, b), initialMotorizedFirefightersCount);
entityCounts.put((pos, b) -> new Cloud(pos, b), initialcloudCount);
entityCounts.put((pos, b) -> new Mountain(pos), initialmountaincount);
entityCounts.put((pos, b) -> new Rockery(pos), 3);
-
+ */
/*
entityCounts.put((pos, b) -> new Rock(pos), 10);
@@ -157,12 +158,12 @@ public class Controller {
entityCounts.put((pos, b) -> new Paper(pos), 10);
*/
- /*
- entityCounts.put((pos, b) -> new Patient(pos), 70);
- entityCounts.put((pos, b) -> new Virus(pos), 6);
- entityCounts.put((pos, b) -> new Doctor(pos), 3);
- */
- Model model = new FireFighterScenario(columnCount, rowCount, entityCounts);
+
+ entityCounts.put((pos, b) -> new model.doctorviruspatient.Patient(pos), 70);
+ entityCounts.put((pos, b) -> new model.doctorviruspatient.Virus(pos), 6);
+ entityCounts.put((pos, b) -> new model.doctorviruspatient.Doctor(pos), 3);
+
+ Model model = new model.doctorviruspatient.DoctorVirusPatientScenario(columnCount, rowCount, entityCounts);
this.setModel(model);
repaintGrid();
}
--
GitLab