simulate and copyAndZeroOut wokring

.idea/workspace.xml

@@ -2,12 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="26347f4d-713c-461d-b161-a64822c4681e" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/.name" />
-      <change beforePath="$PROJECT_DIR$/.idea/Game-Of-Life-Java.iml" afterPath="$PROJECT_DIR$/Game-Of-Life-Java.iml" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
-      <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" />
       <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" />
@@ -21,7 +15,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.56901747">
+    <splitter split-orientation="horizontal" split-proportion="0.7649186">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
           <file leaf-file-name="SimpleWindow.java" pinned="false" current-in-tab="false">
@@ -37,8 +31,8 @@
           <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="450">
-                  <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
+                <state relative-caret-position="410">
+                  <caret line="54" column="43" lean-forward="false" selection-start-line="54" selection-start-column="43" selection-end-line="54" selection-end-column="43" />
                   <folding />
                 </state>
               </provider>
@@ -51,8 +45,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="570">
-                  <caret line="76" column="23" lean-forward="false" selection-start-line="76" selection-start-column="23" selection-end-line="76" selection-end-column="23" />
+                <state relative-caret-position="593">
+                  <caret line="44" column="50" lean-forward="true" selection-start-line="44" selection-start-column="50" selection-end-line="44" selection-end-column="50" />
                   <folding />
                 </state>
               </provider>
@@ -188,7 +182,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest.edgeTest">
+  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest.runTest2">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="HTML_USED" value="false" />
       <option name="WIDTH" value="400" />
@@ -260,6 +254,31 @@
       <envs />
       <patterns />
     </configuration>
+    <configuration name="ConwayGameOfLifeTest.runTest1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="com.zipcodeconway.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="Game-Of-Life-Java" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <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="runTest1" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
     <configuration name="ConwayGameOfLifeTest.runTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
@@ -345,16 +364,18 @@
       <option name="PROGRAM_PARAMETERS" />
       <predefined_log_file id="idea.log" enabled="true" />
     </configuration>
-    <list size="3">
+    <list size="4">
       <item index="0" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.isAliveTest" />
       <item index="1" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
       <item index="2" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.edgeTest" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
     </list>
     <recent_temporary>
-      <list size="3">
-        <item index="0" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.edgeTest" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.isAliveTest" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
+      <list size="4">
+        <item index="0" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.edgeTest" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.isAliveTest" />
       </list>
     </recent_temporary>
   </component>
@@ -372,44 +393,44 @@
       <option name="presentableId" value="Default" />
       <updated>1520867652526</updated>
       <workItem from="1520867656190" duration="4128000" />
-      <workItem from="1520872722088" duration="3717000" />
+      <workItem from="1520872722088" duration="7338000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="ConwayGameOfLifeTest_edgeTest - 2018.03.12 at 13h 12m 33s.xml">
-      <configuration name="ConwayGameOfLifeTest.edgeTest" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.03.12 at 14h 02m 05s.xml">
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_edgeTest - 2018.03.12 at 13h 13m 13s.xml">
-      <configuration name="ConwayGameOfLifeTest.edgeTest" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.03.12 at 14h 02m 14s.xml">
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_edgeTest - 2018.03.12 at 13h 13m 38s.xml">
-      <configuration name="ConwayGameOfLifeTest.edgeTest" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.03.12 at 14h 12m 14s.xml">
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_edgeTest - 2018.03.12 at 13h 14m 04s.xml">
-      <configuration name="ConwayGameOfLifeTest.edgeTest" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.03.12 at 14h 35m 45s.xml">
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_edgeTest - 2018.03.12 at 13h 23m 38s.xml">
-      <configuration name="ConwayGameOfLifeTest.edgeTest" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.03.12 at 13h 57m 25s.xml">
+      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_isAliveTest - 2018.03.12 at 12h 49m 47s.xml">
-      <configuration name="ConwayGameOfLifeTest.isAliveTest" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.03.12 at 14h 02m 09s.xml">
+      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_isAliveTest - 2018.03.12 at 12h 51m 24s.xml">
-      <configuration name="ConwayGameOfLifeTest.isAliveTest" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.03.12 at 14h 35m 52s.xml">
+      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_isAliveTest - 2018.03.12 at 12h 54m 30s.xml">
-      <configuration name="ConwayGameOfLifeTest.isAliveTest" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.03.12 at 14h 42m 04s.xml">
+      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_isAliveTest - 2018.03.12 at 12h 56m 35s.xml">
-      <configuration name="ConwayGameOfLifeTest.isAliveTest" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.03.12 at 14h 42m 23s.xml">
+      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ConwayGameOfLifeTest_isAliveTest - 2018.03.12 at 13h 23m 35s.xml">
-      <configuration name="ConwayGameOfLifeTest.isAliveTest" configurationId="JUnit" />
+    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.03.12 at 14h 43m 18s.xml">
+      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="7845000" />
+    <option name="totallyTimeSpent" value="11466000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-317" y="-1057" width="1882" height="1057" extended-state="0" />
@@ -424,8 +445,8 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23180874" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32952183" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23180874" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32952183" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.09836957" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -489,16 +510,16 @@
     </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="570">
-          <caret line="76" column="23" lean-forward="false" selection-start-line="76" selection-start-column="23" selection-end-line="76" selection-end-column="23" />
+        <state relative-caret-position="593">
+          <caret line="44" column="50" lean-forward="true" selection-start-line="44" selection-start-column="50" selection-end-line="44" selection-end-column="50" />
           <folding />
         </state>
       </provider>
     </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="450">
-          <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
+        <state relative-caret-position="410">
+          <caret line="54" column="43" lean-forward="false" selection-start-line="54" selection-start-column="43" selection-end-line="54" selection-end-column="43" />
           <folding />
         </state>
       </provider>

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

@@ -5,14 +5,17 @@ public class ConwayGameOfLife {
     private Integer edge;
     int[][] currentGen;
     int[][] nextGen;
+    private SimpleWindow ourDisplayWindow;
 
 
     public ConwayGameOfLife(Integer dimension) {
+        this.ourDisplayWindow= new SimpleWindow(dimension);
         this.edge=dimension-1;
         this.nextGen = new int[dimension][dimension];
     }
 
     public ConwayGameOfLife(Integer dimension, int[][] startMatrix) {
+        this.ourDisplayWindow= new SimpleWindow(dimension);
         this.edge=dimension-1;
         this.currentGen = startMatrix;
         this.nextGen = new int[dimension][dimension];
@@ -35,13 +38,31 @@ public class ConwayGameOfLife {
 
     public int[][] simulate(Integer maxGenerations) {
 
+        for (int i = 0; i <= maxGenerations; i++){
+            this.ourDisplayWindow.display(currentGen, i);
+            this.ourDisplayWindow.sleep(125);
+            copyAndZeroOut(nextGen,currentGen);
+        }
 
-        return new int[1][1];
+        return currentGen;
     }
 
     // copy the values of 'next' matrix to 'current' matrix,
     // and then zero out the contents of 'next' matrix
     public void copyAndZeroOut(int[][] next, int[][] current) {
+        for (int i = 0; i < next.length ; i++){
+            for (int j = 0; j <next.length; j++) {
+                next[i][j] = isAlive(i,j,current);
+            }
+        }
+
+        for (int i = 0; i < next.length ; i++){
+            for (int j = 0; j <next.length; j++) {
+                current[i][j] = next[i][j];
+                next[i][j] = 0;
+
+            }
+        }
     }
 
     // Calculate if an individual cell should be alive in the next generation.

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

@@ -45,6 +45,13 @@ public class ConwayGameOfLifeTest {
         assertTrue(java.util.Arrays.deepEquals(results, expected));
     }
 
+//    @Test
+//    public void copyAndZeroOutTest(){
+//        ConwayGameOfLife sim = new ConwayGameOfLife(5);
+//        //Given
+//
+//    }
+
     @Test
     public void isAliveTest(){