Rachelle 6 年 前
コミット
383bde6282
共有2 個のファイルを変更した273 個の追加276 個の削除を含む
  1. 196
    272
      .idea/workspace.xml
  2. 77
    4
      src/main/java/com/zipcodeconway/ConwayGameOfLife.java

+ 196
- 272
.idea/workspace.xml ファイルの表示

@@ -1,7 +1,10 @@
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
+    </list>
5 8
     <ignored path="$PROJECT_DIR$/target/" />
6 9
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7 10
     <option name="TRACKING_ENABLED" value="true" />
@@ -11,12 +14,12 @@
11 14
     <option name="LAST_RESOLUTION" value="IGNORE" />
12 15
   </component>
13 16
   <component name="FileEditorManager">
14
-    <leaf>
17
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
15 18
       <file leaf-file-name="SimpleWindow.java" pinned="false" current-in-tab="false">
16 19
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
17 20
           <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" />
21
+            <state relative-caret-position="540">
22
+              <caret line="37" selection-start-line="37" selection-end-line="37" />
20 23
               <folding>
21 24
                 <element signature="imports" expanded="true" />
22 25
               </folding>
@@ -27,61 +30,20 @@
27 30
       <file leaf-file-name="ConwayGameOfLife.java" pinned="false" current-in-tab="false">
28 31
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
29 32
           <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" />
33
+            <state relative-caret-position="615">
34
+              <caret line="42" column="28" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="28" />
32 35
               <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" />
36
+                <element signature="imports" expanded="true" />
38 37
               </folding>
39 38
             </state>
40 39
           </provider>
41 40
         </entry>
42 41
       </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 42
       <file leaf-file-name="ConwayGameOfLifeTest.java" pinned="false" current-in-tab="true">
80 43
         <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
81 44
           <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 />
45
+            <state relative-caret-position="49">
46
+              <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="15" selection-end-column="33" />
85 47
             </state>
86 48
           </provider>
87 49
         </entry>
@@ -109,11 +71,6 @@
109 71
   <component name="Git.Settings">
110 72
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
111 73
   </component>
112
-  <component name="GradleLocalSettings">
113
-    <option name="externalProjectsViewState">
114
-      <projects_view />
115
-    </option>
116
-  </component>
117 74
   <component name="IdeDocumentHistory">
118 75
     <option name="CHANGED_PATHS">
119 76
       <list>
@@ -125,9 +82,9 @@
125 82
         <option value="$PROJECT_DIR$/src/main/java/SimpleWindow.java" />
126 83
         <option value="$PROJECT_DIR$/src/main/java/ConwayGameOfLife.java" />
127 84
         <option value="$PROJECT_DIR$/src/main/java/Life.java" />
128
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" />
129 85
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java" />
130 86
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/README.md" />
87
+        <option value="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" />
131 88
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" />
132 89
       </list>
133 90
     </option>
@@ -138,27 +95,27 @@
138 95
     <detection-done>true</detection-done>
139 96
     <sorting>DEFINITION_ORDER</sorting>
140 97
   </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" />
98
+  <component name="MavenImportPreferences">
99
+    <option name="importingSettings">
100
+      <MavenImportingSettings>
101
+        <option name="importAutomatically" value="true" />
102
+      </MavenImportingSettings>
103
+    </option>
104
+  </component>
105
+  <component name="NodePackageJsonFileManager">
106
+    <packageJsonPaths />
107
+  </component>
108
+  <component name="ProjectFrameBounds" extendedState="6">
109
+    <option name="y" value="23" />
110
+    <option name="width" value="1280" />
111
+    <option name="height" value="709" />
146 112
   </component>
147 113
   <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 />
114
+    <navigator proportions="" version="1">
159 115
       <foldersAlwaysOnTop value="true" />
160 116
     </navigator>
161 117
     <panes>
118
+      <pane id="Scope" />
162 119
       <pane id="ProjectPane">
163 120
         <subPane>
164 121
           <expand>
@@ -217,22 +174,20 @@
217 174
           <select />
218 175
         </subPane>
219 176
       </pane>
220
-      <pane id="PackagesPane" />
221 177
       <pane id="AndroidView" />
222
-      <pane id="Scratches" />
223
-      <pane id="Scope" />
178
+      <pane id="PackagesPane" />
224 179
     </panes>
225 180
   </component>
226 181
   <component name="PropertiesComponent">
227
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
228 182
     <property name="WebServerToolWindowFactoryState" value="false" />
229 183
     <property name="aspect.path.notification.shown" value="true" />
184
+    <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
230 185
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
231
-    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
186
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
232 187
     <property name="project.structure.last.edited" value="Modules" />
233 188
     <property name="project.structure.proportion" value="0.15" />
234 189
     <property name="project.structure.side.proportion" value="0.2" />
235
-    <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
190
+    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
236 191
   </component>
237 192
   <component name="RecentsManager">
238 193
     <key name="CreateTestDialog.RecentsKey">
@@ -260,69 +215,32 @@
260 215
       </list>
261 216
     </option>
262 217
   </component>
263
-  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest">
218
+  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest.runTest1">
264 219
     <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 220
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
269
-      <module />
270 221
     </configuration>
271 222
     <configuration name="ConwayGameOfLife" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
272
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
223
+      <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLife" />
224
+      <module name="Game-Of-Life-Java" />
225
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
226
+      <extension name="coverage">
273 227
         <pattern>
274 228
           <option name="PATTERN" value="com.zipcodeconway.*" />
275 229
           <option name="ENABLED" value="true" />
276 230
         </pattern>
277 231
       </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 232
     </configuration>
304 233
     <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 234
       <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 />
317 235
     </configuration>
318 236
     <configuration name="ConwayGameOfLifeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
319
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
237
+      <module name="Game-Of-Life-Java" />
238
+      <extension name="coverage">
320 239
         <pattern>
321 240
           <option name="PATTERN" value="com.zipcodeconway.*" />
322 241
           <option name="ENABLED" value="true" />
323 242
         </pattern>
324 243
       </extension>
325
-      <module name="Game-Of-Life-Java" />
326 244
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
327 245
       <option name="ALTERNATIVE_JRE_PATH" />
328 246
       <option name="PACKAGE_NAME" value="com.zipcodeconway" />
@@ -332,22 +250,20 @@
332 250
       <option name="VM_PARAMETERS" value="-ea" />
333 251
       <option name="PARAMETERS" />
334 252
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
335
-      <option name="ENV_VARIABLES" />
336 253
       <option name="PASS_PARENT_ENVS" value="true" />
337 254
       <option name="TEST_SEARCH_SCOPE">
338 255
         <value defaultName="singleModule" />
339 256
       </option>
340
-      <envs />
341 257
       <patterns />
342 258
     </configuration>
343 259
     <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">
260
+      <module name="Game-Of-Life-Java" />
261
+      <extension name="coverage">
345 262
         <pattern>
346 263
           <option name="PATTERN" value="com.zipcodeconway.*" />
347 264
           <option name="ENABLED" value="true" />
348 265
         </pattern>
349 266
       </extension>
350
-      <module name="Game-Of-Life-Java" />
351 267
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
352 268
       <option name="ALTERNATIVE_JRE_PATH" />
353 269
       <option name="PACKAGE_NAME" value="com.zipcodeconway" />
@@ -357,22 +273,43 @@
357 273
       <option name="VM_PARAMETERS" value="-ea" />
358 274
       <option name="PARAMETERS" />
359 275
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
360
-      <option name="ENV_VARIABLES" />
361 276
       <option name="PASS_PARENT_ENVS" value="true" />
362 277
       <option name="TEST_SEARCH_SCOPE">
363 278
         <value defaultName="singleModule" />
364 279
       </option>
365
-      <envs />
366 280
       <patterns />
367 281
     </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">
282
+    <configuration name="ConwayGameOfLifeTest.runTest1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
283
+      <module name="Game-Of-Life-Java" />
284
+      <extension name="coverage">
370 285
         <pattern>
371 286
           <option name="PATTERN" value="com.zipcodeconway.*" />
372 287
           <option name="ENABLED" value="true" />
373 288
         </pattern>
374 289
       </extension>
290
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
291
+      <option name="ALTERNATIVE_JRE_PATH" />
292
+      <option name="PACKAGE_NAME" value="com.zipcodeconway" />
293
+      <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLifeTest" />
294
+      <option name="METHOD_NAME" value="runTest1" />
295
+      <option name="TEST_OBJECT" value="method" />
296
+      <option name="VM_PARAMETERS" value="-ea" />
297
+      <option name="PARAMETERS" />
298
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
299
+      <option name="PASS_PARENT_ENVS" value="true" />
300
+      <option name="TEST_SEARCH_SCOPE">
301
+        <value defaultName="singleModule" />
302
+      </option>
303
+      <patterns />
304
+    </configuration>
305
+    <configuration name="ConwayGameOfLifeTest.runTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
375 306
       <module name="Game-Of-Life-Java" />
307
+      <extension name="coverage">
308
+        <pattern>
309
+          <option name="PATTERN" value="com.zipcodeconway.*" />
310
+          <option name="ENABLED" value="true" />
311
+        </pattern>
312
+      </extension>
376 313
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
377 314
       <option name="ALTERNATIVE_JRE_PATH" />
378 315
       <option name="PACKAGE_NAME" value="com.zipcodeconway" />
@@ -382,17 +319,13 @@
382 319
       <option name="VM_PARAMETERS" value="-ea" />
383 320
       <option name="PARAMETERS" />
384 321
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
385
-      <option name="ENV_VARIABLES" />
386 322
       <option name="PASS_PARENT_ENVS" value="true" />
387 323
       <option name="TEST_SEARCH_SCOPE">
388 324
         <value defaultName="singleModule" />
389 325
       </option>
390
-      <envs />
391 326
       <patterns />
392 327
     </configuration>
393 328
     <configuration default="true" type="JUnit" factoryName="JUnit">
394
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
395
-      <module name="" />
396 329
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
397 330
       <option name="ALTERNATIVE_JRE_PATH" />
398 331
       <option name="PACKAGE_NAME" />
@@ -402,12 +335,10 @@
402 335
       <option name="VM_PARAMETERS" value="-ea" />
403 336
       <option name="PARAMETERS" />
404 337
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
405
-      <option name="ENV_VARIABLES" />
406 338
       <option name="PASS_PARENT_ENVS" value="true" />
407 339
       <option name="TEST_SEARCH_SCOPE">
408 340
         <value defaultName="singleModule" />
409 341
       </option>
410
-      <envs />
411 342
       <patterns />
412 343
     </configuration>
413 344
     <configuration name="ConwayLife" type="MavenRunConfiguration" factoryName="Maven">
@@ -422,6 +353,7 @@
422 353
             <option name="goals">
423 354
               <list />
424 355
             </option>
356
+            <option name="pomFileName" />
425 357
             <option name="profilesMap">
426 358
               <map />
427 359
             </option>
@@ -431,16 +363,7 @@
431 363
         </option>
432 364
       </MavenSettings>
433 365
     </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" />
440
-    </configuration>
441 366
     <configuration default="true" type="TestNG" factoryName="TestNG">
442
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
443
-      <module name="" />
444 367
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
445 368
       <option name="ALTERNATIVE_JRE_PATH" />
446 369
       <option name="SUITE_NAME" />
@@ -453,45 +376,33 @@
453 376
       <option name="PARAMETERS" />
454 377
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
455 378
       <option name="OUTPUT_DIRECTORY" />
456
-      <option name="ANNOTATION_TYPE" />
457
-      <option name="ENV_VARIABLES" />
458 379
       <option name="PASS_PARENT_ENVS" value="true" />
459 380
       <option name="TEST_SEARCH_SCOPE">
460 381
         <value defaultName="singleModule" />
461 382
       </option>
462 383
       <option name="USE_DEFAULT_REPORTERS" value="false" />
463 384
       <option name="PROPERTIES_FILE" />
464
-      <envs />
465 385
       <properties />
466 386
       <listeners />
467 387
     </configuration>
468
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
469
-      <module name="" />
470
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
471
-      <option name="PROGRAM_PARAMETERS" />
472
-      <predefined_log_file id="idea.log" enabled="true" />
473
-    </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" />
388
+    <list>
389
+      <item itemvalue="Maven.ConwayLife" />
390
+      <item itemvalue="Application.ConwayGameOfLife" />
391
+      <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
392
+      <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
393
+      <item itemvalue="JUnit.ConwayGameOfLifeTest" />
394
+      <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
481 395
     </list>
482 396
     <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" />
397
+      <list>
398
+        <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
399
+        <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
400
+        <item itemvalue="Application.ConwayGameOfLife" />
401
+        <item itemvalue="JUnit.ConwayGameOfLifeTest" />
402
+        <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
489 403
       </list>
490 404
     </recent_temporary>
491 405
   </component>
492
-  <component name="ShelveChangesManager" show_recycled="false">
493
-    <option name="remove_strategy" value="false" />
494
-  </component>
495 406
   <component name="SvnConfiguration">
496 407
     <configuration />
497 408
   </component>
@@ -503,72 +414,77 @@
503 414
       <option name="presentableId" value="Default" />
504 415
       <updated>1519668901598</updated>
505 416
       <workItem from="1519668902904" duration="14517000" />
417
+      <workItem from="1529520941007" duration="9029000" />
418
+      <workItem from="1529602971379" duration="512000" />
506 419
     </task>
507 420
     <servers />
508 421
   </component>
509 422
   <component name="TestHistory">
510
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 15h 45m 01s.xml">
511
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
423
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.20 at 17h 33m 39s.xml">
424
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
512 425
     </history-entry>
513
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 15h 59m 00s.xml">
514
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
426
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.20 at 17h 35m 00s.xml">
427
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
515 428
     </history-entry>
516
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 02m 03s.xml">
517
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
429
+    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.06.20 at 17h 35m 09s.xml">
430
+      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
518 431
     </history-entry>
519
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 03m 01s.xml">
520
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
432
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.20 at 17h 35m 39s.xml">
433
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
521 434
     </history-entry>
522
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 05m 07s.xml">
523
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
435
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.20 at 17h 38m 19s.xml">
436
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
524 437
     </history-entry>
525
-    <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 06m 11s.xml">
526
-      <configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
438
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.20 at 17h 38m 40s.xml">
439
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
527 440
     </history-entry>
528
-    <history-entry file="ConwayGameOfLifeTest_runTest - 2018.02.26 at 15h 41m 14s.xml">
529
-      <configuration name="ConwayGameOfLifeTest.runTest" configurationId="JUnit" />
441
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.20 at 17h 43m 48s.xml">
442
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
530 443
     </history-entry>
531
-    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.02.26 at 15h 42m 02s.xml">
444
+    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.06.20 at 17h 44m 01s.xml">
532 445
       <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
533 446
     </history-entry>
534
-    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.02.26 at 15h 42m 18s.xml">
535
-      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
447
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.20 at 17h 44m 22s.xml">
448
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
449
+    </history-entry>
450
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.06.20 at 17h 44m 42s.xml">
451
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
536 452
     </history-entry>
537 453
   </component>
538 454
   <component name="TimeTrackingManager">
539
-    <option name="totallyTimeSpent" value="14517000" />
455
+    <option name="totallyTimeSpent" value="24058000" />
540 456
   </component>
541 457
   <component name="ToolWindowManager">
542
-    <frame x="82" y="32" width="1440" height="821" extended-state="0" />
543
-    <editor active="true" />
458
+    <frame x="0" y="23" width="1280" height="709" extended-state="6" />
544 459
     <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" />
460
+      <window_info anchor="right" id="Palette" order="3" />
461
+      <window_info anchor="bottom" id="TODO" order="6" />
462
+      <window_info anchor="right" id="Palette&#9;" order="3" />
463
+      <window_info id="Image Layers" order="2" />
464
+      <window_info anchor="right" id="Capture Analysis" order="3" />
465
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50078124" side_tool="true" weight="0.32440946" />
466
+      <window_info anchor="right" id="Maven Projects" order="3" />
467
+      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
468
+      <window_info anchor="bottom" id="Version Control" order="7" />
469
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49921876" weight="0.32440946" />
470
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32970026" />
471
+      <window_info id="Capture Tool" order="2" />
472
+      <window_info id="Designer" order="2" />
473
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.134375" />
474
+      <window_info anchor="right" id="Database" order="3" />
475
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
476
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
477
+      <window_info id="UI Designer" order="2" />
478
+      <window_info anchor="right" id="Theme Preview" order="3" />
479
+      <window_info id="Favorites" order="2" side_tool="true" />
480
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
481
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
482
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
483
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
484
+      <window_info anchor="bottom" id="Message" order="0" />
485
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
486
+      <window_info anchor="bottom" id="Find" order="1" />
487
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.32833788" />
572 488
     </layout>
573 489
   </component>
574 490
   <component name="TypeScriptGeneratedFilesManager">
@@ -579,35 +495,73 @@
579 495
   </component>
580 496
   <component name="XDebuggerManager">
581 497
     <breakpoint-manager>
582
-      <option name="time" value="2" />
498
+      <option name="time" value="13" />
583 499
     </breakpoint-manager>
584
-    <watches-manager />
585 500
   </component>
586 501
   <component name="editorHistoryManager">
587
-    <entry file="file://$PROJECT_DIR$/pom.xml">
502
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
588 503
       <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 />
504
+        <state relative-caret-position="540">
505
+          <caret line="37" selection-start-line="37" selection-end-line="37" />
506
+          <folding>
507
+            <element signature="imports" expanded="true" />
508
+          </folding>
509
+        </state>
510
+      </provider>
511
+    </entry>
512
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
513
+      <provider selected="true" editor-type-id="text-editor">
514
+        <state relative-caret-position="615">
515
+          <caret line="42" column="28" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="28" />
516
+          <folding>
517
+            <element signature="imports" expanded="true" />
518
+          </folding>
519
+        </state>
520
+      </provider>
521
+    </entry>
522
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
523
+      <provider selected="true" editor-type-id="text-editor">
524
+        <state relative-caret-position="120">
525
+          <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="15" selection-end-column="33" />
526
+        </state>
527
+      </provider>
528
+    </entry>
529
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
530
+      <provider selected="true" editor-type-id="text-editor">
531
+        <state relative-caret-position="240">
532
+          <caret line="17" column="42" selection-start-line="17" selection-start-column="42" selection-end-line="17" selection-end-column="42" />
533
+          <folding>
534
+            <element signature="imports" expanded="true" />
535
+          </folding>
536
+        </state>
537
+      </provider>
538
+    </entry>
539
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
540
+      <provider selected="true" editor-type-id="text-editor">
541
+        <state relative-caret-position="300">
542
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
543
+          <folding>
544
+            <element signature="imports" expanded="true" />
545
+          </folding>
592 546
         </state>
593 547
       </provider>
594 548
     </entry>
595
-    <entry file="file://$PROJECT_DIR$/src/main/java/LifeStarts.java">
549
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
596 550
       <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 />
551
+        <state relative-caret-position="450">
552
+          <caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
600 553
         </state>
601 554
       </provider>
602 555
     </entry>
603
-    <entry file="file://$PROJECT_DIR$/src/main/java/Life.java">
556
+    <entry file="file://$PROJECT_DIR$/pom.xml">
604 557
       <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 />
558
+        <state relative-caret-position="187">
559
+          <caret line="11" column="10" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
608 560
         </state>
609 561
       </provider>
610 562
     </entry>
563
+    <entry file="file://$PROJECT_DIR$/src/main/java/LifeStarts.java" />
564
+    <entry file="file://$PROJECT_DIR$/src/main/java/Life.java" />
611 565
     <entry file="uml://JAVA/com.zipcodeconway.ConwayGameOfLife">
612 566
       <provider selected="true" editor-type-id="UmlEditorProvider">
613 567
         <state>
@@ -629,39 +583,14 @@
629 583
         </state>
630 584
       </provider>
631 585
     </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">
654
-      <provider selected="true" editor-type-id="text-editor">
655
-        <state relative-caret-position="334">
656
-          <caret line="83" column="17" lean-forward="false" selection-start-line="82" selection-start-column="30" selection-end-line="83" selection-end-column="17" />
657
-          <folding />
658
-        </state>
659
-      </provider>
660
-    </entry>
586
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/README.md" />
587
+    <entry file="file://$USER_HOME$/Downloads/ConwayLifeRandomat50.png" />
588
+    <entry file="file://$USER_HOME$/Documents/gitea/gitea/custom/public/img/ConwayLifeUML.png" />
589
+    <entry file="file://$PROJECT_DIR$/src/main/java/GameofLife.java" />
661 590
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
662 591
       <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" />
592
+        <state relative-caret-position="540">
593
+          <caret line="37" selection-start-line="37" selection-end-line="37" />
665 594
           <folding>
666 595
             <element signature="imports" expanded="true" />
667 596
           </folding>
@@ -670,23 +599,18 @@
670 599
     </entry>
671 600
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
672 601
       <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" />
602
+        <state relative-caret-position="615">
603
+          <caret line="42" column="28" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="28" />
675 604
           <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" />
605
+            <element signature="imports" expanded="true" />
681 606
           </folding>
682 607
         </state>
683 608
       </provider>
684 609
     </entry>
685 610
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
686 611
       <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 />
612
+        <state relative-caret-position="49">
613
+          <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="15" selection-end-column="33" />
690 614
         </state>
691 615
       </provider>
692 616
     </entry>

+ 77
- 4
src/main/java/com/zipcodeconway/ConwayGameOfLife.java ファイルの表示

@@ -1,11 +1,24 @@
1 1
 package com.zipcodeconway;
2 2
 
3
+import java.net.Inet4Address;
4
+import java.util.Arrays;
5
+
3 6
 public class ConwayGameOfLife {
7
+    SimpleWindow simpleWindow;
8
+    int[][] currentGeneration;
9
+    int[][] nextGeneration;
4 10
 
5 11
     public ConwayGameOfLife(Integer dimension) {
6
-     }
12
+        simpleWindow = new SimpleWindow(dimension);
13
+        nextGeneration = new int[dimension][dimension];
14
+        currentGeneration = createRandomStart(dimension);
15
+    }
7 16
 
8 17
     public ConwayGameOfLife(Integer dimension, int[][] startmatrix) {
18
+        simpleWindow = new SimpleWindow(dimension);
19
+        nextGeneration = new int[dimension][dimension];
20
+        currentGeneration = createRandomStart(dimension);
21
+        currentGeneration = startmatrix;
9 22
     }
10 23
 
11 24
     public static void main(String[] args) {
@@ -17,16 +30,39 @@ public class ConwayGameOfLife {
17 30
     // Which cells are alive or dead in generation 0.
18 31
     // allocates and returns the starting matrix of size 'dimension'
19 32
     private int[][] createRandomStart(Integer dimension) {
20
-        return new int[1][1];
33
+        int[][] random = new int[dimension][dimension];
34
+        for (int i = 0; i < random.length; i++) {
35
+            for (int j = 0; j < random.length; j++) {
36
+                random[i][j] = (int) Math.round(Math.random());
37
+            }
38
+        }
39
+        return random;
21 40
     }
22 41
 
23 42
     public int[][] simulate(Integer maxGenerations) {
24
-        return new int[1][1];
43
+        for (int i = 1; i <= maxGenerations; i++) {
44
+            simpleWindow.display(currentGeneration, i);
45
+            for (int j = 0; j < currentGeneration.length; j++) {
46
+                for (int k = 0; k < currentGeneration.length; k++) {
47
+                    nextGeneration[j][k] = isAlive(j,k,currentGeneration);
48
+                }
49
+            }
50
+            copyAndZeroOut(nextGeneration,currentGeneration);
51
+            simpleWindow.sleep(500);
52
+        }
53
+        System.out.println(Arrays.toString(currentGeneration));
54
+        return currentGeneration;
25 55
     }
26 56
 
27 57
     // copy the values of 'next' matrix to 'current' matrix,
28 58
     // and then zero out the contents of 'next' matrix
29
-    public void copyAndZeroOut(int [][] next, int[][] current) {
59
+    public void copyAndZeroOut(int[][] next, int[][] current) {
60
+        for (int i = 0; i < current.length; i++) {
61
+            for (int j = 0; j < current.length; j++) {
62
+                current[i][j] = next[i][j];
63
+                next[i][j] = 0;
64
+            }
65
+        }
30 66
     }
31 67
 
32 68
     // Calculate if an individual cell should be alive in the next generation.
@@ -38,6 +74,43 @@ public class ConwayGameOfLife {
38 74
 		Any dead cell with exactly three live neighbours cells will come to life.
39 75
 	*/
40 76
     private int isAlive(int row, int col, int[][] world) {
77
+        int numberOfNeighbors = countOfNeighborCells(row, col, world);
78
+        boolean amAlive = amIAliveRightNow(row, col, world);
79
+        if (numberOfNeighbors == 3 && !amAlive) {
80
+            return 1;
81
+        } else if ((numberOfNeighbors == 2) || (numberOfNeighbors == 3) && amAlive) {
82
+            return 1;
83
+        }
41 84
         return 0;
42 85
     }
86
+
87
+    private int countOfNeighborCells(int row, int col, int[][] world) {
88
+        //System.out.println("count neighbor");
89
+        int countOfLiveCells = 0;
90
+        for (int i = -1; i < 2; i++) {
91
+            //System.out.println("hi");
92
+            for (int j = -1; j < 2; j++) {
93
+                //System.out.println("world");
94
+                if ((row+i < world.length) && (row+i >= 0) && (col+j < world.length) && (col+j >= 0)) {
95
+                    if((world[row + i][col + j] == 1)) {
96
+                        countOfLiveCells++;
97
+                    }
98
+                }
99
+
100
+            }
101
+        }
102
+        if (amIAliveRightNow(row, col, world)) {
103
+            countOfLiveCells--;
104
+        }
105
+        return countOfLiveCells;
106
+    }
107
+
108
+    private boolean amIAliveRightNow(int row, int col, int[][] world) {
109
+        //System.out.println("outside" + world[row][col] + row + col);
110
+        if (world[row][col] == 1) {
111
+            //System.out.println("conditional" + world[row][col]);
112
+            return true;
113
+        }
114
+        return false;
115
+    }
43 116
 }