From 435918d0ab2873de8597ab7065e08d771b5cab04 Mon Sep 17 00:00:00 2001
From: aimennabi <aimen.nabi@etu.univ-amu.fr>
Date: Wed, 30 Nov 2022 01:29:25 +0100
Subject: [PATCH] tache 1

---
 .gradle/7.4/checksums/checksums.lock          | Bin 17 -> 17 bytes
 .gradle/7.4/checksums/md5-checksums.bin       | Bin 18697 -> 20497 bytes
 .gradle/7.4/checksums/sha1-checksums.bin      | Bin 19577 -> 25517 bytes
 .../7.4/executionHistory/executionHistory.bin | Bin 19586 -> 34221 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/7.4/fileHashes/fileHashes.bin         | Bin 18697 -> 19597 bytes
 .gradle/7.4/fileHashes/fileHashes.lock        | Bin 17 -> 17 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .gradle/buildOutputCleanup/outputFiles.bin    | Bin 18695 -> 19037 bytes
 .idea/compiler.xml                            |   2 +-
 .idea/gradle.xml                              |   1 +
 .idea/misc.xml                                |   2 +-
 src/main/java/Grid.java                       |  15 ++-
 src/main/java/Model.java                      | 108 ++++++++++++++++--
 14 files changed, 113 insertions(+), 15 deletions(-)

diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock
index df54c1e0932a6aad9b35fe2f5781753d92dd27c2..7945266a5ab6080a184744726c20279bc02aff12 100644
GIT binary patch
literal 17
UcmZS1xO!7`QzBOs0|aaX05J6gTmS$7

literal 17
UcmZS1xO!7`QzBOs0|dwb05Dqv!T<mO

diff --git a/.gradle/7.4/checksums/md5-checksums.bin b/.gradle/7.4/checksums/md5-checksums.bin
index 38740cef473d59e77cc7580e7c7e168c289010c2..9bbe785680011a2f8b23e87fc2121a38b13e522d 100644
GIT binary patch
literal 20497
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
ZTMs(Q{ekXoBDNlMl>55?Vh5xi1OQ^R@vZ;>

delta 64
zcmbQZfU$ED;|3E6L6!wwTkB_-8-8N|1CQd#rjiPiW2Gb}zm<~U`40sQ3=D-E6@Q3t
MG*}@%+0o+!00spb9smFU

diff --git a/.gradle/7.4/checksums/sha1-checksums.bin b/.gradle/7.4/checksums/sha1-checksums.bin
index 37d18a5f1d3ac5802ec2e11e6e2ee389d38eabe7..fea70b434ac82a5ac09a3066ba32ffa10504603f 100644
GIT binary patch
literal 25517
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
Y=r_o&<q%!iM!#|B0@(#^IY4v)08Ngxn*aa+

delta 113
zcmZ2`obl%j#tkMCf+ADJ7ng0BbS8-b47{&T_LWqaJXca;vaXcG<X9<#$*Ix?lT~FT
zCZCm&m>erBF*#LEVsfaw#N?|A29r}2B_<zLl$iWi$zU?8iUiMpC}3b<{J2r^hxkSV
L4YAFR9u_PB)KDq?

diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin
index 8044f8db540d8ca16951815ac998f6158a86ba9c..379c05b56bf4592bad402191032e6a449f6f8730 100644
GIT binary patch
literal 34221
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
M-5G;t5cMJ|08KL!O8@`>

delta 49
zcmZ46&D1oLae@dd0|Ntt=tjdA;u9StCQC|4Gcr#0l~88X1PN_)xG6r-L4C8Mha(FB
DSQidJ

diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock
index e57456dc4f9a187338a1af68d935fbf5cffe29da..80e8955e82d390b14df82ea4edcc8a752d441d75 100644
GIT binary patch
literal 17
UcmZQR@qCKwh0L%v1_+1;06dxn00000

literal 17
UcmZQR@qCKwh0L%v1_)pV06abfqyPW_

diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin
index ac4d206fd6144671088bac4e8af72f9d24c99d8f..142907fc41e849b439843292be0e751c757d5320 100644
GIT binary patch
literal 19597
zcmZ=^V2}{_4+RVeAc|m)vPMH-Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nhD!*9GB7Z3K|CX&!vtdRmoqRJ@Gvkih_&;Dw7trd
zE&z!#FnA|Irw{&5|GeXZKf_rCh`8r`nE2|DV_`4kcWFSxeKcX>JAcn&d^Cv}BFx}r
z3KQS+{JtieEZZ%Jg!g2a_`X2zJ)EaqS3|_TX2Qe|2W$NF>zZ;OBJO<@CVsgvS~SKw
zn;RnT^%o}oG>U%*-@2_cA>tlOVdC#fjF^hO-hP9K`$WUUIsc}A5&xDJ0TK7O4ii_F
zx4irNdBZ1&xVJt`T%9|Qsc2%M1XTPxOk9IAc>%-R{n-$4k7Ag(^R>#=hd9C>L&Uw(
zVd8#eSyC*v=DtvIW|(+DO6FwaUQIEGxaUQfcti@{*-W7aYEW@&n0Vw7XM6DpQ)fWL
zy-vf#)2GW^s9InF^_M3nOgyt#E=j#_+j)q34@a1Ij>$vMPEo065OL33m^h4PU|>>&
z$c>VtAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0)s6Cj2RdhG#MBeKnuSW1-c(G3Wj{W=*?->Y~ynA|7HdT#ul5n!_XD)
zT&Ecr81zte%s#$k{a@`DvC|gsuuL}ppbOD)&=TU$muoR~Oz%7NxcPO$=}23p?zMe?
zwnKG*j0I^rfvIEbr7+uv%w0U|l)Vp$h9$N@bR6mhDQ94iZ^P8V=k_yxS#C||_NEIw
ztDf10gLE8?w<v??;M{~o$Nyr!^BJr4md!cVV`LN-3)aEVmkZIsIu%pL<7!R4EZuWo
zj_){H-gNEZbFhv_uGb(sq*yR@9OFE(?CgH;Bf+Bm%YK(K+=l4zXolzztH;#gckxh{
zS*M6}>w`mLtLh)^0PDDC&jHcFx&%{)$m~7Kw-`LQ*4n`)IxDAR0$9f*k2Me-%#$&7
z#4_YO$X+3scEVdJsVYdj4XPsrqJ#S#rjA7=3-{=0Hbk2#2Pay;FI9r-SO?L;S&FH{
zpi##m*j_x$;oRl`^-CVIP#s$!I$WGFb?iQ^eO>3VitoKe>%&*9|9TIs<MLu1hz`z2
zm^#?Cb`-cCoNM(Zs<QLN<h}=B9kPOM5FHGLm^#j=2R5}uB<r#i7Jc)270?aVq2ksK
z)uD%}gR^uOSI`cQW&PW3*;fmuOatpM`LhwK<1?m?XK74jzhySPuo6r-&XVu{3#{Xj
z$3ln>fjCSZYnDX2c6~KSRTOvlHF1Rr8(4?QpB)e#tf1W<Xn9bfHGS{ZwVg3`F>6z_
z*uHK9>$tqw9HN6+8`BQ8x*WH;ofr1TKdvY}c)0Z#SjQueMGzgVrkFY^MK(0bO{nXU
RinL!j)6pRmO~+1<4glF;C~g1%

delta 64
zcmeC3$=ErGaf6A3Aj{Jz{vCYlw$5Y#1COPXWhE6R=SoUU7L}6V`40sQ3=D-E6@Q3t
MG*}@%+0o+!0OOAtAOHXW

diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
index f382ced7e8f10e14ccd723be3c74dae1c97aa72b..377c088269107b126a7bee13fb74d2242b021620 100644
GIT binary patch
literal 17
VcmZQBEe>6w+qHB(0~j!>0RS*c1RDSV

literal 17
UcmZQBEe>6w+qHB(0|c-E05B*6`Tzg`

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index f7492f18c6ecf67db5af3279f7c8498953313f0a..4ec51350aa97f62b3460115e0baef1fe9e4bf6f6 100644
GIT binary patch
literal 17
UcmZRUKJ)c@^b_gh3=l9C06gmjZ2$lO

literal 17
UcmZRUKJ)c@^b_gh3=qHv06b&_<^TWy

diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 22247e075c97d900294472751d70aa6810330c43..326d448f40e8f55068815749a26d8cf43687b3be 100644
GIT binary patch
delta 520
zcmZpl#CUfK;|3Fndb!^FhAs}7|AiUAz;oq)D44w7?E2+^{YqeA29JwS;r}ZP{oZem
zlGcZadx^rtH**!eHJsV|1tRXb8z#Qh?fR;af0fIi;*v1&eSzM4I8R%-u7*f>sly}=
zIvY$Ym;QeZBJSxA6Te+E^;Kf&#4w1s7xQFS2?d8g`Z~vLS4?Dt2zs7{DgHB2+Wn!<
zfp1XpM40$rjtbEn9$_J<xb5Uv2}S-E)$FV7en+5U?2}6+EHqT+PFwnAsVFx@(90WU
zfNK1$>(4Lp=t9IjwI?r?P~`Xdb7I1Oxkpg3`;+%dSU7mdvv*vM_;U*)=w%5rAmmJ{
zY0!1H_YiT<k1+ADjXl|Z=_jv3#ak!8l~54KSlrBV^Izv5s9^DAR!Iec0$CYPp1jQc
zP{HYwWhJ$km>zCa{2{*4z(RDgqsOty`#pFkfAA2RoZt~PIl)5(%JzWLFuphd{j=he

delta 61
zcmcaRg|U4S;|3E6M()YJ5)zZYN=Qr&m6V*^CaFL9sifp&F)97Yy;2gB_ex1jek-NK
S#3;E@@rU?A1M$g@9>)NIq!h~l

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 659bf43..fcb19bf 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="16" />
+    <bytecodeTargetLevel target="18" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ba1ec5c..611e7c8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3db7abf..9cf8f20 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" default="true" project-jdk-name="corretto-16" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="corretto-16" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/Grid.java b/src/main/java/Grid.java
index 23fb50d..0c52228 100644
--- a/src/main/java/Grid.java
+++ b/src/main/java/Grid.java
@@ -17,12 +17,12 @@ public class Grid extends Canvas{
         setFocusTraversable(true);
         setOnMousePressed(this::mousePressed);
         model = new Model(this);
-        model.initialisation(3,8);
+        model.initialisation(3,1,2,1);
     }
 
     public void restart(MouseEvent mouseEvent){
         model = new Model(this);
-        model.initialisation(3,6);
+        model.initialisation(3,6,0,2);
         getGraphicsContext2D().clearRect(0,0,width,height);
         repaint();
     }
@@ -51,6 +51,17 @@ public class Grid extends Canvas{
         getGraphicsContext2D().setFill(Color.BLUE);
         getGraphicsContext2D().fillRect(row*height/rowCount,col*width/colCount,height/rowCount,width/colCount);
     }
+    public void paintCC(int row ,int col){
+        getGraphicsContext2D().setFill(Color.GREEN);
+        getGraphicsContext2D().fillRect(row*height/rowCount,col*width/colCount,height/rowCount,width/colCount);
+
+    }
+
+    public void paintMF(int row ,int col){
+        getGraphicsContext2D().setFill(Color.BLACK);
+        getGraphicsContext2D().fillRect(row*height/rowCount,col*width/colCount,height/rowCount,width/colCount);
+
+    }
 
     public void paintFire(int row, int col) {
         getGraphicsContext2D().setFill(Color.RED);
diff --git a/src/main/java/Model.java b/src/main/java/Model.java
index f23d0d1..52d20ea 100644
--- a/src/main/java/Model.java
+++ b/src/main/java/Model.java
@@ -1,12 +1,19 @@
 import java.util.*;
 
 
-public class Model {
+public class Model  {
     Grid grid;
     int colCount, rowCount;
+    MotoFighter motoFighter = new MotoFighter();
+    List<Position>linefite=new ArrayList<>();
+
     List<Position> firefighters = new ArrayList<>();
+    List<Position> clouds = new ArrayList<>();
     Set<Position> fires = new HashSet<>();
     List<Position> ffNewPositions;
+    List<Position> cNewPositions;
+
+
     int step = 0;
 
     public Model(Grid grid) {
@@ -16,11 +23,16 @@ public class Model {
     }
 
 
-    public void initialisation(int fireNumber, int fireFighterNumber){
+    public void initialisation(int fireNumber, int fireFighterNumber,int cloudNumber,int motoFighterNumber){
         for(int index=0; index<fireNumber;index++)
             fires.add(randomPosition());
         for(int index=0; index<fireFighterNumber;index++)
             firefighters.add(randomPosition());
+        for(int index=0; index<cloudNumber;index++)
+            clouds.add(randomPosition());
+        for(int index=0; index<motoFighterNumber;index++)
+            linefite.add(randomPosition());
+        motoFighter.motofighter.add(randomPosition().row());
     }
 
     private Position randomPosition() {
@@ -28,22 +40,47 @@ public class Model {
     }
 
 
+
     public void activation(){
         ffNewPositions = new ArrayList<>();
         for(Position ff : firefighters){
             Position newPosition = activateFirefighter(ff);
-            grid.paint(ff.row,ff.col);
-            grid.paintFF(newPosition.row, newPosition.col);
+            grid.paint(ff.row(),ff.col());
+            grid.paintFF(newPosition.row(), newPosition.col());
             ffNewPositions.add(newPosition);
         }
+
+        cNewPositions = new ArrayList<>();
+
+        for(Position cc : clouds){
+            Position newPosition = activeCloud(cc);
+            grid.paint(cc.row(),cc.col());
+            grid.paintCC(newPosition.row(), newPosition.col());
+            cNewPositions.add(newPosition);
+        }
+
+       /* for(Position mF : motofighter){
+            Position newPosition = motoFighter.activateFighter(mF);
+            grid.paint(mF.row,mF.col);
+            grid.paintMF(newPosition.row, newPosition.col);
+            mfNewPositions.add(newPosition);
+        }*/
+
         firefighters = ffNewPositions;
+
+        clouds = cNewPositions;
+
+        motoFighter.activation();
+
+
+
         if(step%2==0){
             List<Position> newFires = new ArrayList<>();
             for(Position fire : fires){
                 newFires.addAll(activateFire(fire));
             }
             for(Position newFire : newFires)
-                grid.paintFire(newFire.row, newFire.col);
+                grid.paintFire(newFire.row(), newFire.col());
 
             fires.addAll(newFires);}
         step++;
@@ -54,6 +91,26 @@ public class Model {
         return next(position);
     }
 
+    private Position activeCloud(Position position){
+        Position randomPosition=next(position).get((int) (Math.random()*next(position).size()));
+        List<Position> nextFires = next(randomPosition).stream().filter(fires::contains).toList();
+        extinguish(randomPosition);
+        for (Position fire : nextFires)
+            extinguish(fire);
+        return randomPosition;
+
+    }
+
+  /*  private Position activateMotofighter(Position position) {
+        Position randomPosition = tStepTowardFire(position);
+        //next(position).get((int) (Math.random()*next(position).size()));
+        List<Position> nextFires = next(randomPosition).stream().filter(fires::contains).toList();
+        extinguish(randomPosition);
+        for (Position fire : nextFires)
+            extinguish(fire);
+        return randomPosition;
+    }*/
+
 
 
     private Position activateFirefighter(Position position) {
@@ -68,17 +125,25 @@ public class Model {
 
         private void extinguish(Position position) {
         fires.remove(position);
-        grid.paint(position.row, position.col);
+        grid.paint(position.row(), position.col());
     }
 
     private List<Position> next(Position position){
         List<Position> list = new ArrayList<>();
-        if(position.row>0) list.add(new Position(position.row-1, position.col));
-        if(position.col>0) list.add(new Position(position.row, position.col-1));
-        if(position.row<rowCount-1) list.add(new Position(position.row+1, position.col));
-        if(position.col<colCount-1) list.add(new Position(position.row, position.col+1));
+        if(position.row()>0) list.add(new Position(position.row()-1, position.col()));
+        if(position.col()>0) list.add(new Position(position.row(), position.col()-1));
+        if(position.row()<rowCount-1) list.add(new Position(position.row()+1, position.col()));
+        if(position.col()<colCount-1) list.add(new Position(position.row(), position.col()+1));
         return list;
     }
+   /* private List<Position> nextTwo(Position position){
+        List<Position> list = new ArrayList<>();
+        if(position.row>0) list.add(new Position(position.row-2, position.col));
+        if(position.col>0) list.add(new Position(position.row, position.col-2));
+        if(position.row<rowCount-1) list.add(new Position(position.row+2, position.col));
+        if(position.col<colCount-1) list.add(new Position(position.row, position.col+2));
+        return list;
+    }*/
 
     private Position aStepTowardFire(Position position){
         Queue<Position> toVisit = new LinkedList<>();
@@ -101,5 +166,26 @@ public class Model {
         return position;
     }
 
-    public record Position(int row, int col){}
+  /*  private Position tStepTowardFire(Position position){
+        Queue<Position> toVisit = new LinkedList<>();
+        Set<Position> seen = new HashSet<>();
+        HashMap<Position,Position> firstMove = new HashMap<>();
+        toVisit.addAll(nextTwo(position));
+        for(Position initialMove : toVisit)
+            firstMove.put(initialMove,initialMove);
+        while(!toVisit.isEmpty()){
+            Position current = toVisit.poll();
+            if(fires.contains(current))
+                return firstMove.get(current);
+            for(Position adjacent : next(current)){
+                if(seen.contains(adjacent)) continue;
+                toVisit.add(adjacent);
+                seen.add(adjacent);
+                firstMove.put(adjacent, firstMove.get(current));
+            }
+        }
+        return position;
+    }*/
+
+
 }
\ No newline at end of file
-- 
GitLab