Browse Source

Merge a5c2793b98ad746ba1564a5bdd140ecba7af1341 into 036bfcdb21ddafb11d4b850f4a344597fa1e729e

carolynnmarie 6 years ago
parent
commit
be0c38ce7e
No account linked to committer's email

+ 52
- 26
src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java View File

3
 /**
3
 /**
4
  * Created by dan on 6/14/17.
4
  * Created by dan on 6/14/17.
5
  */
5
  */
6
+
6
 public class MathUtilities {
7
 public class MathUtilities {
7
 
8
 
8
     /**
9
     /**
10
      * @param difference value to add to starting value
11
      * @param difference value to add to starting value
11
      * @return sum of `baseValue` and `difference`
12
      * @return sum of `baseValue` and `difference`
12
      */
13
      */
14
+
13
     public Integer add(int baseValue, int difference) {
15
     public Integer add(int baseValue, int difference) {
14
-        return null;
16
+        return baseValue + difference;
15
     }
17
     }
16
 
18
 
17
     /**
19
     /**
20
      * @return sum of `baseValue` and `difference`
22
      * @return sum of `baseValue` and `difference`
21
      */
23
      */
22
     public Long add(long baseValue, long difference) {
24
     public Long add(long baseValue, long difference) {
23
-        return null;
25
+        return (long)(baseValue + difference);
24
     }
26
     }
25
 
27
 
26
     /**
28
     /**
29
      * @return sum of `baseValue` and `difference`
31
      * @return sum of `baseValue` and `difference`
30
      */
32
      */
31
     public Short add(short baseValue, short difference) {
33
     public Short add(short baseValue, short difference) {
32
-        return null;
34
+
35
+        return (short)(baseValue + difference);
33
     }
36
     }
34
 
37
 
35
     /**
38
     /**
38
      * @return sum of `baseValue` and `difference`
41
      * @return sum of `baseValue` and `difference`
39
      */
42
      */
40
     public Byte add(byte baseValue, byte difference) {
43
     public Byte add(byte baseValue, byte difference) {
41
-        return null;
44
+
45
+        return (byte)(baseValue + difference);
42
     }
46
     }
43
 
47
 
44
     /**
48
     /**
47
      * @return sum of `baseValue` and `difference`
51
      * @return sum of `baseValue` and `difference`
48
      */
52
      */
49
     public Float add(float baseValue, float difference) {
53
     public Float add(float baseValue, float difference) {
50
-        return null;
54
+
55
+        return (float)(baseValue + difference);
51
     }
56
     }
52
 
57
 
53
     /**
58
     /**
56
      * @return sum of `baseValue` and `difference`
61
      * @return sum of `baseValue` and `difference`
57
      */
62
      */
58
     public Double add(double baseValue, double difference) {
63
     public Double add(double baseValue, double difference) {
59
-        return null;
64
+
65
+        return (double)(baseValue + difference);
60
     }
66
     }
61
 
67
 
62
     /**
68
     /**
65
      * @return difference between `baseValue` and `difference`
71
      * @return difference between `baseValue` and `difference`
66
      */
72
      */
67
     public Integer subtract(int baseValue, int difference) {
73
     public Integer subtract(int baseValue, int difference) {
68
-        return null;
74
+
75
+        return baseValue - difference;
69
     }
76
     }
70
 
77
 
71
     /**
78
     /**
74
      * @return difference between `baseValue` and `difference`
81
      * @return difference between `baseValue` and `difference`
75
      */
82
      */
76
     public Long subtract(long baseValue, long difference) {
83
     public Long subtract(long baseValue, long difference) {
77
-        return null;
84
+
85
+        return baseValue - difference;
78
     }
86
     }
79
 
87
 
80
     /**
88
     /**
83
      * @return difference between `baseValue` and `difference`
91
      * @return difference between `baseValue` and `difference`
84
      */
92
      */
85
     public Short subtract(short baseValue, short difference) {
93
     public Short subtract(short baseValue, short difference) {
86
-        return null;
94
+
95
+        return (short)(baseValue - difference);
87
     }
96
     }
88
 
97
 
89
     /**
98
     /**
92
      * @return difference between `baseValue` and `difference`
101
      * @return difference between `baseValue` and `difference`
93
      */
102
      */
94
     public Byte subtract(byte baseValue, byte difference) {
103
     public Byte subtract(byte baseValue, byte difference) {
95
-        return null;
104
+
105
+        return (byte)(baseValue - difference);
96
     }
106
     }
97
 
107
 
98
     /**
108
     /**
101
      * @return difference between `baseValue` and `difference`
111
      * @return difference between `baseValue` and `difference`
102
      */
112
      */
103
     public Float subtract(float baseValue, float difference) {
113
     public Float subtract(float baseValue, float difference) {
104
-        return null;
114
+
115
+        return (float)(baseValue - difference);
105
     }
116
     }
106
 
117
 
107
     /**
118
     /**
110
      * @return difference between `baseValue` and `difference`
121
      * @return difference between `baseValue` and `difference`
111
      */
122
      */
112
     public Double subtract(double baseValue, double difference) {
123
     public Double subtract(double baseValue, double difference) {
113
-        return null;
124
+
125
+        return (double)(baseValue - difference);
114
     }
126
     }
115
 
127
 
116
 
128
 
120
      * @return division of `dividend` by `divisor
132
      * @return division of `dividend` by `divisor
121
      */
133
      */
122
     public Integer divide(int dividend, int divisor) {
134
     public Integer divide(int dividend, int divisor) {
123
-        return null;
135
+
136
+        return dividend / divisor;
124
     }
137
     }
125
 
138
 
126
     /**
139
     /**
129
      * @return division of `dividend` by `divisor
142
      * @return division of `dividend` by `divisor
130
      */
143
      */
131
     public Long divide(long dividend, long divisor) {
144
     public Long divide(long dividend, long divisor) {
132
-        return null;
145
+
146
+        return dividend / divisor;
133
     }
147
     }
134
 
148
 
135
     /**
149
     /**
138
      * @return division of `dividend` by `divisor
152
      * @return division of `dividend` by `divisor
139
      */
153
      */
140
     public Short divide(short dividend, short divisor) {
154
     public Short divide(short dividend, short divisor) {
141
-        return null;
155
+
156
+        return (short)(dividend / divisor);
142
     }
157
     }
143
 
158
 
144
     /**
159
     /**
147
      * @return division of `dividend` by `divisor
162
      * @return division of `dividend` by `divisor
148
      */
163
      */
149
     public Byte divide(byte dividend, byte divisor) {
164
     public Byte divide(byte dividend, byte divisor) {
150
-        return null;
165
+
166
+        return (byte)(dividend / divisor);
151
     }
167
     }
152
 
168
 
153
     /**
169
     /**
156
      * @return division of `dividend` by `divisor
172
      * @return division of `dividend` by `divisor
157
      */
173
      */
158
     public Float divide(float dividend, float divisor) {
174
     public Float divide(float dividend, float divisor) {
159
-        return null;
175
+
176
+        return (float)(dividend / divisor);
160
     }
177
     }
161
 
178
 
162
     /**
179
     /**
165
      * @return division of `dividend` by `divisor
182
      * @return division of `dividend` by `divisor
166
      */
183
      */
167
     public Double divide(double dividend, double divisor) {
184
     public Double divide(double dividend, double divisor) {
168
-        return null;
185
+
186
+        return (double)(dividend / divisor);
169
     }
187
     }
170
 
188
 
171
 
189
 
175
      * @return product of `multiplicand` by `multiplier`
193
      * @return product of `multiplicand` by `multiplier`
176
      */
194
      */
177
     public Integer multiply(int multiplicand, int multiplier) {
195
     public Integer multiply(int multiplicand, int multiplier) {
178
-        return null;
196
+
197
+        return multiplicand * multiplier;
179
     }
198
     }
180
 
199
 
181
     /**
200
     /**
184
      * @return product of `multiplicand` by `multiplier`
203
      * @return product of `multiplicand` by `multiplier`
185
      */
204
      */
186
     public Long multiply(long multiplicand, long multiplier) {
205
     public Long multiply(long multiplicand, long multiplier) {
187
-        return null;
206
+
207
+        return multiplicand * multiplier;
188
     }
208
     }
189
 
209
 
190
     /**
210
     /**
193
      * @return product of `multiplicand` by `multiplier`
213
      * @return product of `multiplicand` by `multiplier`
194
      */
214
      */
195
     public Short multiply(short multiplicand, short multiplier) {
215
     public Short multiply(short multiplicand, short multiplier) {
196
-        return null;
216
+
217
+        return (short)(multiplicand * multiplier);
197
     }
218
     }
198
     /**
219
     /**
199
      * @param multiplicand value to be multiplied
220
      * @param multiplicand value to be multiplied
201
      * @return product of `multiplicand` by `multiplier`
222
      * @return product of `multiplicand` by `multiplier`
202
      */
223
      */
203
     public Byte multiply(byte multiplicand, byte multiplier) {
224
     public Byte multiply(byte multiplicand, byte multiplier) {
204
-        return null;
225
+
226
+        return (byte)(multiplicand * multiplier);
205
     }
227
     }
206
 
228
 
207
     /**
229
     /**
210
      * @return product of `multiplicand` by `multiplier`
232
      * @return product of `multiplicand` by `multiplier`
211
      */
233
      */
212
     public Float multiply(float multiplicand, float multiplier) {
234
     public Float multiply(float multiplicand, float multiplier) {
213
-        return null;
235
+
236
+        return multiplicand * multiplier;
214
     }
237
     }
215
 
238
 
216
     /**
239
     /**
219
      * @return product of `multiplicand` by `multiplier`
242
      * @return product of `multiplicand` by `multiplier`
220
      */
243
      */
221
     public Double multiply(double multiplicand, double multiplier) {
244
     public Double multiply(double multiplicand, double multiplier) {
222
-        return null;
245
+
246
+        return multiplicand * multiplier;
223
     }
247
     }
224
 
248
 
225
 
249
 
227
       * @return true
251
       * @return true
228
      */
252
      */
229
     public Boolean returnTrue() {
253
     public Boolean returnTrue() {
230
-        return null;
254
+
255
+        return true;
231
     }
256
     }
232
 
257
 
233
     /**
258
     /**
234
      * @return false
259
      * @return false
235
      */
260
      */
236
     public Boolean returnFalse() {
261
     public Boolean returnFalse() {
237
-        return null;
262
+
263
+        return false;
238
     }
264
     }
239
 
265
 
240
 }
266
 }

+ 8
- 4
src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java View File

10
      * @return true if `x` is greater than `y`
10
      * @return true if `x` is greater than `y`
11
      */
11
      */
12
     public Boolean isGreaterThan(int x, int y) {
12
     public Boolean isGreaterThan(int x, int y) {
13
-        return null;
13
+
14
+        return (x > y);
14
     }
15
     }
15
 
16
 
16
     /**
17
     /**
19
      * @return true if `x` is less than `y`
20
      * @return true if `x` is less than `y`
20
      */
21
      */
21
     public Boolean isLessThan(int x, int y) {
22
     public Boolean isLessThan(int x, int y) {
22
-        return null;
23
+
24
+        return (x < y);
23
     }
25
     }
24
 
26
 
25
     /**
27
     /**
28
      * @return true if `x` is greater than or equal to `y`
30
      * @return true if `x` is greater than or equal to `y`
29
      */
31
      */
30
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
32
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
31
-        return null;
33
+
34
+        return (x >= y);
32
     }
35
     }
33
 
36
 
34
     /**
37
     /**
37
      * @return true if `x` is less than or equal to `y`
40
      * @return true if `x` is less than or equal to `y`
38
      */
41
      */
39
     public Boolean isLessThanOrEqualTo(int x, int y) {
42
     public Boolean isLessThanOrEqualTo(int x, int y) {
40
-        return null;
43
+
44
+        return (x <= y);
41
     }
45
     }
42
 }
46
 }

+ 30
- 11
src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java View File

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

+ 1
- 1
src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java View File

5
  */
5
  */
6
 public class ZipcodeRocks {
6
 public class ZipcodeRocks {
7
     public static void main(String[] args) {
7
     public static void main(String[] args) {
8
-//         System.out.println("Zipcode Rocks!");
8
+         System.out.println("Zipcode Rocks!");
9
     }
9
     }
10
 }
10
 }