Bladeren bron

updating arrays

Whitney Martinez 6 jaren geleden
bovenliggende
commit
fa82708af9

+ 1
- 1
arraz/.idea/compiler.xml Bestand weergeven

@@ -10,7 +10,7 @@
10 10
       </profile>
11 11
     </annotationProcessing>
12 12
     <bytecodeTargetLevel>
13
-      <module name="arraz" target="6" />
13
+      <module name="arraz" target="8" />
14 14
     </bytecodeTargetLevel>
15 15
   </component>
16 16
 </project>

+ 200
- 93
arraz/.idea/workspace.xml Bestand weergeven

@@ -2,7 +2,14 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="88ea8df4-5dbc-49b8-b3df-2eb51cffc0b3" name="Default Changelist" comment="">
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/MinMax1.java" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/src/test/java/MinMaxTest.java" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/src/main/java/Arraz.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Arraz.java" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/src/main/java/MinMax.java" beforeDir="false" />
5 11
       <change beforePath="$PROJECT_DIR$/src/main/java/MoreArrayc.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/MoreArrayc.java" afterDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/src/test/java/ArrazTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/ArrazTest.java" afterDir="false" />
6 13
       <change beforePath="$PROJECT_DIR$/src/test/java/MoreArraysTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/MoreArraysTest.java" afterDir="false" />
7 14
     </list>
8 15
     <ignored path="$PROJECT_DIR$/target/" />
@@ -22,24 +29,26 @@
22 29
       </usages-collector>
23 30
       <usages-collector id="statistics.file.extensions.open">
24 31
         <counts>
25
-          <entry key="java" value="17" />
32
+          <entry key="class" value="3" />
33
+          <entry key="java" value="43" />
26 34
           <entry key="md" value="2" />
27 35
         </counts>
28 36
       </usages-collector>
29 37
       <usages-collector id="statistics.file.types.open">
30 38
         <counts>
31
-          <entry key="JAVA" value="17" />
39
+          <entry key="CLASS" value="3" />
40
+          <entry key="JAVA" value="43" />
32 41
           <entry key="Markdown" value="2" />
33 42
         </counts>
34 43
       </usages-collector>
35 44
       <usages-collector id="statistics.file.extensions.edit">
36 45
         <counts>
37
-          <entry key="java" value="7371" />
46
+          <entry key="java" value="10714" />
38 47
         </counts>
39 48
       </usages-collector>
40 49
       <usages-collector id="statistics.file.types.edit">
41 50
         <counts>
42
-          <entry key="JAVA" value="7371" />
51
+          <entry key="JAVA" value="10714" />
43 52
         </counts>
44 53
       </usages-collector>
45 54
     </session>
@@ -47,10 +56,34 @@
47 56
   <component name="FileEditorManager">
48 57
     <leaf>
49 58
       <file pinned="false" current-in-tab="false">
59
+        <entry file="file://$PROJECT_DIR$/src/main/java/Arraz.java">
60
+          <provider selected="true" editor-type-id="text-editor">
61
+            <state relative-caret-position="323">
62
+              <caret line="112" selection-start-line="112" selection-end-line="112" />
63
+            </state>
64
+          </provider>
65
+        </entry>
66
+      </file>
67
+      <file pinned="false" current-in-tab="false">
68
+        <entry file="file://$PROJECT_DIR$/src/main/java/MoreArrayc.java">
69
+          <provider selected="true" editor-type-id="text-editor">
70
+            <state relative-caret-position="203">
71
+              <caret line="167" column="5" selection-start-line="167" selection-start-column="5" selection-end-line="167" selection-end-column="5" />
72
+              <folding>
73
+                <element signature="imports" expanded="true" />
74
+                <element signature="e#479#488#0" expanded="true" />
75
+                <element signature="e#2563#2564#0" expanded="true" />
76
+                <element signature="e#2590#2591#0" expanded="true" />
77
+              </folding>
78
+            </state>
79
+          </provider>
80
+        </entry>
81
+      </file>
82
+      <file pinned="false" current-in-tab="false">
50 83
         <entry file="file://$PROJECT_DIR$/src/test/java/MoreArraysTest.java">
51 84
           <provider selected="true" editor-type-id="text-editor">
52
-            <state relative-caret-position="194">
53
-              <caret line="182" selection-start-line="182" selection-end-line="182" />
85
+            <state relative-caret-position="611">
86
+              <caret line="194" column="7" selection-start-line="194" selection-start-column="7" selection-end-line="194" selection-end-column="7" />
54 87
               <folding>
55 88
                 <element signature="imports" expanded="true" />
56 89
                 <element signature="e#3111#3120#0" expanded="true" />
@@ -60,13 +93,25 @@
60 93
         </entry>
61 94
       </file>
62 95
       <file pinned="false" current-in-tab="true">
63
-        <entry file="file://$PROJECT_DIR$/src/main/java/MoreArrayc.java">
96
+        <entry file="file://$PROJECT_DIR$/src/test/java/MinMaxTest.java">
64 97
           <provider selected="true" editor-type-id="text-editor">
65
-            <state relative-caret-position="90">
66
-              <caret line="136" column="8" lean-forward="true" selection-start-line="136" selection-start-column="8" selection-end-line="136" selection-end-column="8" />
98
+            <state relative-caret-position="418">
99
+              <caret line="67" column="21" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
67 100
               <folding>
68 101
                 <element signature="imports" expanded="true" />
69
-                <element signature="e#446#455#0" expanded="true" />
102
+              </folding>
103
+            </state>
104
+          </provider>
105
+        </entry>
106
+      </file>
107
+      <file pinned="false" current-in-tab="false">
108
+        <entry file="file://$PROJECT_DIR$/src/main/java/MinMax1.java">
109
+          <provider selected="true" editor-type-id="text-editor">
110
+            <state relative-caret-position="442">
111
+              <caret line="59" column="32" selection-start-line="59" selection-start-column="32" selection-end-line="59" selection-end-column="32" />
112
+              <folding>
113
+                <element signature="e#875#876#0" expanded="true" />
114
+                <element signature="e#899#900#0" expanded="true" />
70 115
               </folding>
71 116
             </state>
72 117
           </provider>
@@ -87,16 +132,21 @@
87 132
   <component name="IdeDocumentHistory">
88 133
     <option name="CHANGED_PATHS">
89 134
       <list>
90
-        <option value="$PROJECT_DIR$/src/main/java/Arraz.java" />
91
-        <option value="$PROJECT_DIR$/src/test/java/ArrazTest.java" />
92 135
         <option value="$PROJECT_DIR$/src/main/java/OddsAndEvens.java" />
93 136
         <option value="$PROJECT_DIR$/src/main/java/OddsAndEvensMethods.java" />
94 137
         <option value="$PROJECT_DIR$/src/test/java/OddsAndEventsTest.java" />
95 138
         <option value="$PROJECT_DIR$/src/main/java/MoreArrays.java" />
96 139
         <option value="$PROJECT_DIR$/src/test/java/MoreArrays.java" />
97 140
         <option value="$PROJECT_DIR$/src/main/java/MoreArrayz.java" />
98
-        <option value="$PROJECT_DIR$/src/test/java/MoreArraysTest.java" />
141
+        <option value="$PROJECT_DIR$/src/test/java/MinMax.java" />
142
+        <option value="$PROJECT_DIR$/src/main/java/MinMax.java" />
143
+        <option value="$PROJECT_DIR$/src/main/java/MinMaxMethods.java" />
144
+        <option value="$PROJECT_DIR$/src/test/java/ArrazTest.java" />
145
+        <option value="$PROJECT_DIR$/src/main/java/Arraz.java" />
99 146
         <option value="$PROJECT_DIR$/src/main/java/MoreArrayc.java" />
147
+        <option value="$PROJECT_DIR$/src/main/java/MinMax1.java" />
148
+        <option value="$PROJECT_DIR$/src/test/java/MoreArraysTest.java" />
149
+        <option value="$PROJECT_DIR$/src/test/java/MinMaxTest.java" />
100 150
       </list>
101 151
     </option>
102 152
   </component>
@@ -107,8 +157,8 @@
107 157
     <sorting>DEFINITION_ORDER</sorting>
108 158
   </component>
109 159
   <component name="ProjectFrameBounds">
110
-    <option name="x" value="120" />
111
-    <option name="y" value="54" />
160
+    <option name="x" value="50" />
161
+    <option name="y" value="23" />
112 162
     <option name="width" value="991" />
113 163
     <option name="height" value="709" />
114 164
   </component>
@@ -157,6 +207,11 @@
157 207
               <item name="test" type="462c0819:PsiDirectoryNode" />
158 208
               <item name="java" type="462c0819:PsiDirectoryNode" />
159 209
             </path>
210
+            <path>
211
+              <item name="arraz" type="b2602c69:ProjectViewProjectNode" />
212
+              <item name="arraz" type="462c0819:PsiDirectoryNode" />
213
+              <item name="target" type="462c0819:PsiDirectoryNode" />
214
+            </path>
160 215
           </expand>
161 216
           <select />
162 217
         </subPane>
@@ -167,7 +222,7 @@
167 222
   <component name="PropertiesComponent">
168 223
     <property name="WebServerToolWindowFactoryState" value="false" />
169 224
     <property name="aspect.path.notification.shown" value="true" />
170
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544245348087" />
225
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544305064424" />
171 226
     <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
172 227
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
173 228
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -184,71 +239,69 @@
184 239
       </list>
185 240
     </option>
186 241
   </component>
187
-  <component name="RunManager" selected="JUnit.MoreArraysTest.find2ndLargestValueFromArrayTest">
188
-    <configuration name="MoreArraysTest.CopyAnArrayByIteratingitTestAddingnew" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
242
+  <component name="RunManager" selected="JUnit.MinMaxTest.averageArrayWithoutMaxMinTEST">
243
+    <configuration name="ArrazTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
189 244
       <module name="arraz" />
190 245
       <option name="PACKAGE_NAME" value="" />
191
-      <option name="MAIN_CLASS_NAME" value="MoreArraysTest" />
192
-      <option name="METHOD_NAME" value="CopyAnArrayByIteratingitTestAddingnew" />
193
-      <option name="TEST_OBJECT" value="method" />
246
+      <option name="MAIN_CLASS_NAME" value="ArrazTest" />
194 247
       <method v="2">
195 248
         <option name="Make" enabled="true" />
196 249
       </method>
197 250
     </configuration>
198
-    <configuration name="MoreArraysTest.CopyAnArrayByloopingitTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
251
+    <configuration name="MinMaxTest.arraysHas65N77TEST" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
199 252
       <module name="arraz" />
200 253
       <option name="PACKAGE_NAME" value="" />
201
-      <option name="MAIN_CLASS_NAME" value="MoreArraysTest" />
202
-      <option name="METHOD_NAME" value="CopyAnArrayByloopingitTest" />
254
+      <option name="MAIN_CLASS_NAME" value="MinMaxTest" />
255
+      <option name="METHOD_NAME" value="arraysHas65N77TEST" />
203 256
       <option name="TEST_OBJECT" value="method" />
204 257
       <method v="2">
205 258
         <option name="Make" enabled="true" />
206 259
       </method>
207 260
     </configuration>
208
-    <configuration name="MoreArraysTest.CopyAnArrayByloopingitTestadding" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
261
+    <configuration name="MinMaxTest.arraysHas65N77TESTWIN" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
209 262
       <module name="arraz" />
210 263
       <option name="PACKAGE_NAME" value="" />
211
-      <option name="MAIN_CLASS_NAME" value="MoreArraysTest" />
212
-      <option name="METHOD_NAME" value="CopyAnArrayByloopingitTestadding" />
264
+      <option name="MAIN_CLASS_NAME" value="MinMaxTest" />
265
+      <option name="METHOD_NAME" value="arraysHas65N77TESTWIN" />
213 266
       <option name="TEST_OBJECT" value="method" />
214 267
       <method v="2">
215 268
         <option name="Make" enabled="true" />
216 269
       </method>
217 270
     </configuration>
218
-    <configuration name="MoreArraysTest.find2ndLargestValueFromArrayTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
271
+    <configuration name="MinMaxTest.averageArrayWithoutMaxMinTEST" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
219 272
       <module name="arraz" />
220 273
       <option name="PACKAGE_NAME" value="" />
221
-      <option name="MAIN_CLASS_NAME" value="MoreArraysTest" />
222
-      <option name="METHOD_NAME" value="find2ndLargestValueFromArrayTest" />
274
+      <option name="MAIN_CLASS_NAME" value="MinMaxTest" />
275
+      <option name="METHOD_NAME" value="averageArrayWithoutMaxMinTEST" />
223 276
       <option name="TEST_OBJECT" value="method" />
224 277
       <method v="2">
225 278
         <option name="Make" enabled="true" />
226 279
       </method>
227 280
     </configuration>
228
-    <configuration name="MoreArraysTest.removeElementFromArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
281
+    <configuration name="MinMaxTest.getMax" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
229 282
       <module name="arraz" />
230 283
       <option name="PACKAGE_NAME" value="" />
231
-      <option name="MAIN_CLASS_NAME" value="MoreArraysTest" />
232
-      <option name="METHOD_NAME" value="removeElementFromArray" />
284
+      <option name="MAIN_CLASS_NAME" value="MinMaxTest" />
285
+      <option name="METHOD_NAME" value="getMax" />
233 286
       <option name="TEST_OBJECT" value="method" />
234 287
       <method v="2">
235 288
         <option name="Make" enabled="true" />
236 289
       </method>
237 290
     </configuration>
238 291
     <list>
239
-      <item itemvalue="JUnit.MoreArraysTest.CopyAnArrayByIteratingitTestAddingnew" />
240
-      <item itemvalue="JUnit.MoreArraysTest.CopyAnArrayByloopingitTest" />
241
-      <item itemvalue="JUnit.MoreArraysTest.CopyAnArrayByloopingitTestadding" />
242
-      <item itemvalue="JUnit.MoreArraysTest.removeElementFromArray" />
243
-      <item itemvalue="JUnit.MoreArraysTest.find2ndLargestValueFromArrayTest" />
292
+      <item itemvalue="JUnit.MinMaxTest.getMax" />
293
+      <item itemvalue="JUnit.MinMaxTest.averageArrayWithoutMaxMinTEST" />
294
+      <item itemvalue="JUnit.ArrazTest" />
295
+      <item itemvalue="JUnit.MinMaxTest.arraysHas65N77TEST" />
296
+      <item itemvalue="JUnit.MinMaxTest.arraysHas65N77TESTWIN" />
244 297
     </list>
245 298
     <recent_temporary>
246 299
       <list>
247
-        <item itemvalue="JUnit.MoreArraysTest.find2ndLargestValueFromArrayTest" />
248
-        <item itemvalue="JUnit.MoreArraysTest.removeElementFromArray" />
249
-        <item itemvalue="JUnit.MoreArraysTest.CopyAnArrayByloopingitTestadding" />
250
-        <item itemvalue="JUnit.MoreArraysTest.CopyAnArrayByloopingitTest" />
251
-        <item itemvalue="JUnit.MoreArraysTest.CopyAnArrayByIteratingitTestAddingnew" />
300
+        <item itemvalue="JUnit.MinMaxTest.averageArrayWithoutMaxMinTEST" />
301
+        <item itemvalue="JUnit.MinMaxTest.arraysHas65N77TESTWIN" />
302
+        <item itemvalue="JUnit.MinMaxTest.arraysHas65N77TEST" />
303
+        <item itemvalue="JUnit.ArrazTest" />
304
+        <item itemvalue="JUnit.MinMaxTest.getMax" />
252 305
       </list>
253 306
     </recent_temporary>
254 307
   </component>
@@ -262,47 +315,47 @@
262 315
       <option name="number" value="Default" />
263 316
       <option name="presentableId" value="Default" />
264 317
       <updated>1544063273407</updated>
265
-      <workItem from="1544063277559" duration="35316000" />
318
+      <workItem from="1544063277559" duration="54552000" />
266 319
     </task>
267 320
     <servers />
268 321
   </component>
269 322
   <component name="TestHistory">
270
-    <history-entry file="MoreArraysTest_removeElementFromArray - 2018.12.07 at 18h 47m 32s.xml">
271
-      <configuration name="MoreArraysTest.removeElementFromArray" configurationId="JUnit" />
323
+    <history-entry file="MinMaxTest_averageArrayWithoutMaxMinTEST - 2018.12.08 at 15h 53m 54s.xml">
324
+      <configuration name="MinMaxTest.averageArrayWithoutMaxMinTEST" configurationId="JUnit" />
272 325
     </history-entry>
273
-    <history-entry file="MoreArraysTest_removeElementFromArray - 2018.12.07 at 18h 54m 57s.xml">
274
-      <configuration name="MoreArraysTest.removeElementFromArray" configurationId="JUnit" />
326
+    <history-entry file="MinMaxTest_arraysHas65N77TEST - 2018.12.08 at 16h 26m 08s.xml">
327
+      <configuration name="MinMaxTest.arraysHas65N77TEST" configurationId="JUnit" />
275 328
     </history-entry>
276
-    <history-entry file="MoreArraysTest_removeElementFromArray - 2018.12.07 at 19h 03m 00s.xml">
277
-      <configuration name="MoreArraysTest.removeElementFromArray" configurationId="JUnit" />
329
+    <history-entry file="MinMaxTest_arraysHas65N77TEST - 2018.12.08 at 16h 26m 16s.xml">
330
+      <configuration name="MinMaxTest.arraysHas65N77TEST" configurationId="JUnit" />
278 331
     </history-entry>
279
-    <history-entry file="MoreArraysTest_removeElementFromArray - 2018.12.07 at 19h 03m 10s.xml">
280
-      <configuration name="MoreArraysTest.removeElementFromArray" configurationId="JUnit" />
332
+    <history-entry file="MinMaxTest_arraysHas65N77TEST - 2018.12.08 at 16h 26m 49s.xml">
333
+      <configuration name="MinMaxTest.arraysHas65N77TEST" configurationId="JUnit" />
281 334
     </history-entry>
282
-    <history-entry file="MoreArraysTest_removeElementFromArray - 2018.12.07 at 19h 04m 53s.xml">
283
-      <configuration name="MoreArraysTest.removeElementFromArray" configurationId="JUnit" />
335
+    <history-entry file="MinMaxTest_arraysHas65N77TEST - 2018.12.08 at 16h 26m 58s.xml">
336
+      <configuration name="MinMaxTest.arraysHas65N77TEST" configurationId="JUnit" />
284 337
     </history-entry>
285
-    <history-entry file="MoreArraysTest_removeElementFromArray - 2018.12.07 at 19h 05m 23s.xml">
286
-      <configuration name="MoreArraysTest.removeElementFromArray" configurationId="JUnit" />
338
+    <history-entry file="MinMaxTest_arraysHas65N77TEST - 2018.12.08 at 16h 27m 05s.xml">
339
+      <configuration name="MinMaxTest.arraysHas65N77TEST" configurationId="JUnit" />
287 340
     </history-entry>
288
-    <history-entry file="MoreArraysTest_removeElementFromArray - 2018.12.07 at 19h 05m 30s.xml">
289
-      <configuration name="MoreArraysTest.removeElementFromArray" configurationId="JUnit" />
341
+    <history-entry file="MinMaxTest_arraysHas65N77TEST - 2018.12.08 at 16h 30m 12s.xml">
342
+      <configuration name="MinMaxTest.arraysHas65N77TEST" configurationId="JUnit" />
290 343
     </history-entry>
291
-    <history-entry file="MoreArraysTest_find2ndLargestValueFromArrayTest - 2018.12.07 at 21h 16m 54s.xml">
292
-      <configuration name="MoreArraysTest.find2ndLargestValueFromArrayTest" configurationId="JUnit" />
344
+    <history-entry file="MinMaxTest_arraysHas65N77TEST - 2018.12.08 at 16h 30m 36s.xml">
345
+      <configuration name="MinMaxTest.arraysHas65N77TEST" configurationId="JUnit" />
293 346
     </history-entry>
294
-    <history-entry file="MoreArraysTest_find2ndLargestValueFromArrayTest - 2018.12.07 at 21h 17m 04s.xml">
295
-      <configuration name="MoreArraysTest.find2ndLargestValueFromArrayTest" configurationId="JUnit" />
347
+    <history-entry file="MinMaxTest_arraysHas65N77TESTWIN - 2018.12.08 at 16h 30m 56s.xml">
348
+      <configuration name="MinMaxTest.arraysHas65N77TESTWIN" configurationId="JUnit" />
296 349
     </history-entry>
297
-    <history-entry file="MoreArraysTest_find2ndLargestValueFromArrayTest - 2018.12.07 at 21h 17m 14s.xml">
298
-      <configuration name="MoreArraysTest.find2ndLargestValueFromArrayTest" configurationId="JUnit" />
350
+    <history-entry file="MinMaxTest_arraysHas65N77TESTWIN - 2018.12.08 at 16h 31m 03s.xml">
351
+      <configuration name="MinMaxTest.arraysHas65N77TESTWIN" configurationId="JUnit" />
299 352
     </history-entry>
300 353
   </component>
301 354
   <component name="TimeTrackingManager">
302
-    <option name="totallyTimeSpent" value="35316000" />
355
+    <option name="totallyTimeSpent" value="54552000" />
303 356
   </component>
304 357
   <component name="ToolWindowManager">
305
-    <frame x="120" y="54" width="991" height="709" extended-state="0" />
358
+    <frame x="50" y="23" width="991" height="709" extended-state="0" />
306 359
     <editor active="true" />
307 360
     <layout>
308 361
       <window_info id="Image Layers" />
@@ -310,8 +363,8 @@
310 363
       <window_info id="UI Designer" />
311 364
       <window_info id="Capture Tool" />
312 365
       <window_info id="Favorites" side_tool="true" />
313
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23498419" />
314
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
366
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49758455" visible="true" weight="0.23498419" />
367
+      <window_info id="Structure" order="1" sideWeight="0.5024155" side_tool="true" weight="0.23498419" />
315 368
       <window_info anchor="bottom" id="Messages" weight="0.3273906" />
316 369
       <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
317 370
       <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
@@ -319,7 +372,7 @@
319 372
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
320 373
       <window_info anchor="bottom" id="Message" order="0" />
321 374
       <window_info anchor="bottom" id="Find" order="1" />
322
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32901135" />
375
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32901135" />
323 376
       <window_info anchor="bottom" id="Debug" order="3" weight="0.3987034" />
324 377
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
325 378
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -350,65 +403,120 @@
350 403
         </state>
351 404
       </provider>
352 405
     </entry>
353
-    <entry file="file://$PROJECT_DIR$/src/main/java/OddsAndEvens.java">
406
+    <entry file="file://$PROJECT_DIR$/src/main/java/MoreArrays.java">
354 407
       <provider selected="true" editor-type-id="text-editor">
355
-        <state relative-caret-position="195">
356
-          <caret line="13" selection-start-line="13" selection-end-line="13" />
408
+        <state relative-caret-position="60">
409
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
410
+        </state>
411
+      </provider>
412
+    </entry>
413
+    <entry file="file://$PROJECT_DIR$/src/main/java/MoreArrayz.java">
414
+      <provider selected="true" editor-type-id="text-editor">
415
+        <state relative-caret-position="60">
416
+          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
357 417
         </state>
358 418
       </provider>
359 419
     </entry>
360 420
     <entry file="file://$PROJECT_DIR$/src/test/java/OddsAndEventsTest.java">
361 421
       <provider selected="true" editor-type-id="text-editor">
362
-        <state relative-caret-position="247">
363
-          <caret line="77" column="3" selection-start-line="77" selection-start-column="3" selection-end-line="77" selection-end-column="3" />
422
+        <state relative-caret-position="1155">
423
+          <caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
364 424
           <folding>
365 425
             <element signature="imports" expanded="true" />
366 426
           </folding>
367 427
         </state>
368 428
       </provider>
369 429
     </entry>
370
-    <entry file="file://$PROJECT_DIR$/src/main/java/MoreArrays.java">
430
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/src.zip!/java/lang/Integer.java">
371 431
       <provider selected="true" editor-type-id="text-editor">
372
-        <state relative-caret-position="60">
373
-          <caret line="4" selection-start-line="4" selection-end-line="4" />
432
+        <state relative-caret-position="115">
433
+          <caret line="892" selection-start-line="892" selection-end-line="892" />
434
+          <folding>
435
+            <element signature="e#33919#33920#0" expanded="true" />
436
+          </folding>
374 437
         </state>
375 438
       </provider>
376 439
     </entry>
377
-    <entry file="file://$PROJECT_DIR$/src/main/java/MoreArrayz.java">
440
+    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.0/junit-4.0.jar!/org/junit/Assert.class">
378 441
       <provider selected="true" editor-type-id="text-editor">
379
-        <state relative-caret-position="60">
380
-          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
442
+        <state relative-caret-position="115">
443
+          <caret line="51" selection-start-line="51" selection-end-line="51" />
381 444
         </state>
382 445
       </provider>
383 446
     </entry>
384
-    <entry file="file://$PROJECT_DIR$/src/main/java/Arraz.java">
447
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/jre/lib/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class">
448
+      <provider selected="true" editor-type-id="text-editor">
449
+        <state relative-caret-position="102">
450
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
451
+        </state>
452
+      </provider>
453
+    </entry>
454
+    <entry file="file://$PROJECT_DIR$/src/main/java/MinMaxMethods.java">
385 455
       <provider selected="true" editor-type-id="text-editor">
386
-        <state relative-caret-position="1695">
387
-          <caret line="113" selection-start-line="113" selection-end-line="113" />
456
+        <state relative-caret-position="45">
457
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
458
+        </state>
459
+      </provider>
460
+    </entry>
461
+    <entry file="file://$PROJECT_DIR$/src/test/java/ArrazTest.java">
462
+      <provider selected="true" editor-type-id="text-editor">
463
+        <state relative-caret-position="2535">
464
+          <caret line="169" column="19" selection-start-line="169" selection-start-column="19" selection-end-line="169" selection-end-column="19" />
465
+          <folding>
466
+            <element signature="imports" expanded="true" />
467
+          </folding>
388 468
         </state>
389 469
       </provider>
390 470
     </entry>
391 471
     <entry file="file://$PROJECT_DIR$/src/main/java/OddsAndEvensMethods.java">
392 472
       <provider selected="true" editor-type-id="text-editor">
393
-        <state relative-caret-position="97">
473
+        <state relative-caret-position="435">
394 474
           <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" />
395 475
         </state>
396 476
       </provider>
397 477
     </entry>
398
-    <entry file="file://$PROJECT_DIR$/src/test/java/ArrazTest.java">
478
+    <entry file="file://$PROJECT_DIR$/src/main/java/OddsAndEvens.java">
399 479
       <provider selected="true" editor-type-id="text-editor">
400
-        <state relative-caret-position="262">
401
-          <caret line="244" selection-start-line="244" selection-end-line="244" />
480
+        <state relative-caret-position="210">
481
+          <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
482
+        </state>
483
+      </provider>
484
+    </entry>
485
+    <entry file="file://$PROJECT_DIR$/src/main/java/MoreArrayc.java">
486
+      <provider selected="true" editor-type-id="text-editor">
487
+        <state relative-caret-position="203">
488
+          <caret line="167" column="5" selection-start-line="167" selection-start-column="5" selection-end-line="167" selection-end-column="5" />
402 489
           <folding>
403 490
             <element signature="imports" expanded="true" />
491
+            <element signature="e#479#488#0" expanded="true" />
492
+            <element signature="e#2563#2564#0" expanded="true" />
493
+            <element signature="e#2590#2591#0" expanded="true" />
494
+          </folding>
495
+        </state>
496
+      </provider>
497
+    </entry>
498
+    <entry file="file://$PROJECT_DIR$/src/main/java/Arraz.java">
499
+      <provider selected="true" editor-type-id="text-editor">
500
+        <state relative-caret-position="323">
501
+          <caret line="112" selection-start-line="112" selection-end-line="112" />
502
+        </state>
503
+      </provider>
504
+    </entry>
505
+    <entry file="file://$PROJECT_DIR$/src/main/java/MinMax1.java">
506
+      <provider selected="true" editor-type-id="text-editor">
507
+        <state relative-caret-position="442">
508
+          <caret line="59" column="32" selection-start-line="59" selection-start-column="32" selection-end-line="59" selection-end-column="32" />
509
+          <folding>
510
+            <element signature="e#875#876#0" expanded="true" />
511
+            <element signature="e#899#900#0" expanded="true" />
404 512
           </folding>
405 513
         </state>
406 514
       </provider>
407 515
     </entry>
408 516
     <entry file="file://$PROJECT_DIR$/src/test/java/MoreArraysTest.java">
409 517
       <provider selected="true" editor-type-id="text-editor">
410
-        <state relative-caret-position="194">
411
-          <caret line="182" selection-start-line="182" selection-end-line="182" />
518
+        <state relative-caret-position="611">
519
+          <caret line="194" column="7" selection-start-line="194" selection-start-column="7" selection-end-line="194" selection-end-column="7" />
412 520
           <folding>
413 521
             <element signature="imports" expanded="true" />
414 522
             <element signature="e#3111#3120#0" expanded="true" />
@@ -416,13 +524,12 @@
416 524
         </state>
417 525
       </provider>
418 526
     </entry>
419
-    <entry file="file://$PROJECT_DIR$/src/main/java/MoreArrayc.java">
527
+    <entry file="file://$PROJECT_DIR$/src/test/java/MinMaxTest.java">
420 528
       <provider selected="true" editor-type-id="text-editor">
421
-        <state relative-caret-position="90">
422
-          <caret line="136" column="8" lean-forward="true" selection-start-line="136" selection-start-column="8" selection-end-line="136" selection-end-column="8" />
529
+        <state relative-caret-position="418">
530
+          <caret line="67" column="21" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
423 531
           <folding>
424 532
             <element signature="imports" expanded="true" />
425
-            <element signature="e#446#455#0" expanded="true" />
426 533
           </folding>
427 534
         </state>
428 535
       </provider>

+ 1
- 1
arraz/arraz.iml Bestand weergeven

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
3
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4 4
     <output url="file://$MODULE_DIR$/target/classes" />
5 5
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
6 6
     <content url="file://$MODULE_DIR$">

+ 2
- 2
arraz/pom.xml Bestand weergeven

@@ -13,8 +13,8 @@
13 13
                 <groupId>org.apache.maven.plugins</groupId>
14 14
                 <artifactId>maven-compiler-plugin</artifactId>
15 15
                 <configuration>
16
-                    <source>6</source>
17
-                    <target>6</target>
16
+                    <source>8</source>
17
+                    <target>8</target>
18 18
                 </configuration>
19 19
             </plugin>
20 20
         </plugins>

+ 10
- 7
arraz/src/main/java/Arraz.java Bestand weergeven

@@ -25,7 +25,7 @@ public class Arraz {
25 25
     }
26 26
 
27 27
 
28
-    public int sumValuesOfArrayInt(int[] arr) {
28
+    public Integer sumValuesOfArrayInt(Integer[] arr) {
29 29
 
30 30
         int value = 0;
31 31
 
@@ -46,7 +46,7 @@ public class Arraz {
46 46
         return value;
47 47
     }
48 48
 
49
-    public int getTheAvgInt(int[] arr) {
49
+    public Integer getTheAvgInt(Integer[] arr) {
50 50
 
51 51
         int value = sumValuesOfArrayInt(arr);
52 52
 
@@ -77,7 +77,7 @@ public class Arraz {
77 77
 
78 78
     }
79 79
 
80
-    public Boolean containsValue(int [] arr, int value) {
80
+    public Boolean containsValue(Integer [] arr, int value) {
81 81
 
82 82
         Boolean flag = null;
83 83
 
@@ -93,15 +93,18 @@ public class Arraz {
93 93
 
94 94
     }
95 95
 
96
-    public int[] reverseAnArray(int [] arr){
96
+    public Integer[] reverseAnArray(Integer [] arr){
97 97
 
98
-        int [] arr2 = new int[arr.length];
98
+        Integer [] arr2 = new Integer[arr.length];
99 99
         int counter = 0;
100 100
 
101 101
         for (int i = arr.length-1; i >= 0; i--) {
102 102
 
103
-            arr2[counter] = arr[i];
104
-            counter++;
103
+            if(arr[i] != null) {
104
+                arr2[counter] = arr[i];
105
+                counter++;
106
+
107
+            }
105 108
 
106 109
 
107 110
         }

+ 0
- 14
arraz/src/main/java/MinMax.java Bestand weergeven

@@ -1,14 +0,0 @@
1
-public class MinMax {
2
-
3
-    
4
-
5
-}
6
-//   averageArrayWithoutMaxMin
7
-//    ArrayHas65and77
8
-//    theTotalofTensIs30`
9
-//    makeMeACopyPlease
10
-//    removeLastItemAndCopy
11
-//    removeFirstItemAndCopy
12
-//    insertAtStartAndCopy
13
-//    insertAtEndAndCopy
14
-//    sortArrayIntoEvensThenOdds

+ 60
- 0
arraz/src/main/java/MinMax1.java Bestand weergeven

@@ -0,0 +1,60 @@
1
+import java.rmi.NotBoundException;
2
+
3
+public class MinMax1 {
4
+
5
+    static class MinMax {
6
+        public int min;
7
+        public int max;
8
+    }
9
+
10
+    static MinMax findMaxnMin(Integer [] arr){
11
+        MinMax minmax = new MinMax();
12
+
13
+        if(arr.length == 1){
14
+            minmax.max = arr[0];
15
+            minmax.min = arr[0];
16
+
17
+            return minmax;
18
+        }
19
+
20
+
21
+        if(arr[0] > arr[1]){
22
+
23
+            minmax.max = arr[0];
24
+            minmax.min = arr[1];
25
+
26
+        }else{
27
+
28
+            minmax.max = arr[1];
29
+            minmax.min = arr[0];
30
+        }
31
+
32
+        for (int i =2; i < arr.length; i++) {
33
+
34
+            if(arr[i] > minmax.max) {
35
+                minmax.max = arr[i];
36
+
37
+            }
38
+            else if(arr[i] < minmax.min){
39
+
40
+                minmax.min = arr[i];
41
+            }
42
+        }
43
+
44
+        return minmax;
45
+    }
46
+
47
+
48
+    public int averageArrayWithoutMaxMin(){
49
+        return 0;
50
+    }
51
+}
52
+
53
+
54
+//    theTotalofTensIs30`
55
+//    makeMeACopyPlease
56
+//    removeLastItemAndCopy
57
+//    removeFirstItemAndCopy
58
+//    insertAtStartAndCopy
59
+//    insertAtEndAndCopy
60
+//    sortArrayIntoEvensThenOdds

+ 35
- 1
arraz/src/main/java/MoreArrayc.java Bestand weergeven

@@ -1,10 +1,11 @@
1 1
 import java.util.ArrayList;
2 2
 import java.util.Arrays;
3 3
 import java.util.Iterator;
4
+import java.util.regex.Pattern;
4 5
 
5 6
 public class MoreArrayc {
6 7
 
7
-
8
+        Arraz cool = new Arraz();
8 9
 
9 10
     public int findIndexOf(int[] arr, int value) {
10 11
 
@@ -28,6 +29,7 @@ public class MoreArrayc {
28 29
         Integer [] arr2 = new Integer[arr.length];
29 30
         int count = 0;
30 31
 
32
+
31 33
         while (interate.hasNext()){
32 34
 
33 35
             arr2[count] = interate.next();
@@ -121,6 +123,13 @@ public class MoreArrayc {
121 123
         return secondMax;
122 124
     }
123 125
 
126
+    public Integer[] sortingArrays (Integer [] arr) {
127
+
128
+        return null;
129
+
130
+
131
+    }
132
+
124 133
     public void makeAnArrayListfromArray(){
125 134
 
126 135
     }
@@ -142,6 +151,22 @@ public class MoreArrayc {
142 151
         return null;
143 152
     }
144 153
 
154
+    public Boolean arraysHas65N77 (Integer arr [],int n , int k){
155
+
156
+        Boolean flag  = null;
157
+
158
+        for (int i = 0; i <arr.length ; i++) {
159
+
160
+
161
+            if (cool.containsValue(arr, n)&&cool.containsValue(arr,k)) {
162
+                flag = true;
163
+            }else{
164
+                flag = false;
165
+            }
166
+        }
167
+        return flag;
168
+    }
169
+
145 170
 
146 171
 }
147 172
 
@@ -149,4 +174,13 @@ public class MoreArrayc {
149 174
 //    makeMeAnArrayListFromArray
150 175
 //    makeMeAnArrayFromArrayList
151 176
 
177
+//   averageArrayWithoutMaxMin
152 178
 
179
+//    ArrayHas65and77
180
+//    theTotalofTensIs30`
181
+//    makeMeACopyPlease
182
+//    removeLastItemAndCopy
183
+//    removeFirstItemAndCopy
184
+//    insertAtStartAndCopy
185
+//    insertAtEndAndCopy
186
+//    sortArrayIntoEvensThenOdds

+ 15
- 15
arraz/src/test/java/ArrazTest.java Bestand weergeven

@@ -11,7 +11,7 @@ public class ArrazTest {
11 11
     public void sumValuesOfArrayIntTest1(){
12 12
         //Given
13 13
 
14
-        int arr [] = {4,32,1,4};
14
+        Integer arr [] = {4,32,1,4};
15 15
 
16 16
 
17 17
         //When
@@ -27,12 +27,12 @@ public class ArrazTest {
27 27
     public void sumValuesOfArrayIntTestNegative2(){
28 28
         //Given
29 29
 
30
-        int arr [] = {-6,43,10,-3};
30
+        Integer arr [] = {-6,43,10,-3};
31 31
 
32 32
 
33 33
         //When
34 34
         // 44
35
-        int actual = a.sumValuesOfArrayInt(arr);
35
+        Integer actual = a.sumValuesOfArrayInt(arr);
36 36
         //Then
37 37
 
38 38
         Assert.assertEquals(44,actual);
@@ -75,12 +75,12 @@ public class ArrazTest {
75 75
     public void getTheAvgInt(){
76 76
         //Given
77 77
 
78
-        int  arr [] = {65,4,4,3,36};
78
+        Integer  arr [] = {65,4,4,3,36};
79 79
 
80 80
 
81 81
         //When
82 82
 
83
-        int actual = a.getTheAvgInt(arr);
83
+        Integer actual = a.getTheAvgInt(arr);
84 84
 
85 85
         //Then
86 86
         Assert.assertEquals(22,actual);
@@ -90,7 +90,7 @@ public class ArrazTest {
90 90
     public void getTheAvgInt2(){
91 91
         //Given
92 92
 
93
-        int  arr [] = {6,4,4,-399,36};
93
+        Integer  arr [] = {6,4,4,-399,36};
94 94
         int value;
95 95
 
96 96
         //When
@@ -167,7 +167,7 @@ public class ArrazTest {
167 167
     @Test
168 168
     public void testing_TheFibonacci() {
169 169
 
170
-        long i = 44;
170
+        long i = 10;
171 171
 
172 172
 
173 173
         System.out.println(a.theFibonacci(i));
@@ -179,7 +179,7 @@ public class ArrazTest {
179 179
     @Test
180 180
     public void containsValueTestingFalse() {
181 181
 
182
-        int[] arr = {1, 2, 3, 4};
182
+        Integer[] arr = {1, 2, 3, 4};
183 183
 
184 184
         int value = 100;
185 185
 
@@ -191,7 +191,7 @@ public class ArrazTest {
191 191
     @Test
192 192
     public void containsValueTestingTrue() {
193 193
 
194
-        int[] arr = {1, 2, 3, 4};
194
+        Integer[] arr = {1, 2, 3, 4};
195 195
 
196 196
         int value = 1;
197 197
 
@@ -204,12 +204,12 @@ public class ArrazTest {
204 204
     @Test
205 205
     public void reverseArrayTest(){
206 206
 
207
-        int [] arr = {5,6,7,8,9};
208
-        int [] arr2 = {9,8,7,6,5};
207
+        Integer [] arr = {5,6,7,8,9};
208
+        Integer [] arr2 = {9,8,7,6,5};
209 209
         Boolean flag = null;
210 210
 
211 211
 
212
-        int [] actual = a.reverseAnArray(arr);
212
+        Integer [] actual = a.reverseAnArray(arr);
213 213
 
214 214
         for (int i = 0; i < arr.length ; i++) {
215 215
 
@@ -224,12 +224,12 @@ public class ArrazTest {
224 224
     @Test
225 225
     public void reverseArrayTest2() {
226 226
 
227
-        int[] arr = {5, 6, 7, -3, 9};
228
-        int[] arr2 = {9, -3, 7, 6, 5};
227
+        Integer[] arr = {5, 6, 7, -3, 9};
228
+        Integer[] arr2 = {9, -3, 7, 6, 5};
229 229
         Boolean flag = null;
230 230
 
231 231
 
232
-        int[] actual = a.reverseAnArray(arr);
232
+        Integer[] actual = a.reverseAnArray(arr);
233 233
 
234 234
         for (int i = 0; i < arr.length; i++) {
235 235
 

+ 117
- 0
arraz/src/test/java/MinMaxTest.java Bestand weergeven

@@ -0,0 +1,117 @@
1
+import org.junit.Assert;
2
+import org.junit.Test;
3
+
4
+import java.io.IOException;
5
+import java.util.Arrays;
6
+
7
+public class MinMaxTest {
8
+
9
+
10
+Arraz cool = new Arraz();
11
+MoreArrayc moreArrays = new MoreArrayc();
12
+
13
+    @Test
14
+    public void getMin(){
15
+
16
+        //Given
17
+
18
+        Integer [] arr = {10,21,7,8,9,4,3};
19
+
20
+        //When
21
+
22
+        MinMax1.MinMax x  = MinMax1.findMaxnMin(arr);
23
+
24
+        //Then
25
+        Assert.assertEquals(3,x.min);
26
+
27
+    }
28
+
29
+    @Test
30
+    public void getMax(){
31
+
32
+        //Given
33
+
34
+        Integer [] arr = {10,21,7,8,9,4,3};
35
+
36
+        //When
37
+
38
+        MinMax1.MinMax x  = MinMax1.findMaxnMin(arr);
39
+
40
+        //Then
41
+        Assert.assertEquals(21,x.max);
42
+
43
+    }
44
+
45
+    @Test
46
+    public void averageArrayWithoutMaxMinTEST () {
47
+        //Given
48
+
49
+        Integer [] arr = {10,21,7,8,9,4,3};
50
+        MinMax1.MinMax x  = MinMax1.findMaxnMin(arr);
51
+        Integer [] arr2 = new Integer[arr.length];
52
+
53
+
54
+        //When
55
+        for (int i = 0; i < arr.length ; i++) {
56
+
57
+
58
+            if(!arr[i].equals(x.max) && !arr[i].equals(x.min)){
59
+
60
+                arr2[i] = arr[i];
61
+            }
62
+
63
+        }
64
+
65
+        Integer[] arr3 = moreArrays.copyArrayByIteratingthroughIt(arr2);
66
+
67
+
68
+        //Then
69
+        for (int i = 0; i <arr3.length; i++) {
70
+            System.out.print(arr3[i]);
71
+        }
72
+         //   Assert.assertEquals(6,getAvg);
73
+    }
74
+
75
+    @Test
76
+    public void  arraysHas65N77TESTFAIL () {
77
+
78
+
79
+        //Given
80
+
81
+        Integer [] arr = {89,21,7,8,65,4,3};
82
+        Integer n = 65;
83
+        Integer k = 77;
84
+
85
+        //When
86
+
87
+        Boolean actual = moreArrays.arraysHas65N77(arr,n,k);
88
+        //then
89
+
90
+
91
+        Assert.assertFalse(actual);
92
+
93
+    }
94
+
95
+
96
+    @Test
97
+    public void  arraysHas65N77TESTWIN () {
98
+
99
+
100
+        //Given
101
+
102
+        Integer [] arr = {77,21,7,8,65,4,3};
103
+        Integer n = 65;
104
+        Integer k = 77;
105
+
106
+        //When
107
+
108
+        Boolean actual = moreArrays.arraysHas65N77(arr,n,k);
109
+        //then
110
+
111
+
112
+        Assert.assertTrue(actual);
113
+
114
+    }
115
+
116
+
117
+}

+ 14
- 0
arraz/src/test/java/MoreArraysTest.java Bestand weergeven

@@ -185,4 +185,18 @@ public class MoreArraysTest {
185 185
 
186 186
     }
187 187
 
188
+    @Test
189
+    public void sumOfTens (){
190
+        //Given
191
+        Integer [] arr = {5,1,7,8,9,4,3};
192
+
193
+        //When
194
+
195
+
196
+
197
+        //Then
198
+
199
+
200
+    }
201
+
188 202
 }