#34 completed dan to better drills

오픈
sambhutani sambhutani/CR-MicroLabs-JavaFundamentals-DanDoBetterDrills:master 에서 master 로 1 commits 를 머지하려 합니다
7개의 변경된 파일95개의 추가작업 그리고 60개의 파일을 삭제
  1. BIN
      MathUtilities.class
  2. 26
    26
      MathUtilities.java
  3. BIN
      PredicateUtilities.class
  4. 21
    4
      PredicateUtilities.java
  5. BIN
      StringUtilities.class
  6. 28
    10
      StringUtilities.java
  7. 20
    20
      package.bluej

BIN
MathUtilities.class 파일 보기


+ 26
- 26
MathUtilities.java 파일 보기

@@ -11,7 +11,7 @@ public class MathUtilities {
11 11
      * @return sum of `baseValue` and `difference`
12 12
      */
13 13
     public Integer add(int baseValue, int difference) {
14
-        return null;
14
+        return (baseValue + difference);
15 15
     }
16 16
 
17 17
     /**
@@ -20,7 +20,7 @@ public class MathUtilities {
20 20
      * @return sum of `baseValue` and `difference`
21 21
      */
22 22
     public Long add(long baseValue, long difference) {
23
-        return null;
23
+        return (baseValue + difference);
24 24
     }
25 25
 
26 26
     /**
@@ -29,7 +29,7 @@ public class MathUtilities {
29 29
      * @return sum of `baseValue` and `difference`
30 30
      */
31 31
     public Short add(short baseValue, short difference) {
32
-        return null;
32
+        return  (short) (baseValue + difference);
33 33
     }
34 34
 
35 35
     /**
@@ -38,7 +38,7 @@ public class MathUtilities {
38 38
      * @return sum of `baseValue` and `difference`
39 39
      */
40 40
     public Byte add(byte baseValue, byte difference) {
41
-        return null;
41
+        return (byte) (baseValue + difference);
42 42
     }
43 43
 
44 44
     /**
@@ -47,7 +47,7 @@ public class MathUtilities {
47 47
      * @return sum of `baseValue` and `difference`
48 48
      */
49 49
     public Float add(float baseValue, float difference) {
50
-        return null;
50
+        return (baseValue + difference);
51 51
     }
52 52
 
53 53
     /**
@@ -56,7 +56,7 @@ public class MathUtilities {
56 56
      * @return sum of `baseValue` and `difference`
57 57
      */
58 58
     public Double add(double baseValue, double difference) {
59
-        return null;
59
+        return (baseValue + difference);
60 60
     }
61 61
 
62 62
     /**
@@ -65,7 +65,7 @@ public class MathUtilities {
65 65
      * @return difference between `baseValue` and `difference`
66 66
      */
67 67
     public Integer subtract(int baseValue, int difference) {
68
-        return null;
68
+        return (baseValue - difference);
69 69
     }
70 70
 
71 71
     /**
@@ -74,7 +74,7 @@ public class MathUtilities {
74 74
      * @return difference between `baseValue` and `difference`
75 75
      */
76 76
     public Long subtract(long baseValue, long difference) {
77
-        return null;
77
+        return (baseValue - difference);
78 78
     }
79 79
 
80 80
     /**
@@ -83,7 +83,7 @@ public class MathUtilities {
83 83
      * @return difference between `baseValue` and `difference`
84 84
      */
85 85
     public Short subtract(short baseValue, short difference) {
86
-        return null;
86
+        return (short) (baseValue - difference);
87 87
     }
88 88
 
89 89
     /**
@@ -92,7 +92,7 @@ public class MathUtilities {
92 92
      * @return difference between `baseValue` and `difference`
93 93
      */
94 94
     public Byte subtract(byte baseValue, byte difference) {
95
-        return null;
95
+        return (byte) (baseValue - difference);
96 96
     }
97 97
 
98 98
     /**
@@ -101,7 +101,7 @@ public class MathUtilities {
101 101
      * @return difference between `baseValue` and `difference`
102 102
      */
103 103
     public Float subtract(float baseValue, float difference) {
104
-        return null;
104
+        return (baseValue - difference);
105 105
     }
106 106
 
107 107
     /**
@@ -110,7 +110,7 @@ public class MathUtilities {
110 110
      * @return difference between `baseValue` and `difference`
111 111
      */
112 112
     public Double subtract(double baseValue, double difference) {
113
-        return null;
113
+        return (baseValue - difference);
114 114
     }
115 115
 
116 116
 
@@ -120,7 +120,7 @@ public class MathUtilities {
120 120
      * @return division of `dividend` by `divisor
121 121
      */
122 122
     public Integer divide(int dividend, int divisor) {
123
-        return null;
123
+        return (dividend/ divisor);
124 124
     }
125 125
 
126 126
     /**
@@ -129,7 +129,7 @@ public class MathUtilities {
129 129
      * @return division of `dividend` by `divisor
130 130
      */
131 131
     public Long divide(long dividend, long divisor) {
132
-        return null;
132
+        return (dividend/ divisor);
133 133
     }
134 134
 
135 135
     /**
@@ -138,7 +138,7 @@ public class MathUtilities {
138 138
      * @return division of `dividend` by `divisor
139 139
      */
140 140
     public Short divide(short dividend, short divisor) {
141
-        return null;
141
+        return (short) (dividend/ divisor);
142 142
     }
143 143
 
144 144
     /**
@@ -147,7 +147,7 @@ public class MathUtilities {
147 147
      * @return division of `dividend` by `divisor
148 148
      */
149 149
     public Byte divide(byte dividend, byte divisor) {
150
-        return null;
150
+        return (byte) (dividend/ divisor);
151 151
     }
152 152
 
153 153
     /**
@@ -156,7 +156,7 @@ public class MathUtilities {
156 156
      * @return division of `dividend` by `divisor
157 157
      */
158 158
     public Float divide(float dividend, float divisor) {
159
-        return null;
159
+        return (dividend/ divisor);
160 160
     }
161 161
 
162 162
     /**
@@ -165,7 +165,7 @@ public class MathUtilities {
165 165
      * @return division of `dividend` by `divisor
166 166
      */
167 167
     public Double divide(double dividend, double divisor) {
168
-        return null;
168
+        return (dividend/ divisor);
169 169
     }
170 170
 
171 171
 
@@ -175,7 +175,7 @@ public class MathUtilities {
175 175
      * @return product of `multiplicand` by `multiplier`
176 176
      */
177 177
     public Integer multiply(int multiplicand, int multiplier) {
178
-        return null;
178
+        return (multiplicand * multiplier);
179 179
     }
180 180
 
181 181
     /**
@@ -184,7 +184,7 @@ public class MathUtilities {
184 184
      * @return product of `multiplicand` by `multiplier`
185 185
      */
186 186
     public Long multiply(long multiplicand, long multiplier) {
187
-        return null;
187
+        return (multiplicand * multiplier);
188 188
     }
189 189
 
190 190
     /**
@@ -193,7 +193,7 @@ public class MathUtilities {
193 193
      * @return product of `multiplicand` by `multiplier`
194 194
      */
195 195
     public Short multiply(short multiplicand, short multiplier) {
196
-        return null;
196
+        return (short)(multiplicand * multiplier);
197 197
     }
198 198
     /**
199 199
      * @param multiplicand value to be multiplied
@@ -201,7 +201,7 @@ public class MathUtilities {
201 201
      * @return product of `multiplicand` by `multiplier`
202 202
      */
203 203
     public Byte multiply(byte multiplicand, byte multiplier) {
204
-        return null;
204
+        return (byte)(multiplicand * multiplier);
205 205
     }
206 206
 
207 207
     /**
@@ -210,7 +210,7 @@ public class MathUtilities {
210 210
      * @return product of `multiplicand` by `multiplier`
211 211
      */
212 212
     public Float multiply(float multiplicand, float multiplier) {
213
-        return null;
213
+        return (multiplicand * multiplier);
214 214
     }
215 215
 
216 216
     /**
@@ -219,7 +219,7 @@ public class MathUtilities {
219 219
      * @return product of `multiplicand` by `multiplier`
220 220
      */
221 221
     public Double multiply(double multiplicand, double multiplier) {
222
-        return null;
222
+        return (multiplicand * multiplier);
223 223
     }
224 224
 
225 225
 
@@ -227,14 +227,14 @@ public class MathUtilities {
227 227
       * @return true
228 228
      */
229 229
     public Boolean returnTrue() {
230
-        return null;
230
+        return true;
231 231
     }
232 232
 
233 233
     /**
234 234
      * @return false
235 235
      */
236 236
     public Boolean returnFalse() {
237
-        return null;
237
+        return false;
238 238
     }
239 239
 
240 240
 }

BIN
PredicateUtilities.class 파일 보기


+ 21
- 4
PredicateUtilities.java 파일 보기

@@ -10,7 +10,14 @@ public class PredicateUtilities {
10 10
      * @return true if `x` is greater than `y`
11 11
      */
12 12
     public Boolean isGreaterThan(int x, int y) {
13
-        return null;
13
+        if(x>y)
14
+        {return true;
15
+        }
16
+        else
17
+        {
18
+            return false;
19
+        }
20
+        
14 21
     }
15 22
 
16 23
     /**
@@ -19,7 +26,11 @@ public class PredicateUtilities {
19 26
      * @return true if `x` is less than `y`
20 27
      */
21 28
     public Boolean isLessThan(int x, int y) {
22
-        return null;
29
+        if(x<y)
30
+        {
31
+        return true;
32
+    }
33
+        else {return false;}
23 34
     }
24 35
 
25 36
     /**
@@ -28,7 +39,11 @@ public class PredicateUtilities {
28 39
      * @return true if `x` is greater than or equal to `y`
29 40
      */
30 41
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
31
-        return null;
42
+        if(x>=y)
43
+        {
44
+            return true;
45
+        }
46
+        else{return false;}
32 47
     }
33 48
 
34 49
     /**
@@ -37,6 +52,8 @@ public class PredicateUtilities {
37 52
      * @return true if `x` is less than or equal to `y`
38 53
      */
39 54
     public Boolean isLessThanOrEqualTo(int x, int y) {
40
-        return null;
55
+        if(x<=y)
56
+        {return true;}
57
+        else{return false;}
41 58
     }
42 59
 }

BIN
StringUtilities.class 파일 보기


+ 28
- 10
StringUtilities.java 파일 보기

@@ -8,7 +8,7 @@ public class StringUtilities {
8 8
      * @return `Hello World` as a string
9 9
      */
10 10
     public static String getHelloWorld() {
11
-        return null;
11
+        return "Hello World" ;
12 12
     }
13 13
 
14 14
     /**
@@ -17,7 +17,7 @@ public class StringUtilities {
17 17
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
18 18
      */
19 19
     public static String concatenation(String firstSegment, String secondSegment){
20
-        return null;
20
+        return (firstSegment + secondSegment);
21 21
     }
22 22
 
23 23
     /**
@@ -26,7 +26,8 @@ public class StringUtilities {
26 26
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27 27
      */
28 28
     public static String concatenation(int firstSegment, String secondSegment){
29
-        return null;
29
+        
30
+        return (firstSegment + secondSegment);
30 31
     }
31 32
 
32 33
     /**
@@ -34,7 +35,7 @@ public class StringUtilities {
34 35
      * @return the first 3 characters of `input`
35 36
      */
36 37
     public static String getPrefix(String input){
37
-        return null;
38
+        return input.substring(0,3);
38 39
     }
39 40
 
40 41
     /**
@@ -42,7 +43,7 @@ public class StringUtilities {
42 43
      * @return the last 3 characters of `input`
43 44
      */
44 45
     public static String getSuffix(String input){
45
-        return null;
46
+        return input.substring(input.length() - 3);
46 47
     }
47 48
 
48 49
     /**
@@ -51,7 +52,7 @@ public class StringUtilities {
51 52
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
52 53
      */
53 54
     public static Boolean compareTwoStrings(String inputValue, String comparableValue){
54
-        return null;
55
+        return (inputValue==comparableValue);
55 56
     }
56 57
 
57 58
     /**
@@ -59,7 +60,18 @@ public class StringUtilities {
59 60
      * @return the middle character of `inputValue`
60 61
      */
61 62
     public static Character getMiddleCharacter(String inputValue){
62
-        return null;
63
+        char result;
64
+        int len= inputValue.length();
65
+        int pos;
66
+        if(len%2==0)
67
+        {
68
+            pos=(len/2) -1 ;
69
+        }
70
+        else
71
+        {
72
+            pos=len/2;
73
+        }
74
+        return inputValue.charAt(pos);
63 75
     }
64 76
 
65 77
     /**
@@ -67,7 +79,9 @@ public class StringUtilities {
67 79
      * @return the first sequence of characters
68 80
      */
69 81
     public static String getFirstWord(String spaceDelimitedString){
70
-        return null;
82
+     
83
+        
84
+        return spaceDelimitedString.split(" ")[0];
71 85
     }
72 86
 
73 87
     /**
@@ -75,7 +89,7 @@ public class StringUtilities {
75 89
      * @return the second word of a string delimited by spaces.
76 90
      */
77 91
     public static String getSecondWord(String spaceDelimitedString){
78
-        return null;
92
+        return spaceDelimitedString.split(" ")[1];
79 93
     }
80 94
 
81 95
     /**
@@ -83,6 +97,10 @@ public class StringUtilities {
83 97
      * @return an identical string with characters in reverse order.
84 98
      */
85 99
     public static String reverse(String stringToReverse){
86
-        return null;
100
+        char[] str1= stringToReverse.toCharArray();
101
+        String result="";
102
+        for(int i= str1.length-1; i>=0;i--)
103
+        {result= result+ str1[i];}
104
+        return result;
87 105
     }
88 106
 }

+ 20
- 20
package.bluej 파일 보기

@@ -1,18 +1,18 @@
1 1
 #BlueJ package file
2
-editor.fx.0.height=0
3
-editor.fx.0.width=0
4
-editor.fx.0.x=0
5
-editor.fx.0.y=0
2
+editor.fx.0.height=722
3
+editor.fx.0.width=800
4
+editor.fx.0.x=320
5
+editor.fx.0.y=53
6 6
 objectbench.height=129
7
-objectbench.width=1171
8
-package.divider.horizontal=0.6
7
+objectbench.width=570
8
+package.divider.horizontal=0.6004162330905307
9 9
 package.divider.vertical=0.7490774907749077
10 10
 package.editor.height=399
11
-package.editor.width=1069
12
-package.editor.x=59
13
-package.editor.y=63
11
+package.editor.width=855
12
+package.editor.x=9
13
+package.editor.y=154
14 14
 package.frame.height=600
15
-package.frame.width=1195
15
+package.frame.width=981
16 16
 package.numDependencies=0
17 17
 package.numTargets=6
18 18
 package.showExtends=true
@@ -45,19 +45,19 @@ target3.width=100
45 45
 target3.x=60
46 46
 target3.y=150
47 47
 target4.height=50
48
-target4.name=StringUtilities
48
+target4.name=PredicateUtilitiesTest
49 49
 target4.showInterface=false
50
-target4.type=ClassTarget
51
-target4.width=110
52
-target4.x=500
53
-target4.y=130
50
+target4.type=UnitTestTargetJunit4
51
+target4.width=160
52
+target4.x=260
53
+target4.y=50
54 54
 target5.height=50
55
-target5.name=PredicateUtilitiesTest
55
+target5.name=StringUtilities
56 56
 target5.showInterface=false
57
-target5.type=UnitTestTargetJunit4
58
-target5.width=160
59
-target5.x=260
60
-target5.y=50
57
+target5.type=ClassTarget
58
+target5.width=110
59
+target5.x=500
60
+target5.y=130
61 61
 target6.height=50
62 62
 target6.name=MathUtilitiesTest
63 63
 target6.showInterface=false