Browse Source

completed dan do better labs

Jevit Tith 6 years ago
parent
commit
6c9ec1c441
7 changed files with 66 additions and 50 deletions
  1. BIN
      MathUtilities.class
  2. 26
    26
      MathUtilities.java
  3. BIN
      PredicateUtilities.class
  4. 8
    4
      PredicateUtilities.java
  5. BIN
      StringUtilities.class
  6. 23
    11
      StringUtilities.java
  7. 9
    9
      package.bluej

BIN
MathUtilities.class View File


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

BIN
PredicateUtilities.class View File


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

BIN
StringUtilities.class View File


+ 23
- 11
StringUtilities.java View File

1
- 
1
+import java.util.*;
2
 
2
 
3
 /**
3
 /**
4
  * Created by dan on 6/14/17.
4
  * Created by dan on 6/14/17.
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
+        return "Hello World";
12
     }
12
     }
13
 
13
 
14
     /**
14
     /**
17
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
17
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
18
      */
18
      */
19
     public static String concatenation(String firstSegment, String secondSegment){
19
     public static String concatenation(String firstSegment, String secondSegment){
20
-        return null;
20
+        return (firstSegment + secondSegment);
21
     }
21
     }
22
 
22
 
23
     /**
23
     /**
26
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
26
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27
      */
27
      */
28
     public static String concatenation(int firstSegment, String secondSegment){
28
     public static String concatenation(int firstSegment, String secondSegment){
29
-        return null;
29
+        return (firstSegment + secondSegment);
30
     }
30
     }
31
 
31
 
32
     /**
32
     /**
34
      * @return the first 3 characters of `input`
34
      * @return the first 3 characters of `input`
35
      */
35
      */
36
     public static String getPrefix(String input){
36
     public static String getPrefix(String input){
37
-        return null;
37
+        return input.substring(0,3);
38
     }
38
     }
39
 
39
 
40
     /**
40
     /**
42
      * @return the last 3 characters of `input`
42
      * @return the last 3 characters of `input`
43
      */
43
      */
44
     public static String getSuffix(String input){
44
     public static String getSuffix(String input){
45
-        return null;
45
+        return input.substring(2,5);
46
     }
46
     }
47
 
47
 
48
     /**
48
     /**
51
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
51
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
52
      */
52
      */
53
     public static Boolean compareTwoStrings(String inputValue, String comparableValue){
53
     public static 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
      * @return the middle character of `inputValue`
61
      * @return the middle character of `inputValue`
60
      */
62
      */
61
     public static Character getMiddleCharacter(String inputValue){
63
     public static Character getMiddleCharacter(String inputValue){
62
-        return null;
64
+        if ((inputValue.length() % 2) == 0) {
65
+        return inputValue.charAt(((inputValue.length()/2)-1));
66
+        } else return inputValue.charAt((inputValue.length()/2));
63
     }
67
     }
64
 
68
 
65
     /**
69
     /**
67
      * @return the first sequence of characters
71
      * @return the first sequence of characters
68
      */
72
      */
69
     public static String getFirstWord(String spaceDelimitedString){
73
     public static String getFirstWord(String spaceDelimitedString){
70
-        return null;
74
+        String str[] = spaceDelimitedString.split(" ",2);
75
+        String firstWord = str[0];
76
+        return firstWord;
71
     }
77
     }
72
 
78
 
73
     /**
79
     /**
75
      * @return the second word of a string delimited by spaces.
81
      * @return the second word of a string delimited by spaces.
76
      */
82
      */
77
     public static String getSecondWord(String spaceDelimitedString){
83
     public static String getSecondWord(String spaceDelimitedString){
78
-        return null;
84
+        String str[] = spaceDelimitedString.split(" ",2);
85
+        String firstWord = str[1];
86
+        return firstWord;
79
     }
87
     }
80
 
88
 
81
     /**
89
     /**
83
      * @return an identical string with characters in reverse order.
91
      * @return an identical string with characters in reverse order.
84
      */
92
      */
85
     public static String reverse(String stringToReverse){
93
     public static String reverse(String stringToReverse){
86
-        return null;
94
+        StringBuilder str = new StringBuilder();
95
+        str = str.append(stringToReverse);
96
+        str = str.reverse();
97
+        String stringReversed = str.toString(); 
98
+        return stringReversed;
87
     }
99
     }
88
 }
100
 }

+ 9
- 9
package.bluej View File

1
 #BlueJ package file
1
 #BlueJ package file
2
-editor.fx.0.height=0
3
-editor.fx.0.width=0
4
-editor.fx.0.x=0
5
-editor.fx.0.y=0
6
-objectbench.height=129
2
+editor.fx.0.height=756
3
+editor.fx.0.width=950
4
+editor.fx.0.x=667
5
+editor.fx.0.y=-887
6
+objectbench.height=128
7
 objectbench.width=1171
7
 objectbench.width=1171
8
 package.divider.horizontal=0.6
8
 package.divider.horizontal=0.6
9
-package.divider.vertical=0.7490774907749077
10
-package.editor.height=399
9
+package.divider.vertical=0.7509225092250923
10
+package.editor.height=400
11
 package.editor.width=1069
11
 package.editor.width=1069
12
-package.editor.x=59
13
-package.editor.y=63
12
+package.editor.x=-242
13
+package.editor.y=-1017
14
 package.frame.height=600
14
 package.frame.height=600
15
 package.frame.width=1195
15
 package.frame.width=1195
16
 package.numDependencies=0
16
 package.numDependencies=0