Refactoring Main and Main2

AllenDowney · AllenDowney · commit 561ca418d7bd · 2019-09-13T14:08:30.000-04:00
diff --git a/ch15/Langton.java b/ch15/Langton.java
@@ -8,12 +8,12 @@ public class Langton extends Automaton {
     private int head; // 0=North, 1=East, 2=South, 3=West
 
     /**
-     * Creates an 11x11 grid with the ant in the center.
+     * Creates a grid with the ant in the center.
      */
-    public Langton() {
-        grid = new GridCanvas(11, 11, SIZE);
-        xpos = 5;
-        ypos = 5;
+    public Langton(int nrows, int ncols) {
+        grid = new GridCanvas(nrows, ncols, 10);
+        xpos = nrows / 2;
+        ypos = ncols / 2;
         head = 0;
     }
 
diff --git a/ch15/Main.java b/ch15/Main.java
@@ -7,19 +7,25 @@
 public class Main {
 
     /**
-     * Sets up the grid, creates the frame, and plays the game.
+     * Creates an automaton and runs it.
      * 
      * @param args command-line arguments
      */
     public static void main(String[] args) {
-
         String title = "Conway's Game of Life";
         Automaton game = new Conway("pulsar.cells", 2);
+        runSimulation(title, game, 500);
+    }
 
-        // String title = "Langton's Ant";
-        // Automaton game = new Langton();
-
-        // set up the window frame
+    /**
+	 * Creates a JFrame and runs the simulation.
+	 * 
+	 * @param title
+	 * @param game
+	 * @param delay
+	 */
+	public static void runSimulation(String title, Automaton game, int delay) {
+		// set up the window frame
         JFrame frame = new JFrame(title);
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setResizable(false);
@@ -32,16 +38,15 @@ public static void main(String[] args) {
         while (true) {
 
             // update the drawing
-            toolkit.sync();
             game.update();
+            toolkit.sync();
 
             // delay the simulation
             try {
-                Thread.sleep(500);
+                Thread.sleep(delay);
             } catch (InterruptedException e) {
                 // do nothing
             }
         }
-    }
-
+	}
 }
diff --git a/ch15/Main2.java b/ch15/Main2.java
@@ -0,0 +1,17 @@
+/**
+ * Application that runs a cellular automaton.
+ */
+public class Main2 {
+
+    /**
+     * Creates an automaton and runs it.
+     * 
+     * @param args command-line arguments
+     */
+    public static void main(String[] args) {
+        String title = "Langton's Ant";
+        Automaton game = new Langton(61, 61);
+        Main.runSimulation(title, game, 1);
+    }
+
+}
