#41 one of the many labs I simply forgot to push @rjsmall90

Отворени
rjsmall90 заяви обединяване на 2 ревизии от rjsmall90/ZCW-Lab-Fundamental-Methods:master във master
променени са 4 файла, в които са добавени 96 реда и са изтрити 83 реда
  1. 26
    26
      MathUtilities.java
  2. 38
    35
      PredicateUtilities.java
  3. 23
    13
      StringUtilities.java
  4. 9
    9
      package.bluej

+ 26
- 26
MathUtilities.java Целия файл

@@ -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 (long) 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 (float) (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 (double) (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 (float) (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 (double) (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 (long) (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 (float) (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 (double) (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 (long) (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 (float) (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 (double) (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
 }

+ 38
- 35
PredicateUtilities.java Целия файл

@@ -1,42 +1,45 @@
1 1
 
2
-
3 2
 /**
4
-* Created by dan on 6/14/17.
5
-*/
3
+ * Created by dan on 6/14/17.
4
+ */
6 5
 public class PredicateUtilities {
7
-   /**
8
-    * @param x
9
-    * @param y
10
-    * @return true if `x` is greater than `y`
11
-    */
12
-   public Boolean isGreaterThan(int x, int y) {
13
-       return null;
14
-   }
6
+    /**
7
+     * @param x
8
+     * @param y
9
+     * @return true if `x` is greater than `y`
10
+     */
11
+    public Boolean isGreaterThan(int x, int y) {
12
+        if (x>y)
13
+            return true; else return false;
14
+    }
15 15
 
16
-   /**
17
-    * @param x
18
-    * @param y
19
-    * @return true if `x` is less than `y`
20
-    */
21
-   public Boolean isLessThan(int x, int y) {
22
-       return null;
23
-   }
16
+    /**
17
+     * @param x
18
+     * @param y
19
+     * @return true if `x` is less than `y`
20
+     */
21
+    public Boolean isLessThan(int x, int y) {
22
+        if (x<y)
23
+            return true; else return false;
24
+    }
24 25
 
25
-   /**
26
-    * @param x
27
-    * @param y
28
-    * @return true if `x` is greater than or equal to `y`
29
-    */
30
-   public Boolean isGreaterThanOrEqualTo(int x, int y) {
31
-       return null;
32
-   }
26
+    /**
27
+     * @param x
28
+     * @param y
29
+     * @return true if `x` is greater than or equal to `y`
30
+     */
31
+    public Boolean isGreaterThanOrEqualTo(int x, int y) {
32
+        if (y<=x)
33
+            return true; else return false;
34
+    }
33 35
 
34
-   /**
35
-    * @param x
36
-    * @param y
37
-    * @return true if `x` is less than or equal to `y`
38
-    */
39
-   public Boolean isLessThanOrEqualTo(int x, int y) {
40
-       return null;
41
-   }
36
+    /**
37
+     * @param x
38
+     * @param y
39
+     * @return true if `x` is less than or equal to `y`
40
+     */
41
+    public Boolean isLessThanOrEqualTo(int x, int y) {
42
+        if (x<=y)
43
+            return true; else return false;
44
+    }
42 45
 }

+ 23
- 13
StringUtilities.java Целия файл

@@ -1,5 +1,4 @@
1 1
 
2
-
3 2
 /**
4 3
  * Created by dan on 6/14/17.
5 4
  */
@@ -8,7 +7,7 @@ public class StringUtilities {
8 7
      * @return `Hello World` as a string
9 8
      */
10 9
     public String getHelloWorld() {
11
-        return null;
10
+        return "Hello World";
12 11
     }
13 12
 
14 13
     /**
@@ -17,7 +16,7 @@ public class StringUtilities {
17 16
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
18 17
      */
19 18
     public String concatenation(String firstSegment, String secondSegment){
20
-        return null;
19
+        return String.join("",firstSegment, secondSegment);
21 20
     }
22 21
 
23 22
     /**
@@ -26,7 +25,8 @@ public class StringUtilities {
26 25
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27 26
      */
28 27
     public String concatenation(int firstSegment, String secondSegment){
29
-        return null;
28
+        Integer.toString(firstSegment);
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 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 String getSuffix(String input){
45
-        return null;
45
+        return input.substring(input.length()-3);
46 46
     }
47 47
 
48 48
     /**
@@ -51,7 +51,9 @@ public class StringUtilities {
51 51
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
52 52
      */
53 53
     public Boolean compareTwoStrings(String inputValue, String comparableValue){
54
-        return null;
54
+        if (inputValue.equals(comparableValue)){
55
+            return true;}
56
+        else {return false;}
55 57
     }
56 58
 
57 59
     /**
@@ -59,7 +61,13 @@ public class StringUtilities {
59 61
      * @return the middle character of `inputValue`
60 62
      */
61 63
     public Character getMiddleCharacter(String inputValue){
62
-        return null;
64
+        /*if (inputValue.charAt(inputValue.length()%2) !=0){
65
+        return inputValue.charAt(inputValue.length()/2);}
66
+        else if (inputValue.charAt(inputValue.length()%2) ==0){
67
+        return inputValue.charAt(inputValue.length(/);}
68
+        else{ return 0;}*/
69
+        return inputValue.charAt((inputValue.length()-1)/2);
70
+
63 71
     }
64 72
 
65 73
     /**
@@ -67,7 +75,7 @@ public class StringUtilities {
67 75
      * @return the first sequence of characters
68 76
      */
69 77
     public String getFirstWord(String spaceDelimitedString){
70
-        return null;
78
+        return spaceDelimitedString.split(" ")[0];
71 79
     }
72 80
 
73 81
     /**
@@ -75,7 +83,7 @@ public class StringUtilities {
75 83
      * @return the second word of a string delimited by spaces.
76 84
      */
77 85
     public String getSecondWord(String spaceDelimitedString){
78
-        return null;
86
+        return spaceDelimitedString.split(" ")[1];
79 87
     }
80 88
 
81 89
     /**
@@ -83,7 +91,9 @@ public class StringUtilities {
83 91
      * @return an identical string with characters in reverse order.
84 92
      */
85 93
     public String reverse(String stringToReverse){
86
-        return null;
94
+        StringBuilder builder = new StringBuilder(stringToReverse);
95
+        
96
+        return builder.reverse().toString();
87 97
     }
88 98
 
89 99
     /**
@@ -91,7 +101,7 @@ public class StringUtilities {
91 101
      * @return an identical string with spaces removed.
92 102
      */
93 103
     public String removeWhitespace(String input){
94
-        return null;
104
+        return input.replaceAll("\\s+","");
95 105
     }
96 106
 
97 107
     /**
@@ -99,6 +109,6 @@ public class StringUtilities {
99 109
      * @return an identical string with spaces in the front and end removed.
100 110
      */
101 111
     public String trim(String input){
102
-        return null;
112
+        return input.trim();
103 113
     }
104 114
 }

+ 9
- 9
package.bluej Целия файл

@@ -13,15 +13,15 @@ editor.fx.0.width=0
13 13
 editor.fx.0.x=0
14 14
 editor.fx.0.y=0
15 15
 objectbench.height=145
16
-objectbench.width=776
17
-package.divider.horizontal=0.6
18
-package.divider.vertical=0.7195571955719557
19
-package.editor.height=383
20
-package.editor.width=674
21
-package.editor.x=29
22
-package.editor.y=132
23
-package.frame.height=600
24
-package.frame.width=800
16
+objectbench.width=681
17
+package.divider.horizontal=0.6003490401396161
18
+package.divider.vertical=0.7717717717717718
19
+package.editor.height=507
20
+package.editor.width=1040
21
+package.editor.x=100
22
+package.editor.y=23
23
+package.frame.height=724
24
+package.frame.width=1166
25 25
 package.numDependencies=3
26 26
 package.numTargets=6
27 27
 package.showExtends=true