From 9b68af80de07aa5f135030cb8446853a26bb964d Mon Sep 17 00:00:00 2001
From: AREZKI Celia <celia.arezki.1@etu.univ-amu.fr>
Date: Thu, 28 Nov 2024 15:07:17 +0100
Subject: [PATCH] correction of the BoardFirefighterProperties class
---
.../model/BoardFirefighterProperties.class | Bin 1817 -> 1043 bytes
.../model/BoardFirefighterProperties.java | 23 ++++--------------
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/build/classes/java/main/model/BoardFirefighterProperties.class b/build/classes/java/main/model/BoardFirefighterProperties.class
index 60cf557b1858dce3c97629a5e7714b29130e8a13..a094b5badf9a5c8b929c25141e712d65a3445892 100644
GIT binary patch
delta 609
zcmbQqH<^R$)W2Q(7#J9w7<49bwK20Z2u}PXAtlViAi^NX$iP{UUz}NznV(n8#lXQJ
z#={^!S&valO_Gs;x3nZPM?U~6&BY+WAkD+T${@qYz^dWtsTs!3AU8RWQEKu>#;D2b
zndB#%Giyzr!faMA%fQSa#K6tK!@$5G#J~@wMHmDb7#LU?7(qrbFfzz9FfimZFf%YS
zFfhn!ZD(NAlHSU|t|haTfmcgf<|u;z(^du{t!)gV8yOfFm>3io7#O4&*cccX_!w9i
z_!&4E1Q_@j1Q{e4gcxKPgc%eW7#I}5hN;RjC^0BAfPgI66^tMo!0upTU}6wwU<27c
z`7w)fx{$Py%x(sWNNJhv3{t@@OpMF_KWSlPT>k$G$Wmq`OC=e&7^E0P7^E3g8KfAr
z86+7D8RX!W@-WCVs4(y_fXvrtP-Wm@0NH5-b%)yITvqXVbp{QPy$lQt?hH&|hjMCd
zVF0<nXan4bAg3`fD8mhAVBmxr0%E}o=7d_t$iU5@2{lxofe~yetJW3<_BCh*sxv5t
gGcZ7%#R@f%k%1qpZeDcVI$-BO{Djb~1-3&Q025C^#Q*>R
literal 1817
zcmX^0Z`VEs1_mbv2QCIC24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk-
z5<5l)W)00SP6iGJPId+^9tLg(9!3U*-29Z(9DS$!#G(|p%%aq^%=C<s)S`f*{DRb?
zlFZa%Mh1?e{Bq~~(!3Hz21ZYic0L{kevn@7<ouk{+&r)xNL-MIL5M+^k%2QWH8VXU
zDZi+gk%8X_?4Ht+%p85+!~$!OI#C`5F_3-%kh3xqb3pdO4UynskOWDJBS}IX1y;k(
zAkD}i7#-~cHZmZ;II|=(KM!oKEDwVmNS3nzDq76Nz`>xv!=MNX7-6V^nN_JUUB&DS
z%8U%WC?;_+C^4vl!cvWqfmOrPQ!|X6L4%P&6e*mL1BWv>Gd(Y{q_ilNk--twuQq5-
zM3VK%EG|KpwzIagW@Hf4@bpAd2nsTg8yFc_obyvsLE)L1m+DuVo0M7<l9-f}%E%z(
zlb@WJ6P8$%3F1QqSxPc8iy0Y|e2|<C3T9|XB76X{64ijpf>fv>9vE&xcQcYpad`>i
zdNxQ>VPs$~$}eYR;0-QGOwRUAEP&d?lb%}Qhe$Mn8k$HZgTjE3!5LkQ47V^caHpr1
zz+#_~K^PRjXt4y&C7z57!s)3co_U!i$mx@jK?+qA8l2#S$;iMJoL^d$oa&YdiWYg?
zSxOI-B^VSLI2f217#Y+V*cgOBnUR5kK?szwz_c8LG?*4*5N2Rx&}3j>U}Df>5CUZ!
zu(%`x4+8@O2LmGmD}y!z6N3%|1H&E$W(GC}1_nK??F@`s(pwqWwPdz3@M`I9Wf0I3
zW!cIgq9w|@l|fufTIMK&6w_7)8Le#$@*5c#7?>G!85kJU7&sXi7z7wt7z7zO8H5=4
z7=#&w8AKQ)8AKW68N?Vg8N?ZM86+6=7#JArAT}}RGZ-*{fF9Tfj3C>=eqaK#K(1#7
zv&0y97+An8kjq&a3>g?0co-n+g&4FLn4x|&VqgMgR|ZC~k7hBjF@W?NG22LMZDC+v
z#Gu7&E2FiAfp-yul-3po8EGS#-3&^R(lXl_RDxTW7?=Nl(!$8N{Qnh%ucW{(m1W>!
zkYf;GkY`Y3kYmthkYzArPy+izfq|KUhe4jfn1P3ZiGhhhpTPv`G9#$(Od+B2hk=Rl
z4+AITF9x|^46F={3}y`G(2&<>U<CVxRci}_zy@$+fdZ5bET|5)2I5&(sF9EewP0Xm
zuw<};de$9OkTWnaa6&z1gl>>F*dUO585lUB27y>G_i{r0z{tSOU=1}C*=6i&&|Ibu
rHW1Zij12r(HS?ltHo>ad2CHTfbj=o6HQQp<ERL?(2CHT}u;=Un-uPdm
diff --git a/src/main/java/model/BoardFirefighterProperties.java b/src/main/java/model/BoardFirefighterProperties.java
index d2a0a17..243f8ad 100644
--- a/src/main/java/model/BoardFirefighterProperties.java
+++ b/src/main/java/model/BoardFirefighterProperties.java
@@ -9,22 +9,18 @@ public class BoardFirefighterProperties implements BoardProperties{
private final int rowCount;
private final int columnCount;
private final Position[][] positions;
- private final Map<Position, List<Position>> neighbors;
- private final int initialFireCount;
- private final int initialFirefighterCount;
- public BoardFirefighterProperties(int rowCount, int columnCount, Map<Position, List<Position>> neighbors, int initialFireCount, int initialFirefighterCount) {
+
+ public BoardFirefighterProperties(int rowCount, int columnCount) {
this.rowCount = rowCount;
this.columnCount = columnCount;
- this.neighbors = neighbors;
- this.initialFireCount = initialFireCount;
- this.initialFirefighterCount = initialFirefighterCount;
- this.positions=new Position[rowCount][columnCount];
+ this.positions = new Position[rowCount][columnCount];
initializePositions();
}
+
private void initializePositions() {
for (int row = 0; row < rowCount; row++) {
for (int column = 0; column < columnCount; column++) {
@@ -35,10 +31,6 @@ public class BoardFirefighterProperties implements BoardProperties{
- public Map<Position, List<Position>> getNeighbors() {
- return neighbors;
- }
-
public Position getPosition(int row, int column) {
return positions[row][column];
}
@@ -52,11 +44,6 @@ public class BoardFirefighterProperties implements BoardProperties{
return columnCount;
}
- public int getInitialFireCount() {
- return initialFireCount;
- }
- public int getInitialFirefighterCount() {
- return initialFirefighterCount;
- }
+
}
--
GitLab