Browse Source

Fundamental Methods complete

Donna Jacobs 6 years ago
parent
commit
639636ab23
5 changed files with 78 additions and 59 deletions
  1. 26
    26
      MathUtilities.java
  2. 4
    4
      PredicateUtilities.java
  3. 0
    0
      README.TXT
  4. 32
    13
      StringUtilities.java
  5. 16
    16
      package.bluej

+ 26
- 26
MathUtilities.java View 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,7 @@ 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
+       return (byte) (baseValue + difference);
42 42
    }
43 43
 
44 44
    /**
@@ -47,7 +47,7 @@ public class MathUtilities {
47 47
     * @return sum of `baseValue` and `difference`
48 48
     */
49 49
    public Float add(float baseValue, float difference) {
50
-       return null;
50
+       return baseValue + difference;
51 51
    }
52 52
 
53 53
    /**
@@ -56,7 +56,7 @@ public class MathUtilities {
56 56
     * @return sum of `baseValue` and `difference`
57 57
     */
58 58
    public Double add(double baseValue, double difference) {
59
-       return null;
59
+       return baseValue + difference;
60 60
    }
61 61
 
62 62
    /**
@@ -65,7 +65,7 @@ public class MathUtilities {
65 65
     * @return difference between `baseValue` and `difference`
66 66
     */
67 67
    public Integer subtract(int baseValue, int difference) {
68
-       return null;
68
+       return baseValue - difference;
69 69
    }
70 70
 
71 71
    /**
@@ -74,7 +74,7 @@ public class MathUtilities {
74 74
     * @return difference between `baseValue` and `difference`
75 75
     */
76 76
    public Long subtract(long baseValue, long difference) {
77
-       return null;
77
+       return baseValue - difference;
78 78
    }
79 79
 
80 80
    /**
@@ -83,7 +83,7 @@ public class MathUtilities {
83 83
     * @return difference between `baseValue` and `difference`
84 84
     */
85 85
    public Short subtract(short baseValue, short difference) {
86
-       return null;
86
+       return (short) (baseValue - difference);
87 87
    }
88 88
 
89 89
    /**
@@ -92,7 +92,7 @@ public class MathUtilities {
92 92
     * @return difference between `baseValue` and `difference`
93 93
     */
94 94
    public Byte subtract(byte baseValue, byte difference) {
95
-       return null;
95
+       return (byte) (baseValue - difference);
96 96
    }
97 97
 
98 98
    /**
@@ -101,7 +101,7 @@ public class MathUtilities {
101 101
     * @return difference between `baseValue` and `difference`
102 102
     */
103 103
    public Float subtract(float baseValue, float difference) {
104
-       return null;
104
+       return baseValue - difference;
105 105
    }
106 106
 
107 107
    /**
@@ -110,7 +110,7 @@ public class MathUtilities {
110 110
     * @return difference between `baseValue` and `difference`
111 111
     */
112 112
    public Double subtract(double baseValue, double difference) {
113
-       return null;
113
+       return baseValue - difference;
114 114
    }
115 115
 
116 116
 
@@ -120,7 +120,7 @@ public class MathUtilities {
120 120
     * @return division of `dividend` by `divisor
121 121
     */
122 122
    public Integer divide(int dividend, int divisor) {
123
-       return null;
123
+       return dividend / divisor;
124 124
    }
125 125
 
126 126
    /**
@@ -129,7 +129,7 @@ public class MathUtilities {
129 129
     * @return division of `dividend` by `divisor
130 130
     */
131 131
    public Long divide(long dividend, long divisor) {
132
-       return null;
132
+       return dividend / divisor;
133 133
    }
134 134
 
135 135
    /**
@@ -138,7 +138,7 @@ public class MathUtilities {
138 138
     * @return division of `dividend` by `divisor
139 139
     */
140 140
    public Short divide(short dividend, short divisor) {
141
-       return null;
141
+       return (short) (dividend / divisor);
142 142
    }
143 143
 
144 144
    /**
@@ -147,7 +147,7 @@ public class MathUtilities {
147 147
     * @return division of `dividend` by `divisor
148 148
     */
149 149
    public Byte divide(byte dividend, byte divisor) {
150
-       return null;
150
+       return (byte) (dividend / divisor);
151 151
    }
152 152
 
153 153
    /**
@@ -156,7 +156,7 @@ public class MathUtilities {
156 156
     * @return division of `dividend` by `divisor
157 157
     */
158 158
    public Float divide(float dividend, float divisor) {
159
-       return null;
159
+       return dividend / divisor;
160 160
    }
161 161
 
162 162
    /**
@@ -165,7 +165,7 @@ public class MathUtilities {
165 165
     * @return division of `dividend` by `divisor
166 166
     */
167 167
    public Double divide(double dividend, double divisor) {
168
-       return null;
168
+       return dividend / divisor;
169 169
    }
170 170
 
171 171
 
@@ -175,7 +175,7 @@ public class MathUtilities {
175 175
     * @return product of `multiplicand` by `multiplier`
176 176
     */
177 177
    public Integer multiply(int multiplicand, int multiplier) {
178
-       return null;
178
+       return multiplicand * multiplier;
179 179
    }
180 180
 
181 181
    /**
@@ -184,7 +184,7 @@ public class MathUtilities {
184 184
     * @return product of `multiplicand` by `multiplier`
185 185
     */
186 186
    public Long multiply(long multiplicand, long multiplier) {
187
-       return null;
187
+       return multiplicand * multiplier;
188 188
    }
189 189
 
190 190
    /**
@@ -193,7 +193,7 @@ public class MathUtilities {
193 193
     * @return product of `multiplicand` by `multiplier`
194 194
     */
195 195
    public Short multiply(short multiplicand, short multiplier) {
196
-       return null;
196
+       return (short) (multiplicand * multiplier);
197 197
    }
198 198
    /**
199 199
     * @param multiplicand value to be multiplied
@@ -201,7 +201,7 @@ public class MathUtilities {
201 201
     * @return product of `multiplicand` by `multiplier`
202 202
     */
203 203
    public Byte multiply(byte multiplicand, byte multiplier) {
204
-       return null;
204
+       return (byte) (multiplicand * multiplier);
205 205
    }
206 206
 
207 207
    /**
@@ -210,7 +210,7 @@ public class MathUtilities {
210 210
     * @return product of `multiplicand` by `multiplier`
211 211
     */
212 212
    public Float multiply(float multiplicand, float multiplier) {
213
-       return null;
213
+       return multiplicand * multiplier;
214 214
    }
215 215
 
216 216
    /**
@@ -219,7 +219,7 @@ public class MathUtilities {
219 219
     * @return product of `multiplicand` by `multiplier`
220 220
     */
221 221
    public Double multiply(double multiplicand, double multiplier) {
222
-       return null;
222
+       return multiplicand * multiplier;
223 223
    }
224 224
 
225 225
 
@@ -227,14 +227,14 @@ public class MathUtilities {
227 227
      * @return true
228 228
     */
229 229
    public Boolean returnTrue() {
230
-       return null;
230
+       return true;
231 231
    }
232 232
 
233 233
    /**
234 234
     * @return false
235 235
     */
236 236
    public Boolean returnFalse() {
237
-       return null;
237
+       return false;
238 238
    }
239 239
 
240 240
 }

+ 4
- 4
PredicateUtilities.java View File

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

+ 0
- 0
README.TXT View File


+ 32
- 13
StringUtilities.java View File

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

+ 16
- 16
package.bluej View File

@@ -1,25 +1,25 @@
1 1
 #BlueJ package file
2
-dependency1.from=StringUtilitiesTest
3
-dependency1.to=StringUtilities
2
+dependency1.from=PredicateUtilitiesTest
3
+dependency1.to=PredicateUtilities
4 4
 dependency1.type=UsesDependency
5
-dependency2.from=PredicateUtilitiesTest
6
-dependency2.to=PredicateUtilities
5
+dependency2.from=MathUtilitiesTest
6
+dependency2.to=MathUtilities
7 7
 dependency2.type=UsesDependency
8
-dependency3.from=MathUtilitiesTest
9
-dependency3.to=MathUtilities
8
+dependency3.from=StringUtilitiesTest
9
+dependency3.to=StringUtilities
10 10
 dependency3.type=UsesDependency
11
-editor.fx.0.height=0
12
-editor.fx.0.width=0
13
-editor.fx.0.x=0
14
-editor.fx.0.y=0
15
-objectbench.height=145
16
-objectbench.width=776
11
+editor.fx.0.height=709
12
+editor.fx.0.width=800
13
+editor.fx.0.x=480
14
+editor.fx.0.y=25
15
+objectbench.height=230
16
+objectbench.width=461
17 17
 package.divider.horizontal=0.6
18
-package.divider.vertical=0.7195571955719557
19
-package.editor.height=383
18
+package.divider.vertical=0.5627306273062731
19
+package.editor.height=298
20 20
 package.editor.width=674
21
-package.editor.x=29
22
-package.editor.y=132
21
+package.editor.x=68
22
+package.editor.y=125
23 23
 package.frame.height=600
24 24
 package.frame.width=800
25 25
 package.numDependencies=3