donnaj před 6 roky
rodič
revize
e937ce792f
3 změnil soubory, kde provedl 126 přidání a 67 odebrání
  1. 44
    1
      IntegerDuplicateDeleter.java
  2. 44
    1
      StringDuplicateDeleter.java
  3. 38
    65
      package.bluej

+ 44
- 1
IntegerDuplicateDeleter.java Zobrazit soubor

@@ -1,6 +1,49 @@
1 1
  
2
-
2
+import java.util.*;
3 3
 
4 4
 public class IntegerDuplicateDeleter extends DuplicateDeleter<Integer>{
5 5
 
6
+public IntegerDuplicateDeleter (Integer[] array){
7
+    super(array);
8
+}
9
+    
10
+public Integer[] removeDuplicates(int maxNumberOfDuplications) {
11
+Integer[] answer = new Integer[array.length];
12
+int answerIndex = 0;
13
+for(int i = 0; i < array.length; i++) {
14
+    Integer occurrences = getAppearances(array[i]);
15
+    if(occurrences < maxNumberOfDuplications){
16
+        answer[answerIndex] = array[i];
17
+        answerIndex++;
18
+    }
19
+}
20
+Integer[] realAnswer = Arrays.copyOf(answer, answerIndex);
21
+return realAnswer;
22
+}
23
+
24
+public Integer[] removeDuplicatesExactly(int exactNumberOfDuplications) {
25
+Integer[] answer = new Integer[array.length];
26
+int answerIndex = 0;
27
+for(int i = 0; i < array.length; i++) {
28
+    Integer occurrences = getAppearances(array[i]);
29
+    if(occurrences < exactNumberOfDuplications || occurrences > exactNumberOfDuplications){
30
+        answer[answerIndex] = array[i];
31
+        answerIndex++;
32
+    }
33
+}
34
+Integer[] realAnswer = Arrays.copyOf(answer, answerIndex);
35
+return realAnswer;
36
+}
37
+
38
+public int getAppearances(Integer value){
39
+int appearances = 0;
40
+for(Integer element : array) {
41
+    if (element == value) {
42
+        appearances++;
43
+    }
44
+    
45
+}
46
+    return appearances;
47
+}
48
+    
6 49
 }

+ 44
- 1
StringDuplicateDeleter.java Zobrazit soubor

@@ -1,6 +1,49 @@
1
- 
1
+ import java.util.*;
2 2
 
3 3
 public final class StringDuplicateDeleter extends DuplicateDeleter<String> {
4 4
 
5
+    public StringDuplicateDeleter (String[] array){
6
+    super(array);
7
+}
8
+
9
+    
10
+public String[] removeDuplicates(int maxNumberOfDuplications) {
11
+String[] answer = new String[array.length];
12
+int answerIndex = 0;
13
+for(int i = 0; i < array.length; i++) {
14
+    Integer occurrences = getAppearances(array[i]);
15
+    if(occurrences < maxNumberOfDuplications){
16
+        answer[answerIndex] = array[i];
17
+        answerIndex++;
18
+    }
19
+}
20
+String[] realAnswer = Arrays.copyOf(answer, answerIndex);
21
+return realAnswer;
22
+}
23
+
24
+public String[] removeDuplicatesExactly(int exactNumberOfDuplications) {
25
+String[] answer = new String[array.length];
26
+int answerIndex = 0;
27
+for(int i = 0; i < array.length; i++) {
28
+    Integer occurrences = getAppearances(array[i]);
29
+    if(occurrences < exactNumberOfDuplications || occurrences > exactNumberOfDuplications){
30
+        answer[answerIndex] = array[i];
31
+        answerIndex++;
32
+    }
33
+}
34
+String[] realAnswer = Arrays.copyOf(answer, answerIndex);
35
+return realAnswer;
36
+}
37
+
38
+public int getAppearances(String value){
39
+int appearances = 0;
40
+for(String element : array) {
41
+    if (element.equals(value)) {
42
+        appearances++;
43
+    }
44
+    
45
+}
46
+    return appearances;
47
+}
5 48
 
6 49
 }

+ 38
- 65
package.bluej Zobrazit soubor

@@ -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
-editor.fx.0.height=722
14
+editor.fx.0.height=709
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=23
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=25
25
+package.editor.y=140
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