Cohort4.2
/
GameOfLifeConway
Tarkkaile 7
Äänestä 0
Fork 17
Koodi Ongelmat 0 Pull-pyynnöt 2 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

so cclose fixing alive error

Daniel Horowitz 6 vuotta sitten
vanhempi
2286bf332a
commit
9e7d3df181
9 muutettua tiedostoa jossa 166 lisäystä ja 548 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 1
    0
      .idea/.name
  2. 3
    1
      .idea/misc.xml
  3. 1
    1
      .idea/modules.xml
  4. 0
    124
      .idea/uiDesigner.xml
  5. 1
    1
      .idea/vcs.xml
  6. 86
    415
      .idea/workspace.xml
  7. 0
    1
      Game-Of-Life-Java.iml
  8. 72
    3
      src/main/java/com/zipcodeconway/ConwayGameOfLife.java
  9. 2
    2
      src/main/java/com/zipcodeconway/SimpleWindow.java

+ 1
- 0
.idea/.name Näytä tiedosto 

@@ -0,0 +1 @@
1 
+Game-Of-Life-Java

+ 3
- 1
.idea/misc.xml Näytä tiedosto 

@@ -7,5 +7,7 @@
7 7 
       </list>
8 8 
     </option>
9 9 
   </component>
10 
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
10 
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
11 
+    <output url="file://$PROJECT_DIR$/classes" />
12 
+  </component>
11 13 
 </project>

+ 1
- 1
.idea/modules.xml Näytä tiedosto 

@@ -2,7 +2,7 @@
2 2 
 <project version="4">
3 3 
   <component name="ProjectModuleManager">
4 4 
     <modules>
5 
-      <module fileurl="file://$PROJECT_DIR$/.idea/Game-Of-Life-Java.iml" filepath="$PROJECT_DIR$/.idea/Game-Of-Life-Java.iml" />
5 
+      <module fileurl="file://$PROJECT_DIR$/Game-Of-Life-Java.iml" filepath="$PROJECT_DIR$/Game-Of-Life-Java.iml" />
6 6 
     </modules>
7 7 
   </component>
8 8 
 </project>

+ 0
- 124
.idea/uiDesigner.xml Näytä tiedosto 

@@ -1,124 +0,0 @@
1 
-<?xml version="1.0" encoding="UTF-8"?>
2 
-<project version="4">
3 
-  <component name="Palette2">
4 
-    <group name="Swing">
5 
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
6 
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
7 
-      </item>
8 
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
9 
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
10 
-      </item>
11 
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
12 
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
13 
-      </item>
14 
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
15 
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
16 
-      </item>
17 
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
18 
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
19 
-        <initial-values>
20 
-          <property name="text" value="Button" />
21 
-        </initial-values>
22 
-      </item>
23 
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
24 
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
25 
-        <initial-values>
26 
-          <property name="text" value="RadioButton" />
27 
-        </initial-values>
28 
-      </item>
29 
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
30 
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
31 
-        <initial-values>
32 
-          <property name="text" value="CheckBox" />
33 
-        </initial-values>
34 
-      </item>
35 
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
36 
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
37 
-        <initial-values>
38 
-          <property name="text" value="Label" />
39 
-        </initial-values>
40 
-      </item>
41 
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
42 
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
43 
-          <preferred-size width="150" height="-1" />
44 
-        </default-constraints>
45 
-      </item>
46 
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
47 
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
48 
-          <preferred-size width="150" height="-1" />
49 
-        </default-constraints>
50 
-      </item>
51 
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
52 
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
53 
-          <preferred-size width="150" height="-1" />
54 
-        </default-constraints>
55 
-      </item>
56 
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
57 
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
58 
-          <preferred-size width="150" height="50" />
59 
-        </default-constraints>
60 
-      </item>
61 
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
62 
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
63 
-          <preferred-size width="150" height="50" />
64 
-        </default-constraints>
65 
-      </item>
66 
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
67 
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
68 
-          <preferred-size width="150" height="50" />
69 
-        </default-constraints>
70 
-      </item>
71 
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
72 
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
73 
-      </item>
74 
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
75 
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
76 
-          <preferred-size width="150" height="50" />
77 
-        </default-constraints>
78 
-      </item>
79 
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
80 
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
81 
-          <preferred-size width="150" height="50" />
82 
-        </default-constraints>
83 
-      </item>
84 
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
85 
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
86 
-          <preferred-size width="150" height="50" />
87 
-        </default-constraints>
88 
-      </item>
89 
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
90 
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
91 
-          <preferred-size width="200" height="200" />
92 
-        </default-constraints>
93 
-      </item>
94 
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
95 
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
96 
-          <preferred-size width="200" height="200" />
97 
-        </default-constraints>
98 
-      </item>
99 
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
100 
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
101 
-      </item>
102 
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
103 
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
104 
-      </item>
105 
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
106 
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
107 
-      </item>
108 
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
109 
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
110 
-      </item>
111 
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
112 
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
113 
-          <preferred-size width="-1" height="20" />
114 
-        </default-constraints>
115 
-      </item>
116 
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
117 
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
118 
-      </item>
119 
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
120 
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
121 
-      </item>
122 
-    </group>
123 
-  </component>
124 
-</project>

+ 1
- 1
.idea/vcs.xml Näytä tiedosto 

@@ -1,6 +1,6 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 2 
 <project version="4">
3 3 
   <component name="VcsDirectoryMappings">
4 
-    <mapping directory="" vcs="Git" />
4 
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
5 5 
   </component>
6 6 
 </project>

+ 86
- 415
.idea/workspace.xml Näytä tiedosto 

@@ -1,7 +1,17 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 2 
 <project version="4">
3 3 
   <component name="ChangeListManager">
4 
-    <list default="true" id="e282cee1-bfe9-42a3-9794-9633eb4654d1" name="Default" comment="" />
4 
+    <list default="true" id="a87c0587-ce49-4fef-855f-6e0ade4512ae" name="Default" comment="">
5 
+      <change beforePath="" afterPath="$PROJECT_DIR$/Game-Of-Life-Java.iml" />
6 
+      <change beforePath="$PROJECT_DIR$/.idea/Game-Of-Life-Java.iml" afterPath="" />
7 
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
8 
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
9 
+      <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterPath="" />
10 
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
11 
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
12 
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" />
13 
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java" />
14 
+    </list>
5 15 
     <ignored path="$PROJECT_DIR$/target/" />
6 16 
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7 17 
     <option name="TRACKING_ENABLED" value="true" />
 
@@ -15,11 +25,9 @@
15 25 
       <file leaf-file-name="SimpleWindow.java" pinned="false" current-in-tab="false">
16 26 
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
17 27 
           <provider selected="true" editor-type-id="text-editor">
18 
-            <state relative-caret-position="289">
19 
-              <caret line="17" column="42" lean-forward="false" selection-start-line="17" selection-start-column="42" selection-end-line="17" selection-end-column="42" />
20 
-              <folding>
21 
-                <element signature="imports" expanded="true" />
22 
-              </folding>
28 
+            <state relative-caret-position="660">
29 
+              <caret line="45" column="41" lean-forward="false" selection-start-line="45" selection-start-column="41" selection-end-line="45" selection-end-column="41" />
30 
+              <folding />
23 31 
             </state>
24 32 
           </provider>
25 33 
         </entry>
 
@@ -27,48 +35,19 @@
27 35 
       <file leaf-file-name="ConwayGameOfLife.java" pinned="false" current-in-tab="false">
28 36 
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
29 37 
           <provider selected="true" editor-type-id="text-editor">
30 
-            <state relative-caret-position="164">
31 
-              <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
32 
-              <folding>
33 
-                <element signature="e#585#586#0" expanded="true" />
34 
-                <element signature="e#676#677#0" expanded="true" />
35 
-                <element signature="e#712#713#0" expanded="true" />
36 
-                <element signature="e#1429#1430#0" expanded="true" />
37 
-                <element signature="e#1453#1454#0" expanded="true" />
38 
-              </folding>
39 
-            </state>
40 
-          </provider>
41 
-        </entry>
42 
-      </file>
43 
-      <file leaf-file-name="JAVA/com.zipcodeconway.ConwayGameOfLife" pinned="false" current-in-tab="false">
44 
-        <entry file="uml://JAVA/com.zipcodeconway.ConwayGameOfLife">
45 
-          <provider selected="true" editor-type-id="UmlEditorProvider">
46 
-            <state>
47 
-              <ID>JAVA</ID>
48 
-              <OriginalElement>com.zipcodeconway.ConwayGameOfLife</OriginalElement>
49 
-              <nodes>
50 
-                <node x="-54.0" y="-179.0">com.zipcodeconway.ConwayGameOfLife</node>
51 
-              </nodes>
52 
-              <notes />
53 
-              <edges />
54 
-              <settings layout="Hierarchic Group" zoom="1.0" x="-203.0" y="-1.0" />
55 
-              <SelectedNodes />
56 
-              <Categories>
57 
-                <Category>Constructors</Category>
58 
-                <Category>Methods</Category>
59 
-              </Categories>
60 
-              <SCOPE>All</SCOPE>
61 
-              <VISIBILITY>private</VISIBILITY>
38 
+            <state relative-caret-position="293">
39 
+              <caret line="59" column="54" lean-forward="true" selection-start-line="59" selection-start-column="54" selection-end-line="59" selection-end-column="54" />
40 
+              <folding />
62 41 
             </state>
63 42 
           </provider>
64 43 
         </entry>
65 44 
       </file>
66 45 
       <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
67 
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/README.md">
46 
+        <entry file="file://$PROJECT_DIR$/README.md">
68 47 
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
69 48 
             <state split_layout="SPLIT">
70 
-              <first_editor relative-caret-position="236">
71 
-                <caret line="52" column="194" lean-forward="false" selection-start-line="52" selection-start-column="194" selection-end-line="52" selection-end-column="194" />
49 
+              <first_editor relative-caret-position="0">
50 
+                <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
72 51 
                 <folding />
73 52 
               </first_editor>
74 53 
               <second_editor />
 
@@ -79,8 +58,8 @@
79 58 
       <file leaf-file-name="ConwayGameOfLifeTest.java" pinned="false" current-in-tab="true">
80 59 
         <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
81 60 
           <provider selected="true" editor-type-id="text-editor">
82 
-            <state relative-caret-position="510">
83 
-              <caret line="32" column="32" lean-forward="false" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
61 
+            <state relative-caret-position="100">
62 
+              <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
84 63 
               <folding />
85 64 
             </state>
86 65 
           </provider>
 
@@ -88,24 +67,6 @@
88 67 
       </file>
89 68 
     </leaf>
90 69 
   </component>
91 
-  <component name="FileTemplateManagerImpl">
92 
-    <option name="RECENT_TEMPLATES">
93 
-      <list>
94 
-        <option value="Arquillian JUnit Test Class" />
95 
-        <option value="Class" />
96 
-        <option value="JUnit4 Test Class" />
97 
-      </list>
98 
-    </option>
99 
-  </component>
100 
-  <component name="FindInProjectRecents">
101 
-    <findStrings>
102 
-      <find>end</find>
103 
-    </findStrings>
104 
-    <replaceStrings>
105 
-      <replace>currentGeneration</replace>
106 
-      <replace>nextGeneration</replace>
107 
-    </replaceStrings>
108 
-  </component>
109 70 
   <component name="Git.Settings">
110 71 
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
111 72 
   </component>
 
@@ -117,17 +78,7 @@
117 78 
   <component name="IdeDocumentHistory">
118 79 
     <option name="CHANGED_PATHS">
119 80 
       <list>
120 
-        <option value="$PROJECT_DIR$/LifeStarts.java" />
121 
-        <option value="$PROJECT_DIR$/pom.xml" />
122 
-        <option value="$PROJECT_DIR$/src/main/java/GameOnLife.java" />
123 
-        <option value="$PROJECT_DIR$/src/main/java/GameOfLife.java" />
124 
-        <option value="$PROJECT_DIR$/src/main/java/GameofLife.java" />
125 
-        <option value="$PROJECT_DIR$/src/main/java/SimpleWindow.java" />
126 
-        <option value="$PROJECT_DIR$/src/main/java/ConwayGameOfLife.java" />
127 
-        <option value="$PROJECT_DIR$/src/main/java/Life.java" />
128 
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" />
129 81 
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java" />
130 
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/README.md" />
131 82 
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" />
132 83 
       </list>
133 84 
     </option>
 
@@ -139,11 +90,12 @@
139 90 
     <sorting>DEFINITION_ORDER</sorting>
140 91 
   </component>
141 92 
   <component name="ProjectFrameBounds">
142 
-    <option name="x" value="82" />
143 
-    <option name="y" value="32" />
144 
-    <option name="width" value="1440" />
145 
-    <option name="height" value="821" />
93 
+    <option name="x" value="9" />
94 
+    <option name="y" value="33" />
95 
+    <option name="width" value="1843" />
96 
+    <option name="height" value="997" />
146 97 
   </component>
98 
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
147 99 
   <component name="ProjectView">
148 100 
     <navigator currentView="ProjectPane" proportions="" version="1">
149 101 
       <flattenPackages />
 
@@ -159,94 +111,94 @@
159 111 
       <foldersAlwaysOnTop value="true" />
160 112 
     </navigator>
161 113 
     <panes>
114 
+      <pane id="PackagesPane" />
115 
+      <pane id="AndroidView" />
116 
+      <pane id="Scratches" />
117 
+      <pane id="Scope" />
162 118 
       <pane id="ProjectPane">
163 119 
         <subPane>
164 120 
           <expand>
165 121 
             <path>
166 122 
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
167 
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
123 
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
168 124 
             </path>
169 125 
             <path>
170 126 
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
171 
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
127 
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
172 128 
               <item name="src" type="462c0819:PsiDirectoryNode" />
173 129 
             </path>
174 130 
             <path>
175 131 
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
176 
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
132 
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
177 133 
               <item name="src" type="462c0819:PsiDirectoryNode" />
178 134 
               <item name="main" type="462c0819:PsiDirectoryNode" />
179 135 
             </path>
180 136 
             <path>
181 137 
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
182 
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
138 
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
183 139 
               <item name="src" type="462c0819:PsiDirectoryNode" />
184 140 
               <item name="main" type="462c0819:PsiDirectoryNode" />
185 141 
               <item name="java" type="462c0819:PsiDirectoryNode" />
186 142 
             </path>
187 143 
             <path>
188 144 
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
189 
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
145 
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
190 146 
               <item name="src" type="462c0819:PsiDirectoryNode" />
191 147 
               <item name="main" type="462c0819:PsiDirectoryNode" />
192 148 
               <item name="java" type="462c0819:PsiDirectoryNode" />
149 
+              <item name="com" type="462c0819:PsiDirectoryNode" />
150 
+            </path>
151 
+            <path>
152 
+              <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
153 
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
154 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
155 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
156 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
157 
+              <item name="com" type="462c0819:PsiDirectoryNode" />
193 158 
               <item name="zipcodeconway" type="462c0819:PsiDirectoryNode" />
194 159 
             </path>
195 160 
             <path>
196 161 
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
197 
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
162 
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
163 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
164 
+              <item name="test" type="462c0819:PsiDirectoryNode" />
165 
+            </path>
166 
+            <path>
167 
+              <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
168 
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
198 169 
               <item name="src" type="462c0819:PsiDirectoryNode" />
199 170 
               <item name="test" type="462c0819:PsiDirectoryNode" />
171 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
200 172 
             </path>
201 173 
             <path>
202 174 
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
203 
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
175 
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
204 176 
               <item name="src" type="462c0819:PsiDirectoryNode" />
205 177 
               <item name="test" type="462c0819:PsiDirectoryNode" />
206 178 
               <item name="java" type="462c0819:PsiDirectoryNode" />
179 
+              <item name="com" type="462c0819:PsiDirectoryNode" />
207 180 
             </path>
208 181 
             <path>
209 182 
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
210 
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
183 
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
211 184 
               <item name="src" type="462c0819:PsiDirectoryNode" />
212 185 
               <item name="test" type="462c0819:PsiDirectoryNode" />
213 186 
               <item name="java" type="462c0819:PsiDirectoryNode" />
187 
+              <item name="com" type="462c0819:PsiDirectoryNode" />
214 188 
               <item name="zipcodeconway" type="462c0819:PsiDirectoryNode" />
215 189 
             </path>
216 190 
           </expand>
217 191 
           <select />
218 192 
         </subPane>
219 193 
       </pane>
220 
-      <pane id="PackagesPane" />
221 
-      <pane id="AndroidView" />
222 
-      <pane id="Scratches" />
223 
-      <pane id="Scope" />
224 194 
     </panes>
225 195 
   </component>
226 196 
   <component name="PropertiesComponent">
227 197 
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
198 
+    <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
228 199 
     <property name="WebServerToolWindowFactoryState" value="false" />
229 200 
     <property name="aspect.path.notification.shown" value="true" />
230 
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
231 
-    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
232 
-    <property name="project.structure.last.edited" value="Modules" />
233 
-    <property name="project.structure.proportion" value="0.15" />
234 
-    <property name="project.structure.side.proportion" value="0.2" />
235 
-    <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
236 
-  </component>
237 
-  <component name="RecentsManager">
238 
-    <key name="CreateTestDialog.RecentsKey">
239 
-      <recent name="com.zipcodeconway" />
240 
-    </key>
241 
-    <key name="CopyFile.RECENT_KEYS">
242 
-      <recent name="$PROJECT_DIR$" />
243 
-    </key>
244 
-    <key name="CreateTestDialog.Recents.Supers">
245 
-      <recent name="" />
246 
-    </key>
247 
-    <key name="MoveFile.RECENT_KEYS">
248 
-      <recent name="$PROJECT_DIR$/src/main/java" />
249 
-    </key>
201 
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
250 202 
   </component>
251 203 
   <component name="RunDashboard">
252 204 
     <option name="ruleStates">
 
@@ -260,7 +212,7 @@
260 212 
       </list>
261 213 
     </option>
262 214 
   </component>
263 
-  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest">
215 
+  <component name="RunManager">
264 216 
     <configuration default="true" type="Applet" factoryName="Applet">
265 217 
       <option name="HTML_USED" value="false" />
266 218 
       <option name="WIDTH" value="400" />
 
@@ -268,39 +220,6 @@
268 220 
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
269 221 
       <module />
270 222 
     </configuration>
271 
-    <configuration name="ConwayGameOfLife" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
272 
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
273 
-        <pattern>
274 
-          <option name="PATTERN" value="com.zipcodeconway.*" />
275 
-          <option name="ENABLED" value="true" />
276 
-        </pattern>
277 
-      </extension>
278 
-      <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLife" />
279 
-      <option name="VM_PARAMETERS" />
280 
-      <option name="PROGRAM_PARAMETERS" />
281 
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
282 
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
283 
-      <option name="ALTERNATIVE_JRE_PATH" />
284 
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
285 
-      <option name="ENV_VARIABLES" />
286 
-      <option name="PASS_PARENT_ENVS" value="true" />
287 
-      <module name="Game-Of-Life-Java" />
288 
-      <envs />
289 
-    </configuration>
290 
-    <configuration name="GameofLife" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
291 
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
292 
-      <option name="MAIN_CLASS_NAME" value="GameofLife" />
293 
-      <option name="VM_PARAMETERS" />
294 
-      <option name="PROGRAM_PARAMETERS" />
295 
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
296 
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
297 
-      <option name="ALTERNATIVE_JRE_PATH" />
298 
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
299 
-      <option name="ENV_VARIABLES" />
300 
-      <option name="PASS_PARENT_ENVS" value="true" />
301 
-      <module name="Game-Of-Life-Java" />
302 
-      <envs />
303 
-    </configuration>
304 223 
     <configuration default="true" type="Application" factoryName="Application">
305 224 
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
306 225 
       <option name="MAIN_CLASS_NAME" />
 
@@ -340,56 +259,6 @@
340 259 
       <envs />
341 260 
       <patterns />
342 261 
     </configuration>
343 
-    <configuration name="ConwayGameOfLifeTest.runTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
344 
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
345 
-        <pattern>
346 
-          <option name="PATTERN" value="com.zipcodeconway.*" />
347 
-          <option name="ENABLED" value="true" />
348 
-        </pattern>
349 
-      </extension>
350 
-      <module name="Game-Of-Life-Java" />
351 
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
352 
-      <option name="ALTERNATIVE_JRE_PATH" />
353 
-      <option name="PACKAGE_NAME" value="com.zipcodeconway" />
354 
-      <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLifeTest" />
355 
-      <option name="METHOD_NAME" value="runTest" />
356 
-      <option name="TEST_OBJECT" value="method" />
357 
-      <option name="VM_PARAMETERS" value="-ea" />
358 
-      <option name="PARAMETERS" />
359 
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
360 
-      <option name="ENV_VARIABLES" />
361 
-      <option name="PASS_PARENT_ENVS" value="true" />
362 
-      <option name="TEST_SEARCH_SCOPE">
363 
-        <value defaultName="singleModule" />
364 
-      </option>
365 
-      <envs />
366 
-      <patterns />
367 
-    </configuration>
368 
-    <configuration name="ConwayGameOfLifeTest.runTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
369 
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
370 
-        <pattern>
371 
-          <option name="PATTERN" value="com.zipcodeconway.*" />
372 
-          <option name="ENABLED" value="true" />
373 
-        </pattern>
374 
-      </extension>
375 
-      <module name="Game-Of-Life-Java" />
376 
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
377 
-      <option name="ALTERNATIVE_JRE_PATH" />
378 
-      <option name="PACKAGE_NAME" value="com.zipcodeconway" />
379 
-      <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLifeTest" />
380 
-      <option name="METHOD_NAME" value="runTest2" />
381 
-      <option name="TEST_OBJECT" value="method" />
382 
-      <option name="VM_PARAMETERS" value="-ea" />
383 
-      <option name="PARAMETERS" />
384 
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
385 
-      <option name="ENV_VARIABLES" />
386 
-      <option name="PASS_PARENT_ENVS" value="true" />
387 
-      <option name="TEST_SEARCH_SCOPE">
388 
-        <value defaultName="singleModule" />
389 
-      </option>
390 
-      <envs />
391 
-      <patterns />
392 
-    </configuration>
393 262 
     <configuration default="true" type="JUnit" factoryName="JUnit">
394 263 
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
395 264 
       <module name="" />
 
@@ -410,27 +279,6 @@
410 279 
       <envs />
411 280 
       <patterns />
412 281 
     </configuration>
413 
-    <configuration name="ConwayLife" type="MavenRunConfiguration" factoryName="Maven">
414 
-      <MavenSettings>
415 
-        <option name="myGeneralSettings" />
416 
-        <option name="myRunnerSettings" />
417 
-        <option name="myRunnerParameters">
418 
-          <MavenRunnerParameters>
419 
-            <option name="profiles">
420 
-              <set />
421 
-            </option>
422 
-            <option name="goals">
423 
-              <list />
424 
-            </option>
425 
-            <option name="profilesMap">
426 
-              <map />
427 
-            </option>
428 
-            <option name="resolveToWorkspace" value="false" />
429 
-            <option name="workingDirPath" value="$PROJECT_DIR$" />
430 
-          </MavenRunnerParameters>
431 
-        </option>
432 
-      </MavenSettings>
433 
-    </configuration>
434 282 
     <configuration default="true" type="Remote" factoryName="Remote">
435 283 
       <option name="USE_SOCKET_TRANSPORT" value="true" />
436 284 
       <option name="SERVER_MODE" value="false" />
 
@@ -471,21 +319,9 @@
471 319 
       <option name="PROGRAM_PARAMETERS" />
472 320 
       <predefined_log_file id="idea.log" enabled="true" />
473 321 
     </configuration>
474 
-    <list size="6">
475 
-      <item index="0" class="java.lang.String" itemvalue="Maven.ConwayLife" />
476 
-      <item index="1" class="java.lang.String" itemvalue="Application.GameofLife" />
477 
-      <item index="2" class="java.lang.String" itemvalue="Application.ConwayGameOfLife" />
478 
-      <item index="3" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
479 
-      <item index="4" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
480 
-      <item index="5" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest" />
481 
-    </list>
482 322 
     <recent_temporary>
483 
-      <list size="5">
323 
+      <list size="1">
484 324 
         <item index="0" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest" />
485 
-        <item index="1" class="java.lang.String" itemvalue="Application.ConwayGameOfLife" />
486 
-        <item index="2" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
487 
-        <item index="3" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
488 
-        <item index="4" class="java.lang.String" itemvalue="Application.GameofLife" />
489 325 
       </list>
490 326 
     </recent_temporary>
491 327 
   </component>
 
@@ -497,72 +333,51 @@
497 333 
   </component>
498 334 
   <component name="TaskManager">
499 335 
     <task active="true" id="Default" summary="Default task">
500 
-      <changelist id="e282cee1-bfe9-42a3-9794-9633eb4654d1" name="Default" comment="" />
501 
-      <created>1519668901598</created>
336 
+      <changelist id="a87c0587-ce49-4fef-855f-6e0ade4512ae" name="Default" comment="" />
337 
+      <created>1520876843046</created>
502 338 
       <option name="number" value="Default" />
503 339 
       <option name="presentableId" value="Default" />
504 
-      <updated>1519668901598</updated>
505 
-      <workItem from="1519668902904" duration="14517000" />
340 
+      <updated>1520876843046</updated>
341 
+      <workItem from="1520876844362" duration="8081000" />
506 342 
     </task>
507 343 
     <servers />
508 344 
   </component>
509 345 
   <component name="TestHistory">
510 
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 15h 45m 01s.xml">
511 
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
512 
-    </history-entry>
513 
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 15h 59m 00s.xml">
514 
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
515 
-    </history-entry>
516 
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 02m 03s.xml">
517 
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
518 
-    </history-entry>
519 
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 03m 01s.xml">
346 
+    <history-entry file="ConwayGameOfLifeTest - 2018.03.12 at 16h 07m 12s.xml">
520 347 
       <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
521 348 
     </history-entry>
522 
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 05m 07s.xml">
349 
+    <history-entry file="ConwayGameOfLifeTest - 2018.03.12 at 16h 09m 24s.xml">
523 350 
       <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
524 351 
     </history-entry>
525 
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 06m 11s.xml">
526 
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
527 
-    </history-entry>
528 
-    <history-entry file="ConwayGameOfLifeTest_runTest - 2018.02.26 at 15h 41m 14s.xml">
529 
-      <configuration name="ConwayGameOfLifeTest.runTest" configurationId="JUnit" />
530 
-    </history-entry>
531 
-    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.02.26 at 15h 42m 02s.xml">
532 
-      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
533 
-    </history-entry>
534 
-    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.02.26 at 15h 42m 18s.xml">
535 
-      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
536 
-    </history-entry>
537 352 
   </component>
538 353 
   <component name="TimeTrackingManager">
539 
-    <option name="totallyTimeSpent" value="14517000" />
354 
+    <option name="totallyTimeSpent" value="8081000" />
540 355 
   </component>
541 356 
   <component name="ToolWindowManager">
542 
-    <frame x="82" y="32" width="1440" height="821" extended-state="0" />
357 
+    <frame x="9" y="33" width="1843" height="997" extended-state="0" />
543 358 
     <editor active="true" />
544 359 
     <layout>
545 360 
       <window_info id="Palette" 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="-1" side_tool="false" content_ui="tabs" />
546 361 
       <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
547 
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32833788" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
362 
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287827" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
548 363 
       <window_info id="Palette&#9;" 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="-1" side_tool="false" content_ui="tabs" />
549 364 
       <window_info id="Image Layers" 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="-1" side_tool="false" content_ui="tabs" />
550 365 
       <window_info id="Capture Analysis" 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="-1" side_tool="false" content_ui="tabs" />
551 366 
       <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="-1" side_tool="true" content_ui="tabs" />
552 367 
       <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="-1" side_tool="false" content_ui="tabs" />
553 
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32561308" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
554 368 
       <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="-1" side_tool="false" content_ui="tabs" />
555 
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32970026" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
369 
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29920363" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
370 
+      <window_info id="Terminal" 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="-1" side_tool="false" content_ui="tabs" />
556 371 
       <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="-1" side_tool="false" content_ui="tabs" />
557 372 
       <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="-1" side_tool="false" content_ui="tabs" />
558 
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
373 
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.086063296" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
559 374 
       <window_info id="Database" 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="-1" side_tool="false" content_ui="tabs" />
560 375 
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
561 376 
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
562 377 
       <window_info id="UI 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="-1" side_tool="false" content_ui="tabs" />
563 378 
       <window_info id="Theme Preview" 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="-1" side_tool="false" content_ui="tabs" />
564 
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
565 379 
       <window_info id="Favorites" 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="-1" side_tool="true" content_ui="tabs" />
380 
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
566 381 
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
567 382 
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
568 383 
       <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
 
@@ -578,114 +393,41 @@
578 393 
     <option name="myLimit" value="2678400000" />
579 394 
   </component>
580 395 
   <component name="XDebuggerManager">
581 
-    <breakpoint-manager>
582 
-      <option name="time" value="2" />
583 
-    </breakpoint-manager>
396 
+    <breakpoint-manager />
584 397 
     <watches-manager />
585 398 
   </component>
586 399 
   <component name="editorHistoryManager">
587 
-    <entry file="file://$PROJECT_DIR$/pom.xml">
588 
-      <provider selected="true" editor-type-id="text-editor">
589 
-        <state relative-caret-position="187">
590 
-          <caret line="11" column="10" lean-forward="false" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
591 
-          <folding />
592 
-        </state>
593 
-      </provider>
594 
-    </entry>
595 
-    <entry file="file://$PROJECT_DIR$/src/main/java/LifeStarts.java">
596 
-      <provider selected="true" editor-type-id="text-editor">
597 
-        <state relative-caret-position="272">
598 
-          <caret line="16" column="5" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="16" selection-end-column="5" />
599 
-          <folding />
600 
-        </state>
601 
-      </provider>
602 
-    </entry>
603 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Life.java">
604 
-      <provider selected="true" editor-type-id="text-editor">
605 
-        <state relative-caret-position="669">
606 
-          <caret line="87" column="5" lean-forward="true" selection-start-line="47" selection-start-column="0" selection-end-line="87" selection-end-column="5" />
607 
-          <folding />
608 
-        </state>
609 
-      </provider>
610 
-    </entry>
611 
-    <entry file="uml://JAVA/com.zipcodeconway.ConwayGameOfLife">
612 
-      <provider selected="true" editor-type-id="UmlEditorProvider">
613 
-        <state>
614 
-          <ID>JAVA</ID>
615 
-          <OriginalElement>com.zipcodeconway.ConwayGameOfLife</OriginalElement>
616 
-          <nodes>
617 
-            <node x="-54.0" y="-179.0">com.zipcodeconway.ConwayGameOfLife</node>
618 
-          </nodes>
619 
-          <notes />
620 
-          <edges />
621 
-          <settings layout="Hierarchic Group" zoom="1.0" x="-203.0" y="-1.0" />
622 
-          <SelectedNodes />
623 
-          <Categories>
624 
-            <Category>Constructors</Category>
625 
-            <Category>Methods</Category>
626 
-          </Categories>
627 
-          <SCOPE>All</SCOPE>
628 
-          <VISIBILITY>private</VISIBILITY>
629 
-        </state>
630 
-      </provider>
631 
-    </entry>
632 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/README.md">
400 
+    <entry file="file://$PROJECT_DIR$/README.md">
633 401 
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
634 402 
         <state split_layout="SPLIT">
635 
-          <first_editor relative-caret-position="236">
636 
-            <caret line="52" column="194" lean-forward="false" selection-start-line="52" selection-start-column="194" selection-end-line="52" selection-end-column="194" />
403 
+          <first_editor relative-caret-position="0">
404 
+            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
637 405 
             <folding />
638 406 
           </first_editor>
639 407 
           <second_editor />
640 408 
         </state>
641 409 
       </provider>
642 410 
     </entry>
643 
-    <entry file="file://$USER_HOME$/Downloads/ConwayLifeRandomat50.png">
644 
-      <provider selected="true" editor-type-id="images">
645 
-        <state />
646 
-      </provider>
647 
-    </entry>
648 
-    <entry file="file://$USER_HOME$/Documents/gitea/gitea/custom/public/img/ConwayLifeUML.png">
649 
-      <provider selected="true" editor-type-id="images">
650 
-        <state />
651 
-      </provider>
652 
-    </entry>
653 
-    <entry file="file://$PROJECT_DIR$/src/main/java/GameofLife.java">
654 
-      <provider selected="true" editor-type-id="text-editor">
655 
-        <state relative-caret-position="334">
656 
-          <caret line="83" column="17" lean-forward="false" selection-start-line="82" selection-start-column="30" selection-end-line="83" selection-end-column="17" />
657 
-          <folding />
658 
-        </state>
659 
-      </provider>
660 
-    </entry>
661 411 
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
662 412 
       <provider selected="true" editor-type-id="text-editor">
663 
-        <state relative-caret-position="289">
664 
-          <caret line="17" column="42" lean-forward="false" selection-start-line="17" selection-start-column="42" selection-end-line="17" selection-end-column="42" />
665 
-          <folding>
666 
-            <element signature="imports" expanded="true" />
667 
-          </folding>
413 
+        <state relative-caret-position="660">
414 
+          <caret line="45" column="41" lean-forward="false" selection-start-line="45" selection-start-column="41" selection-end-line="45" selection-end-column="41" />
415 
+          <folding />
668 416 
         </state>
669 417 
       </provider>
670 418 
     </entry>
671 419 
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
672 420 
       <provider selected="true" editor-type-id="text-editor">
673 
-        <state relative-caret-position="164">
674 
-          <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
675 
-          <folding>
676 
-            <element signature="e#585#586#0" expanded="true" />
677 
-            <element signature="e#676#677#0" expanded="true" />
678 
-            <element signature="e#712#713#0" expanded="true" />
679 
-            <element signature="e#1429#1430#0" expanded="true" />
680 
-            <element signature="e#1453#1454#0" expanded="true" />
681 
-          </folding>
421 
+        <state relative-caret-position="293">
422 
+          <caret line="59" column="54" lean-forward="true" selection-start-line="59" selection-start-column="54" selection-end-line="59" selection-end-column="54" />
423 
+          <folding />
682 424 
         </state>
683 425 
       </provider>
684 426 
     </entry>
685 427 
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
686 428 
       <provider selected="true" editor-type-id="text-editor">
687 
-        <state relative-caret-position="510">
688 
-          <caret line="32" column="32" lean-forward="false" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
429 
+        <state relative-caret-position="100">
430 
+          <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
689 431 
           <folding />
690 432 
         </state>
691 433 
       </provider>
 
@@ -693,66 +435,6 @@
693 435 
   </component>
694 436 
   <component name="masterDetails">
695 437 
     <states>
696 
-      <state key="ArtifactsStructureConfigurable.UI">
697 
-        <settings>
698 
-          <artifact-editor />
699 
-          <splitter-proportions>
700 
-            <option name="proportions">
701 
-              <list>
702 
-                <option value="0.2" />
703 
-              </list>
704 
-            </option>
705 
-          </splitter-proportions>
706 
-        </settings>
707 
-      </state>
708 
-      <state key="FacetStructureConfigurable.UI">
709 
-        <settings>
710 
-          <last-edited>No facets are configured</last-edited>
711 
-          <splitter-proportions>
712 
-            <option name="proportions">
713 
-              <list>
714 
-                <option value="0.2" />
715 
-              </list>
716 
-            </option>
717 
-          </splitter-proportions>
718 
-        </settings>
719 
-      </state>
720 
-      <state key="GlobalLibrariesConfigurable.UI">
721 
-        <settings>
722 
-          <splitter-proportions>
723 
-            <option name="proportions">
724 
-              <list>
725 
-                <option value="0.2" />
726 
-              </list>
727 
-            </option>
728 
-          </splitter-proportions>
729 
-        </settings>
730 
-      </state>
731 
-      <state key="JdkListConfigurable.UI">
732 
-        <settings>
733 
-          <last-edited>1.8</last-edited>
734 
-          <splitter-proportions>
735 
-            <option name="proportions">
736 
-              <list>
737 
-                <option value="0.2" />
738 
-              </list>
739 
-            </option>
740 
-          </splitter-proportions>
741 
-        </settings>
742 
-      </state>
743 
-      <state key="ModuleStructureConfigurable.UI">
744 
-        <settings>
745 
-          <last-edited>Game-Of-Life-Java</last-edited>
746 
-          <splitter-proportions>
747 
-            <option name="proportions">
748 
-              <list>
749 
-                <option value="0.2" />
750 
-                <option value="0.6" />
751 
-              </list>
752 
-            </option>
753 
-          </splitter-proportions>
754 
-        </settings>
755 
-      </state>
756 438 
       <state key="ProjectJDKs.UI">
757 439 
         <settings>
758 440 
           <last-edited>1.8</last-edited>
 
@@ -765,17 +447,6 @@
765 447 
           </splitter-proportions>
766 448 
         </settings>
767 449 
       </state>
768 
-      <state key="ProjectLibrariesConfigurable.UI">
769 
-        <settings>
770 
-          <splitter-proportions>
771 
-            <option name="proportions">
772 
-              <list>
773 
-                <option value="0.2" />
774 
-              </list>
775 
-            </option>
776 
-          </splitter-proportions>
777 
-        </settings>
778 
-      </state>
779 450 
     </states>
780 451 
   </component>
781 452 
 </project>

.idea/Game-Of-Life-Java.iml → Game-Of-Life-Java.iml Näytä tiedosto 

@@ -5,7 +5,6 @@
5 5 
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
6 6 
     <content url="file://$MODULE_DIR$">
7 7 
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8 
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9 8 
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
10 9 
       <excludeFolder url="file://$MODULE_DIR$/target" />
11 10 
     </content>

+ 72
- 3
src/main/java/com/zipcodeconway/ConwayGameOfLife.java Näytä tiedosto 

@@ -1,11 +1,24 @@
1 1 
 package com.zipcodeconway;
2 2
3 
+import java.util.Arrays;
4 
+
3 5 
 public class ConwayGameOfLife {
4 6
7 
+    private int[][] currentGen;
8 
+    private int[][] nextGen;
9 
+    private SimpleWindow displayWindow;
10 
+
5 11 
     public ConwayGameOfLife(Integer dimension) {
12 
+        this.displayWindow = new SimpleWindow(dimension);
13 
+        currentGen = createRandomStart(dimension);
14 
+       nextGen = new int[dimension][dimension];
6 15 
      }
7 16
8 17 
     public ConwayGameOfLife(Integer dimension, int[][] startmatrix) {
18 
+        this.displayWindow = new SimpleWindow(dimension);
19 
+        currentGen = startmatrix;
20 
+        nextGen = new int[dimension][dimension];
21 
+
9 22 
     }
10 23
11 24 
     public static void main(String[] args) {
 
@@ -17,16 +30,41 @@ public class ConwayGameOfLife {
17 30 
     // Which cells are alive or dead in generation 0.
18 31 
     // allocates and returns the starting matrix of size 'dimension'
19 32 
     private int[][] createRandomStart(Integer dimension) {
20 
-        return new int[1][1];
33 
+        for (int i = 0; i < dimension; i++) {
34 
+            for (int j = 0; j < dimension; i++) {
35 
+                currentGen[i][j] = (int) Math.round(Math.random());
36 
+            }
37 
+        }
38 
+        return currentGen;
21 39 
     }
22 40
23 41 
     public int[][] simulate(Integer maxGenerations) {
24 
-        return new int[1][1];
42 
+        int count = 0;
43 
+        //count has to be less than OR equal to maxGen because it has to be equal to the number of times it has to run
44 
+        while (count <= maxGenerations) {
45 
+            displayWindow.display(currentGen, count);
46 
+            //update nextGen from currentGen
47 
+            for (int row = 0; row < currentGen.length; row++) {
48 
+                for (int column = 0; column < currentGen[row].length; column++) {
49 
+                    nextGen[row][column] = isAlive(row, column, currentGen);
50 
+                }
51 
+            }
52 
+            copyAndZeroOut(nextGen, currentGen);
53 
+            displayWindow.sleep(125);
54 
+            count++;
55 
+        }
56 
+        return currentGen;
25 57 
     }
26 58
27 59 
     // copy the values of 'next' matrix to 'current' matrix,
28 60 
     // and then zero out the contents of 'next' matrix
29 61 
     public void copyAndZeroOut(int [][] next, int[][] current) {
62 
+        for(int i = 0; i < next.length; i++) {
63 
+            for(int j = 0; j < next.length; j++) {
64 
+                current[i][j] = next[i][j];
65 
+                next[i][j] = 0;
66 
+            }
67 
+        }
30 68 
     }
31 69
32 70 
     // Calculate if an individual cell should be alive in the next generation.
 
@@ -38,6 +76,37 @@ public class ConwayGameOfLife {
38 76 
 		Any dead cell with exactly three live neighbours cells will come to life.
39 77 
 	*/
40 78 
     private int isAlive(int row, int col, int[][] world) {
41 
-        return 0;
79 
+        int north = col -1;
80 
+        int south = col +1;
81 
+        int west = row -1;
82 
+        int east = row +1;
83 
+
84 
+        if(north < 0) {
85 
+            north = world[row].length -1;
86 
+        }
87 
+        if (south == world[row].length) {
88 
+            south = 0;
89 
+        }
90 
+        if (west < 0) {
91 
+            west = world[col].length -1;
92 
+        }
93 
+        if (east == world[col].length) {
94 
+            east = 0;
95 
+        }
96 
+
97 
+        int numOfLiveNeighbors = world[row][north] + world[east][north] + world[west][north] +
98 
+                world[row][south] + world[east][south] + world[west][south]
99 
+                + world[row][west] + world[row][east];
100 
+
101 
+        if (numOfLiveNeighbors < 2 || numOfLiveNeighbors > 3)
102 
+            return 0;
103 
+
104 
+        if (world[row][col] == 0 && numOfLiveNeighbors == 3)
105 
+            return 1;
106 
+
107 
+        // if this cell we are looking at is alive
108 
+        // and my live neighbors = 2 or three
109 
+        if (world[row][col] == 1 && ((numOfLiveNeighbors == 2) || (numOfLiveNeighbors == 3)));
110 
+            return 1;
42 111 
     }
43 112 
 }

+ 2
- 2
src/main/java/com/zipcodeconway/SimpleWindow.java Näytä tiedosto 

@@ -39,11 +39,11 @@ public class SimpleWindow {
39 39 
             for (int j = 0; j < array[0].length; j++) {
40 40 
                 g.drawRect(i * BOX_DIM, j * BOX_DIM, 10, 10);
41 41 
                 if (array[i][j] == 0) {
42 
-                    g.setColor(Color.WHITE);
42 
+                    g.setColor(Color.RED);
43 43 
                     g.fillRect(i * BOX_DIM, j * BOX_DIM, 10, 10);
44 44 
                 }
45 45 
                 if (array[i][j] == 1) {
46 
-                    g.setColor(Color.BLACK);
46 
+                    g.setColor(Color.BLUE);
47 47 
                     g.fillRect(i * BOX_DIM, j * BOX_DIM, 10, 10);
48 48 
                 }
49 49 
             }