Преглед на файлове

committing duplicateDeleter

chitraB преди 6 години
родител
ревизия
84bb5612a5
променени са 3 файла, в които са добавени 185 реда и са изтрити 67 реда
  1. 77
    2
      IntegerDuplicateDeleter.java
  2. 71
    1
      StringDuplicateDeleter.java
  3. 37
    64
      package.bluej

+ 77
- 2
IntegerDuplicateDeleter.java Целия файл

@@ -1,6 +1,81 @@
1 1
  
2
-
2
+import java.lang.Integer;
3 3
 
4 4
 public class IntegerDuplicateDeleter extends DuplicateDeleter<Integer>{
5
+    
6
+    public IntegerDuplicateDeleter(Integer[] array){
7
+        super(array);
8
+    }
9
+
10
+    public Integer[] removeDuplicates(int maxNumberOfDuplications){
11
+         Integer[] newArray=new Integer[100];
12
+     
13
+       int m=0;
14
+       for(int i=0;i<array.length;i++)
15
+       {
16
+           int k=noOfOccurrence(array[i]);
17
+           if(k<maxNumberOfDuplications)
18
+           {
19
+               newArray[m]=array[i];
20
+             
21
+               m++;
22
+             
23
+           }
24
+       }
25
+       Integer[] resultArray=new Integer[m];
26
+       for(int i=0;i<m;i++)
27
+       {
28
+           resultArray[i]=newArray[i];
29
+       }
30
+       
31
+       
32
+       return resultArray;
33
+   }
34
+   public int noOfOccurrence(Integer a)
35
+   {
36
+       int count=0;
37
+       for(int i=0;i<array.length;i++)
38
+       {
39
+           if(array[i].equals(a))
40
+           {
41
+               count++;
42
+           }
43
+       }
44
+       
45
+       return count;
46
+        
47
+        
48
+        
49
+    }
50
+    
51
+     public Integer[] removeDuplicatesExactly(int exactNumberOfDuplications){
52
+        Integer[] newArray=new Integer[100];
53
+     
54
+       int m=0;
55
+       for(int i=0;i<array.length;i++)
56
+       {
57
+           int k=noOfOccurrence(array[i]);
58
+           if(k!=exactNumberOfDuplications)
59
+           {
60
+               newArray[m]=array[i];
61
+             
62
+               m++;
63
+             
64
+           }
65
+       }
66
+       Integer[] resultArray=new Integer[m];
67
+       for(int i=0;i<m;i++)
68
+       {
69
+           resultArray[i]=newArray[i];
70
+       }
71
+       System.out.println(resultArray);
72
+       
73
+       return resultArray;
74
+       
75
+     
76
+   } 
77
+           
78
+        
79
+     }
80
+    
5 81
 
6
-}

+ 71
- 1
StringDuplicateDeleter.java Целия файл

@@ -1,6 +1,76 @@
1 1
  
2 2
 
3 3
 public final class StringDuplicateDeleter extends DuplicateDeleter<String> {
4
+    
5
+    public StringDuplicateDeleter(String[] array){
6
+        super(array);
7
+    }
8
+
9
+    public String[] removeDuplicates(int maxNumberOfDuplications){
10
+         String[] newArray=new String[100];
11
+
12
+       int m=0;
13
+       for(int i=0;i<array.length;i++)
14
+       {
15
+           int k=noOfOccurrence(array[i]);
16
+           if(k<maxNumberOfDuplications)
17
+           {
18
+               newArray[m]=array[i];
19
+
20
+               m++;
21
+
22
+           }
23
+       }
24
+       String[] resultArray=new String[m];
25
+       for(int i=0;i<m;i++)
26
+       {
27
+           resultArray[i]=newArray[i];
28
+       }
29
+       System.out.println(resultArray);
30
+
31
+       return resultArray;
32
+   }
33
+
34
+   public int noOfOccurrence(String a)
35
+   {
36
+       int count=0;
37
+       for(int i=0;i<array.length;i++)
38
+       {
39
+           if(array[i].equals(a))
40
+           {
41
+               count++;
42
+           }
43
+       }
44
+
45
+       return count;
46
+        
47
+    }
48
+    
49
+     public String[] removeDuplicatesExactly(int exactNumberOfDuplications){
50
+         String[] newArray=new String[100];
51
+
52
+       int m=0;
53
+       for(int i=0;i<array.length;i++)
54
+       {
55
+           int k=noOfOccurrence(array[i]);
56
+           if(k!=exactNumberOfDuplications)
57
+           {
58
+               newArray[m]=array[i];
59
+
60
+               m++;
61
+
62
+           }
63
+       }
64
+       String[] resultArray=new String[m];
65
+       for(int i=0;i<m;i++)
66
+       {
67
+           resultArray[i]=newArray[i];
68
+       }
69
+       System.out.println(resultArray);
70
+
71
+       return resultArray;
72
+   }
73
+         
74
+     }
4 75
 
5 76
 
6
-}

+ 37
- 64
package.bluej Целия файл

@@ -1,38 +1,32 @@
1 1
 #BlueJ package file
2
-dependency1.from=StringDuplicateDeleterTest
3
-dependency1.to=StringDuplicateDeleter
2
+dependency1.from=IntegerDuplicateDeleterTest
3
+dependency1.to=DuplicateDeleter
4 4
 dependency1.type=UsesDependency
5
-dependency2.from=StringDuplicateDeleterTest
6
-dependency2.to=TestUtils
5
+dependency2.from=IntegerDuplicateDeleterTest
6
+dependency2.to=IntegerDuplicateDeleter
7 7
 dependency2.type=UsesDependency
8 8
 dependency3.from=StringDuplicateDeleterTest
9
-dependency3.to=RandomNumberFactory
9
+dependency3.to=DuplicateDeleter
10 10
 dependency3.type=UsesDependency
11
-dependency4.from=IntegerDuplicateDeleterTest
12
-dependency4.to=IntegerDuplicateDeleter
11
+dependency4.from=StringDuplicateDeleterTest
12
+dependency4.to=StringDuplicateDeleter
13 13
 dependency4.type=UsesDependency
14
-dependency5.from=IntegerDuplicateDeleterTest
15
-dependency5.to=TestUtils
16
-dependency5.type=UsesDependency
17
-dependency6.from=IntegerDuplicateDeleterTest
18
-dependency6.to=RandomNumberFactory
19
-dependency6.type=UsesDependency
20 14
 editor.fx.0.height=722
21 15
 editor.fx.0.width=988
22
-editor.fx.0.x=425
23
-editor.fx.0.y=176
16
+editor.fx.0.x=292
17
+editor.fx.0.y=31
24 18
 objectbench.height=189
25
-objectbench.width=1211
19
+objectbench.width=722
26 20
 package.divider.horizontal=0.6
27 21
 package.divider.vertical=0.6979969183359014
28 22
 package.editor.height=446
29 23
 package.editor.width=1109
30
-package.editor.x=142
31
-package.editor.y=61
24
+package.editor.x=45
25
+package.editor.y=46
32 26
 package.frame.height=707
33 27
 package.frame.width=1235
34
-package.numDependencies=6
35
-package.numTargets=8
28
+package.numDependencies=4
29
+package.numTargets=5
36 30
 package.showExtends=true
37 31
 package.showUses=true
38 32
 project.charset=UTF-8
@@ -41,61 +35,40 @@ readme.name=@README
41 35
 readme.width=47
42 36
 readme.x=10
43 37
 readme.y=10
38
+target1.association=StringDuplicateDeleterTest
44 39
 target1.height=50
45
-target1.name=TestUtils
40
+target1.name=StringDuplicateDeleter
46 41
 target1.showInterface=false
47 42
 target1.type=ClassTarget
48
-target1.width=80
49
-target1.x=750
50
-target1.y=210
51
-target2.association=StringDuplicateDeleterTest
43
+target1.width=170
44
+target1.x=90
45
+target1.y=40
46
+target2.association=IntegerDuplicateDeleterTest
52 47
 target2.height=50
53
-target2.name=StringDuplicateDeleter
48
+target2.name=IntegerDuplicateDeleter
54 49
 target2.showInterface=false
55 50
 target2.type=ClassTarget
56 51
 target2.width=170
57
-target2.x=90
58
-target2.y=40
52
+target2.x=40
53
+target2.y=220
59 54
 target3.height=50
60
-target3.name=RandomNumberFactory
55
+target3.name=IntegerDuplicateDeleterTest
61 56
 target3.showInterface=false
62
-target3.type=ClassTarget
57
+target3.type=UnitTestTargetJunit4
63 58
 target3.width=170
64
-target3.x=230
65
-target3.y=130
59
+target3.x=70
60
+target3.y=190
66 61
 target4.height=50
67
-target4.name=DuplicateDeleterInterface
62
+target4.name=StringDuplicateDeleterTest
68 63
 target4.showInterface=false
69
-target4.type=InterfaceTarget
70
-target4.width=210
71
-target4.x=480
72
-target4.y=30
73
-target5.association=IntegerDuplicateDeleterTest
64
+target4.type=UnitTestTargetJunit4
65
+target4.width=170
66
+target4.x=120
67
+target4.y=10
74 68
 target5.height=50
75
-target5.name=IntegerDuplicateDeleter
69
+target5.name=DuplicateDeleter
76 70
 target5.showInterface=false
77
-target5.type=ClassTarget
78
-target5.width=170
79
-target5.x=40
80
-target5.y=220
81
-target6.height=50
82
-target6.name=StringDuplicateDeleterTest
83
-target6.showInterface=false
84
-target6.type=UnitTestTargetJunit4
85
-target6.width=170
86
-target6.x=120
87
-target6.y=10
88
-target7.height=50
89
-target7.name=IntegerDuplicateDeleterTest
90
-target7.showInterface=false
91
-target7.type=UnitTestTargetJunit4
92
-target7.width=170
93
-target7.x=70
94
-target7.y=190
95
-target8.height=50
96
-target8.name=DuplicateDeleter
97
-target8.showInterface=false
98
-target8.type=AbstractTarget
99
-target8.width=160
100
-target8.x=450
101
-target8.y=120
71
+target5.type=AbstractTarget
72
+target5.width=160
73
+target5.x=450
74
+target5.y=120