Quellcode durchsuchen

Merge 1986d02ccf48bc17711c75a2d313a3494754517c into 2286bf332a6a66859fa1ab1a7063f5e3ecc912fc

Haysel Giovanni Santiago vor 6 Jahren
Ursprung
Commit
7314edd15b
Es ist kein Account mit dieser Commiter-Email verbunden

+ 1
- 0
.idea/.name Datei anzeigen

1
+Game-Of-Life-Java

+ 3
- 1
.idea/misc.xml Datei anzeigen

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

+ 1
- 1
.idea/modules.xml Datei anzeigen

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

+ 0
- 124
.idea/uiDesigner.xml Datei anzeigen

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

+ 1
- 1
.idea/vcs.xml Datei anzeigen

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

+ 110
- 430
.idea/workspace.xml Datei anzeigen

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

.idea/Game-Of-Life-Java.iml → Game-Of-Life-Java.iml Datei anzeigen

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

BIN
Screen Shot 2018-03-12 at 6.19.12 PM.png Datei anzeigen


+ 84
- 5
src/main/java/com/zipcodeconway/ConwayGameOfLife.java Datei anzeigen

1
 package com.zipcodeconway;
1
 package com.zipcodeconway;
2
 
2
 
3
+import sun.java2d.pipe.SpanShapeRenderer;
4
+
3
 public class ConwayGameOfLife {
5
 public class ConwayGameOfLife {
6
+    private SimpleWindow displayWindow;
7
+    private int[][] currentGen;
8
+    private int[][] nextGen;
4
 
9
 
5
     public ConwayGameOfLife(Integer dimension) {
10
     public ConwayGameOfLife(Integer dimension) {
6
-     }
11
+        this.displayWindow = new SimpleWindow(dimension);
12
+        this.currentGen = createRandomStart(dimension);
13
+        this.nextGen = new int[dimension][dimension];
14
+    }
7
 
15
 
8
     public ConwayGameOfLife(Integer dimension, int[][] startmatrix) {
16
     public ConwayGameOfLife(Integer dimension, int[][] startmatrix) {
17
+        this.displayWindow = new SimpleWindow(dimension);
18
+        this.currentGen = startmatrix;
19
+        this.nextGen = new int[dimension][dimension];
9
     }
20
     }
10
 
21
 
11
     public static void main(String[] args) {
22
     public static void main(String[] args) {
17
     // Which cells are alive or dead in generation 0.
28
     // Which cells are alive or dead in generation 0.
18
     // allocates and returns the starting matrix of size 'dimension'
29
     // allocates and returns the starting matrix of size 'dimension'
19
     private int[][] createRandomStart(Integer dimension) {
30
     private int[][] createRandomStart(Integer dimension) {
20
-        return new int[1][1];
31
+        int[][] newArray = new int[dimension][dimension];
32
+        for (int row = 0; row < newArray.length; row++) {
33
+            for (int col = 0; col < newArray.length; col++) {
34
+                newArray[row][col] = (int) Math.round(Math.random());
35
+            }
36
+        }
37
+        return newArray;
21
     }
38
     }
22
 
39
 
23
     public int[][] simulate(Integer maxGenerations) {
40
     public int[][] simulate(Integer maxGenerations) {
24
-        return new int[1][1];
41
+        int generations = 0;
42
+        while (generations <= maxGenerations) {
43
+            this.displayWindow.display(currentGen, generations);
44
+            for (int row = 0; row < currentGen.length; row++) { //upating currentGen to nextGeneration
45
+                for (int col = 0; col < currentGen.length; col++) {
46
+                    nextGen[row][col] = isAlive(row, col, currentGen);
47
+                }
48
+            }
49
+            copyAndZeroOut(nextGen, currentGen);
50
+            this.displayWindow.sleep(125);
51
+            generations++;
52
+        }
53
+        return currentGen;
25
     }
54
     }
26
 
55
 
27
     // copy the values of 'next' matrix to 'current' matrix,
56
     // copy the values of 'next' matrix to 'current' matrix,
28
     // and then zero out the contents of 'next' matrix
57
     // and then zero out the contents of 'next' matrix
29
-    public void copyAndZeroOut(int [][] next, int[][] current) {
58
+    public void copyAndZeroOut(int[][] next, int[][] current) {
59
+        for (int row = 0; row < next.length; row++) {
60
+            for (int col = 0; col < current.length; col++) {
61
+                current[row][col] = next[row][col];
62
+                next[row][col] = 0;
63
+            }
64
+        }
30
     }
65
     }
31
 
66
 
32
     // Calculate if an individual cell should be alive in the next generation.
67
     // Calculate if an individual cell should be alive in the next generation.
38
 		Any dead cell with exactly three live neighbours cells will come to life.
73
 		Any dead cell with exactly three live neighbours cells will come to life.
39
 	*/
74
 	*/
40
     private int isAlive(int row, int col, int[][] world) {
75
     private int isAlive(int row, int col, int[][] world) {
41
-        return 0;
76
+        int north = col - 1;
77
+        int east = row + 1;
78
+        int south = col + 1;
79
+        int west = row - 1;
80
+        int countNeighborsAlive = 0;
81
+
82
+        //these will wrap around the world in order to handle edge cases
83
+        if (north < 0) {
84
+            north = world.length - 1;
85
+        }
86
+        if (west < 0) {
87
+            west = world.length - 1;
88
+        }
89
+        if (south == world.length) {
90
+            south = 0;
91
+        }
92
+        if (east == world.length) {
93
+            east = 0;
94
+        }
95
+
96
+        //checking how many neighbors are alive
97
+
98
+        if (world[east][north] == 1) countNeighborsAlive++;
99
+        if (world[east][south] == 1) countNeighborsAlive++;
100
+        if (world[east][col] == 1) countNeighborsAlive++;
101
+
102
+        if (world[west][north] == 1) countNeighborsAlive++;
103
+        if (world[west][south] == 1) countNeighborsAlive++;
104
+        if (world[west][col] == 1) countNeighborsAlive++;
105
+
106
+        if (world[row][north] == 1) countNeighborsAlive++;
107
+        if (world[row][south] == 1) countNeighborsAlive++;
108
+
109
+        if (countNeighborsAlive < 2 || countNeighborsAlive > 3) {
110
+            return 0;
111
+        } else if (countNeighborsAlive == 3) {
112
+            return 1;
113
+        } else
114
+            return world[row][col];
42
     }
115
     }
43
 }
116
 }
117
+    /*
118
+		Any live cell with fewer than two live neighbours dies, as if by needs caused by underpopulation.
119
+		Any live cell with more than three live neighbours dies, as if by overcrowding.
120
+		Any live cell with two or three live neighbours lives, unchanged, to the next generation.
121
+		Any dead cell with exactly three live neighbours cells will come to life.
122
+	*/

+ 3
- 4
src/main/java/com/zipcodeconway/SimpleWindow.java Datei anzeigen

39
             for (int j = 0; j < array[0].length; j++) {
39
             for (int j = 0; j < array[0].length; j++) {
40
                 g.drawRect(i * BOX_DIM, j * BOX_DIM, 10, 10);
40
                 g.drawRect(i * BOX_DIM, j * BOX_DIM, 10, 10);
41
                 if (array[i][j] == 0) {
41
                 if (array[i][j] == 0) {
42
-                    g.setColor(Color.WHITE);
42
+                    g.setColor(Color.GRAY);
43
                     g.fillRect(i * BOX_DIM, j * BOX_DIM, 10, 10);
43
                     g.fillRect(i * BOX_DIM, j * BOX_DIM, 10, 10);
44
                 }
44
                 }
45
                 if (array[i][j] == 1) {
45
                 if (array[i][j] == 1) {
46
-                    g.setColor(Color.BLACK);
46
+                    g.setColor(Color.GREEN);
47
                     g.fillRect(i * BOX_DIM, j * BOX_DIM, 10, 10);
47
                     g.fillRect(i * BOX_DIM, j * BOX_DIM, 10, 10);
48
                 }
48
                 }
49
             }
49
             }
50
         }
50
         }
51
-
52
     }
51
     }
53
-}
52
+}