duplicateDeleter

IntegerDuplicateDeleter.java

@@ -2,57 +2,51 @@ import java.util.*;
 import java.util.List;
 import java.util.Collection;
 
-
-public class IntegerDuplicateDeleter extends DuplicateDeleter{
-    
+public class IntegerDuplicateDeleter extends DuplicateDeleter<Integer>{
     public IntegerDuplicateDeleter(Integer[] array) {
         super(array);
     }
-    
+
     public Integer[] removeDuplicates(int maxNumberOfDuplications) {
-       List<Integer> list = new ArrayList<>();
-        
-        // go thru each element in array
-       for (Object num : super.array) {
-            
-            // count occurence
-            int occurence = countOccurrence((Integer)num);
-        
-            //add to new array if occurrence != exactnumber of duplication
-            if (occurence < maxNumberOfDuplications) 
-                list.add((Integer)num);
-                
-       }
-        return list.toArray(new Integer[list.size()]);
+       Integer[] answer = new Integer[array.length];
+        int answerIndex = 0;
+        for (int i = 0; i < array.length; i++) {
+            Integer occurences = getAppearances(array[i]);
+            if(occurences < maxNumberOfDuplications) {
+                answer[answerIndex] = array[i];
+                answerIndex++;    
+
+            }
+        }
+        Integer[] realAnswer = Arrays.copyOf(answer, answerIndex);
+        return realAnswer;
     }
-    
-        
+
     public Integer[] removeDuplicatesExactly(int exactNumberOfDuplications) {
-        List<Integer> list = new ArrayList<>();
-        
-        // go thru each element in array
-        for (Object num : super.array) {
-            
-            // count occurence
-            int occurrence = countOccurrence((Integer)num);
-        
-            //add to new array if occurrence != exactnumber of duplication
-            if (occurrence != exactNumberOfDuplications) 
-                list.add((Integer)num);
-                
+        Integer[] answer = new Integer[array.length];
+        int answerIndex = 0;
+        for (int i = 0; i < array.length; i++) {
+            Integer occurences = getAppearances(array[i]);
+
+            if (occurences  < exactNumberOfDuplications || occurences > exactNumberOfDuplications){ 
+                answer[answerIndex] = array[i];
+                answerIndex++;
+            }
         }
-        return list.toArray(new Integer[list.size()]);
+        Integer[] realAnswer = Arrays.copyOf(answer, answerIndex);
+        return realAnswer;
+
     }
 
-    private int countOccurrence(Integer number) {
-        List<Integer> list = new ArrayList<>();
-        int count = 0;
-        
-        for (Object i : super.array) {
-            if (i.equals(number)) { // when == 1
-                count++;
+    private int getAppearances(Integer s) {
+
+        int appearances = 0;
+
+        for (Integer element: array) {
+            if (element == s) { // when == 1
+                appearances++;
             }
         }
-        return count;
+        return appearances;
     }
 }

StringDuplicateDeleter.java

@@ -4,54 +4,50 @@ public final class StringDuplicateDeleter extends DuplicateDeleter<String> {
     public StringDuplicateDeleter(String[] array) {
         super(array);
     }
-    
+
     public String[] removeDuplicates(int maxNumberOfDuplications) {
-       List<String> list = new ArrayList<>();
-        
-        // go thru each element in array
-       for (Object num : super.array) {
-            
-            // count occurence
-            int occurence = countOccurrence((String)num);
-        
-            //add to new array if occurrence != exactnumber of duplication
-            if (occurence < maxNumberOfDuplications) 
-                list.add((String)num);
-                
-       }
-        return list.toArray(new String[list.size()]);
+
+        String[] answer = new String[array.length];
+        int answerIndex = 0;
+        for (int i = 0; i < array.length; i++) {
+            Integer occurences = getAppearances(array[i]);
+            if(occurences < maxNumberOfDuplications) {
+                answer[answerIndex] = array[i];
+                answerIndex++;    
+
+            }
+        }
+        String[] realAnswer = Arrays.copyOf(answer, answerIndex);
+        return realAnswer;
+
     }
-    
-        
+
     public String[] removeDuplicatesExactly(int exactNumberOfDuplications) {
-        List<String> list = new ArrayList<>();
-        
-        // go thru each element in array
-        for (Object num : super.array) {
-            
-            // count occurence
-            int occurrence = countOccurrence((String)num);
-        
-            //add to new array if occurrence != exactnumber of duplication
-            if (occurrence != exactNumberOfDuplications) 
-                list.add((String)num);
-                
+        String[] answer = new String[array.length];
+        int answerIndex = 0;
+        for (int i = 0; i < array.length; i++) {
+            Integer occurences = getAppearances(array[i]);
+
+            if (occurences  < exactNumberOfDuplications || occurences > exactNumberOfDuplications){ 
+                answer[answerIndex] = array[i];
+                answerIndex++;
+            }
         }
-        return list.toArray(new String[list.size()]);
+        String[] realAnswer = Arrays.copyOf(answer, answerIndex);
+        return realAnswer;
+
     }
 
-    private int countOccurrence(String s) {
+    private int getAppearances(String s) {
 
-        int count = 0;
-        
-        for (Object i : super.array) {
-            if (i.equals(s)) { // when == 1
-                count++;
+        int appearances = 0;
+
+        for (String element: array) {
+            if (element == s) { // when == 1
+                appearances++;
             }
         }
-        return count;
+        return appearances;
     }
 }
 
-
-

package.bluej

@@ -1,28 +1,28 @@
 #BlueJ package file
-dependency1.from=StringDuplicateDeleterTest
+dependency1.from=IntegerDuplicateDeleterTest
 dependency1.to=DuplicateDeleter
 dependency1.type=UsesDependency
-dependency2.from=StringDuplicateDeleterTest
-dependency2.to=StringDuplicateDeleter
+dependency2.from=IntegerDuplicateDeleterTest
+dependency2.to=IntegerDuplicateDeleter
 dependency2.type=UsesDependency
-dependency3.from=IntegerDuplicateDeleterTest
+dependency3.from=StringDuplicateDeleterTest
 dependency3.to=DuplicateDeleter
 dependency3.type=UsesDependency
-dependency4.from=IntegerDuplicateDeleterTest
-dependency4.to=IntegerDuplicateDeleter
+dependency4.from=StringDuplicateDeleterTest
+dependency4.to=StringDuplicateDeleter
 dependency4.type=UsesDependency
-editor.fx.0.height=807
-editor.fx.0.width=1440
-editor.fx.0.x=0
-editor.fx.0.y=23
+editor.fx.0.height=614
+editor.fx.0.width=858
+editor.fx.0.x=405
+editor.fx.0.y=216
 objectbench.height=189
 objectbench.width=722
 package.divider.horizontal=0.6
 package.divider.vertical=0.6979969183359014
 package.editor.height=446
 package.editor.width=1109
-package.editor.x=263
-package.editor.y=218
+package.editor.x=205
+package.editor.y=126
 package.frame.height=707
 package.frame.width=1235
 package.numDependencies=4