diff --git a/src/Goldfish.java b/src/Goldfish.java index 041af01..319903b 100644 --- a/src/Goldfish.java +++ b/src/Goldfish.java @@ -15,20 +15,28 @@ public class Goldfish { public void run () { //TODO: make it run. - _grid.getPatch(0,1).setState(1); - _grid.getPatch(1,2).setState(1); - _grid.getPatch(2,2).setState(1); + _grid.getPatch(1,0).setState(1); _grid.getPatch(2,1).setState(1); - _grid.getPatch(2,0).setState(1); + _grid.getPatch(2,2).setState(1); + _grid.getPatch(1,2).setState(1); + _grid.getPatch(0,2).setState(1); System.out.println(_grid); _grid = Conway.run(_grid); + System.out.println("------------"); + System.out.println(_grid); _grid = Conway.run(_grid); + System.out.println("------------"); + System.out.println(_grid); _grid = Conway.run(_grid); + System.out.println("------------"); + System.out.println(_grid); _grid = Conway.run(_grid); + System.out.println("------------"); + System.out.println(_grid); } public static void main (String[] args) { diff --git a/src/rules/Conway.java b/src/rules/Conway.java index 07c704b..d40a71b 100644 --- a/src/rules/Conway.java +++ b/src/rules/Conway.java @@ -20,14 +20,11 @@ public class Conway extends RuleSet { int numAlive = 0; for (Patch neighbor : neighbors) if (neighbor.getState() == 1) numAlive++; - //System.out.println(numAlive); Patch p = g.getPatch(i,j).clone(newGrid); if (numAlive < 2) { p.setState(0); //Dies by underpopulation - //System.out.println("ded by under"); } if (numAlive > 3) { - //System.out.println("ded by over"); p.setState(0); //Dies by overpopulation } if (numAlive == 3) @@ -36,9 +33,6 @@ public class Conway extends RuleSet { } } - System.out.println(g); - System.out.println("-----"); - System.out.println(newGrid); //boolean running = true; //while (running) { //running = false;