Explorar el Código

completed Dan Do Better lab

Michelle DiMarino hace 6 años
padre
commit
97b10f0f69
Se han modificado 7 ficheros con 87 adiciones y 55 borrados
  1. BIN
      MathUtilities.class
  2. 27
    26
      MathUtilities.java
  3. BIN
      PredicateUtilities.class
  4. 21
    4
      PredicateUtilities.java
  5. BIN
      StringUtilities.class
  6. 25
    11
      StringUtilities.java
  7. 14
    14
      package.bluej

BIN
MathUtilities.class Ver fichero


+ 27
- 26
MathUtilities.java Ver fichero

@@ -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,8 @@ 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 90
     /**
@@ -92,7 +93,7 @@ public class MathUtilities {
92 93
      * @return difference between `baseValue` and `difference`
93 94
      */
94 95
     public Byte subtract(byte baseValue, byte difference) {
95
-        return null;
96
+        return (byte) (baseValue - difference);
96 97
     }
97 98
 
98 99
     /**
@@ -101,7 +102,7 @@ public class MathUtilities {
101 102
      * @return difference between `baseValue` and `difference`
102 103
      */
103 104
     public Float subtract(float baseValue, float difference) {
104
-        return null;
105
+        return baseValue - difference;
105 106
     }
106 107
 
107 108
     /**
@@ -110,7 +111,7 @@ public class MathUtilities {
110 111
      * @return difference between `baseValue` and `difference`
111 112
      */
112 113
     public Double subtract(double baseValue, double difference) {
113
-        return null;
114
+        return baseValue - difference;
114 115
     }
115 116
 
116 117
 
@@ -120,7 +121,7 @@ public class MathUtilities {
120 121
      * @return division of `dividend` by `divisor
121 122
      */
122 123
     public Integer divide(int dividend, int divisor) {
123
-        return null;
124
+        return dividend/divisor;
124 125
     }
125 126
 
126 127
     /**
@@ -129,7 +130,7 @@ public class MathUtilities {
129 130
      * @return division of `dividend` by `divisor
130 131
      */
131 132
     public Long divide(long dividend, long divisor) {
132
-        return null;
133
+        return dividend/divisor;
133 134
     }
134 135
 
135 136
     /**
@@ -138,7 +139,7 @@ public class MathUtilities {
138 139
      * @return division of `dividend` by `divisor
139 140
      */
140 141
     public Short divide(short dividend, short divisor) {
141
-        return null;
142
+        return (short) (dividend/divisor);
142 143
     }
143 144
 
144 145
     /**
@@ -147,7 +148,7 @@ public class MathUtilities {
147 148
      * @return division of `dividend` by `divisor
148 149
      */
149 150
     public Byte divide(byte dividend, byte divisor) {
150
-        return null;
151
+        return (byte) (dividend/divisor);
151 152
     }
152 153
 
153 154
     /**
@@ -156,7 +157,7 @@ public class MathUtilities {
156 157
      * @return division of `dividend` by `divisor
157 158
      */
158 159
     public Float divide(float dividend, float divisor) {
159
-        return null;
160
+        return dividend/divisor;
160 161
     }
161 162
 
162 163
     /**
@@ -165,7 +166,7 @@ public class MathUtilities {
165 166
      * @return division of `dividend` by `divisor
166 167
      */
167 168
     public Double divide(double dividend, double divisor) {
168
-        return null;
169
+        return dividend/divisor;
169 170
     }
170 171
 
171 172
 
@@ -175,7 +176,7 @@ public class MathUtilities {
175 176
      * @return product of `multiplicand` by `multiplier`
176 177
      */
177 178
     public Integer multiply(int multiplicand, int multiplier) {
178
-        return null;
179
+        return multiplicand * multiplier;
179 180
     }
180 181
 
181 182
     /**
@@ -184,7 +185,7 @@ public class MathUtilities {
184 185
      * @return product of `multiplicand` by `multiplier`
185 186
      */
186 187
     public Long multiply(long multiplicand, long multiplier) {
187
-        return null;
188
+        return multiplicand * multiplier;
188 189
     }
189 190
 
190 191
     /**
@@ -193,7 +194,7 @@ public class MathUtilities {
193 194
      * @return product of `multiplicand` by `multiplier`
194 195
      */
195 196
     public Short multiply(short multiplicand, short multiplier) {
196
-        return null;
197
+        return (short) (multiplicand * multiplier);
197 198
     }
198 199
     /**
199 200
      * @param multiplicand value to be multiplied
@@ -201,7 +202,7 @@ public class MathUtilities {
201 202
      * @return product of `multiplicand` by `multiplier`
202 203
      */
203 204
     public Byte multiply(byte multiplicand, byte multiplier) {
204
-        return null;
205
+        return (byte) (multiplicand * multiplier);
205 206
     }
206 207
 
207 208
     /**
@@ -210,7 +211,7 @@ public class MathUtilities {
210 211
      * @return product of `multiplicand` by `multiplier`
211 212
      */
212 213
     public Float multiply(float multiplicand, float multiplier) {
213
-        return null;
214
+        return multiplicand * multiplier;
214 215
     }
215 216
 
216 217
     /**
@@ -219,7 +220,7 @@ public class MathUtilities {
219 220
      * @return product of `multiplicand` by `multiplier`
220 221
      */
221 222
     public Double multiply(double multiplicand, double multiplier) {
222
-        return null;
223
+        return multiplicand * multiplier;
223 224
     }
224 225
 
225 226
 
@@ -227,14 +228,14 @@ public class MathUtilities {
227 228
       * @return true
228 229
      */
229 230
     public Boolean returnTrue() {
230
-        return null;
231
+        return true;
231 232
     }
232 233
 
233 234
     /**
234 235
      * @return false
235 236
      */
236 237
     public Boolean returnFalse() {
237
-        return null;
238
+        return false;
238 239
     }
239 240
 
240 241
 }

BIN
PredicateUtilities.class Ver fichero


+ 21
- 4
PredicateUtilities.java Ver fichero

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

BIN
StringUtilities.class Ver fichero


+ 25
- 11
StringUtilities.java Ver fichero

@@ -1,4 +1,3 @@
1
- 
2 1
 
3 2
 /**
4 3
  * Created by dan on 6/14/17.
@@ -8,7 +7,7 @@ public class StringUtilities {
8 7
      * @return `Hello World` as a string
9 8
      */
10 9
     public static String getHelloWorld() {
11
-        return null;
10
+        return "Hello World";
12 11
     }
13 12
 
14 13
     /**
@@ -17,7 +16,7 @@ public class StringUtilities {
17 16
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
18 17
      */
19 18
     public static String concatenation(String firstSegment, String secondSegment){
20
-        return null;
19
+        return firstSegment + secondSegment;
21 20
     }
22 21
 
23 22
     /**
@@ -26,7 +25,8 @@ public class StringUtilities {
26 25
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27 26
      */
28 27
     public static String concatenation(int firstSegment, String secondSegment){
29
-        return null;
28
+        String newString = Integer.toString(firstSegment);      
29
+        return newString + secondSegment;
30 30
     }
31 31
 
32 32
     /**
@@ -34,7 +34,7 @@ public class StringUtilities {
34 34
      * @return the first 3 characters of `input`
35 35
      */
36 36
     public static String getPrefix(String input){
37
-        return null;
37
+        return input.substring(0,3);
38 38
     }
39 39
 
40 40
     /**
@@ -42,7 +42,7 @@ public class StringUtilities {
42 42
      * @return the last 3 characters of `input`
43 43
      */
44 44
     public static String getSuffix(String input){
45
-        return null;
45
+        return input.substring(input.length()-3, input.length());
46 46
     }
47 47
 
48 48
     /**
@@ -51,7 +51,8 @@ public class StringUtilities {
51 51
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
52 52
      */
53 53
     public static Boolean compareTwoStrings(String inputValue, String comparableValue){
54
-        return null;
54
+
55
+        return inputValue.equals(comparableValue);
55 56
     }
56 57
 
57 58
     /**
@@ -59,7 +60,16 @@ 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
+      int middleChar;
64
+        if ((inputValue.length()/2)%2 == 0){
65
+            middleChar = inputValue.length()/2-1;
66
+            
67
+        }else{
68
+            middleChar = inputValue.length()/2;
69
+            
70
+            
71
+        }
72
+        return inputValue.charAt(middleChar);
63 73
     }
64 74
 
65 75
     /**
@@ -67,7 +77,8 @@ public class StringUtilities {
67 77
      * @return the first sequence of characters
68 78
      */
69 79
     public static String getFirstWord(String spaceDelimitedString){
70
-        return null;
80
+        String words[] = spaceDelimitedString.split(" ");
81
+        return words[0];
71 82
     }
72 83
 
73 84
     /**
@@ -75,7 +86,8 @@ public class StringUtilities {
75 86
      * @return the second word of a string delimited by spaces.
76 87
      */
77 88
     public static String getSecondWord(String spaceDelimitedString){
78
-        return null;
89
+        String words[] = spaceDelimitedString.split(" ");
90
+        return words[1];
79 91
     }
80 92
 
81 93
     /**
@@ -83,6 +95,8 @@ public class StringUtilities {
83 95
      * @return an identical string with characters in reverse order.
84 96
      */
85 97
     public static String reverse(String stringToReverse){
86
-        return null;
98
+        StringBuilder reverseString = new StringBuilder(stringToReverse);
99
+        return reverseString.reverse().toString();
87 100
     }
101
+
88 102
 }

+ 14
- 14
package.bluej Ver fichero

@@ -1,8 +1,8 @@
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=716
3
+editor.fx.0.width=800
4
+editor.fx.0.x=296
5
+editor.fx.0.y=23
6 6
 objectbench.height=129
7 7
 objectbench.width=1171
8 8
 package.divider.horizontal=0.6
@@ -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