Bo Lee vor 6 Jahren
Ursprung
Commit
c6b7806bda

+ 1
- 1
.idea/compiler.xml Datei anzeigen

@@ -9,7 +9,7 @@
9 9
         <module name="ChapterOneMicro" />
10 10
       </profile>
11 11
     </annotationProcessing>
12
-    <bytecodeTargetLevel target="1.8">
12
+    <bytecodeTargetLevel>
13 13
       <module name="ChapterOneMicro" target="1.8" />
14 14
     </bytecodeTargetLevel>
15 15
   </component>

+ 0
- 7
.idea/kotlinc.xml Datei anzeigen

@@ -1,7 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="KotlinCommonCompilerArguments">
4
-    <option name="languageVersion" value="1.1" />
5
-    <option name="apiVersion" value="1.1" />
6
-  </component>
7
-</project>

+ 0
- 77
.idea/misc.xml Datei anzeigen

@@ -7,84 +7,7 @@
7 7
       </list>
8 8
     </option>
9 9
   </component>
10
-  <component name="ProjectInspectionProfilesVisibleTreeState">
11
-    <entry key="Project Default">
12
-      <profile-state>
13
-        <expanded-state>
14
-          <State>
15
-            <id />
16
-          </State>
17
-        </expanded-state>
18
-        <selected-state>
19
-          <State>
20
-            <id>Android</id>
21
-          </State>
22
-        </selected-state>
23
-      </profile-state>
24
-    </entry>
25
-  </component>
26 10
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
27 11
     <output url="file://$PROJECT_DIR$/classes" />
28 12
   </component>
29
-  <component name="masterDetails">
30
-    <states>
31
-      <state key="GlobalLibrariesConfigurable.UI">
32
-        <settings>
33
-          <splitter-proportions>
34
-            <option name="proportions">
35
-              <list>
36
-                <option value="0.2" />
37
-              </list>
38
-            </option>
39
-          </splitter-proportions>
40
-        </settings>
41
-      </state>
42
-      <state key="JdkListConfigurable.UI">
43
-        <settings>
44
-          <last-edited>1.8</last-edited>
45
-          <splitter-proportions>
46
-            <option name="proportions">
47
-              <list>
48
-                <option value="0.2" />
49
-              </list>
50
-            </option>
51
-          </splitter-proportions>
52
-        </settings>
53
-      </state>
54
-      <state key="ProjectJDKs.UI">
55
-        <settings>
56
-          <last-edited>1.8</last-edited>
57
-          <splitter-proportions>
58
-            <option name="proportions">
59
-              <list>
60
-                <option value="0.2" />
61
-              </list>
62
-            </option>
63
-          </splitter-proportions>
64
-        </settings>
65
-      </state>
66
-      <state key="ProjectLibrariesConfigurable.UI">
67
-        <settings>
68
-          <splitter-proportions>
69
-            <option name="proportions">
70
-              <list>
71
-                <option value="0.2" />
72
-              </list>
73
-            </option>
74
-          </splitter-proportions>
75
-        </settings>
76
-      </state>
77
-      <state key="ScopeChooserConfigurable.UI">
78
-        <settings>
79
-          <splitter-proportions>
80
-            <option name="proportions">
81
-              <list>
82
-                <option value="0.2" />
83
-              </list>
84
-            </option>
85
-          </splitter-proportions>
86
-        </settings>
87
-      </state>
88
-    </states>
89
-  </component>
90 13
 </project>

+ 28
- 26
src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java Datei anzeigen

@@ -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,8 @@ 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
+
24
+        return (baseValue + difference);
24 25
     }
25 26
 
26 27
     /**
@@ -29,7 +30,7 @@ public class MathUtilities {
29 30
      * @return sum of `baseValue` and `difference`
30 31
      */
31 32
     public Short add(short baseValue, short difference) {
32
-        return null;
33
+        return (short)(baseValue + difference);
33 34
     }
34 35
 
35 36
     /**
@@ -38,7 +39,7 @@ public class MathUtilities {
38 39
      * @return sum of `baseValue` and `difference`
39 40
      */
40 41
     public Byte add(byte baseValue, byte difference) {
41
-        return null;
42
+        return (byte)(baseValue + difference);
42 43
     }
43 44
 
44 45
     /**
@@ -47,7 +48,7 @@ public class MathUtilities {
47 48
      * @return sum of `baseValue` and `difference`
48 49
      */
49 50
     public Float add(float baseValue, float difference) {
50
-        return null;
51
+        return baseValue + difference;
51 52
     }
52 53
 
53 54
     /**
@@ -56,7 +57,7 @@ public class MathUtilities {
56 57
      * @return sum of `baseValue` and `difference`
57 58
      */
58 59
     public Double add(double baseValue, double difference) {
59
-        return null;
60
+        return baseValue + difference;
60 61
     }
61 62
 
62 63
     /**
@@ -65,7 +66,7 @@ public class MathUtilities {
65 66
      * @return difference between `baseValue` and `difference`
66 67
      */
67 68
     public Integer subtract(int baseValue, int difference) {
68
-        return null;
69
+        return baseValue - difference;
69 70
     }
70 71
 
71 72
     /**
@@ -74,7 +75,7 @@ public class MathUtilities {
74 75
      * @return difference between `baseValue` and `difference`
75 76
      */
76 77
     public Long subtract(long baseValue, long difference) {
77
-        return null;
78
+        return (long)(baseValue - difference);
78 79
     }
79 80
 
80 81
     /**
@@ -83,7 +84,7 @@ public class MathUtilities {
83 84
      * @return difference between `baseValue` and `difference`
84 85
      */
85 86
     public Short subtract(short baseValue, short difference) {
86
-        return null;
87
+        return (short)(baseValue - difference);
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 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 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,8 @@ 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;
224
+
223 225
     }
224 226
 
225 227
 
@@ -227,14 +229,14 @@ public class MathUtilities {
227 229
       * @return true
228 230
      */
229 231
     public Boolean returnTrue() {
230
-        return null;
232
+        return true;
231 233
     }
232 234
 
233 235
     /**
234 236
      * @return false
235 237
      */
236 238
     public Boolean returnFalse() {
237
-        return null;
239
+        return false;
238 240
     }
239 241
 
240 242
 }

+ 4
- 4
src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java Datei anzeigen

@@ -10,7 +10,7 @@ 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
+       return x > y;
14 14
     }
15 15
 
16 16
     /**
@@ -19,7 +19,7 @@ public class PredicateUtilities {
19 19
      * @return true if `x` is less than `y`
20 20
      */
21 21
     public Boolean isLessThan(int x, int y) {
22
-        return null;
22
+        return x < y;
23 23
     }
24 24
 
25 25
     /**
@@ -28,7 +28,7 @@ public class PredicateUtilities {
28 28
      * @return true if `x` is greater than or equal to `y`
29 29
      */
30 30
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
31
-        return null;
31
+        return x >= y;
32 32
     }
33 33
 
34 34
     /**
@@ -37,6 +37,6 @@ public class PredicateUtilities {
37 37
      * @return true if `x` is less than or equal to `y`
38 38
      */
39 39
     public Boolean isLessThanOrEqualTo(int x, int y) {
40
-        return null;
40
+      return x <= y;
41 41
     }
42 42
 }

+ 21
- 10
src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java Datei anzeigen

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

+ 1
- 1
src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java Datei anzeigen

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

+ 2
- 2
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java Datei anzeigen

@@ -36,7 +36,7 @@ public class TestMathUtilities {
36 36
         // : Given
37 37
         short baseValue = 16384;
38 38
         short addedValue = 7;
39
-        short expected = 32767;
39
+        short expected = 16391;
40 40
         // : When
41 41
         short actual = primativeTypes.add(baseValue, addedValue);
42 42
         // : Then
@@ -296,7 +296,7 @@ public class TestMathUtilities {
296 296
         // : Given
297 297
         byte multiplicand = 16;
298 298
         byte multiplier = 14;
299
-        byte expectedByte = 64;
299
+        byte expectedByte = -32;
300 300
         // : When
301 301
         byte actualByte = primativeTypes.multiply(multiplicand, multiplier);
302 302
         // : Then

+ 3
- 3
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java Datei anzeigen

@@ -33,7 +33,7 @@ public class TestPredicateUtilities {
33 33
         boolean outcome = math.isGreaterThan(greaterValue, lesserValue);
34 34
 
35 35
         // : Then
36
-        assertTrue(outcome);
36
+        assertFalse(outcome);
37 37
     }
38 38
 
39 39
 
@@ -62,7 +62,7 @@ public class TestPredicateUtilities {
62 62
         boolean outcome = math.isLessThan(greaterValue, lesserValue);
63 63
 
64 64
         // : Then
65
-        assertTrue(outcome);
65
+        assertFalse(outcome);
66 66
     }
67 67
 
68 68
 
@@ -116,6 +116,6 @@ public class TestPredicateUtilities {
116 116
         boolean outcome = math.isGreaterThanOrEqualTo(greaterValue, lesserValue);
117 117
 
118 118
         // : Then
119
-        assertTrue(outcome);
119
+        assertFalse(outcome);
120 120
     }
121 121
 }

+ 1
- 1
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java Datei anzeigen

@@ -56,7 +56,7 @@ public class TestStringUtilities {
56 56
     public void substringBeginTest(){
57 57
         // : Given
58 58
         String input = "Hello";
59
-        String expected = "olleH";
59
+        String expected = "Hel";
60 60
 
61 61
         // : When
62 62
         String actual = StringUtilities.getPrefix(input);

BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class Datei anzeigen


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class Datei anzeigen


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class Datei anzeigen


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class Datei anzeigen


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class Datei anzeigen


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class Datei anzeigen


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class Datei anzeigen