소스 검색

dan do better drills lab - completed

Jonathan Hinds 6 년 전
부모
커밋
da121c6a11
9개의 변경된 파일88개의 추가작업 그리고 50개의 파일을 삭제
  1. BIN
      MathUtilities.class
  2. 27
    27
      MathUtilities.java
  3. BIN
      PredicateUtilities.class
  4. 20
    4
      PredicateUtilities.java
  5. BIN
      PredicateUtilitiesTest.class
  6. 0
    2
      PredicateUtilitiesTest.java
  7. BIN
      StringUtilities.class
  8. 31
    10
      StringUtilities.java
  9. 10
    7
      package.bluej

BIN
MathUtilities.class 파일 보기


+ 27
- 27
MathUtilities.java 파일 보기

@@ -10,8 +10,8 @@ public class MathUtilities {
10 10
      * @param difference value to add to starting value
11 11
      * @return sum of `baseValue` and `difference`
12 12
      */
13
-    public Integer add(int baseValue, int difference) {
14
-        return null;
13
+    public Integer add(int baseValue, int difference) {        
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 (float)(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 (double)(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 (long)(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 (float)(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 (double)(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 (long)(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 (float)(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 (double)(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 (long)(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 (float)(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 (double)(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 파일 보기


+ 20
- 4
PredicateUtilities.java 파일 보기

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

BIN
PredicateUtilitiesTest.class 파일 보기


+ 0
- 2
PredicateUtilitiesTest.java 파일 보기

@@ -1,5 +1,3 @@
1
- 
2
-
3 1
 import org.junit.Test;
4 2
 
5 3
 import static org.junit.Assert.*;

BIN
StringUtilities.class 파일 보기


+ 31
- 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,8 @@ 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
+        String answer = firstSegment + secondSegment;
21
+        return answer;
21 22
     }
22 23
 
23 24
     /**
@@ -26,7 +27,9 @@ public class StringUtilities {
26 27
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27 28
      */
28 29
     public static String concatenation(int firstSegment, String secondSegment){
29
-        return null;
30
+        String string = String.valueOf(firstSegment);
31
+        String answer = string + secondSegment;
32
+        return answer;
30 33
     }
31 34
 
32 35
     /**
@@ -34,7 +37,8 @@ public class StringUtilities {
34 37
      * @return the first 3 characters of `input`
35 38
      */
36 39
     public static String getPrefix(String input){
37
-        return null;
40
+        String answer = input.substring(0, 3);
41
+        return answer;
38 42
     }
39 43
 
40 44
     /**
@@ -42,7 +46,9 @@ public class StringUtilities {
42 46
      * @return the last 3 characters of `input`
43 47
      */
44 48
     public static String getSuffix(String input){
45
-        return null;
49
+        String answer = input.substring(input.toCharArray().length - 3, input.toCharArray().length);
50
+        System.out.println(answer);
51
+        return answer;
46 52
     }
47 53
 
48 54
     /**
@@ -51,7 +57,11 @@ public class StringUtilities {
51 57
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
52 58
      */
53 59
     public static Boolean compareTwoStrings(String inputValue, String comparableValue){
54
-        return null;
60
+        if(inputValue.equals(comparableValue)){
61
+            return true;
62
+        } else {
63
+            return false;
64
+        }          
55 65
     }
56 66
 
57 67
     /**
@@ -59,7 +69,15 @@ public class StringUtilities {
59 69
      * @return the middle character of `inputValue`
60 70
      */
61 71
     public static Character getMiddleCharacter(String inputValue){
62
-        return null;
72
+        char[] character = inputValue.toCharArray();
73
+        int len = (character.length) / 2;
74
+        
75
+        if(character.length % 2 == 0)
76
+        {
77
+            return character[len - 1];
78
+        } else {
79
+            return character[len];
80
+        }
63 81
     }
64 82
 
65 83
     /**
@@ -67,7 +85,8 @@ public class StringUtilities {
67 85
      * @return the first sequence of characters
68 86
      */
69 87
     public static String getFirstWord(String spaceDelimitedString){
70
-        return null;
88
+        String[] answer = spaceDelimitedString.split(" ");
89
+        return answer[0];
71 90
     }
72 91
 
73 92
     /**
@@ -75,7 +94,8 @@ public class StringUtilities {
75 94
      * @return the second word of a string delimited by spaces.
76 95
      */
77 96
     public static String getSecondWord(String spaceDelimitedString){
78
-        return null;
97
+        String[] answer = spaceDelimitedString.split(" ");
98
+        return answer[1];
79 99
     }
80 100
 
81 101
     /**
@@ -83,6 +103,7 @@ public class StringUtilities {
83 103
      * @return an identical string with characters in reverse order.
84 104
      */
85 105
     public static String reverse(String stringToReverse){
86
-        return null;
106
+        String answer = new StringBuilder(stringToReverse).reverse().toString();       
107
+        return answer;
87 108
     }
88 109
 }

+ 10
- 7
package.bluej 파일 보기

@@ -1,19 +1,22 @@
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
+dependency1.from=PredicateUtilitiesTest
3
+dependency1.to=PredicateUtilities
4
+dependency1.type=UsesDependency
5
+editor.fx.0.height=714
6
+editor.fx.0.width=800
7
+editor.fx.0.x=240
8
+editor.fx.0.y=23
6 9
 objectbench.height=129
7 10
 objectbench.width=1171
8 11
 package.divider.horizontal=0.6
9 12
 package.divider.vertical=0.7490774907749077
10 13
 package.editor.height=399
11 14
 package.editor.width=1069
12
-package.editor.x=59
13
-package.editor.y=63
15
+package.editor.x=50
16
+package.editor.y=97
14 17
 package.frame.height=600
15 18
 package.frame.width=1195
16
-package.numDependencies=0
19
+package.numDependencies=1
17 20
 package.numTargets=6
18 21
 package.showExtends=true
19 22
 package.showUses=true