Przeglądaj źródła

almost done, need crandom start

April Rivera 6 lat temu
rodzic
commit
3fda6ce703

+ 1
- 0
.idea/.name Wyświetl plik

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

+ 1
- 1
.idea/compiler.xml Wyświetl plik

@@ -9,7 +9,7 @@
9 9
         <module name="Game-Of-Life-Java" />
10 10
       </profile>
11 11
     </annotationProcessing>
12
-    <bytecodeTargetLevel>
12
+    <bytecodeTargetLevel target="1.8">
13 13
       <module name="Game-Of-Life-Java" target="1.5" />
14 14
     </bytecodeTargetLevel>
15 15
   </component>

+ 3
- 1
.idea/misc.xml Wyświetl plik

@@ -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 Wyświetl plik

@@ -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 Wyświetl plik

@@ -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 Wyświetl plik

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

+ 94
- 459
.idea/workspace.xml Wyświetl plik

@@ -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="b752c630-f33d-4c1a-b23b-763b8ece3fda" name="Default" comment="">
5
+      <change beforePath="$PROJECT_DIR$/.idea/Game-Of-Life-Java.iml" afterPath="" />
6
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
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" />
@@ -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.5751073">
25
+      <split-first>
26
+        <leaf>
27
+          <file leaf-file-name="ConwayGameOfLife.java" pinned="false" current-in-tab="true">
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="285">
31
+                  <caret line="19" column="57" lean-forward="true" selection-start-line="19" selection-start-column="57" selection-end-line="19" selection-end-column="57" />
32
+                  <folding />
33
+                </state>
34
+              </provider>
35
+            </entry>
36
+          </file>
37
+          <file leaf-file-name="SimpleWindow.java" pinned="false" current-in-tab="false">
38
+            <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
39
+              <provider selected="true" editor-type-id="text-editor">
40
+                <state relative-caret-position="645">
41
+                  <caret line="44" column="39" lean-forward="true" selection-start-line="44" selection-start-column="39" selection-end-line="44" selection-end-column="39" />
42
+                  <folding />
43
+                </state>
44
+              </provider>
45
+            </entry>
46
+          </file>
47
+        </leaf>
48
+      </split-first>
49
+      <split-second>
50
+        <leaf>
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="60">
55
+                  <caret line="6" column="35" lean-forward="true" selection-start-line="6" selection-start-column="35" selection-end-line="6" selection-end-column="35" />
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
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" />
129 76
         <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>
@@ -138,12 +84,13 @@
138 84
     <detection-done>true</detection-done>
139 85
     <sorting>DEFINITION_ORDER</sorting>
140 86
   </component>
141
-  <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" />
87
+  <component name="ProjectFrameBounds" extendedState="6">
88
+    <option name="x" value="10" />
89
+    <option name="y" value="23" />
90
+    <option name="width" value="1430" />
91
+    <option name="height" value="764" />
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,38 @@
159 106
       <foldersAlwaysOnTop value="true" />
160 107
     </navigator>
161 108
     <panes>
109
+      <pane id="PackagesPane" />
110
+      <pane id="Scratches" />
111
+      <pane id="Scope" />
112
+      <pane id="AndroidView" />
162 113
       <pane id="ProjectPane">
163 114
         <subPane>
164 115
           <expand>
165 116
             <path>
166 117
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
167
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
118
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
168 119
             </path>
169 120
             <path>
170 121
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
171
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
122
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
172 123
               <item name="src" type="462c0819:PsiDirectoryNode" />
173 124
             </path>
174 125
             <path>
175 126
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
176
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
127
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
177 128
               <item name="src" type="462c0819:PsiDirectoryNode" />
178 129
               <item name="main" type="462c0819:PsiDirectoryNode" />
179 130
             </path>
180 131
             <path>
181 132
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
182
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
133
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
183 134
               <item name="src" type="462c0819:PsiDirectoryNode" />
184 135
               <item name="main" type="462c0819:PsiDirectoryNode" />
185 136
               <item name="java" type="462c0819:PsiDirectoryNode" />
186 137
             </path>
187 138
             <path>
188 139
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
189
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
140
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
190 141
               <item name="src" type="462c0819:PsiDirectoryNode" />
191 142
               <item name="main" type="462c0819:PsiDirectoryNode" />
192 143
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -194,20 +145,20 @@
194 145
             </path>
195 146
             <path>
196 147
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
197
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
148
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
198 149
               <item name="src" type="462c0819:PsiDirectoryNode" />
199 150
               <item name="test" type="462c0819:PsiDirectoryNode" />
200 151
             </path>
201 152
             <path>
202 153
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
203
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
154
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
204 155
               <item name="src" type="462c0819:PsiDirectoryNode" />
205 156
               <item name="test" type="462c0819:PsiDirectoryNode" />
206 157
               <item name="java" type="462c0819:PsiDirectoryNode" />
207 158
             </path>
208 159
             <path>
209 160
               <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
210
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
161
+              <item name="ConwayGameOfLife" type="462c0819:PsiDirectoryNode" />
211 162
               <item name="src" type="462c0819:PsiDirectoryNode" />
212 163
               <item name="test" type="462c0819:PsiDirectoryNode" />
213 164
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -217,36 +168,17 @@
217 168
           <select />
218 169
         </subPane>
219 170
       </pane>
220
-      <pane id="PackagesPane" />
221
-      <pane id="AndroidView" />
222
-      <pane id="Scratches" />
223
-      <pane id="Scope" />
224 171
     </panes>
225 172
   </component>
226 173
   <component name="PropertiesComponent">
227 174
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
228
-    <property name="WebServerToolWindowFactoryState" value="false" />
229
-    <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" />
175
+    <property name="project.structure.last.edited" value="Project" />
233 176
     <property name="project.structure.proportion" value="0.15" />
234 177
     <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>
178
+    <property name="settings.editor.selected.configurable" value="configurable.group.build.tools" />
179
+    <property name="WebServerToolWindowFactoryState" value="false" />
180
+    <property name="aspect.path.notification.shown" value="true" />
181
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
250 182
   </component>
251 183
   <component name="RunDashboard">
252 184
     <option name="ruleStates">
@@ -260,7 +192,7 @@
260 192
       </list>
261 193
     </option>
262 194
   </component>
263
-  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest">
195
+  <component name="RunManager">
264 196
     <configuration default="true" type="Applet" factoryName="Applet">
265 197
       <option name="HTML_USED" value="false" />
266 198
       <option name="WIDTH" value="400" />
@@ -268,39 +200,6 @@
268 200
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
269 201
       <module />
270 202
     </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 203
     <configuration default="true" type="Application" factoryName="Application">
305 204
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
306 205
       <option name="MAIN_CLASS_NAME" />
@@ -315,81 +214,6 @@
315 214
       <module name="" />
316 215
       <envs />
317 216
     </configuration>
318
-    <configuration name="ConwayGameOfLifeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
319
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
320
-        <pattern>
321
-          <option name="PATTERN" value="com.zipcodeconway.*" />
322
-          <option name="ENABLED" value="true" />
323
-        </pattern>
324
-      </extension>
325
-      <module name="Game-Of-Life-Java" />
326
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
327
-      <option name="ALTERNATIVE_JRE_PATH" />
328
-      <option name="PACKAGE_NAME" value="com.zipcodeconway" />
329
-      <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLifeTest" />
330
-      <option name="METHOD_NAME" />
331
-      <option name="TEST_OBJECT" value="class" />
332
-      <option name="VM_PARAMETERS" value="-ea" />
333
-      <option name="PARAMETERS" />
334
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
335
-      <option name="ENV_VARIABLES" />
336
-      <option name="PASS_PARENT_ENVS" value="true" />
337
-      <option name="TEST_SEARCH_SCOPE">
338
-        <value defaultName="singleModule" />
339
-      </option>
340
-      <envs />
341
-      <patterns />
342
-    </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 217
     <configuration default="true" type="JUnit" factoryName="JUnit">
394 218
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
395 219
       <module name="" />
@@ -410,27 +234,6 @@
410 234
       <envs />
411 235
       <patterns />
412 236
     </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 237
     <configuration default="true" type="Remote" factoryName="Remote">
435 238
       <option name="USE_SOCKET_TRANSPORT" value="true" />
436 239
       <option name="SERVER_MODE" value="false" />
@@ -471,23 +274,6 @@
471 274
       <option name="PROGRAM_PARAMETERS" />
472 275
       <predefined_log_file id="idea.log" enabled="true" />
473 276
     </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
-    <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" />
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
-      </list>
490
-    </recent_temporary>
491 277
   </component>
492 278
   <component name="ShelveChangesManager" show_recycled="false">
493 279
     <option name="remove_strategy" value="false" />
@@ -497,72 +283,42 @@
497 283
   </component>
498 284
   <component name="TaskManager">
499 285
     <task active="true" id="Default" summary="Default task">
500
-      <changelist id="e282cee1-bfe9-42a3-9794-9633eb4654d1" name="Default" comment="" />
501
-      <created>1519668901598</created>
286
+      <changelist id="b752c630-f33d-4c1a-b23b-763b8ece3fda" name="Default" comment="" />
287
+      <created>1520888960822</created>
502 288
       <option name="number" value="Default" />
503 289
       <option name="presentableId" value="Default" />
504
-      <updated>1519668901598</updated>
505
-      <workItem from="1519668902904" duration="14517000" />
290
+      <updated>1520888960822</updated>
291
+      <workItem from="1520888962137" duration="5483000" />
506 292
     </task>
507 293
     <servers />
508 294
   </component>
509
-  <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">
520
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
521
-    </history-entry>
522
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 05m 07s.xml">
523
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
524
-    </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
-  </component>
538 295
   <component name="TimeTrackingManager">
539
-    <option name="totallyTimeSpent" value="14517000" />
296
+    <option name="totallyTimeSpent" value="5483000" />
540 297
   </component>
541 298
   <component name="ToolWindowManager">
542
-    <frame x="82" y="32" width="1440" height="821" extended-state="0" />
299
+    <frame x="0" y="23" width="1440" height="796" extended-state="6" />
543 300
     <editor active="true" />
544 301
     <layout>
545 302
       <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 303
       <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 304
       <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 305
       <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 306
       <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 307
       <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 308
       <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 309
       <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" />
310
+      <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
311
+      <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 312
       <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 313
       <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" />
314
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
559 315
       <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 316
       <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 317
       <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 318
       <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 319
       <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 320
       <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" />
321
+      <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 322
       <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 323
       <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 324
       <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 +334,30 @@
578 334
     <option name="myLimit" value="2678400000" />
579 335
   </component>
580 336
   <component name="XDebuggerManager">
581
-    <breakpoint-manager>
582
-      <option name="time" value="2" />
583
-    </breakpoint-manager>
337
+    <breakpoint-manager />
584 338
     <watches-manager />
585 339
   </component>
586 340
   <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">
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">
341
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
654 342
       <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" />
343
+        <state relative-caret-position="60">
344
+          <caret line="6" column="35" lean-forward="true" selection-start-line="6" selection-start-column="35" selection-end-line="6" selection-end-column="35" />
657 345
           <folding />
658 346
         </state>
659 347
       </provider>
660 348
     </entry>
661 349
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
662 350
       <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>
351
+        <state relative-caret-position="645">
352
+          <caret line="44" column="39" lean-forward="true" selection-start-line="44" selection-start-column="39" selection-end-line="44" selection-end-column="39" />
353
+          <folding />
668 354
         </state>
669 355
       </provider>
670 356
     </entry>
671 357
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
672 358
       <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" />
359
+        <state relative-caret-position="285">
360
+          <caret line="19" column="57" lean-forward="true" selection-start-line="19" selection-start-column="57" selection-end-line="19" selection-end-column="57" />
689 361
           <folding />
690 362
         </state>
691 363
       </provider>
@@ -693,30 +365,6 @@
693 365
   </component>
694 366
   <component name="masterDetails">
695 367
     <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 368
       <state key="GlobalLibrariesConfigurable.UI">
721 369
         <settings>
722 370
           <splitter-proportions>
@@ -740,19 +388,6 @@
740 388
           </splitter-proportions>
741 389
         </settings>
742 390
       </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 391
       <state key="ProjectJDKs.UI">
757 392
         <settings>
758 393
           <last-edited>1.8</last-edited>

.idea/Game-Of-Life-Java.iml → Game-Of-Life-Java.iml Wyświetl plik

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

+ 61
- 2
src/main/java/com/zipcodeconway/ConwayGameOfLife.java Wyświetl plik

@@ -1,11 +1,23 @@
1 1
 package com.zipcodeconway;
2 2
 
3
+import java.util.Random;
4
+
3 5
 public class ConwayGameOfLife {
4 6
 
7
+    private int[][] next;
8
+    private int[][] currentGen;
9
+    private SimpleWindow displayWindow;
10
+
5 11
     public ConwayGameOfLife(Integer dimension) {
12
+        next = new int[dimension][dimension];
13
+        currentGen = createRandomStart(dimension);
14
+        this.displayWindow = new SimpleWindow(dimension);
6 15
      }
7 16
 
8 17
     public ConwayGameOfLife(Integer dimension, int[][] startmatrix) {
18
+        currentGen = startmatrix;
19
+        next = new int [dimension][dimension];
20
+        this.displayWindow = new SimpleWindow(dimension);
9 21
     }
10 22
 
11 23
     public static void main(String[] args) {
@@ -17,16 +29,29 @@ public class ConwayGameOfLife {
17 29
     // Which cells are alive or dead in generation 0.
18 30
     // allocates and returns the starting matrix of size 'dimension'
19 31
     private int[][] createRandomStart(Integer dimension) {
32
+        final Random random = new Random();
33
+
20 34
         return new int[1][1];
21 35
     }
22 36
 
23 37
     public int[][] simulate(Integer maxGenerations) {
24
-        return new int[1][1];
38
+        for(int i = 0; i <= maxGenerations; i++){
39
+            this.displayWindow.display(currentGen, i);
40
+            this.displayWindow.sleep(125);
41
+            copyAndZeroOut(next, currentGen);
42
+        }
43
+        return currentGen;
25 44
     }
26 45
 
27 46
     // copy the values of 'next' matrix to 'current' matrix,
28 47
     // and then zero out the contents of 'next' matrix
29 48
     public void copyAndZeroOut(int [][] next, int[][] current) {
49
+        for(int row = 0; row < next.length; row++){
50
+            for(int col = 0; col < current.length; col++){
51
+                current[row][col] = next[row][col];
52
+                next[row][col] = 0;
53
+            }
54
+        }
30 55
     }
31 56
 
32 57
     // Calculate if an individual cell should be alive in the next generation.
@@ -38,6 +63,40 @@ public class ConwayGameOfLife {
38 63
 		Any dead cell with exactly three live neighbours cells will come to life.
39 64
 	*/
40 65
     private int isAlive(int row, int col, int[][] world) {
41
-        return 0;
66
+        //declaring directions to move and check for neighbors
67
+        int north = col - 1;
68
+        int south = col + 1;
69
+        int east= row + 1;
70
+        int west = row - 1;
71
+        int countNeighbor = 0;
72
+
73
+        //boundaries that loop move [][]
74
+        if(north < 0) north = world.length -1;
75
+        if(west < 0) west = world.length - 1;
76
+        if(south == world.length) south = 0;
77
+        if(east == world.length) east = 0;
78
+
79
+        //checking how many neighbors are alive in each direction
80
+        if(world[east][north] == 1) countNeighbor++;
81
+        if(world[east][col] == 1) countNeighbor++;
82
+        if(world[east][south] == 1) countNeighbor++;
83
+
84
+        if(world[west][north] == 1) countNeighbor++;
85
+        if(world[west][col] == 1) countNeighbor++;
86
+        if(world[west][south] == 1) countNeighbor++;
87
+
88
+        if(world[row][north] == 1) countNeighbor++;
89
+        if(world[row][south] == 1) countNeighbor++;
90
+
91
+        //determining whether the neighbor is alive or dead and returning that world
92
+        if(countNeighbor < 2 || countNeighbor > 3) return 0;
93
+        else if(countNeighbor == 3) return 1;
94
+        else return world[row][col];
42 95
     }
43 96
 }
97
+/*
98
+		Any live cell with fewer than two live neighbours dies, as if by needs caused by underpopulation.
99
+		Any live cell with more than three live neighbours dies, as if by overcrowding.
100
+		Any live cell with two or three live neighbours lives, unchanged, to the next generation.
101
+		Any dead cell with exactly three live neighbours cells will come to life.
102
+	*/

+ 1
- 1
src/main/java/com/zipcodeconway/SimpleWindow.java Wyświetl plik

@@ -39,7 +39,7 @@ 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.YELLOW);
43 43
                     g.fillRect(i * BOX_DIM, j * BOX_DIM, 10, 10);
44 44
                 }
45 45
                 if (array[i][j] == 1) {