Haysel Santiago 6 anni fa
parent
commit
bd60003a8a

+ 1
- 1
.idea/compiler.xml Vedi File

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

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

+ 1
- 78
.idea/misc.xml Vedi File

@@ -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
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
10
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" project-jdk-name="9.0" 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 Vedi File

@@ -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,8 @@ 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
+
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 baseValue - difference;
78 79
     }
79 80
 
80 81
     /**
@@ -83,7 +84,8 @@ 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
+
88
+        return (short) (baseValue - difference);
87 89
     }
88 90
 
89 91
     /**
@@ -92,7 +94,7 @@ public class MathUtilities {
92 94
      * @return difference between `baseValue` and `difference`
93 95
      */
94 96
     public Byte subtract(byte baseValue, byte difference) {
95
-        return null;
97
+        return (byte) (baseValue - difference);
96 98
     }
97 99
 
98 100
     /**
@@ -101,7 +103,7 @@ public class MathUtilities {
101 103
      * @return difference between `baseValue` and `difference`
102 104
      */
103 105
     public Float subtract(float baseValue, float difference) {
104
-        return null;
106
+        return baseValue - difference;
105 107
     }
106 108
 
107 109
     /**
@@ -110,7 +112,7 @@ public class MathUtilities {
110 112
      * @return difference between `baseValue` and `difference`
111 113
      */
112 114
     public Double subtract(double baseValue, double difference) {
113
-        return null;
115
+        return (baseValue - difference);
114 116
     }
115 117
 
116 118
 
@@ -120,7 +122,7 @@ public class MathUtilities {
120 122
      * @return division of `dividend` by `divisor
121 123
      */
122 124
     public Integer divide(int dividend, int divisor) {
123
-        return null;
125
+        return dividend / divisor;
124 126
     }
125 127
 
126 128
     /**
@@ -129,7 +131,7 @@ public class MathUtilities {
129 131
      * @return division of `dividend` by `divisor
130 132
      */
131 133
     public Long divide(long dividend, long divisor) {
132
-        return null;
134
+        return dividend / divisor;
133 135
     }
134 136
 
135 137
     /**
@@ -138,7 +140,7 @@ public class MathUtilities {
138 140
      * @return division of `dividend` by `divisor
139 141
      */
140 142
     public Short divide(short dividend, short divisor) {
141
-        return null;
143
+        return (short) (dividend / divisor);
142 144
     }
143 145
 
144 146
     /**
@@ -147,7 +149,7 @@ public class MathUtilities {
147 149
      * @return division of `dividend` by `divisor
148 150
      */
149 151
     public Byte divide(byte dividend, byte divisor) {
150
-        return null;
152
+        return (byte) (dividend / divisor);
151 153
     }
152 154
 
153 155
     /**
@@ -156,7 +158,7 @@ public class MathUtilities {
156 158
      * @return division of `dividend` by `divisor
157 159
      */
158 160
     public Float divide(float dividend, float divisor) {
159
-        return null;
161
+        return dividend / divisor;
160 162
     }
161 163
 
162 164
     /**
@@ -165,7 +167,7 @@ public class MathUtilities {
165 167
      * @return division of `dividend` by `divisor
166 168
      */
167 169
     public Double divide(double dividend, double divisor) {
168
-        return null;
170
+        return dividend / divisor;
169 171
     }
170 172
 
171 173
 
@@ -175,7 +177,7 @@ public class MathUtilities {
175 177
      * @return product of `multiplicand` by `multiplier`
176 178
      */
177 179
     public Integer multiply(int multiplicand, int multiplier) {
178
-        return null;
180
+        return multiplicand * multiplier;
179 181
     }
180 182
 
181 183
     /**
@@ -184,7 +186,7 @@ public class MathUtilities {
184 186
      * @return product of `multiplicand` by `multiplier`
185 187
      */
186 188
     public Long multiply(long multiplicand, long multiplier) {
187
-        return null;
189
+        return multiplicand * multiplier;
188 190
     }
189 191
 
190 192
     /**
@@ -193,7 +195,7 @@ public class MathUtilities {
193 195
      * @return product of `multiplicand` by `multiplier`
194 196
      */
195 197
     public Short multiply(short multiplicand, short multiplier) {
196
-        return null;
198
+        return (short) (multiplicand * multiplier);
197 199
     }
198 200
     /**
199 201
      * @param multiplicand value to be multiplied
@@ -201,7 +203,7 @@ public class MathUtilities {
201 203
      * @return product of `multiplicand` by `multiplier`
202 204
      */
203 205
     public Byte multiply(byte multiplicand, byte multiplier) {
204
-        return null;
206
+        return (byte) (multiplicand * multiplier);
205 207
     }
206 208
 
207 209
     /**
@@ -210,7 +212,7 @@ public class MathUtilities {
210 212
      * @return product of `multiplicand` by `multiplier`
211 213
      */
212 214
     public Float multiply(float multiplicand, float multiplier) {
213
-        return null;
215
+        return multiplicand * multiplier;
214 216
     }
215 217
 
216 218
     /**
@@ -219,7 +221,7 @@ public class MathUtilities {
219 221
      * @return product of `multiplicand` by `multiplier`
220 222
      */
221 223
     public Double multiply(double multiplicand, double multiplier) {
222
-        return null;
224
+        return multiplicand * multiplier;
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
 }

+ 24
- 5
src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java Vedi File

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

+ 15
- 9
src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java Vedi File

@@ -17,7 +17,7 @@ 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
+        return firstSegment + secondSegment;
21 21
     }
22 22
 
23 23
     /**
@@ -26,7 +26,7 @@ public class StringUtilities {
26 26
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27 27
      */
28 28
     public static String concatenation(int firstSegment, String secondSegment){
29
-        return null;
29
+        return firstSegment + 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.lastIndexOf(2) +1 );
46 46
     }
47 47
 
48 48
     /**
@@ -51,7 +51,7 @@ 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
+        return inputValue .equals(comparableValue);
55 55
     }
56 56
 
57 57
     /**
@@ -59,7 +59,11 @@ public class StringUtilities {
59 59
      * @return the middle character of `inputValue`
60 60
      */
61 61
     public static Character getMiddleCharacter(String inputValue){
62
-        return null;
62
+        if (inputValue.length() % 2 == 0) {
63
+            return inputValue.charAt((inputValue.length()/2)-1);
64
+        } else {
65
+            return inputValue.charAt(inputValue.length()/2);
66
+        }
63 67
     }
64 68
 
65 69
     /**
@@ -67,7 +71,9 @@ public class StringUtilities {
67 71
      * @return the first sequence of characters
68 72
      */
69 73
     public static String getFirstWord(String spaceDelimitedString){
70
-        return null;
74
+
75
+        String[]  space = spaceDelimitedString.split(" ");
76
+        return space[0];
71 77
     }
72 78
 
73 79
     /**
@@ -75,7 +81,7 @@ public class StringUtilities {
75 81
      * @return the second word of a string delimited by spaces.
76 82
      */
77 83
     public static String getSecondWord(String spaceDelimitedString){
78
-        return null;
84
+        return String.format("%d:%d");
79 85
     }
80 86
 
81 87
     /**
@@ -83,6 +89,6 @@ public class StringUtilities {
83 89
      * @return an identical string with characters in reverse order.
84 90
      */
85 91
     public static String reverseTheTwo(String stringToReverse){
86
-        return null;
92
+        return new StringBuffer(stringToReverse).reverse().toString();
87 93
     }
88 94
 }

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

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

BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class Vedi File


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class Vedi File


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class Vedi File


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class Vedi File