Whitney Martinez преди 6 години
родител
ревизия
5f6b7ebf61
променени са 4 файла, в които са добавени 76 реда и са изтрити 32 реда
  1. 18
    22
      arraz/.idea/workspace.xml
  2. 14
    0
      arraz/src/main/java/MinMax.java
  3. 25
    10
      arraz/src/main/java/MoreArrayc.java
  4. 19
    0
      arraz/src/test/java/MoreArraysTest.java

+ 18
- 22
arraz/.idea/workspace.xml Целия файл

@@ -2,14 +2,8 @@
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 beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/src/main/java/Arraz.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Arraz.java" afterDir="false" />
7 5
       <change beforePath="$PROJECT_DIR$/src/main/java/MoreArrayc.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/MoreArrayc.java" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/src/main/java/OddsAndEvens.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/OddsAndEvens.java" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/src/main/java/OddsAndEvensMethods.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/OddsAndEvensMethods.java" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/src/test/java/ArrazTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/ArrazTest.java" afterDir="false" />
11 6
       <change beforePath="$PROJECT_DIR$/src/test/java/MoreArraysTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/MoreArraysTest.java" afterDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/src/test/java/OddsAndEventsTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/OddsAndEventsTest.java" afterDir="false" />
13 7
     </list>
14 8
     <ignored path="$PROJECT_DIR$/target/" />
15 9
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -40,12 +34,12 @@
40 34
       </usages-collector>
41 35
       <usages-collector id="statistics.file.extensions.edit">
42 36
         <counts>
43
-          <entry key="java" value="7032" />
37
+          <entry key="java" value="7371" />
44 38
         </counts>
45 39
       </usages-collector>
46 40
       <usages-collector id="statistics.file.types.edit">
47 41
         <counts>
48
-          <entry key="JAVA" value="7032" />
42
+          <entry key="JAVA" value="7371" />
49 43
         </counts>
50 44
       </usages-collector>
51 45
     </session>
@@ -55,10 +49,11 @@
55 49
       <file pinned="false" current-in-tab="false">
56 50
         <entry file="file://$PROJECT_DIR$/src/test/java/MoreArraysTest.java">
57 51
           <provider selected="true" editor-type-id="text-editor">
58
-            <state relative-caret-position="181">
59
-              <caret line="158" column="33" selection-start-line="158" selection-start-column="33" selection-end-line="158" selection-end-column="33" />
52
+            <state relative-caret-position="194">
53
+              <caret line="182" selection-start-line="182" selection-end-line="182" />
60 54
               <folding>
61 55
                 <element signature="imports" expanded="true" />
56
+                <element signature="e#3111#3120#0" expanded="true" />
62 57
               </folding>
63 58
             </state>
64 59
           </provider>
@@ -67,8 +62,8 @@
67 62
       <file pinned="false" current-in-tab="true">
68 63
         <entry file="file://$PROJECT_DIR$/src/main/java/MoreArrayc.java">
69 64
           <provider selected="true" editor-type-id="text-editor">
70
-            <state relative-caret-position="170">
71
-              <caret line="124" lean-forward="true" selection-start-line="124" selection-end-line="124" />
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" />
72 67
               <folding>
73 68
                 <element signature="imports" expanded="true" />
74 69
                 <element signature="e#446#455#0" expanded="true" />
@@ -112,8 +107,8 @@
112 107
     <sorting>DEFINITION_ORDER</sorting>
113 108
   </component>
114 109
   <component name="ProjectFrameBounds">
115
-    <option name="x" value="225" />
116
-    <option name="y" value="23" />
110
+    <option name="x" value="120" />
111
+    <option name="y" value="54" />
117 112
     <option name="width" value="991" />
118 113
     <option name="height" value="709" />
119 114
   </component>
@@ -172,7 +167,7 @@
172 167
   <component name="PropertiesComponent">
173 168
     <property name="WebServerToolWindowFactoryState" value="false" />
174 169
     <property name="aspect.path.notification.shown" value="true" />
175
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544235469961" />
170
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544245348087" />
176 171
     <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
177 172
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
178 173
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -267,7 +262,7 @@
267 262
       <option name="number" value="Default" />
268 263
       <option name="presentableId" value="Default" />
269 264
       <updated>1544063273407</updated>
270
-      <workItem from="1544063277559" duration="32781000" />
265
+      <workItem from="1544063277559" duration="35316000" />
271 266
     </task>
272 267
     <servers />
273 268
   </component>
@@ -304,10 +299,10 @@
304 299
     </history-entry>
305 300
   </component>
306 301
   <component name="TimeTrackingManager">
307
-    <option name="totallyTimeSpent" value="32781000" />
302
+    <option name="totallyTimeSpent" value="35316000" />
308 303
   </component>
309 304
   <component name="ToolWindowManager">
310
-    <frame x="225" y="23" width="991" height="709" extended-state="0" />
305
+    <frame x="120" y="54" width="991" height="709" extended-state="0" />
311 306
     <editor active="true" />
312 307
     <layout>
313 308
       <window_info id="Image Layers" />
@@ -412,18 +407,19 @@
412 407
     </entry>
413 408
     <entry file="file://$PROJECT_DIR$/src/test/java/MoreArraysTest.java">
414 409
       <provider selected="true" editor-type-id="text-editor">
415
-        <state relative-caret-position="181">
416
-          <caret line="158" column="33" selection-start-line="158" selection-start-column="33" selection-end-line="158" selection-end-column="33" />
410
+        <state relative-caret-position="194">
411
+          <caret line="182" selection-start-line="182" selection-end-line="182" />
417 412
           <folding>
418 413
             <element signature="imports" expanded="true" />
414
+            <element signature="e#3111#3120#0" expanded="true" />
419 415
           </folding>
420 416
         </state>
421 417
       </provider>
422 418
     </entry>
423 419
     <entry file="file://$PROJECT_DIR$/src/main/java/MoreArrayc.java">
424 420
       <provider selected="true" editor-type-id="text-editor">
425
-        <state relative-caret-position="170">
426
-          <caret line="124" lean-forward="true" selection-start-line="124" selection-end-line="124" />
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" />
427 423
           <folding>
428 424
             <element signature="imports" expanded="true" />
429 425
             <element signature="e#446#455#0" expanded="true" />

+ 14
- 0
arraz/src/main/java/MinMax.java Целия файл

@@ -0,0 +1,14 @@
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

+ 25
- 10
arraz/src/main/java/MoreArrayc.java Целия файл

@@ -120,18 +120,33 @@ public class MoreArrayc {
120 120
         }
121 121
         return secondMax;
122 122
     }
123
+
124
+    public void makeAnArrayListfromArray(){
125
+
126
+    }
127
+    public void capacity(int mincap){
128
+
129
+
130
+
131
+    }
132
+
133
+
134
+
135
+    public Integer[] ArrayFromArrayList(ArrayList<Integer> arrlist){
136
+
137
+        return null;
138
+
139
+    }
140
+
141
+    public ArrayList<Integer> AnArrayFromArrayList(Integer[] arr){
142
+        return null;
143
+    }
144
+
145
+
123 146
 }
124 147
 
125 148
 
126 149
 //    makeMeAnArrayListFromArray
127 150
 //    makeMeAnArrayFromArrayList
128
-//    check2ArraysForEqual
129
-//   averageArrayWithoutMaxMin
130
-//    ArrayHas65and77
131
-//    theTotalofTensIs30`
132
-//    makeMeACopyPlease
133
-//    removeLastItemAndCopy
134
-//    removeFirstItemAndCopy
135
-//    insertAtStartAndCopy
136
-//    insertAtEndAndCopy
137
-//    sortArrayIntoEvensThenOdds
151
+
152
+

+ 19
- 0
arraz/src/test/java/MoreArraysTest.java Целия файл

@@ -2,6 +2,7 @@ import com.sun.xml.internal.xsom.impl.scd.Iterators;
2 2
 import org.junit.Assert;
3 3
 import org.junit.Test;
4 4
 
5
+import java.util.ArrayList;
5 6
 import java.util.Arrays;
6 7
 import java.util.Iterator;
7 8
 
@@ -166,4 +167,22 @@ public class MoreArraysTest {
166 167
         Assert.assertEquals(8,actual);
167 168
     }
168 169
 
170
+    @Test
171
+    public void makeMeAnArrayListFromArrayTest(){
172
+
173
+        //Given
174
+        Integer [] arr = {5,1,7,8,9,4,3};
175
+        int modCount = 0;
176
+        //When
177
+
178
+        ArrayList<Integer> arrlist = new ArrayList<Integer>(Arrays.asList(arr));
179
+
180
+        //Then
181
+        int counting = 0;
182
+
183
+
184
+
185
+
186
+    }
187
+
169 188
 }