cleaned up the code

ChrisMayfield · ChrisMayfield · commit 70b0af8f5cd3 · 2019-09-11T21:46:43.000-04:00
diff --git a/ch15/Automaton.java b/ch15/Automaton.java
@@ -1,6 +1,6 @@
 /**
- * A cellular automaton consists of a grid of cells and has the ability to
- * update itself over time.
+ * A cellular automaton consists of a grid of cells and follows a set of rules
+ * that update the grid over time.
  */
 public abstract class Automaton {
 
diff --git a/ch15/Cell.java b/ch15/Cell.java
@@ -29,7 +29,7 @@ public Cell(int x, int y, int size) {
     }
 
     /**
-     * Paints the cell on the screen.
+     * Draws the cell on the screen.
      * 
      * @param g graphics context
      */
@@ -41,28 +41,14 @@ public void draw(Graphics g) {
     }
 
     /**
-     * @return the cell's color
-     */
-    public Color getColor() {
-        return this.color;
-    }
-
-    /**
-     * @param color the new color
-     */
-    public void setColor(Color color) {
-        this.color = color;
-    }
-
-    /**
-     * @return true if the cell is off
+     * @return true if the cell is OFF
      */
     public boolean isOff() {
         return this.color == OFF;
     }
 
     /**
-     * @return true if the cell is on
+     * @return true if the cell is ON
      */
     public boolean isOn() {
         return this.color == ON;
diff --git a/ch15/Conway.java b/ch15/Conway.java
@@ -131,8 +131,8 @@ private static void updateCell(Cell cell, int count) {
      * Simulates one round of Conway's Game of Life.
      */
     public void update() {
-        int rows = grid.getRows();
-        int cols = grid.getCols();
+        int rows = grid.numRows();
+        int cols = grid.numCols();
 
         // count neighbors before changing anything
         int[][] counts = new int[rows][cols];
diff --git a/ch15/GridCanvas.java b/ch15/GridCanvas.java
@@ -26,21 +26,21 @@ public GridCanvas(int rows, int cols, int size) {
             }
         }
 
-        // set up the Canvas drawing
+        // set up the canvas drawing
         setSize(cols * size, rows * size);
     }
 
     /**
      * @return number of rows
      */
-    public int getRows() {
+    public int numRows() {
         return array.length;
     }
 
     /**
      * @return number of columns
      */
-    public int getCols() {
+    public int numCols() {
         return array[0].length;
     }
 
diff --git a/ch15/Simulation.java b/ch15/Simulation.java
@@ -2,7 +2,7 @@
 import javax.swing.JFrame;
 
 /**
- * Application that simulates a zero-player game.
+ * Application that simulates a cellular automaton.
  */
 public class Simulation {
 
@@ -13,17 +13,17 @@ public class Simulation {
      */
     public static void main(String[] args) {
 
-        // String title = "Langton's Ant";
-        // Automaton auto = new Langton();
-
         String title = "Conway's Game of Life";
-        Automaton auto = new Conway("bakersdozen.cells");
+        Automaton game = new Conway("bakersdozen.cells");
+
+        // String title = "Langton's Ant";
+        // Automaton game = new Langton();
 
         // set up the window frame
         JFrame frame = new JFrame(title);
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setResizable(false);
-        frame.add(auto.getGrid());
+        frame.add(game.getGrid());
         frame.pack();
         frame.setVisible(true);
 
@@ -33,7 +33,7 @@ public static void main(String[] args) {
 
             // update the drawing
             toolkit.sync();
-            auto.update();
+            game.update();
 
             // delay the simulation
             try {

Original file line number	Diff line number	Diff line change
`@@ -26,21 +26,21 @@ public GridCanvas(int rows, int cols, int size) {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`- // set up the Canvas drawing`
	`29`	`+ // set up the canvas drawing`
`30`	`30`	`setSize(cols * size, rows * size);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`
`34`	`34`	`* @return number of rows`
`35`	`35`	`*/`
`36`		`- public int getRows() {`
	`36`	`+ public int numRows() {`
`37`	`37`	`return array.length;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
`41`	`41`	`* @return number of columns`
`42`	`42`	`*/`
`43`		`- public int getCols() {`
	`43`	`+ public int numCols() {`
`44`	`44`	`return array[0].length;`
`45`	`45`	`}`
`46`	`46`