Diagonal Cells

rr1952 · Jul 28, 2017 · bfca276 · bfca276
1 parent 37d1d2a
commit bfca276
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 39 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/main/java/com/gc/demo/Cell.java b/src/main/java/com/gc/demo/Cell.java
@@ -8,6 +8,8 @@ public static boolean liveOrDie(boolean isLive, int liveNeighbors) {
         return isLive;
     }
 
+    // Cell neighbors are only considered to be directly north/east/south/west of a cell. Diagonals don't count.
+
     public static boolean[][] advanceGeneration(boolean[][] grid) {
         // a new clean boolean grid to keep track of our next generation
         boolean[][] ice = new boolean[grid.length][grid[0].length];
@@ -16,12 +18,19 @@ public static boolean[][] advanceGeneration(boolean[][] grid) {
         for (int i = 0; i < ice.length; i++) {
             for(int j = 0; j < ice[i].length; j++) {
 
-                //four checks around the grid. First checks if on border, and if not, proceeds in that direction and fishes out boolean of adjacent cell.
+                // four checks around the grid. First checks if on border, and if not, proceeds in that direction and fishes out boolean of adjacent cell.
                 if(i != 0 && grid[i-1][j]) neighbors++;
                 if((i != grid.length -1) && grid[i+1][j]) neighbors++;
                 if(j != 0 && grid[i][j-1]) neighbors++;
                 if((j != grid[i].length - 1) && grid[i][j+1]) neighbors++;
 
+                // Although if you wanted to check diagonals as well, you could just do the other dimension checks as well.
+                ///*
+                if(i != 0 && j != 0 && grid[i-1][j-1]) neighbors++;
+                if(i != 0 && (j != grid[i].length -1) && grid[i-1][j+1]) neighbors++;
+                if((i != grid.length -1) && j != 0 && grid[i+1][j-1]) neighbors++;
+                if((i != grid.length -1) && (j != grid[i].length -1) && grid[i+1][j+1]) neighbors++;
+                //*/
                 ice[i][j] = liveOrDie(grid[i][j], neighbors);
                 neighbors = 0;
             }

diff --git a/src/test/java/com/gc/demo/CellTest.java b/src/test/java/com/gc/demo/CellTest.java
@@ -44,7 +44,7 @@ public void test5() {
     // Tries out a 3x3 cell array. Hopefully nothing crashes.
     @Test
     public void test6() {
-        boolean [][] allAlive = {{true,true,false}, {true,false,true}, {false, true,true}};
+        boolean [][] allAlive = {{true,true,true, true}, {true,true,true,true}, {true, true,true,true}, {true,true,true,true}};
         allAlive = advanceGeneration(allAlive);
 
         assertFalse(Arrays.deepToString(allAlive), true);

diff --git a/target/classes/com/gc/demo/Cell.class b/target/classes/com/gc/demo/Cell.class
diff --git a/target/test-classes/com/gc/demo/CellTest.class b/target/test-classes/com/gc/demo/CellTest.class