Selaa lähdekoodia

isAlive.equals(working)

Amy Gill 6 vuotta sitten
vanhempi
commit
dde0e0ad88

+ 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>

+ 147
- 405
.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="26347f4d-713c-461d-b161-a64822c4681e" name="Default" comment="">
5
+      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/.name" />
6
+      <change beforePath="$PROJECT_DIR$/.idea/Game-Of-Life-Java.iml" afterPath="$PROJECT_DIR$/Game-Of-Life-Java.iml" />
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/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.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" />
@@ -11,100 +21,46 @@
11 21
     <option name="LAST_RESOLUTION" value="IGNORE" />
12 22
   </component>
13 23
   <component name="FileEditorManager">
14
-    <leaf>
15
-      <file leaf-file-name="SimpleWindow.java" pinned="false" current-in-tab="false">
16
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
17
-          <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>
23
-            </state>
24
-          </provider>
25
-        </entry>
26
-      </file>
27
-      <file leaf-file-name="ConwayGameOfLife.java" pinned="false" current-in-tab="false">
28
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
29
-          <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>
62
-            </state>
63
-          </provider>
64
-        </entry>
65
-      </file>
66
-      <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">
68
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
69
-            <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" />
72
-                <folding />
73
-              </first_editor>
74
-              <second_editor />
75
-            </state>
76
-          </provider>
77
-        </entry>
78
-      </file>
79
-      <file leaf-file-name="ConwayGameOfLifeTest.java" pinned="false" current-in-tab="true">
80
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
81
-          <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" />
84
-              <folding />
85
-            </state>
86
-          </provider>
87
-        </entry>
88
-      </file>
89
-    </leaf>
90
-  </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>
24
+    <splitter split-orientation="horizontal" split-proportion="0.56901747">
25
+      <split-first>
26
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
27
+          <file leaf-file-name="SimpleWindow.java" pinned="false" current-in-tab="false">
28
+            <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
29
+              <provider selected="true" editor-type-id="text-editor">
30
+                <state relative-caret-position="60">
31
+                  <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
32
+                  <folding />
33
+                </state>
34
+              </provider>
35
+            </entry>
36
+          </file>
37
+          <file leaf-file-name="ConwayGameOfLife.java" pinned="false" current-in-tab="true">
38
+            <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
39
+              <provider selected="true" editor-type-id="text-editor">
40
+                <state relative-caret-position="450">
41
+                  <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
42
+                  <folding />
43
+                </state>
44
+              </provider>
45
+            </entry>
46
+          </file>
47
+        </leaf>
48
+      </split-first>
49
+      <split-second>
50
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
51
+          <file leaf-file-name="ConwayGameOfLifeTest.java" pinned="false" current-in-tab="true">
52
+            <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
53
+              <provider selected="true" editor-type-id="text-editor">
54
+                <state relative-caret-position="570">
55
+                  <caret line="76" column="23" lean-forward="false" selection-start-line="76" selection-start-column="23" selection-end-line="76" selection-end-column="23" />
56
+                  <folding />
57
+                </state>
58
+              </provider>
59
+            </entry>
60
+          </file>
61
+        </leaf>
62
+      </split-second>
63
+    </splitter>
108 64
   </component>
109 65
   <component name="Git.Settings">
110 66
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -117,17 +73,7 @@
117 73
   <component name="IdeDocumentHistory">
118 74
     <option name="CHANGED_PATHS">
119 75
       <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 76
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" />
129
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java" />
130
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/README.md" />
131 77
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" />
132 78
       </list>
133 79
     </option>
@@ -139,11 +85,12 @@
139 85
     <sorting>DEFINITION_ORDER</sorting>
140 86
   </component>
141 87
   <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" />
88
+    <option name="x" value="-317" />
89
+    <option name="y" value="-1057" />
90
+    <option name="width" value="1882" />
91
+    <option name="height" value="1057" />
146 92
   </component>
93
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
147 94
   <component name="ProjectView">
148 95
     <navigator currentView="ProjectPane" proportions="" version="1">
149 96
       <flattenPackages />
@@ -159,34 +106,37 @@
159 106
       <foldersAlwaysOnTop value="true" />
160 107
     </navigator>
161 108
     <panes>
109
+      <pane id="AndroidView" />
110
+      <pane id="PackagesPane" />
111
+      <pane id="Scratches" />
162 112
       <pane id="ProjectPane">
163 113
         <subPane>
164 114
           <expand>
165 115
             <path>
166 116
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
167
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
117
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
168 118
             </path>
169 119
             <path>
170 120
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
171
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
121
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
172 122
               <item name="src" type="462c0819:PsiDirectoryNode" />
173 123
             </path>
174 124
             <path>
175 125
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
176
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
126
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
177 127
               <item name="src" type="462c0819:PsiDirectoryNode" />
178 128
               <item name="main" type="462c0819:PsiDirectoryNode" />
179 129
             </path>
180 130
             <path>
181 131
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
182
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
132
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
183 133
               <item name="src" type="462c0819:PsiDirectoryNode" />
184 134
               <item name="main" type="462c0819:PsiDirectoryNode" />
185 135
               <item name="java" type="462c0819:PsiDirectoryNode" />
186 136
             </path>
187 137
             <path>
188 138
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
189
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
139
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
190 140
               <item name="src" type="462c0819:PsiDirectoryNode" />
191 141
               <item name="main" type="462c0819:PsiDirectoryNode" />
192 142
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -194,20 +144,20 @@
194 144
             </path>
195 145
             <path>
196 146
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
197
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
147
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
198 148
               <item name="src" type="462c0819:PsiDirectoryNode" />
199 149
               <item name="test" type="462c0819:PsiDirectoryNode" />
200 150
             </path>
201 151
             <path>
202 152
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
203
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
153
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
204 154
               <item name="src" type="462c0819:PsiDirectoryNode" />
205 155
               <item name="test" type="462c0819:PsiDirectoryNode" />
206 156
               <item name="java" type="462c0819:PsiDirectoryNode" />
207 157
             </path>
208 158
             <path>
209 159
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
210
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
160
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
211 161
               <item name="src" type="462c0819:PsiDirectoryNode" />
212 162
               <item name="test" type="462c0819:PsiDirectoryNode" />
213 163
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -217,9 +167,6 @@
217 167
           <select />
218 168
         </subPane>
219 169
       </pane>
220
-      <pane id="PackagesPane" />
221
-      <pane id="AndroidView" />
222
-      <pane id="Scratches" />
223 170
       <pane id="Scope" />
224 171
     </panes>
225 172
   </component>
@@ -227,26 +174,7 @@
227 174
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
228 175
     <property name="WebServerToolWindowFactoryState" value="false" />
229 176
     <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>
177
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
250 178
   </component>
251 179
   <component name="RunDashboard">
252 180
     <option name="ruleStates">
@@ -260,7 +188,7 @@
260 188
       </list>
261 189
     </option>
262 190
   </component>
263
-  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest">
191
+  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest.edgeTest">
264 192
     <configuration default="true" type="Applet" factoryName="Applet">
265 193
       <option name="HTML_USED" value="false" />
266 194
       <option name="WIDTH" value="400" />
@@ -268,39 +196,6 @@
268 196
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
269 197
       <module />
270 198
     </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 199
     <configuration default="true" type="Application" factoryName="Application">
305 200
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
306 201
       <option name="MAIN_CLASS_NAME" />
@@ -315,7 +210,7 @@
315 210
       <module name="" />
316 211
       <envs />
317 212
     </configuration>
318
-    <configuration name="ConwayGameOfLifeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
213
+    <configuration name="ConwayGameOfLifeTest.edgeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
319 214
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
320 215
         <pattern>
321 216
           <option name="PATTERN" value="com.zipcodeconway.*" />
@@ -327,8 +222,8 @@
327 222
       <option name="ALTERNATIVE_JRE_PATH" />
328 223
       <option name="PACKAGE_NAME" value="com.zipcodeconway" />
329 224
       <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLifeTest" />
330
-      <option name="METHOD_NAME" />
331
-      <option name="TEST_OBJECT" value="class" />
225
+      <option name="METHOD_NAME" value="edgeTest" />
226
+      <option name="TEST_OBJECT" value="method" />
332 227
       <option name="VM_PARAMETERS" value="-ea" />
333 228
       <option name="PARAMETERS" />
334 229
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@@ -340,7 +235,7 @@
340 235
       <envs />
341 236
       <patterns />
342 237
     </configuration>
343
-    <configuration name="ConwayGameOfLifeTest.runTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
238
+    <configuration name="ConwayGameOfLifeTest.isAliveTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
344 239
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
345 240
         <pattern>
346 241
           <option name="PATTERN" value="com.zipcodeconway.*" />
@@ -352,7 +247,7 @@
352 247
       <option name="ALTERNATIVE_JRE_PATH" />
353 248
       <option name="PACKAGE_NAME" value="com.zipcodeconway" />
354 249
       <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLifeTest" />
355
-      <option name="METHOD_NAME" value="runTest" />
250
+      <option name="METHOD_NAME" value="isAliveTest" />
356 251
       <option name="TEST_OBJECT" value="method" />
357 252
       <option name="VM_PARAMETERS" value="-ea" />
358 253
       <option name="PARAMETERS" />
@@ -410,27 +305,6 @@
410 305
       <envs />
411 306
       <patterns />
412 307
     </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 308
     <configuration default="true" type="Remote" factoryName="Remote">
435 309
       <option name="USE_SOCKET_TRANSPORT" value="true" />
436 310
       <option name="SERVER_MODE" value="false" />
@@ -471,21 +345,16 @@
471 345
       <option name="PROGRAM_PARAMETERS" />
472 346
       <predefined_log_file id="idea.log" enabled="true" />
473 347
     </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" />
348
+    <list size="3">
349
+      <item index="0" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.isAliveTest" />
350
+      <item index="1" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
351
+      <item index="2" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.edgeTest" />
481 352
     </list>
482 353
     <recent_temporary>
483
-      <list size="5">
484
-        <item index="0" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest" />
485
-        <item index="1" class="java.lang.String" itemvalue="Application.ConwayGameOfLife" />
354
+      <list size="3">
355
+        <item index="0" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.edgeTest" />
356
+        <item index="1" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.isAliveTest" />
486 357
         <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 358
       </list>
490 359
     </recent_temporary>
491 360
   </component>
@@ -497,78 +366,82 @@
497 366
   </component>
498 367
   <component name="TaskManager">
499 368
     <task active="true" id="Default" summary="Default task">
500
-      <changelist id="e282cee1-bfe9-42a3-9794-9633eb4654d1" name="Default" comment="" />
501
-      <created>1519668901598</created>
369
+      <changelist id="26347f4d-713c-461d-b161-a64822c4681e" name="Default" comment="" />
370
+      <created>1520867652526</created>
502 371
       <option name="number" value="Default" />
503 372
       <option name="presentableId" value="Default" />
504
-      <updated>1519668901598</updated>
505
-      <workItem from="1519668902904" duration="14517000" />
373
+      <updated>1520867652526</updated>
374
+      <workItem from="1520867656190" duration="4128000" />
375
+      <workItem from="1520872722088" duration="3717000" />
506 376
     </task>
507 377
     <servers />
508 378
   </component>
509 379
   <component name="TestHistory">
510
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 15h 45m 01s.xml">
511
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
380
+    <history-entry file="ConwayGameOfLifeTest_edgeTest - 2018.03.12 at 13h 12m 33s.xml">
381
+      <configuration name="ConwayGameOfLifeTest.edgeTest" configurationId="JUnit" />
382
+    </history-entry>
383
+    <history-entry file="ConwayGameOfLifeTest_edgeTest - 2018.03.12 at 13h 13m 13s.xml">
384
+      <configuration name="ConwayGameOfLifeTest.edgeTest" configurationId="JUnit" />
512 385
     </history-entry>
513
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 15h 59m 00s.xml">
514
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
386
+    <history-entry file="ConwayGameOfLifeTest_edgeTest - 2018.03.12 at 13h 13m 38s.xml">
387
+      <configuration name="ConwayGameOfLifeTest.edgeTest" configurationId="JUnit" />
515 388
     </history-entry>
516
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 02m 03s.xml">
517
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
389
+    <history-entry file="ConwayGameOfLifeTest_edgeTest - 2018.03.12 at 13h 14m 04s.xml">
390
+      <configuration name="ConwayGameOfLifeTest.edgeTest" configurationId="JUnit" />
518 391
     </history-entry>
519
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 03m 01s.xml">
520
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
392
+    <history-entry file="ConwayGameOfLifeTest_edgeTest - 2018.03.12 at 13h 23m 38s.xml">
393
+      <configuration name="ConwayGameOfLifeTest.edgeTest" configurationId="JUnit" />
521 394
     </history-entry>
522
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 05m 07s.xml">
523
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
395
+    <history-entry file="ConwayGameOfLifeTest_isAliveTest - 2018.03.12 at 12h 49m 47s.xml">
396
+      <configuration name="ConwayGameOfLifeTest.isAliveTest" configurationId="JUnit" />
524 397
     </history-entry>
525
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 06m 11s.xml">
526
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
398
+    <history-entry file="ConwayGameOfLifeTest_isAliveTest - 2018.03.12 at 12h 51m 24s.xml">
399
+      <configuration name="ConwayGameOfLifeTest.isAliveTest" configurationId="JUnit" />
527 400
     </history-entry>
528
-    <history-entry file="ConwayGameOfLifeTest_runTest - 2018.02.26 at 15h 41m 14s.xml">
529
-      <configuration name="ConwayGameOfLifeTest.runTest" configurationId="JUnit" />
401
+    <history-entry file="ConwayGameOfLifeTest_isAliveTest - 2018.03.12 at 12h 54m 30s.xml">
402
+      <configuration name="ConwayGameOfLifeTest.isAliveTest" configurationId="JUnit" />
530 403
     </history-entry>
531
-    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.02.26 at 15h 42m 02s.xml">
532
-      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
404
+    <history-entry file="ConwayGameOfLifeTest_isAliveTest - 2018.03.12 at 12h 56m 35s.xml">
405
+      <configuration name="ConwayGameOfLifeTest.isAliveTest" configurationId="JUnit" />
533 406
     </history-entry>
534
-    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.02.26 at 15h 42m 18s.xml">
535
-      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
407
+    <history-entry file="ConwayGameOfLifeTest_isAliveTest - 2018.03.12 at 13h 23m 35s.xml">
408
+      <configuration name="ConwayGameOfLifeTest.isAliveTest" configurationId="JUnit" />
536 409
     </history-entry>
537 410
   </component>
538 411
   <component name="TimeTrackingManager">
539
-    <option name="totallyTimeSpent" value="14517000" />
412
+    <option name="totallyTimeSpent" value="7845000" />
540 413
   </component>
541 414
   <component name="ToolWindowManager">
542
-    <frame x="82" y="32" width="1440" height="821" extended-state="0" />
415
+    <frame x="-317" y="-1057" width="1882" height="1057" extended-state="0" />
543 416
     <editor active="true" />
544 417
     <layout>
545
-      <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" />
418
+      <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="3" side_tool="false" content_ui="tabs" />
546 419
       <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" />
548
-      <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
-      <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
-      <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
-      <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
-      <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
-      <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" />
556
-      <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
-      <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" />
559
-      <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" />
420
+      <window_info id="Messages" 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" />
421
+      <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="3" side_tool="false" content_ui="tabs" />
422
+      <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="2" side_tool="false" content_ui="tabs" />
423
+      <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="3" side_tool="false" content_ui="tabs" />
424
+      <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" />
425
+      <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" />
426
+      <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" />
427
+      <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" />
428
+      <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" />
429
+      <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" />
430
+      <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" />
431
+      <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" />
432
+      <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="3" side_tool="false" content_ui="tabs" />
560 433
       <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 434
       <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
-      <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
-      <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" />
435
+      <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="2" side_tool="false" content_ui="tabs" />
436
+      <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="3" side_tool="false" content_ui="tabs" />
437
+      <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="2" side_tool="true" content_ui="tabs" />
564 438
       <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
-      <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" />
566 439
       <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
-      <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 440
       <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" />
569 441
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
570
-      <window_info id="Find" 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" />
442
+      <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" />
571 443
       <window_info id="Inspection" 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="5" side_tool="false" content_ui="tabs" />
444
+      <window_info id="Find" 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" />
572 445
     </layout>
573 446
   </component>
574 447
   <component name="TypeScriptGeneratedFilesManager">
@@ -578,114 +451,54 @@
578 451
     <option name="myLimit" value="2678400000" />
579 452
   </component>
580 453
   <component name="XDebuggerManager">
581
-    <breakpoint-manager>
582
-      <option name="time" value="2" />
583
-    </breakpoint-manager>
454
+    <breakpoint-manager />
584 455
     <watches-manager />
585 456
   </component>
586 457
   <component name="editorHistoryManager">
587
-    <entry file="file://$PROJECT_DIR$/pom.xml">
458
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
588 459
       <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" />
460
+        <state relative-caret-position="60">
461
+          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
591 462
           <folding />
592 463
         </state>
593 464
       </provider>
594 465
     </entry>
595
-    <entry file="file://$PROJECT_DIR$/src/main/java/LifeStarts.java">
466
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
596 467
       <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" />
468
+        <state relative-caret-position="0">
469
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
599 470
           <folding />
600 471
         </state>
601 472
       </provider>
602 473
     </entry>
603
-    <entry file="file://$PROJECT_DIR$/src/main/java/Life.java">
474
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
604 475
       <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" />
476
+        <state relative-caret-position="825">
477
+          <caret line="55" column="13" lean-forward="true" selection-start-line="55" selection-start-column="13" selection-end-line="55" selection-end-column="13" />
607 478
           <folding />
608 479
         </state>
609 480
       </provider>
610 481
     </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">
633
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
634
-        <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" />
637
-            <folding />
638
-          </first_editor>
639
-          <second_editor />
640
-        </state>
641
-      </provider>
642
-    </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">
482
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
654 483
       <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" />
484
+        <state relative-caret-position="60">
485
+          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
657 486
           <folding />
658 487
         </state>
659 488
       </provider>
660 489
     </entry>
661
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
490
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
662 491
       <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>
492
+        <state relative-caret-position="570">
493
+          <caret line="76" column="23" lean-forward="false" selection-start-line="76" selection-start-column="23" selection-end-line="76" selection-end-column="23" />
494
+          <folding />
668 495
         </state>
669 496
       </provider>
670 497
     </entry>
671 498
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
672 499
       <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>
682
-        </state>
683
-      </provider>
684
-    </entry>
685
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
686
-      <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" />
500
+        <state relative-caret-position="450">
501
+          <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
689 502
           <folding />
690 503
         </state>
691 504
       </provider>
@@ -693,66 +506,6 @@
693 506
   </component>
694 507
   <component name="masterDetails">
695 508
     <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 509
       <state key="ProjectJDKs.UI">
757 510
         <settings>
758 511
           <last-edited>1.8</last-edited>
@@ -765,17 +518,6 @@
765 518
           </splitter-proportions>
766 519
         </settings>
767 520
       </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 521
     </states>
780 522
   </component>
781 523
 </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>

+ 54
- 5
src/main/java/com/zipcodeconway/ConwayGameOfLife.java Näytä tiedosto

@@ -2,10 +2,21 @@ package com.zipcodeconway;
2 2
 
3 3
 public class ConwayGameOfLife {
4 4
 
5
+    private Integer edge;
6
+    int[][] currentGen;
7
+    int[][] nextGen;
8
+
9
+
5 10
     public ConwayGameOfLife(Integer dimension) {
6
-     }
11
+        this.edge=dimension-1;
12
+        this.nextGen = new int[dimension][dimension];
13
+    }
14
+
15
+    public ConwayGameOfLife(Integer dimension, int[][] startMatrix) {
16
+        this.edge=dimension-1;
17
+        this.currentGen = startMatrix;
18
+        this.nextGen = new int[dimension][dimension];
7 19
 
8
-    public ConwayGameOfLife(Integer dimension, int[][] startmatrix) {
9 20
     }
10 21
 
11 22
     public static void main(String[] args) {
@@ -17,16 +28,20 @@ public class ConwayGameOfLife {
17 28
     // Which cells are alive or dead in generation 0.
18 29
     // allocates and returns the starting matrix of size 'dimension'
19 30
     private int[][] createRandomStart(Integer dimension) {
31
+
32
+
20 33
         return new int[1][1];
21 34
     }
22 35
 
23 36
     public int[][] simulate(Integer maxGenerations) {
37
+
38
+
24 39
         return new int[1][1];
25 40
     }
26 41
 
27 42
     // copy the values of 'next' matrix to 'current' matrix,
28 43
     // and then zero out the contents of 'next' matrix
29
-    public void copyAndZeroOut(int [][] next, int[][] current) {
44
+    public void copyAndZeroOut(int[][] next, int[][] current) {
30 45
     }
31 46
 
32 47
     // Calculate if an individual cell should be alive in the next generation.
@@ -37,7 +52,41 @@ public class ConwayGameOfLife {
37 52
 		Any live cell with two or three live neighbours lives, unchanged, to the next generation.
38 53
 		Any dead cell with exactly three live neighbours cells will come to life.
39 54
 	*/
40
-    private int isAlive(int row, int col, int[][] world) {
41
-        return 0;
55
+    protected int isAlive(int row, int col, int[][] world) {
56
+        //all we're returning is a binary. 1 = alive for next gen.
57
+        Integer aliveForNextGen;
58
+        Integer numOfLiveCells = 0;
59
+
60
+        for (int cellWereLookingAthorizontally = row -1; cellWereLookingAthorizontally <=row +1; cellWereLookingAthorizontally++){
61
+            int rowCheck = cellWereLookingAthorizontally;
62
+            if (cellWereLookingAthorizontally <0){
63
+                rowCheck=edge;
64
+            } else if (cellWereLookingAthorizontally > edge) {
65
+                rowCheck = 0;
66
+            }
67
+
68
+            for (int cellWereLookingAtVertically = col -1; cellWereLookingAtVertically <= col +1; cellWereLookingAtVertically++){
69
+                int colCheck = cellWereLookingAtVertically;
70
+                if (cellWereLookingAtVertically <0 ){
71
+                    colCheck = edge;
72
+                } else if (cellWereLookingAtVertically > edge){
73
+                    colCheck = 0;
74
+                }
75
+
76
+                if (world[rowCheck][colCheck]==1) numOfLiveCells++;
77
+            }
78
+        }
79
+
80
+
81
+        if (numOfLiveCells ==3) {
82
+            aliveForNextGen = 1;
83
+        } else if (numOfLiveCells ==4){
84
+            aliveForNextGen= world[row][col];
85
+        } else {
86
+            aliveForNextGen = 0;
87
+        }
88
+
89
+        return aliveForNextGen;
42 90
     }
91
+
43 92
 }

+ 48
- 0
src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java Näytä tiedosto

@@ -1,5 +1,6 @@
1 1
 package com.zipcodeconway;
2 2
 
3
+import org.junit.Assert;
3 4
 import org.junit.Test;
4 5
 
5 6
 import static org.junit.Assert.*;
@@ -43,4 +44,51 @@ public class ConwayGameOfLifeTest {
43 44
         int[][] results = sim.simulate(10);
44 45
         assertTrue(java.util.Arrays.deepEquals(results, expected));
45 46
     }
47
+
48
+    @Test
49
+    public void isAliveTest(){
50
+
51
+        ConwayGameOfLife sim = new ConwayGameOfLife(5);
52
+        //Given
53
+
54
+        Integer row = 2;
55
+        Integer col= 2;
56
+        int[][] world = {
57
+                {0, 0, 0, 0, 0},
58
+                {0, 1, 0, 0, 0},
59
+                {0, 0, 1, 1, 0},
60
+                {0, 0, 0, 0, 0},
61
+                {0, 0, 0, 0, 0}};
62
+
63
+
64
+        Integer expected = 1;
65
+        Integer actual = sim.isAlive(row, col, world);
66
+
67
+        Assert.assertEquals(expected,actual);
68
+    }
69
+
70
+    @Test
71
+    public void edgeTest(){
72
+
73
+        ConwayGameOfLife simEdge = new ConwayGameOfLife(5);
74
+        //Given
75
+
76
+        Integer row =4;
77
+        Integer col = 4;
78
+
79
+        int[][]world = {
80
+                {1, 0, 0, 0, 0},
81
+                {0, 1, 0, 0, 0},
82
+                {0, 0, 1, 1, 0},
83
+                {0, 0, 0, 0, 1},
84
+                {0, 0, 0, 1, 0}};
85
+
86
+
87
+        Integer expected = 1;
88
+        Integer actual = simEdge.isAlive(row, col, world);
89
+
90
+        Assert.assertEquals(expected,actual);
91
+    }
92
+
93
+
46 94
 }