From 41c69169e1fda05b4df95f717f9049d738c4517d Mon Sep 17 00:00:00 2001 From: arthur <c19222814> Date: Tue, 6 Oct 2020 21:53:11 +0200 Subject: [PATCH] =?UTF-8?q?correction=20de=20la=20methode=20getNeighbour?= =?UTF-8?q?=20qui=20donnait=20un=20mauvais=20nombre=20de=20voisin=20(9)=20?= =?UTF-8?q?et=20correction=20de=20la=20m=C3=A9thode=20calculateNextState?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Grid.java | 4 ++-- out/production/tp3/Grid.class | Bin 2420 -> 3771 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Grid.java b/Grid.java index 19f447f..2567832 100644 --- a/Grid.java +++ b/Grid.java @@ -107,7 +107,7 @@ public class Grid implements Iterable<Cell> { private boolean calculateNextState(int rowIndex, int columnIndex, Cell cell) { int aliveNeighbours = countAliveNeighbours(rowIndex, columnIndex); if (cell.isAlive()) { - return aliveNeighbours > 1 && aliveNeighbours < 4; + return aliveNeighbours >= 2 && aliveNeighbours <= 3; } return aliveNeighbours == 3; } @@ -127,7 +127,7 @@ public class Grid implements Iterable<Cell> { List<Cell> cells = new ArrayList<>(); for (int i = rowIndex - 1; i <= rowIndex + 1; i++) { for (int j = columnIndex - 1; j <= columnIndex + 1; j++) { - if (i != rowIndex && j != columnIndex || i > 0 && j > 0 && i < getNumberOfRows() && j < getNumberOfColumns()) + if ((!(i == rowIndex && j == columnIndex)) && i > 0 && j > 0 && i < getNumberOfRows() && j < getNumberOfColumns()) cells.add(getCell(i, j)); } } diff --git a/out/production/tp3/Grid.class b/out/production/tp3/Grid.class index 056f19902a2199cee6fdae89286ef9e11ac6a3e7..e700d5d726f22901bb94e808d42c7e2b105862f1 100644 GIT binary patch literal 3771 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 delta 1248 zcmdlj`$dTB)W2Q(7#J8V8Dcha9cP^Uk~w<vb|$6CPAn0VA2NyxGBWVxrB;-<r{<*= zC6;97=S^Z#7GPvxNlwklVPs(QaZb(2v7W5UBtN-;Nu8aMK}N&VQ*$ymtCR#MNMCSC zVo53^19NnA6e9y`a!zVu(d2a2IgI9$S=ba=Eg2XYtR`!*X=qzBFffQQure?(h%>M- zNHB0RNHXv-NHK^pNHf?lFfb@EFoWf68SEz4vPrVrGdM6XF<4EW%O<4{(#yuc$iToL z4_3<qW^*#wGT1RNFgP+WFfcJVF)%R*F$jb0d&cHd57HyYz|O$Hpv=I_pu!-|pvs`g zpvIufpvqv(pu%9upb0ihi-Cnfl0k~WnSqCanSq}{i@}9~hk=QKfx#MTJ}-kFgBXK2 z10#bg0|SFF1Iu3qes%^G#y<?4jK3Hpe=)E!FfzC?xPz=_U|{fPU}j)un7ol)66^+u zyUoCMLHsBPHJ5=w5NsF7UxHx!nHZQDv>3FZ27&w!atDvJ);0#&1Q1cM2JBam-yr5% zfz1^IyO#%UE)T@q2nHqwJ?zFQf{atdFwPE#aiG9qWME{FXHWn+Zt_A7F?EC^+`+ma zk-`df1S5koRP8+!wE<YvGB9{BfV^WhS(;M{9B5o%4<#~iFeD+VhebFOgCT<v$Q=v} z3_1)TcQG(9F>XK$np7m6Oi))bF?cd~L3M&?7LXohlt8U#U|`4uYXzkYP|C6er!o)= zlrliE#RQElkeD}v4+Ap;6N4{<AJkw621amNW<oWXfq@|xY%U}fz?=j!1KHeqP~u}^ z@Mj1BC4UA62Dot;J}e@_IFM<MAYU>BGB7ciGMGUfX$lr&U|`$`W*{Q7z6@+CBuOzs z!;OJ~ks*j77@X}wAaTXOz@W_l631dj4cG`sf<PD%$`D4#@-_w=9dJ1TO7{qzj11un S5e$qBOwha@$q)s0bu<7ztaM%g -- GitLab