finished commit

.idea/workspace.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e282cee1-bfe9-42a3-9794-9633eb4654d1" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" afterDir="false" />
     </list>
@@ -21,8 +20,8 @@
           <file leaf-file-name="SimpleWindow.java" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="255">
-                  <caret line="17" column="42" selection-start-line="17" selection-start-column="42" selection-end-line="17" selection-end-column="42" />
+                <state relative-caret-position="555">
+                  <caret line="37" selection-start-line="37" selection-end-line="37" />
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -33,17 +32,17 @@
           <file leaf-file-name="ConwayGameOfLife.java" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="90">
-                  <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+                <state relative-caret-position="389">
+                  <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
                   <folding>
-                    <element signature="e#862#863#0" expanded="true" />
-                    <element signature="e#914#915#0" expanded="true" />
-                    <element signature="e#3134#3135#0" expanded="true" />
-                    <element signature="e#3167#3168#0" expanded="true" />
-                    <element signature="e#3211#3212#0" expanded="true" />
-                    <element signature="e#3243#3244#0" expanded="true" />
-                    <element signature="e#3285#3286#0" expanded="true" />
-                    <element signature="e#3317#3318#0" expanded="true" />
+                    <element signature="e#803#804#0" expanded="true" />
+                    <element signature="e#858#859#0" expanded="true" />
+                    <element signature="e#2720#2721#0" expanded="true" />
+                    <element signature="e#2753#2754#0" expanded="true" />
+                    <element signature="e#2797#2798#0" expanded="true" />
+                    <element signature="e#2829#2830#0" expanded="true" />
+                    <element signature="e#2871#2872#0" expanded="true" />
+                    <element signature="e#2903#2904#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
@@ -56,8 +55,8 @@
           <file leaf-file-name="ConwayGameOfLifeTest.java" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="165">
-                  <caret line="15" column="24" lean-forward="true" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
+                <state relative-caret-position="575">
+                  <caret line="52" column="27" lean-forward="true" selection-start-line="52" selection-start-column="27" selection-end-line="52" selection-end-column="27" />
                 </state>
               </provider>
             </entry>
@@ -100,8 +99,8 @@
         <option value="$PROJECT_DIR$/src/main/java/Life.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/README.md" />
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" />
+        <option value="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" />
       </list>
     </option>
   </component>
@@ -232,7 +231,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest">
+  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest.randomTest">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
     </configuration>
@@ -273,7 +272,7 @@
       </option>
       <patterns />
     </configuration>
-    <configuration name="ConwayGameOfLifeTest.runTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="ConwayGameOfLifeTest.randomTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="Game-Of-Life-Java" />
       <extension name="coverage">
         <pattern>
@@ -285,7 +284,7 @@
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="com.zipcodeconway" />
       <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLifeTest" />
-      <option name="METHOD_NAME" value="runTest" />
+      <option name="METHOD_NAME" value="randomTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -405,18 +404,18 @@
     <list>
       <item itemvalue="Maven.ConwayLife" />
       <item itemvalue="Application.ConwayGameOfLife" />
-      <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
       <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
       <item itemvalue="JUnit.ConwayGameOfLifeTest" />
       <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
+      <item itemvalue="JUnit.ConwayGameOfLifeTest.randomTest" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.ConwayGameOfLifeTest.randomTest" />
         <item itemvalue="JUnit.ConwayGameOfLifeTest" />
         <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
         <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
         <item itemvalue="Application.ConwayGameOfLife" />
-        <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
       </list>
     </recent_temporary>
   </component>
@@ -431,44 +430,44 @@
       <option name="presentableId" value="Default" />
       <updated>1519668901598</updated>
       <workItem from="1519668902904" duration="14517000" />
-      <workItem from="1529872758253" duration="11170000" />
+      <workItem from="1529872758253" duration="12387000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.24 at 19h 41m 42s.xml">
-      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest - 2018.06.24 at 20h 10m 59s.xml">
+      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.24 at 19h 44m 04s.xml">
-      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest - 2018.06.24 at 20h 11m 11s.xml">
+      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.24 at 19h 48m 24s.xml">
-      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest - 2018.06.24 at 20h 11m 29s.xml">
+      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.24 at 19h 50m 04s.xml">
-      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest - 2018.06.24 at 20h 12m 22s.xml">
+      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.24 at 19h 52m 16s.xml">
-      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest - 2018.06.24 at 20h 13m 42s.xml">
+      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.24 at 19h 52m 49s.xml">
-      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest - 2018.06.24 at 20h 14m 32s.xml">
+      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.24 at 19h 55m 01s.xml">
-      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest - 2018.06.24 at 20h 14m 44s.xml">
+      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.24 at 19h 55m 28s.xml">
-      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest - 2018.06.24 at 20h 15m 33s.xml">
+      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.24 at 19h 57m 09s.xml">
-      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest - 2018.06.24 at 20h 17m 19s.xml">
+      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest - 2018.06.24 at 19h 57m 13s.xml">
+    <history-entry file="ConwayGameOfLifeTest - 2018.06.24 at 20h 18m 40s.xml">
       <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="25687000" />
+    <option name="totallyTimeSpent" value="26904000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-306" y="-1080" width="1920" height="1080" extended-state="0" />
@@ -483,7 +482,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3299389" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.22912423" />
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.32970026" />
       <window_info id="Capture Tool" order="2" />
@@ -512,7 +511,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="52" />
+      <option name="time" value="53" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
@@ -531,14 +530,14 @@
         <state relative-caret-position="300">
           <caret line="20" selection-start-line="20" selection-end-line="20" />
           <folding>
-            <element signature="e#862#863#0" expanded="true" />
-            <element signature="e#914#915#0" expanded="true" />
-            <element signature="e#3134#3135#0" expanded="true" />
-            <element signature="e#3167#3168#0" expanded="true" />
-            <element signature="e#3211#3212#0" expanded="true" />
-            <element signature="e#3243#3244#0" expanded="true" />
-            <element signature="e#3285#3286#0" expanded="true" />
-            <element signature="e#3317#3318#0" expanded="true" />
+            <element signature="e#803#804#0" expanded="true" />
+            <element signature="e#858#859#0" expanded="true" />
+            <element signature="e#2720#2721#0" expanded="true" />
+            <element signature="e#2753#2754#0" expanded="true" />
+            <element signature="e#2797#2798#0" expanded="true" />
+            <element signature="e#2829#2830#0" expanded="true" />
+            <element signature="e#2871#2872#0" expanded="true" />
+            <element signature="e#2903#2904#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -584,17 +583,10 @@
     <entry file="file://$USER_HOME$/Downloads/ConwayLifeRandomat50.png" />
     <entry file="file://$USER_HOME$/Documents/gitea/gitea/custom/public/img/ConwayLifeUML.png" />
     <entry file="file://$PROJECT_DIR$/src/main/java/GameofLife.java" />
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="15" column="24" lean-forward="true" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="42" selection-start-line="17" selection-start-column="42" selection-end-line="17" selection-end-column="42" />
+        <state relative-caret-position="555">
+          <caret line="37" selection-start-line="37" selection-end-line="37" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -603,21 +595,28 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+        <state relative-caret-position="389">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
           <folding>
-            <element signature="e#862#863#0" expanded="true" />
-            <element signature="e#914#915#0" expanded="true" />
-            <element signature="e#3134#3135#0" expanded="true" />
-            <element signature="e#3167#3168#0" expanded="true" />
-            <element signature="e#3211#3212#0" expanded="true" />
-            <element signature="e#3243#3244#0" expanded="true" />
-            <element signature="e#3285#3286#0" expanded="true" />
-            <element signature="e#3317#3318#0" expanded="true" />
+            <element signature="e#803#804#0" expanded="true" />
+            <element signature="e#858#859#0" expanded="true" />
+            <element signature="e#2720#2721#0" expanded="true" />
+            <element signature="e#2753#2754#0" expanded="true" />
+            <element signature="e#2797#2798#0" expanded="true" />
+            <element signature="e#2829#2830#0" expanded="true" />
+            <element signature="e#2871#2872#0" expanded="true" />
+            <element signature="e#2903#2904#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="575">
+          <caret line="52" column="27" lean-forward="true" selection-start-line="52" selection-start-column="27" selection-end-line="52" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

src/main/java/com/zipcodeconway/ConwayGameOfLife.java

@@ -1,6 +1,5 @@
 package com.zipcodeconway;
 
-import java.util.Arrays;
 
 
 /**
@@ -11,33 +10,45 @@ public class ConwayGameOfLife {
     private int[][] world;
     private int[][] nextWorld;
     private int dimension;
+    private SimpleWindow display;
 
     public ConwayGameOfLife(Integer dimension) {
-        world = createRandomStart(dimension);
         this.dimension = dimension;
+        world = starterWorld();
+        nextWorld = new int[dimension][dimension];
+        display = new SimpleWindow(dimension);
      }
 
     public ConwayGameOfLife(Integer dimension, int[][] startMatrix) {
         world = startMatrix;
-        nextWorld = new int[dimension][dimension];
         this.dimension = dimension;
+        nextWorld = new int[dimension][dimension];
+        display = new SimpleWindow(dimension);
     }
 
-    public static void main(String[] args) {
-//        ConwayGameOfLife sim = new ConwayGameOfLife(50);
+    public int[][] starterWorld() {
+        int[][] starterWorld = new int[dimension][dimension];
+        for (int i = 0; i < dimension; i++) {
+            for (int j = 0; j < dimension; j++) {
+                starterWorld[i][j] = randomBinary();
+            }
+        }
+        return starterWorld;
     }
 
-    // Contains the logic for the starting scenario.
-    // Which cells are alive or dead in generation 0.
-    // allocates and returns the starting matrix of size 'dimension'
-    private int[][] createRandomStart(Integer dimension) {
-        return new int[dimension][dimension];
+    public int randomBinary() {
+        return (int)Math.round((Math.random()));
+    }
+
+    public static void main(String[] args) {
     }
 
     public int[][] simulate(Integer maxGenerations) {
         for (int i = 0; i <= maxGenerations; i++) {
+            this.display.display(world, i);
             gen();
             copyAndZeroOut();
+            this.display.sleep(500);
         }
         return world;
     }
@@ -50,21 +61,11 @@ public class ConwayGameOfLife {
         }
     }
 
-    // copy the values of 'next' matrix to 'current' matrix,
-    // and then zero out the contents of 'next' matrix
     public void copyAndZeroOut() {
         world = nextWorld;
         nextWorld = new int[dimension][dimension];
     }
 
-    // Calculate if an individual cell should be alive in the next generation.
-    // Based on the game logic:
-	/*
-		Any live cell with fewer than two live neighbours dies, as if by needs caused by underpopulation.
-		Any live cell with more than three live neighbours dies, as if by overcrowding.
-		Any live cell with two or three live neighbours lives, unchanged, to the next generation.
-		Any dead cell with exactly three live neighbours cells will come to life.
-	*/
     private int isAlive(int row, int col) {
         int count = countNeighbors(row, col);
         boolean alive;
@@ -76,7 +77,7 @@ public class ConwayGameOfLife {
         }
         return alive ? 1 : 0;
     }
-    //count works
+
     private int countNeighbors(int row, int col) {
         int count= 0;
         int column = col - 1;
@@ -99,7 +100,6 @@ public class ConwayGameOfLife {
             if (world[thisRow][x] == 1) count++;
             } catch (Exception e) {}
         }
-
         return count;
     }
 

src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java

@@ -46,4 +46,11 @@ public class ConwayGameOfLifeTest {
         assertTrue(java.util.Arrays.deepEquals(results, expected));
     }
 
+    @Test
+    public void randomTest(){
+    ConwayGameOfLife sim = new ConwayGameOfLife(50);
+    int[][] results =  sim.simulate(50);
+    assertNotNull(results);
+    }
+
 }