From bcd68cee423c3281e64f723d1d5843a737000f11 Mon Sep 17 00:00:00 2001
From: Susanne <mahler-susanne@web.de>
Date: Sun, 16 Feb 2025 16:35:12 +0100
Subject: [PATCH] nextGeneration() Implementierung setAlive() auch mit zwei
 Nachbarn -> Test keepAliveWithTwoNeighbours() passes

---
 .../GameOfLifeAssignment/Life.class           | Bin 2065 -> 2093 bytes
 out/test/GameOfLifeAssignment/LifeTest.class  | Bin 1439 -> 1439 bytes
 src/Life.java                                 |   2 ++
 test/LifeTest.java                            |   5 -----
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/out/production/GameOfLifeAssignment/Life.class b/out/production/GameOfLifeAssignment/Life.class
index 24afbc3ff35222b1bb40cf72007b3eda78374160..d0084a203759dda198a7809d449dbdf04f8fddf6 100644
GIT binary patch
delta 275
zcmXAjze>Y!6otQEW15h5DAl4vB03clgi`TuZ9!|b)heh%sW^y(lXUR`MCc1h23K|I
zBoq-91Xtg{r%~z&F87{$&vy^^Husbp-r4mL7Gpr~1JiwDx@}ec@P(<*M^3F;kVwC*
zp%n)HD^dEMY?P?tfYSfUj=${a`njJngV94YRF*|mwM<rZ0hdL_Sz?A|LRPd{mA}R|
z6;4>^Ox}f<OE#$KBGf+x4%woiB#(2E4N`J?)Y(*b#qUZPnwlnYf5~_b#{A%!ARk|)
mZ|0JV9Wo*&XfZ3k$R6|TE8{?kP1^F0IF1A7-E`t_r}784CohEn

delta 247
zcmW-a&r1Sv6vRK@U3F!>2$^))jXFuY1fk@QLW68AQxS^};vW-%_mDkw@6t)|ASndh
z`X{{lA9PM^>N0QMyqS5^>?AvTNuI2+NdTh{%y7Ye*RFfPoW0Li+IGYLqh3)<Iq<!A
z!c@FUhL2xk%e-yp;Y>lBx-h^MmPm8T4rLCgNUKVzam^V$Y4^GfxuEgyPp~U?MWhCo
zJ}ogzmk~`aHPiCniWzRS<#9H+4#xc8TE>r`Q%^@t1tKzv=Je!H#sY1Q>8PSBwIz(W
OV-VMzrFn?Io%3I8Whu%4

diff --git a/out/test/GameOfLifeAssignment/LifeTest.class b/out/test/GameOfLifeAssignment/LifeTest.class
index 2748436d558b8dc4a09c0f9aad5e668f81afc76d..72dfc8e99faa79d3391aa25f0f03366578cdac0e 100644
GIT binary patch
delta 109
zcmbQwJ)e8SH)csa1`Y;&20jJ@1`!5B1}O$(26+Y(1}z5D$^0xGvQ|J@YoM$RP}UYG
zYsa9#;J~2D;0RRjG<ge4pQ0B~g*Q-z4^V|KP=y~*g+GHDLlA>DLnwn8L)heGRvQ3*
CF%Q)M

delta 109
zcmbQwJ)e8SH)cs41`Y;Y20jKo1`!5*1}O$Z26+Y}1}z5T$^0xGvgSZp3!tneP}T}4
zYt5j*V9TJ&V8>v<U_W^aOP``UP=yCjg(pyj7f^*aP=ybJ8iPNBHbW4D8AI^oWL6sh
Dal{Xl

diff --git a/src/Life.java b/src/Life.java
index 00df3fd..53b91c7 100644
--- a/src/Life.java
+++ b/src/Life.java
@@ -54,6 +54,8 @@ public class Life implements ILife {
       for (int x = 0; x < grid[y].length; x++) {
         if (countAliveNeighbours(x, y) == 3) {
           next.setAlive(x, y);
+        } else if (countAliveNeighbours(x, y) == 2) {
+          next.setAlive(x, y);
         } else if (countAliveNeighbours(x, y) < 2 || countAliveNeighbours(x, y) > 3) {
           next.setDead(x, y);
         }
diff --git a/test/LifeTest.java b/test/LifeTest.java
index e81bb79..537efc8 100644
--- a/test/LifeTest.java
+++ b/test/LifeTest.java
@@ -37,12 +37,8 @@ public class LifeTest {
     }
 
 
-    // Testfall "keepAliveCell()" aufgeteilt in zwei einzelne Tests, da es ja eigentlich üblich ist, dass je Test
-    // nur ein einzelnes Szenario überprüft wird
     @Test
     public void keepAliveWithTwoNeighbours() {
-        // failed, weil bislang nur Zellen mit genau 3 Nachbarn in nextGen auf alive gesetzt werden,
-        // andernfalls standardmäßig mit false, also tot, initialisiert
         Life l = new Life();
         l.setAlive(1, 1);
         l.setAlive(0, 0);
@@ -54,7 +50,6 @@ public class LifeTest {
 
     @Test
     public void keepAliveWithThreeNeighbours() {
-        // passed, weil Zellen mit genau 3 Nachbarn bereits in nextGen auf alive gesetzt werden
         Life l = new Life();
         l.setAlive(1, 1);
         l.setAlive(0, 0);