More Arraz

arraz/.idea/workspace.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="81f99a04-35ff-49d0-a7a5-4ed795a161d6" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Arraz.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Arraz.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/test/java/ArrazTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/ArrazTest.java" afterDir="false" />
     </list>
@@ -28,7 +27,7 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="5436" />
+          <entry key="JAVA" value="5929" />
         </counts>
       </usages-collector>
     </session>
@@ -40,8 +39,8 @@
           <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/main/java/Arraz.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="206">
-                  <caret line="224" column="23" lean-forward="true" selection-start-line="224" selection-start-column="23" selection-end-line="224" selection-end-column="23" />
+                <state relative-caret-position="162">
+                  <caret line="153" column="22" selection-start-line="153" selection-start-column="22" selection-end-line="153" selection-end-column="22" />
                   <folding>
                     <element signature="e#1659#1668#0" expanded="true" />
                     <element signature="e#2355#2364#0" expanded="true" />
@@ -71,8 +70,8 @@
           <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/test/java/ArrazTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="197">
-                  <caret line="292" column="35" lean-forward="true" selection-start-line="292" selection-start-column="35" selection-end-line="292" selection-end-column="35" />
+                <state relative-caret-position="352">
+                  <caret line="450" column="25" selection-start-line="450" selection-start-column="25" selection-end-line="450" selection-end-column="25" />
                   <folding>
                     <element signature="imports" expanded="true" />
                     <element signature="e#7644#7653#0" expanded="true" />
@@ -94,8 +93,8 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/test/java/ArrazTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/Arraz.java" />
+        <option value="$PROJECT_DIR$/src/test/java/ArrazTest.java" />
       </list>
     </option>
   </component>
@@ -106,10 +105,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="21" />
-    <option name="y" value="214" />
-    <option name="width" value="1280" />
-    <option name="height" value="747" />
+    <option name="x" value="-298" />
+    <option name="y" value="-995" />
+    <option name="width" value="1845" />
+    <option name="height" value="940" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -166,7 +165,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544159948022" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544193603852" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -183,7 +182,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.ArrazTest">
+  <component name="RunManager" selected="JUnit.ArrazTest.test2AverageArrayWithoutMaxMin">
     <configuration name="ArrazTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="arraz" />
       <option name="PACKAGE_NAME" value="" />
@@ -192,31 +191,31 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ArrazTest.test2Check2ArraysForEqual" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="ArrazTest.test2AverageArrayWithoutMaxMin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="arraz" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="ArrazTest" />
-      <option name="METHOD_NAME" value="test2Check2ArraysForEqual" />
+      <option name="METHOD_NAME" value="test2AverageArrayWithoutMaxMin" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ArrazTest.test2MakeMeAnArrayFromArrayList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="ArrazTest.test2Check2ArraysForEqual" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="arraz" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="ArrazTest" />
-      <option name="METHOD_NAME" value="test2MakeMeAnArrayFromArrayList" />
+      <option name="METHOD_NAME" value="test2Check2ArraysForEqual" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ArrazTest.test2MakeMeAnArrayListFromArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="ArrazTest.testAverageArrayWithoutMaxMin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="arraz" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="ArrazTest" />
-      <option name="METHOD_NAME" value="test2MakeMeAnArrayListFromArray" />
+      <option name="METHOD_NAME" value="testAverageArrayWithoutMaxMin" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -233,19 +232,19 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="JUnit.ArrazTest.test2MakeMeAnArrayListFromArray" />
-      <item itemvalue="JUnit.ArrazTest.test2MakeMeAnArrayFromArrayList" />
       <item itemvalue="JUnit.ArrazTest.testCheck2ArraysForEqual" />
       <item itemvalue="JUnit.ArrazTest.test2Check2ArraysForEqual" />
       <item itemvalue="JUnit.ArrazTest" />
+      <item itemvalue="JUnit.ArrazTest.testAverageArrayWithoutMaxMin" />
+      <item itemvalue="JUnit.ArrazTest.test2AverageArrayWithoutMaxMin" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.ArrazTest.test2AverageArrayWithoutMaxMin" />
+        <item itemvalue="JUnit.ArrazTest.testAverageArrayWithoutMaxMin" />
         <item itemvalue="JUnit.ArrazTest" />
         <item itemvalue="JUnit.ArrazTest.test2Check2ArraysForEqual" />
         <item itemvalue="JUnit.ArrazTest.testCheck2ArraysForEqual" />
-        <item itemvalue="JUnit.ArrazTest.test2MakeMeAnArrayFromArrayList" />
-        <item itemvalue="JUnit.ArrazTest.test2MakeMeAnArrayListFromArray" />
       </list>
     </recent_temporary>
   </component>
@@ -259,17 +258,11 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1544046001151</updated>
-      <workItem from="1544046022231" duration="26398000" />
+      <workItem from="1544046022231" duration="29127000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="ArrazTest_test2RemoveDupesFromArray - 2018.12.06 at 22h 39m 23s.xml">
-      <configuration name="ArrazTest.test2RemoveDupesFromArray" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="ArrazTest_testFind2ndLargestValueFromArray - 2018.12.06 at 22h 39m 28s.xml">
-      <configuration name="ArrazTest.testFind2ndLargestValueFromArray" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="ArrazTest_testFind2ndLargestValueFromArray - 2018.12.06 at 22h 40m 59s.xml">
       <configuration name="ArrazTest.testFind2ndLargestValueFromArray" configurationId="JUnit" />
     </history-entry>
@@ -294,12 +287,18 @@
     <history-entry file="ArrazTest_test2Check2ArraysForEqual - 2018.12.06 at 23h 47m 25s.xml">
       <configuration name="ArrazTest.test2Check2ArraysForEqual" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="ArrazTest - 2018.12.07 at 00h 21m 26s.xml">
+      <configuration name="ArrazTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="ArrazTest_testAverageArrayWithoutMaxMin - 2018.12.07 at 09h 37m 22s.xml">
+      <configuration name="ArrazTest.testAverageArrayWithoutMaxMin" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="26398000" />
+    <option name="totallyTimeSpent" value="29127000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="31" y="130" width="1280" height="747" extended-state="0" />
+    <frame x="-298" y="-995" width="1845" height="940" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Image Layers" />
@@ -307,16 +306,16 @@
       <window_info id="UI Designer" />
       <window_info id="Capture Tool" />
       <window_info id="Favorites" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.09289176" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.06378259" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Messages" weight="0.32594937" />
+      <window_info anchor="bottom" id="Messages" weight="0.32484847" />
       <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" weight="0.3908228" />
+      <window_info anchor="bottom" id="Terminal" weight="0.29939395" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.40822786" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.40727273" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39810428" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -366,24 +365,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/ArrazTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="292" column="35" lean-forward="true" selection-start-line="292" selection-start-column="35" selection-end-line="292" selection-end-column="35" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#7644#7653#0" expanded="true" />
-            <element signature="e#8053#8062#0" expanded="true" />
-            <element signature="e#8057#8066#0" expanded="true" />
-            <element signature="e#8728#8737#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/Arraz.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="206">
-          <caret line="224" column="23" lean-forward="true" selection-start-line="224" selection-start-column="23" selection-end-line="224" selection-end-column="23" />
+        <state relative-caret-position="162">
+          <caret line="153" column="22" selection-start-line="153" selection-start-column="22" selection-end-line="153" selection-end-column="22" />
           <folding>
             <element signature="e#1659#1668#0" expanded="true" />
             <element signature="e#2355#2364#0" expanded="true" />
@@ -405,5 +390,19 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/ArrazTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="450" column="25" selection-start-line="450" selection-start-column="25" selection-end-line="450" selection-end-column="25" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#7644#7653#0" expanded="true" />
+            <element signature="e#8053#8062#0" expanded="true" />
+            <element signature="e#8057#8066#0" expanded="true" />
+            <element signature="e#8728#8737#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

arraz/src/main/java/Arraz.java

@@ -143,11 +143,32 @@ public class Arraz {
         return Arrays.equals(str1, str2);
     }
 
-    public Integer averageArrayWithoutMaxMin(Integer[] arr1) {
+    public int averageArrayWithoutMaxMin(int[] arr1) {
+        int max = arr1[0];
+        int min = arr1[0];
+        int[] arr2 = new int[arr1.length - 2];
+        int count = 0;
+        int sum = 0;
+
+
+
+        for (int i : arr1){
+            if (i > max){
+                max = i;
+            } else {
+                min = i;
+            }
+        }
+
+        for (int i : arr1) {
+            if ( i != max || i != min){
+                sum += i;
+                count++;
+            }
+        }
 
-//        findMaxMinOfArray((Double) arr1);
 
-        return null;
+        return sum / count;
     }
 
     public class OddEven {

arraz/src/test/java/ArrazTest.java

@@ -435,10 +435,21 @@ public class ArrazTest {
     @Test
     public void testAverageArrayWithoutMaxMin(){
 
-        Integer[] arr1 = {1,2,3,4,5};
+        int[] arr1 = {1,2,3,4,5};
 
-        Integer expected = 3;
-        Integer actual = arraz.averageArrayWithoutMaxMin(arr1);
+        int expected = 3;
+        int actual = arraz.averageArrayWithoutMaxMin(arr1);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void test2AverageArrayWithoutMaxMin(){
+
+        int[] arr1 = {1,2,3};
+
+        int expected = 2;
+        int actual = arraz.averageArrayWithoutMaxMin(arr1);
 
         Assert.assertEquals(expected, actual);
     }