Browse Source

git commit -m 'The Ole College Try'

Katrice Williams-Dredden 6 years ago
parent
commit
2be3751657

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

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

+ 0
- 7
.idea/kotlinc.xml View File

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 View File

7
       </list>
7
       </list>
8
     </option>
8
     </option>
9
   </component>
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
     <output url="file://$PROJECT_DIR$/classes" />
11
     <output url="file://$PROJECT_DIR$/classes" />
28
   </component>
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
 </project>
13
 </project>

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

11
      * @return sum of `baseValue` and `difference`
11
      * @return sum of `baseValue` and `difference`
12
      */
12
      */
13
     public Integer add(int baseValue, int difference) {
13
     public Integer add(int baseValue, int difference) {
14
-        return null;
14
+
15
+        return baseValue + difference;
15
     }
16
     }
16
 
17
 
17
     /**
18
     /**
20
      * @return sum of `baseValue` and `difference`
21
      * @return sum of `baseValue` and `difference`
21
      */
22
      */
22
     public Long add(long baseValue, long difference) {
23
     public Long add(long baseValue, long difference) {
23
-        return null;
24
+
25
+        return 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 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 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 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 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 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 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
 }

+ 5
- 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
+            return x > y;
14
+
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
+            return x < y;
23
     }
24
     }
24
 
25
 
25
     /**
26
     /**
28
      * @return true if `x` is greater than or equal to `y`
29
      * @return true if `x` is greater than or equal to `y`
29
      */
30
      */
30
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
31
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
31
-        return null;
32
+        return x > y;
32
     }
33
     }
33
 
34
 
34
     /**
35
     /**
37
      * @return true if `x` is less than or equal to `y`
38
      * @return true if `x` is less than or equal to `y`
38
      */
39
      */
39
     public Boolean isLessThanOrEqualTo(int x, int y) {
40
     public Boolean isLessThanOrEqualTo(int x, int y) {
40
-        return null;
41
+        return x < y;
41
     }
42
     }
42
 }
43
 }

+ 33
- 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
+        return "Hello World";
12
     }
13
     }
13
 
14
 
14
     /**
15
     /**
17
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
18
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
18
      */
19
      */
19
     public static String concatenation(String firstSegment, String secondSegment){
20
     public static String concatenation(String firstSegment, String secondSegment){
20
-        return null;
21
+
22
+        return firstSegment + secondSegment;
21
     }
23
     }
22
 
24
 
23
     /**
25
     /**
26
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
28
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27
      */
29
      */
28
     public static String concatenation(int firstSegment, String secondSegment){
30
     public static String concatenation(int firstSegment, String secondSegment){
29
-        return null;
31
+
32
+        return firstSegment + secondSegment;
30
     }
33
     }
31
 
34
 
32
     /**
35
     /**
34
      * @return the first 3 characters of `input`
37
      * @return the first 3 characters of `input`
35
      */
38
      */
36
     public static String getPrefix(String input){
39
     public static String getPrefix(String input){
37
-        return null;
40
+
41
+        return input.substring(0,3);
38
     }
42
     }
39
 
43
 
40
     /**
44
     /**
42
      * @return the last 3 characters of `input`
46
      * @return the last 3 characters of `input`
43
      */
47
      */
44
     public static String getSuffix(String input){
48
     public static String getSuffix(String input){
45
-        return null;
49
+
50
+        return input.substring(input.length() - 3);
46
     }
51
     }
47
 
52
 
48
     /**
53
     /**
51
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
56
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
52
      */
57
      */
53
     public static Boolean compareTwoStrings(String inputValue, String comparableValue){
58
     public static Boolean compareTwoStrings(String inputValue, String comparableValue){
54
-        return null;
59
+
60
+        return inputValue.equals(comparableValue);
55
     }
61
     }
56
 
62
 
57
     /**
63
     /**
58
      * @param inputValue the value input from user
64
      * @param inputValue the value input from user
59
      * @return the middle character of `inputValue`
65
      * @return the middle character of `inputValue`
60
      */
66
      */
61
-    public static Character getMiddleCharacter(String inputValue){
62
-        return null;
67
+    public static int getMiddleCharacter(String inputValue) {
68
+        // Checking to see if the string is even numbers fist
69
+        // if its not Even, then return the character after its been divided by two
70
+        if(inputValue.length()%2==0){
71
+           /*For Even: this returns the length of inputValue's characters, AFTER
72
+           its been divided by 2 and subtracted by one.*/
73
+           return inputValue.charAt((inputValue.length()/2));
74
+       }else {
75
+            return inputValue.charAt((inputValue.length() / 2) - 1);
76
+        }
63
     }
77
     }
64
 
78
 
65
     /**
79
     /**
67
      * @return the first sequence of characters
81
      * @return the first sequence of characters
68
      */
82
      */
69
     public static String getFirstWord(String spaceDelimitedString){
83
     public static String getFirstWord(String spaceDelimitedString){
70
-        return null;
84
+        //using .split and index 0 to grab the first word in spaceDelimitedString.
85
+        return spaceDelimitedString.split(" ")[0];
71
     }
86
     }
72
 
87
 
73
     /**
88
     /**
75
      * @return the second word of a string delimited by spaces.
90
      * @return the second word of a string delimited by spaces.
76
      */
91
      */
77
     public static String getSecondWord(String spaceDelimitedString){
92
     public static String getSecondWord(String spaceDelimitedString){
78
-        return null;
93
+        //same as above but index 1 represents the second word.
94
+        return spaceDelimitedString.split(" ")[1];
79
     }
95
     }
80
 
96
 
81
     /**
97
     /**
83
      * @return an identical string with characters in reverse order.
99
      * @return an identical string with characters in reverse order.
84
      */
100
      */
85
     public static String reverseTheTwo(String stringToReverse){
101
     public static String reverseTheTwo(String stringToReverse){
86
-        return null;
102
+        //so if the string contains a space, I want to split it then reverse it
103
+        if (stringToReverse.contains(" ")
104
+            return(reverse(stringToReverse.split(" ")));
105
+        else //if not still reverse it
106
+            return(reverse(stringToReverse));
87
     }
107
     }
88
 }
108
 }
109
+
110
+//Everytime I try to test "TestStringUtilities I get "java: char cannot be dereferenced."

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

+ 3
- 3
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java View File

56
     public void substringBeginTest(){
56
     public void substringBeginTest(){
57
         // : Given
57
         // : Given
58
         String input = "Hello";
58
         String input = "Hello";
59
-        String expected = "olleH";
59
+        String expected = "Hel";
60
 
60
 
61
         // : When
61
         // : When
62
         String actual = StringUtilities.getPrefix(input);
62
         String actual = StringUtilities.getPrefix(input);
112
         char expected = 'c';
112
         char expected = 'c';
113
 
113
 
114
         // : When
114
         // : When
115
-        char actual = StringUtilities.getMiddleCharacter(input);
115
+        int actual = StringUtilities.getMiddleCharacter(input);
116
 
116
 
117
         // : Then
117
         // : Then
118
         Assert.assertEquals(expected, actual);
118
         Assert.assertEquals(expected, actual);
126
         Character expected = 'c';
126
         Character expected = 'c';
127
 
127
 
128
         // : When
128
         // : When
129
-        Character actual = StringUtilities.getMiddleCharacter(input);
129
+        char actual = StringUtilities.getMiddleCharacter(input);
130
 
130
 
131
         // : Then
131
         // : Then
132
         Assert.assertEquals(expected.toString(), actual.toString());
132
         Assert.assertEquals(expected.toString(), actual.toString());

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


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


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


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


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class View File