#39 DanDoBetterDrills zmalone97

Öppen
zmalone vill sammanfoga 1 incheckningar från s[2]s in i master
7 ändrade filer med 87 tillägg och 48 borttagningar
  1. Binär
      MathUtilities.class
  2. 26
    26
      MathUtilities.java
  3. Binär
      PredicateUtilities.class
  4. 20
    5
      PredicateUtilities.java
  5. Binär
      StringUtilities.class
  6. 35
    11
      StringUtilities.java
  7. 6
    6
      package.bluej

Binär
MathUtilities.class Visa fil


+ 26
- 26
MathUtilities.java Visa fil

@@ -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är
PredicateUtilities.class Visa fil


+ 20
- 5
PredicateUtilities.java Visa fil

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

Binär
StringUtilities.class Visa fil


+ 35
- 11
StringUtilities.java Visa fil

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

+ 6
- 6
package.bluej Visa fil

@@ -1,16 +1,16 @@
1 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
2
+editor.fx.0.height=722
3
+editor.fx.0.width=800
4
+editor.fx.0.x=241
5
+editor.fx.0.y=106
6 6
 objectbench.height=129
7 7
 objectbench.width=1171
8 8
 package.divider.horizontal=0.6
9 9
 package.divider.vertical=0.7490774907749077
10 10
 package.editor.height=399
11 11
 package.editor.width=1069
12
-package.editor.x=59
13
-package.editor.y=63
12
+package.editor.x=85
13
+package.editor.y=23
14 14
 package.frame.height=600
15 15
 package.frame.width=1195
16 16
 package.numDependencies=0