Bladeren bron

Completed all of the lab.

William Brown 6 jaren geleden
bovenliggende
commit
88031344da
7 gewijzigde bestanden met toevoegingen van 109 en 59 verwijderingen
  1. BIN
      MathUtilities.class
  2. 26
    26
      MathUtilities.java
  3. BIN
      PredicateUtilities.class
  4. 20
    4
      PredicateUtilities.java
  5. BIN
      StringUtilities.class
  6. 45
    11
      StringUtilities.java
  7. 18
    18
      package.bluej

BIN
MathUtilities.class Bestand weergeven


+ 26
- 26
MathUtilities.java Bestand weergeven

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

BIN
PredicateUtilities.class Bestand weergeven


+ 20
- 4
PredicateUtilities.java Bestand weergeven

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

BIN
StringUtilities.class Bestand weergeven


+ 45
- 11
StringUtilities.java Bestand weergeven

@@ -1,4 +1,4 @@
1
- 
1
+ import java.lang.*;
2 2
 
3 3
 /**
4 4
  * Created by dan on 6/14/17.
@@ -8,7 +8,8 @@ public class StringUtilities {
8 8
      * @return `Hello World` as a string
9 9
      */
10 10
     public static String getHelloWorld() {
11
-        return null;
11
+        String hello = "Hello World";
12
+        return hello;
12 13
     }
13 14
 
14 15
     /**
@@ -17,7 +18,8 @@ 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
+        String together = firstSegment + secondSegment;
22
+        return together;
21 23
     }
22 24
 
23 25
     /**
@@ -26,7 +28,8 @@ public class StringUtilities {
26 28
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27 29
      */
28 30
     public static String concatenation(int firstSegment, String secondSegment){
29
-        return null;
31
+        String together = firstSegment + secondSegment;
32
+        return together;
30 33
     }
31 34
 
32 35
     /**
@@ -34,7 +37,11 @@ public class StringUtilities {
34 37
      * @return the first 3 characters of `input`
35 38
      */
36 39
     public static String getPrefix(String input){
37
-        return null;
40
+        String output = "";
41
+        for(int i = 0; i <= 2 ; i++){
42
+            output = output + input.charAt(i);
43
+        }
44
+        return output;
38 45
     }
39 46
 
40 47
     /**
@@ -42,7 +49,11 @@ public class StringUtilities {
42 49
      * @return the last 3 characters of `input`
43 50
      */
44 51
     public static String getSuffix(String input){
45
-        return null;
52
+        String output = "";
53
+        for(int i = input.length() - 3; i < input.length(); i ++){
54
+            output = output + input.charAt(i);
55
+        }
56
+        return output;
46 57
     }
47 58
 
48 59
     /**
@@ -51,7 +62,13 @@ public class StringUtilities {
51 62
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
52 63
      */
53 64
     public static Boolean compareTwoStrings(String inputValue, String comparableValue){
54
-        return null;
65
+        boolean output = false;
66
+        if(inputValue.equals(comparableValue)){
67
+            output = true;
68
+        }else{
69
+            output = false;
70
+        }
71
+            return output;
55 72
     }
56 73
 
57 74
     /**
@@ -59,7 +76,16 @@ public class StringUtilities {
59 76
      * @return the middle character of `inputValue`
60 77
      */
61 78
     public static Character getMiddleCharacter(String inputValue){
62
-        return null;
79
+        int middle = 0;
80
+        char middleChar = 'a';
81
+        if(inputValue.length() % 2 == 0){
82
+            middle = (inputValue.length() / 2) - 1;
83
+            middleChar = inputValue.charAt(middle);
84
+        } else if(inputValue.length() % 2 == 1){
85
+            middle = inputValue.length() / 2;
86
+            middleChar = inputValue.charAt(middle);
87
+        }
88
+        return middleChar;
63 89
     }
64 90
 
65 91
     /**
@@ -67,7 +93,9 @@ public class StringUtilities {
67 93
      * @return the first sequence of characters
68 94
      */
69 95
     public static String getFirstWord(String spaceDelimitedString){
70
-        return null;
96
+        int space = spaceDelimitedString.indexOf(' ');
97
+        String firstWord = spaceDelimitedString.substring(0,space);
98
+        return firstWord;
71 99
     }
72 100
 
73 101
     /**
@@ -75,7 +103,9 @@ public class StringUtilities {
75 103
      * @return the second word of a string delimited by spaces.
76 104
      */
77 105
     public static String getSecondWord(String spaceDelimitedString){
78
-        return null;
106
+        int space = spaceDelimitedString.indexOf(' ');
107
+        String secondWord = spaceDelimitedString.substring(space+ 1, spaceDelimitedString.length());
108
+        return secondWord;
79 109
     }
80 110
 
81 111
     /**
@@ -83,6 +113,10 @@ public class StringUtilities {
83 113
      * @return an identical string with characters in reverse order.
84 114
      */
85 115
     public static String reverse(String stringToReverse){
86
-        return null;
116
+        String output = "";
117
+        for(int i = stringToReverse.length() - 1; i >= 0; i --){
118
+            output = output + stringToReverse.charAt(i);
119
+        }
120
+        return output;
87 121
     }
88 122
 }

+ 18
- 18
package.bluej Bestand weergeven

@@ -3,16 +3,16 @@ editor.fx.0.height=0
3 3
 editor.fx.0.width=0
4 4
 editor.fx.0.x=0
5 5
 editor.fx.0.y=0
6
-objectbench.height=129
7
-objectbench.width=1171
6
+objectbench.height=128
7
+objectbench.width=593
8 8
 package.divider.horizontal=0.6
9
-package.divider.vertical=0.7490774907749077
10
-package.editor.height=399
11
-package.editor.width=1069
12
-package.editor.x=59
13
-package.editor.y=63
9
+package.divider.vertical=0.7509225092250923
10
+package.editor.height=384
11
+package.editor.width=491
12
+package.editor.x=5
13
+package.editor.y=25
14 14
 package.frame.height=600
15
-package.frame.width=1195
15
+package.frame.width=617
16 16
 package.numDependencies=0
17 17
 package.numTargets=6
18 18
 package.showExtends=true
@@ -45,19 +45,19 @@ target3.width=100
45 45
 target3.x=60
46 46
 target3.y=150
47 47
 target4.height=50
48
-target4.name=StringUtilities
48
+target4.name=PredicateUtilitiesTest
49 49
 target4.showInterface=false
50
-target4.type=ClassTarget
51
-target4.width=110
52
-target4.x=500
53
-target4.y=130
50
+target4.type=UnitTestTargetJunit4
51
+target4.width=160
52
+target4.x=260
53
+target4.y=50
54 54
 target5.height=50
55
-target5.name=PredicateUtilitiesTest
55
+target5.name=StringUtilities
56 56
 target5.showInterface=false
57
-target5.type=UnitTestTargetJunit4
58
-target5.width=160
59
-target5.x=260
60
-target5.y=50
57
+target5.type=ClassTarget
58
+target5.width=110
59
+target5.x=500
60
+target5.y=130
61 61
 target6.height=50
62 62
 target6.name=MathUtilitiesTest
63 63
 target6.showInterface=false