Yesoda Sanka 6 лет назад
Родитель
Сommit
15b8e561d2

+ 224
- 344
.idea/workspace.xml Просмотреть файл

@@ -1,22 +1,57 @@
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="e282cee1-bfe9-42a3-9794-9633eb4654d1" name="Default" comment="">
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java" afterDir="false" />
8
+    </list>
5 9
     <ignored path="$PROJECT_DIR$/target/" />
6 10
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7
-    <option name="TRACKING_ENABLED" value="true" />
8 11
     <option name="SHOW_DIALOG" value="false" />
9 12
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
10 13
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
11 14
     <option name="LAST_RESOLUTION" value="IGNORE" />
12 15
   </component>
16
+  <component name="FUSProjectUsageTrigger">
17
+    <session id="274421268">
18
+      <usages-collector id="statistics.lifecycle.project">
19
+        <counts>
20
+          <entry key="project.closed" value="1" />
21
+          <entry key="project.open.time.11" value="1" />
22
+          <entry key="project.open.time.12" value="1" />
23
+          <entry key="project.opened" value="2" />
24
+        </counts>
25
+      </usages-collector>
26
+      <usages-collector id="statistics.file.extensions.edit">
27
+        <counts>
28
+          <entry key="java" value="287" />
29
+        </counts>
30
+      </usages-collector>
31
+      <usages-collector id="statistics.file.types.edit">
32
+        <counts>
33
+          <entry key="JAVA" value="287" />
34
+        </counts>
35
+      </usages-collector>
36
+      <usages-collector id="statistics.file.extensions.open">
37
+        <counts>
38
+          <entry key="md" value="1" />
39
+        </counts>
40
+      </usages-collector>
41
+      <usages-collector id="statistics.file.types.open">
42
+        <counts>
43
+          <entry key="Markdown" value="1" />
44
+        </counts>
45
+      </usages-collector>
46
+    </session>
47
+  </component>
13 48
   <component name="FileEditorManager">
14
-    <leaf>
15
-      <file leaf-file-name="SimpleWindow.java" pinned="false" current-in-tab="false">
49
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
50
+      <file pinned="false" current-in-tab="true">
16 51
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
17 52
           <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" />
53
+            <state relative-caret-position="360">
54
+              <caret line="45" column="46" lean-forward="true" selection-start-line="45" selection-start-column="46" selection-end-line="45" selection-end-column="46" />
20 55
               <folding>
21 56
                 <element signature="imports" expanded="true" />
22 57
               </folding>
@@ -24,68 +59,34 @@
24 59
           </provider>
25 60
         </entry>
26 61
       </file>
27
-      <file leaf-file-name="ConwayGameOfLife.java" pinned="false" current-in-tab="false">
62
+      <file pinned="false" current-in-tab="false">
28 63
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
29 64
           <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>
65
+            <state relative-caret-position="-45">
66
+              <caret line="92" column="5" lean-forward="true" selection-start-line="92" selection-start-column="5" selection-end-line="92" selection-end-column="5" />
39 67
             </state>
40 68
           </provider>
41 69
         </entry>
42 70
       </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>
71
+      <file pinned="false" current-in-tab="false">
72
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
73
+          <provider selected="true" editor-type-id="text-editor">
74
+            <state relative-caret-position="237">
75
+              <caret line="30" column="32" lean-forward="true" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
62 76
             </state>
63 77
           </provider>
64 78
         </entry>
65 79
       </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">
80
+      <file pinned="false" current-in-tab="false">
81
+        <entry file="file://$PROJECT_DIR$/README.md">
68 82
           <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>
83
+            <state split_layout="FIRST">
84
+              <first_editor />
74 85
               <second_editor />
75 86
             </state>
76 87
           </provider>
77 88
         </entry>
78 89
       </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 90
     </leaf>
90 91
   </component>
91 92
   <component name="FileTemplateManagerImpl">
@@ -109,11 +110,6 @@
109 110
   <component name="Git.Settings">
110 111
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
111 112
   </component>
112
-  <component name="GradleLocalSettings">
113
-    <option name="externalProjectsViewState">
114
-      <projects_view />
115
-    </option>
116
-  </component>
117 113
   <component name="IdeDocumentHistory">
118 114
     <option name="CHANGED_PATHS">
119 115
       <list>
@@ -126,9 +122,9 @@
126 122
         <option value="$PROJECT_DIR$/src/main/java/ConwayGameOfLife.java" />
127 123
         <option value="$PROJECT_DIR$/src/main/java/Life.java" />
128 124
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" />
129
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java" />
130 125
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/README.md" />
131 126
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" />
127
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java" />
132 128
       </list>
133 129
     </option>
134 130
   </component>
@@ -138,101 +134,100 @@
138 134
     <detection-done>true</detection-done>
139 135
     <sorting>DEFINITION_ORDER</sorting>
140 136
   </component>
137
+  <component name="MavenImportPreferences">
138
+    <option name="importingSettings">
139
+      <MavenImportingSettings>
140
+        <option name="importAutomatically" value="true" />
141
+      </MavenImportingSettings>
142
+    </option>
143
+  </component>
141 144
   <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" />
145
+    <option name="y" value="23" />
146
+    <option name="width" value="1280" />
147
+    <option name="height" value="717" />
146 148
   </component>
147 149
   <component name="ProjectView">
148
-    <navigator currentView="ProjectPane" proportions="" version="1">
149
-      <flattenPackages />
150
-      <showMembers />
151
-      <showModules />
152
-      <showLibraryContents />
153
-      <hideEmptyPackages />
154
-      <abbreviatePackageNames />
155
-      <autoscrollToSource />
156
-      <autoscrollFromSource />
157
-      <sortByType />
158
-      <manualOrder />
150
+    <navigator proportions="" version="1">
159 151
       <foldersAlwaysOnTop value="true" />
160 152
     </navigator>
161 153
     <panes>
154
+      <pane id="PackagesPane" />
162 155
       <pane id="ProjectPane">
163 156
         <subPane>
164 157
           <expand>
165 158
             <path>
166
-              <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
167
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
159
+              <item name="GameOfLifeConway" type="b2602c69:ProjectViewProjectNode" />
160
+              <item name="GameOfLifeConway" type="462c0819:PsiDirectoryNode" />
168 161
             </path>
169 162
             <path>
170
-              <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
171
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
163
+              <item name="GameOfLifeConway" type="b2602c69:ProjectViewProjectNode" />
164
+              <item name="GameOfLifeConway" type="462c0819:PsiDirectoryNode" />
172 165
               <item name="src" type="462c0819:PsiDirectoryNode" />
173 166
             </path>
174 167
             <path>
175
-              <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
176
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
168
+              <item name="GameOfLifeConway" type="b2602c69:ProjectViewProjectNode" />
169
+              <item name="GameOfLifeConway" type="462c0819:PsiDirectoryNode" />
177 170
               <item name="src" type="462c0819:PsiDirectoryNode" />
178 171
               <item name="main" type="462c0819:PsiDirectoryNode" />
179 172
             </path>
180 173
             <path>
181
-              <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
182
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
174
+              <item name="GameOfLifeConway" type="b2602c69:ProjectViewProjectNode" />
175
+              <item name="GameOfLifeConway" type="462c0819:PsiDirectoryNode" />
183 176
               <item name="src" type="462c0819:PsiDirectoryNode" />
184 177
               <item name="main" type="462c0819:PsiDirectoryNode" />
185 178
               <item name="java" type="462c0819:PsiDirectoryNode" />
186 179
             </path>
187 180
             <path>
188
-              <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
189
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
181
+              <item name="GameOfLifeConway" type="b2602c69:ProjectViewProjectNode" />
182
+              <item name="GameOfLifeConway" type="462c0819:PsiDirectoryNode" />
190 183
               <item name="src" type="462c0819:PsiDirectoryNode" />
191 184
               <item name="main" type="462c0819:PsiDirectoryNode" />
192 185
               <item name="java" type="462c0819:PsiDirectoryNode" />
193 186
               <item name="zipcodeconway" type="462c0819:PsiDirectoryNode" />
194 187
             </path>
195 188
             <path>
196
-              <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
197
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
189
+              <item name="GameOfLifeConway" type="b2602c69:ProjectViewProjectNode" />
190
+              <item name="GameOfLifeConway" type="462c0819:PsiDirectoryNode" />
198 191
               <item name="src" type="462c0819:PsiDirectoryNode" />
199 192
               <item name="test" type="462c0819:PsiDirectoryNode" />
200 193
             </path>
201 194
             <path>
202
-              <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
203
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
195
+              <item name="GameOfLifeConway" type="b2602c69:ProjectViewProjectNode" />
196
+              <item name="GameOfLifeConway" type="462c0819:PsiDirectoryNode" />
204 197
               <item name="src" type="462c0819:PsiDirectoryNode" />
205 198
               <item name="test" type="462c0819:PsiDirectoryNode" />
206 199
               <item name="java" type="462c0819:PsiDirectoryNode" />
207 200
             </path>
208 201
             <path>
209
-              <item name="Game-Of-Life-Java" type="b2602c69:ProjectViewProjectNode" />
210
-              <item name="Game-Of-Life-Java" type="462c0819:PsiDirectoryNode" />
202
+              <item name="GameOfLifeConway" type="b2602c69:ProjectViewProjectNode" />
203
+              <item name="GameOfLifeConway" type="462c0819:PsiDirectoryNode" />
211 204
               <item name="src" type="462c0819:PsiDirectoryNode" />
212 205
               <item name="test" type="462c0819:PsiDirectoryNode" />
213 206
               <item name="java" type="462c0819:PsiDirectoryNode" />
214 207
               <item name="zipcodeconway" type="462c0819:PsiDirectoryNode" />
215 208
             </path>
209
+            <path>
210
+              <item name="GameOfLifeConway" type="b2602c69:ProjectViewProjectNode" />
211
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
212
+            </path>
216 213
           </expand>
217 214
           <select />
218 215
         </subPane>
219 216
       </pane>
220
-      <pane id="PackagesPane" />
221
-      <pane id="AndroidView" />
222
-      <pane id="Scratches" />
223 217
       <pane id="Scope" />
218
+      <pane id="AndroidView" />
224 219
     </panes>
225 220
   </component>
226 221
   <component name="PropertiesComponent">
227
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
228 222
     <property name="WebServerToolWindowFactoryState" value="false" />
229 223
     <property name="aspect.path.notification.shown" value="true" />
224
+    <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
230 225
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
231
-    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
226
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
232 227
     <property name="project.structure.last.edited" value="Modules" />
233 228
     <property name="project.structure.proportion" value="0.15" />
234 229
     <property name="project.structure.side.proportion" value="0.2" />
235
-    <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
230
+    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
236 231
   </component>
237 232
   <component name="RecentsManager">
238 233
     <key name="CreateTestDialog.RecentsKey">
@@ -260,155 +255,104 @@
260 255
       </list>
261 256
     </option>
262 257
   </component>
263
-  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest">
258
+  <component name="RunManager" selected="Application.ConwayGameOfLife">
264 259
     <configuration default="true" type="Applet" factoryName="Applet">
265
-      <option name="HTML_USED" value="false" />
266
-      <option name="WIDTH" value="400" />
267
-      <option name="HEIGHT" value="300" />
268 260
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
269
-      <module />
261
+      <method v="2">
262
+        <option name="Make" enabled="true" />
263
+      </method>
270 264
     </configuration>
271 265
     <configuration name="ConwayGameOfLife" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
272
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
266
+      <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLife" />
267
+      <module name="Game-Of-Life-Java" />
268
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
269
+      <extension name="coverage">
273 270
         <pattern>
274 271
           <option name="PATTERN" value="com.zipcodeconway.*" />
275 272
           <option name="ENABLED" value="true" />
276 273
         </pattern>
277 274
       </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 />
275
+      <method v="2">
276
+        <option name="Make" enabled="true" />
277
+      </method>
303 278
     </configuration>
304 279
     <configuration default="true" type="Application" factoryName="Application">
305
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
306
-      <option name="MAIN_CLASS_NAME" />
307
-      <option name="VM_PARAMETERS" />
308
-      <option name="PROGRAM_PARAMETERS" />
309 280
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
310
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
311
-      <option name="ALTERNATIVE_JRE_PATH" />
312
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
313
-      <option name="ENV_VARIABLES" />
314
-      <option name="PASS_PARENT_ENVS" value="true" />
315
-      <module name="" />
316
-      <envs />
281
+      <method v="2">
282
+        <option name="Make" enabled="true" />
283
+      </method>
317 284
     </configuration>
318 285
     <configuration name="ConwayGameOfLifeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
319
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
286
+      <module name="Game-Of-Life-Java" />
287
+      <extension name="coverage">
320 288
         <pattern>
321 289
           <option name="PATTERN" value="com.zipcodeconway.*" />
322 290
           <option name="ENABLED" value="true" />
323 291
         </pattern>
324 292
       </extension>
325
-      <module name="Game-Of-Life-Java" />
326
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
327
-      <option name="ALTERNATIVE_JRE_PATH" />
328 293
       <option name="PACKAGE_NAME" value="com.zipcodeconway" />
329 294
       <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 295
       <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 />
296
+      <method v="2">
297
+        <option name="Make" enabled="true" />
298
+      </method>
342 299
     </configuration>
343 300
     <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">
301
+      <module name="Game-Of-Life-Java" />
302
+      <extension name="coverage">
345 303
         <pattern>
346 304
           <option name="PATTERN" value="com.zipcodeconway.*" />
347 305
           <option name="ENABLED" value="true" />
348 306
         </pattern>
349 307
       </extension>
350
-      <module name="Game-Of-Life-Java" />
351
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
352
-      <option name="ALTERNATIVE_JRE_PATH" />
353 308
       <option name="PACKAGE_NAME" value="com.zipcodeconway" />
354 309
       <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLifeTest" />
355 310
       <option name="METHOD_NAME" value="runTest" />
356 311
       <option name="TEST_OBJECT" value="method" />
357
-      <option name="VM_PARAMETERS" value="-ea" />
358
-      <option name="PARAMETERS" />
359 312
       <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 />
313
+      <method v="2">
314
+        <option name="Make" enabled="true" />
315
+      </method>
367 316
     </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">
317
+    <configuration name="ConwayGameOfLifeTest.runTest1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
318
+      <module name="Game-Of-Life-Java" />
319
+      <extension name="coverage">
370 320
         <pattern>
371 321
           <option name="PATTERN" value="com.zipcodeconway.*" />
372 322
           <option name="ENABLED" value="true" />
373 323
         </pattern>
374 324
       </extension>
325
+      <option name="PACKAGE_NAME" value="com.zipcodeconway" />
326
+      <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLifeTest" />
327
+      <option name="METHOD_NAME" value="runTest1" />
328
+      <option name="TEST_OBJECT" value="method" />
329
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
330
+      <method v="2">
331
+        <option name="Make" enabled="true" />
332
+      </method>
333
+    </configuration>
334
+    <configuration name="ConwayGameOfLifeTest.runTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
375 335
       <module name="Game-Of-Life-Java" />
376
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
377
-      <option name="ALTERNATIVE_JRE_PATH" />
336
+      <extension name="coverage">
337
+        <pattern>
338
+          <option name="PATTERN" value="com.zipcodeconway.*" />
339
+          <option name="ENABLED" value="true" />
340
+        </pattern>
341
+      </extension>
378 342
       <option name="PACKAGE_NAME" value="com.zipcodeconway" />
379 343
       <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLifeTest" />
380 344
       <option name="METHOD_NAME" value="runTest2" />
381 345
       <option name="TEST_OBJECT" value="method" />
382
-      <option name="VM_PARAMETERS" value="-ea" />
383
-      <option name="PARAMETERS" />
384 346
       <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 />
347
+      <method v="2">
348
+        <option name="Make" enabled="true" />
349
+      </method>
392 350
     </configuration>
393 351
     <configuration default="true" type="JUnit" factoryName="JUnit">
394
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
395
-      <module name="" />
396
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
397
-      <option name="ALTERNATIVE_JRE_PATH" />
398
-      <option name="PACKAGE_NAME" />
399
-      <option name="MAIN_CLASS_NAME" />
400
-      <option name="METHOD_NAME" />
401
-      <option name="TEST_OBJECT" value="class" />
402
-      <option name="VM_PARAMETERS" value="-ea" />
403
-      <option name="PARAMETERS" />
404 352
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
405
-      <option name="ENV_VARIABLES" />
406
-      <option name="PASS_PARENT_ENVS" value="true" />
407
-      <option name="TEST_SEARCH_SCOPE">
408
-        <value defaultName="singleModule" />
409
-      </option>
410
-      <envs />
411
-      <patterns />
353
+      <method v="2">
354
+        <option name="Make" enabled="true" />
355
+      </method>
412 356
     </configuration>
413 357
     <configuration name="ConwayLife" type="MavenRunConfiguration" factoryName="Maven">
414 358
       <MavenSettings>
@@ -422,6 +366,7 @@
422 366
             <option name="goals">
423 367
               <list />
424 368
             </option>
369
+            <option name="pomFileName" />
425 370
             <option name="profilesMap">
426 371
               <map />
427 372
             </option>
@@ -430,68 +375,43 @@
430 375
           </MavenRunnerParameters>
431 376
         </option>
432 377
       </MavenSettings>
433
-    </configuration>
434
-    <configuration default="true" type="Remote" factoryName="Remote">
435
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
436
-      <option name="SERVER_MODE" value="false" />
437
-      <option name="SHMEM_ADDRESS" value="javadebug" />
438
-      <option name="HOST" value="localhost" />
439
-      <option name="PORT" value="5005" />
378
+      <method v="2" />
440 379
     </configuration>
441 380
     <configuration default="true" type="TestNG" factoryName="TestNG">
442
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
443
-      <module name="" />
444
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
445
-      <option name="ALTERNATIVE_JRE_PATH" />
446
-      <option name="SUITE_NAME" />
447
-      <option name="PACKAGE_NAME" />
448
-      <option name="MAIN_CLASS_NAME" />
449
-      <option name="METHOD_NAME" />
450
-      <option name="GROUP_NAME" />
451
-      <option name="TEST_OBJECT" value="CLASS" />
452
-      <option name="VM_PARAMETERS" value="-ea" />
453
-      <option name="PARAMETERS" />
454 381
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
455
-      <option name="OUTPUT_DIRECTORY" />
456
-      <option name="ANNOTATION_TYPE" />
457
-      <option name="ENV_VARIABLES" />
458
-      <option name="PASS_PARENT_ENVS" value="true" />
459
-      <option name="TEST_SEARCH_SCOPE">
460
-        <value defaultName="singleModule" />
461
-      </option>
462
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
463
-      <option name="PROPERTIES_FILE" />
464
-      <envs />
465 382
       <properties />
466 383
       <listeners />
384
+      <method v="2">
385
+        <option name="Make" enabled="true" />
386
+      </method>
467 387
     </configuration>
468 388
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
469 389
       <module name="" />
470 390
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
471 391
       <option name="PROGRAM_PARAMETERS" />
472 392
       <predefined_log_file id="idea.log" enabled="true" />
393
+      <method v="2">
394
+        <option name="Make" enabled="true" />
395
+      </method>
473 396
     </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" />
397
+    <list>
398
+      <item itemvalue="Maven.ConwayLife" />
399
+      <item itemvalue="Application.ConwayGameOfLife" />
400
+      <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
401
+      <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
402
+      <item itemvalue="JUnit.ConwayGameOfLifeTest" />
403
+      <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
481 404
     </list>
482 405
     <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" />
406
+      <list>
407
+        <item itemvalue="Application.ConwayGameOfLife" />
408
+        <item itemvalue="JUnit.ConwayGameOfLifeTest" />
409
+        <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
410
+        <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
411
+        <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
489 412
       </list>
490 413
     </recent_temporary>
491 414
   </component>
492
-  <component name="ShelveChangesManager" show_recycled="false">
493
-    <option name="remove_strategy" value="false" />
494
-  </component>
495 415
   <component name="SvnConfiguration">
496 416
     <configuration />
497 417
   </component>
@@ -503,19 +423,12 @@
503 423
       <option name="presentableId" value="Default" />
504 424
       <updated>1519668901598</updated>
505 425
       <workItem from="1519668902904" duration="14517000" />
426
+      <workItem from="1543032873363" duration="4771000" />
427
+      <workItem from="1543116661973" duration="2476000" />
506 428
     </task>
507 429
     <servers />
508 430
   </component>
509 431
   <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 432
     <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 03m 01s.xml">
520 433
       <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
521 434
     </history-entry>
@@ -534,41 +447,54 @@
534 447
     <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.02.26 at 15h 42m 18s.xml">
535 448
       <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
536 449
     </history-entry>
450
+    <history-entry file="ConwayGameOfLifeTest - 2018.11.23 at 23h 47m 33s.xml">
451
+      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
452
+    </history-entry>
453
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.11.23 at 23h 48m 41s.xml">
454
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
455
+    </history-entry>
456
+    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.11.23 at 23h 49m 56s.xml">
457
+      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
458
+    </history-entry>
459
+    <history-entry file="ConwayGameOfLifeTest - 2018.11.24 at 23h 55m 41s.xml">
460
+      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
461
+    </history-entry>
537 462
   </component>
538 463
   <component name="TimeTrackingManager">
539
-    <option name="totallyTimeSpent" value="14517000" />
464
+    <option name="totallyTimeSpent" value="21764000" />
540 465
   </component>
541 466
   <component name="ToolWindowManager">
542
-    <frame x="82" y="32" width="1440" height="821" extended-state="0" />
467
+    <frame x="0" y="23" width="1280" height="717" extended-state="6" />
543 468
     <editor active="true" />
544 469
     <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" />
546
-      <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" />
560
-      <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
-      <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" />
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
-      <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
-      <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
-      <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
-      <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" />
571
-      <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" />
470
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25767368" />
471
+      <window_info id="Structure" order="1" weight="0.25" />
472
+      <window_info id="Image Layers" order="2" />
473
+      <window_info id="Designer" order="3" />
474
+      <window_info id="UI Designer" order="4" />
475
+      <window_info id="Capture Tool" order="5" />
476
+      <window_info id="Favorites" order="6" side_tool="true" />
477
+      <window_info id="Learn" order="7" />
478
+      <window_info anchor="bottom" id="Message" order="0" />
479
+      <window_info anchor="bottom" id="Find" order="1" />
480
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32392028" />
481
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
482
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
483
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
484
+      <window_info anchor="bottom" id="TODO" order="6" />
485
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32970026" />
486
+      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
487
+      <window_info anchor="bottom" id="Version Control" order="9" />
488
+      <window_info anchor="bottom" id="Messages" order="10" weight="0.32724252" />
489
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
490
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
491
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
492
+      <window_info anchor="right" id="Palette" order="3" />
493
+      <window_info anchor="right" id="Capture Analysis" order="4" />
494
+      <window_info anchor="right" id="Theme Preview" order="5" />
495
+      <window_info anchor="right" id="Database" order="6" />
496
+      <window_info anchor="right" id="Palette&#9;" order="7" />
497
+      <window_info anchor="right" id="Maven Projects" order="8" />
572 498
     </layout>
573 499
   </component>
574 500
   <component name="TypeScriptGeneratedFilesManager">
@@ -577,37 +503,16 @@
577 503
   <component name="VcsContentAnnotationSettings">
578 504
     <option name="myLimit" value="2678400000" />
579 505
   </component>
580
-  <component name="XDebuggerManager">
581
-    <breakpoint-manager>
582
-      <option name="time" value="2" />
583
-    </breakpoint-manager>
584
-    <watches-manager />
585
-  </component>
586 506
   <component name="editorHistoryManager">
587 507
     <entry file="file://$PROJECT_DIR$/pom.xml">
588 508
       <provider selected="true" editor-type-id="text-editor">
589 509
         <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 />
510
+          <caret line="11" column="10" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
608 511
         </state>
609 512
       </provider>
610 513
     </entry>
514
+    <entry file="file://$PROJECT_DIR$/src/main/java/LifeStarts.java" />
515
+    <entry file="file://$PROJECT_DIR$/src/main/java/Life.java" />
611 516
     <entry file="uml://JAVA/com.zipcodeconway.ConwayGameOfLife">
612 517
       <provider selected="true" editor-type-id="UmlEditorProvider">
613 518
         <state>
@@ -629,67 +534,42 @@
629 534
         </state>
630 535
       </provider>
631 536
     </entry>
632
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/README.md">
537
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/README.md" />
538
+    <entry file="file://$USER_HOME$/Downloads/ConwayLifeRandomat50.png" />
539
+    <entry file="file://$USER_HOME$/Documents/gitea/gitea/custom/public/img/ConwayLifeUML.png" />
540
+    <entry file="file://$PROJECT_DIR$/src/main/java/GameofLife.java" />
541
+    <entry file="file://$PROJECT_DIR$/README.md">
633 542
       <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>
543
+        <state split_layout="FIRST">
544
+          <first_editor />
639 545
           <second_editor />
640 546
         </state>
641 547
       </provider>
642 548
     </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">
549
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
654 550
       <provider selected="true" editor-type-id="text-editor">
655
-        <state relative-caret-position="334">
656
-          <caret line="83" column="17" lean-forward="false" selection-start-line="82" selection-start-column="30" selection-end-line="83" selection-end-column="17" />
657
-          <folding />
551
+        <state relative-caret-position="237">
552
+          <caret line="30" column="32" lean-forward="true" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
658 553
         </state>
659 554
       </provider>
660 555
     </entry>
661
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
556
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
662 557
       <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>
558
+        <state relative-caret-position="-45">
559
+          <caret line="92" column="5" lean-forward="true" selection-start-line="92" selection-start-column="5" selection-end-line="92" selection-end-column="5" />
668 560
         </state>
669 561
       </provider>
670 562
     </entry>
671
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
563
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
672 564
       <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" />
565
+        <state relative-caret-position="360">
566
+          <caret line="45" column="46" lean-forward="true" selection-start-line="45" selection-start-column="46" selection-end-line="45" selection-end-column="46" />
675 567
           <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" />
568
+            <element signature="imports" expanded="true" />
681 569
           </folding>
682 570
         </state>
683 571
       </provider>
684 572
     </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" />
689
-          <folding />
690
-        </state>
691
-      </provider>
692
-    </entry>
693 573
   </component>
694 574
   <component name="masterDetails">
695 575
     <states>

+ 98
- 4
src/main/java/com/zipcodeconway/ConwayGameOfLife.java Просмотреть файл

@@ -1,32 +1,76 @@
1 1
 package com.zipcodeconway;
2 2
 
3
+import java.util.Random;
4
+
3 5
 public class ConwayGameOfLife {
6
+    private SimpleWindow sw;
7
+    private int[][] nextGen;
8
+    private int[][] currentGen;
9
+    private int dimension;
4 10
 
5 11
     public ConwayGameOfLife(Integer dimension) {
12
+        this.sw = new SimpleWindow(dimension);
13
+        currentGen = createRandomStart(dimension);
14
+        nextGen = new int[dimension][dimension];
15
+        this.dimension = dimension;
6 16
      }
7 17
 
8 18
     public ConwayGameOfLife(Integer dimension, int[][] startmatrix) {
19
+        this.sw = new SimpleWindow(dimension);
20
+        currentGen = startmatrix;
21
+        nextGen = new int[dimension][dimension];
22
+        this.dimension = dimension;
23
+
9 24
     }
10 25
 
11 26
     public static void main(String[] args) {
12 27
         ConwayGameOfLife sim = new ConwayGameOfLife(50);
13
-        int[][] endingWorld = sim.simulate(50);
28
+        int[][] endingWorld = sim.simulate(19);
29
+
14 30
     }
15 31
 
16 32
     // Contains the logic for the starting scenario.
17 33
     // Which cells are alive or dead in generation 0.
18 34
     // allocates and returns the starting matrix of size 'dimension'
19 35
     private int[][] createRandomStart(Integer dimension) {
20
-        return new int[1][1];
36
+        int[][] randomStart = new int[dimension][dimension];
37
+        Random rand = new Random();
38
+
39
+        for (int i = 0; i < dimension; i++) {
40
+            for (int j = 0; j < dimension; j++) {
41
+                randomStart[i][j] = rand.nextInt(2);
42
+            }
43
+        }
44
+        return randomStart;
45
+        //return new int[dimension  ][dimension  ];
21 46
     }
22 47
 
23 48
     public int[][] simulate(Integer maxGenerations) {
24
-        return new int[1][1];
49
+        for (int gen = 0; gen <= maxGenerations; gen++) {
50
+            this.sw.display(currentGen, gen);
51
+            for (int i = 0; i < currentGen.length ; i++) {
52
+                for (int j = 0; j < currentGen.length; j++) {
53
+                    nextGen[i][j] = isAlive(i, j, currentGen);
54
+                }
55
+            }
56
+            copyAndZeroOut(nextGen, currentGen);
57
+            this.sw.sleep(1250);
58
+        }
59
+        return nextGen;
60
+
61
+
25 62
     }
26 63
 
27 64
     // copy the values of 'next' matrix to 'current' matrix,
28 65
     // and then zero out the contents of 'next' matrix
29 66
     public void copyAndZeroOut(int [][] next, int[][] current) {
67
+        for (int i = 0; i < current.length; i++) {
68
+            for (int j = 0; j < current.length; j++) {
69
+                current[i][j] = next[i][j];
70
+                next[i][j] = 0;
71
+            }
72
+        }
73
+
30 74
     }
31 75
 
32 76
     // Calculate if an individual cell should be alive in the next generation.
@@ -38,6 +82,56 @@ public class ConwayGameOfLife {
38 82
 		Any dead cell with exactly three live neighbours cells will come to life.
39 83
 	*/
40 84
     private int isAlive(int row, int col, int[][] world) {
41
-        return 0;
85
+        int count = neighbors(row, col, world);
86
+        int returnValue = 0;
87
+
88
+        if (count == 3 || (world[row][col] == 1 && count == 2)) {
89
+            returnValue = 1;
90
+        }
91
+        return returnValue;
92
+
42 93
     }
94
+    private int neighbors(int row , int col, int[][] world) {
95
+        int x, y, count = 0;
96
+
97
+        for (int i = row - 1; i <= row + 1; i++) {
98
+
99
+            for (int j = col - 1; j <= col + 1; j++) {
100
+                x = i;
101
+                y = j;
102
+
103
+                if (i == -1) {
104
+                    i = dimension - 1;
105
+                } else if (i == dimension) {
106
+                    i = 0;
107
+                }
108
+
109
+                if (j == -1) {
110
+                    j = dimension - 1;
111
+                } else if (j == dimension) {
112
+                    j = 0;
113
+                }
114
+
115
+                if (world[i][j] == 1 && (!(i == row && j == col))) {
116
+                    count++;
117
+                }
118
+
119
+                i = x;
120
+                j = y;
121
+            }
122
+        }
123
+        return count;
124
+    }
125
+    @Override
126
+    public String toString() {
127
+        StringBuilder sb = new StringBuilder();
128
+        for (int[] aCurrentGen : currentGen) {
129
+            for (int j = 0; j < currentGen.length; j++) {
130
+                sb.append(aCurrentGen[j]);
131
+            }
132
+        }
133
+
134
+        return sb.toString();
135
+    }
136
+
43 137
 }

+ 2
- 2
src/main/java/com/zipcodeconway/SimpleWindow.java Просмотреть файл

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