소스 검색

First submit

Vincent Gasbarro 6 년 전
부모
커밋
c5be559258
17개의 변경된 파일131개의 추가작업 그리고 159개의 파일을 삭제
  1. 1
    1
      .idea/compiler.xml
  2. 0
    7
      .idea/kotlinc.xml
  3. 0
    77
      .idea/misc.xml
  4. 66
    39
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java
  5. 8
    4
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java
  6. 47
    22
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java
  7. 1
    1
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java
  8. 3
    3
      src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java
  9. 3
    3
      src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java
  10. 2
    2
      src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java
  11. BIN
      target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class
  12. BIN
      target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class
  13. BIN
      target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class
  14. BIN
      target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class
  15. BIN
      target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class
  16. BIN
      target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class
  17. BIN
      target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class

+ 1
- 1
.idea/compiler.xml 파일 보기

@@ -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 파일 보기

@@ -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 파일 보기

@@ -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>

+ 66
- 39
src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java 파일 보기

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

+ 8
- 4
src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java 파일 보기

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

+ 47
- 22
src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java 파일 보기

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

+ 1
- 1
src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java 파일 보기

@@ -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
 }

+ 3
- 3
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java 파일 보기

@@ -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
@@ -146,7 +146,7 @@ public class TestMathUtilities {
146 146
         // : When
147 147
         float actualFloat = primativeTypes.subtract(baseValue,difference);
148 148
         // : Then
149
-        assertEquals(expectedFloat,actualFloat, 0);
149
+        assertEquals(expectedFloat,actualFloat, 0.005);
150 150
     }
151 151
     @Test
152 152
     public void testSubtractions5() {
@@ -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 파일 보기

@@ -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
 }

+ 2
- 2
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java 파일 보기

@@ -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);
@@ -154,7 +154,7 @@ public class TestStringUtilities {
154 154
         String expected = "Wilmington";
155 155
 
156 156
         // : When
157
-        String actual = StringUtilities.getFirstWord(input);
157
+        String actual = StringUtilities.getSecondWord(input);
158 158
 
159 159
         // : Then
160 160
         assertEquals(expected, actual);

BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class 파일 보기


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class 파일 보기


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class 파일 보기


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class 파일 보기


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class 파일 보기


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class 파일 보기


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class 파일 보기