Browse Source

tried my best to complete

ThuyKhong 6 years ago
parent
commit
a16059b885
4 changed files with 76 additions and 29 deletions
  1. 31
    4
      LoopFun.java
  2. 9
    5
      MathUtilities.java
  3. 21
    4
      StringUtilities.java
  4. 15
    16
      package.bluej

+ 31
- 4
LoopFun.java View File

@@ -8,7 +8,12 @@ public class LoopFun
8 8
        * @return the factorial of the number
9 9
        */
10 10
       public int factorial(int number){
11
-          return -1;
11
+          int total = 0;
12
+          for (int i=1;i<=number;i++) {
13
+              total = total * i;
14
+              i++;
15
+            }
16
+          return total;
12 17
       }
13 18
 
14 19
       /**
@@ -19,7 +24,13 @@ public class LoopFun
19 24
        * @return Upper case string of the first letter of each word
20 25
        */
21 26
       public String acronym(String phrase) {
22
-          return null;
27
+        StringBuilder newStr = new StringBuilder();
28
+        String[] array = phrase.split(" ");
29
+            for (int i=0;i<array.length;i++){
30
+                phrase = array[i].substring(0, 1).toUpperCase();
31
+                newStr.append(phrase);
32
+            }
33
+        return newStr.toString();
23 34
       }
24 35
 
25 36
       /**
@@ -34,7 +45,23 @@ public class LoopFun
34 45
        * @param word
35 46
        * @return the encrypted string by shifting each character by three character
36 47
        */
48
+      
49
+      
37 50
       public String encrypt(String word) {
38
-          return null;
39
-      }
51
+          String encrypted = "";
52
+          for (int i = 0; i < word.length(); i++) {
53
+          if (((char)(word.charAt(i) + 3)  > 'Z' &&
54
+                         word.charAt(i) <= 'Z') 
55
+                    || ((char)(word.charAt(i) + 3)  > 'z' 
56
+                        && word.charAt(i) <= 'z')){
57
+                            encrypted = encrypted + (char)(word.charAt(i) + 3 - 26);	
58
+				}
59
+				else 
60
+				{encrypted = encrypted + (char)(word.charAt(i) + 3);
61
+				}
62
+				encrypted = encrypted + word.charAt(i);
40 63
 }
64
+			                
65
+            return encrypted;                  
66
+      }
67
+    }

+ 9
- 5
MathUtilities.java View File

@@ -6,7 +6,7 @@ public class MathUtilities{
6 6
    * @return the sum of the two numbers
7 7
    */
8 8
   public int add(int num1, int num2){
9
-      return -1;
9
+      return num1 + num2;
10 10
   }
11 11
 
12 12
   /**
@@ -16,7 +16,7 @@ public class MathUtilities{
16 16
    * @return the sum of the two numbers
17 17
    */
18 18
   public double add(double num1, double num2){
19
-      return -1;
19
+      return num1 + num2;
20 20
   }
21 21
 
22 22
   /**
@@ -25,7 +25,7 @@ public class MathUtilities{
25 25
    * @return the half of the number in double
26 26
    */
27 27
   public double half(int number) {
28
-      return -1;
28
+      return number/2;
29 29
   }
30 30
 
31 31
   /**
@@ -34,7 +34,11 @@ public class MathUtilities{
34 34
    * @return true if the number is odd, false if it is even
35 35
    */
36 36
   public boolean isOdd(int number){
37
-      return false;
37
+      
38
+      if (number%2 == 1){
39
+          return true;
40
+        }
41
+      return false;  
38 42
   }
39 43
 
40 44
 
@@ -44,7 +48,7 @@ public class MathUtilities{
44 48
    * @return the result of the number multiply by itself
45 49
    */
46 50
   public int square(int number) {
47
-      return -1;
51
+      return number*number;
48 52
   }
49 53
 
50 54
 }

+ 21
- 4
StringUtilities.java View File

@@ -1,13 +1,30 @@
1 1
 public class StringUtilities {
2 2
    public Character getMiddleCharacter(String word){
3
-       return null;
3
+       char wordResult = 'a';
4
+
5
+       if (word.length()%2 == 1) {
6
+           int oddLength = word.length()/2;
7
+           int evenLength = word.length()/2-1;
8
+//           wordResult = word.substring(oddLength, oddLength + 1);
9
+        }
10
+        else {
11
+ //           wordResult = word.substring(evenLength, evenlength + 1);
12
+        }
13
+       return wordResult;
4 14
    }
5
-   
15
+ 
16
+
6 17
    public String removeCharacter(String value, char charToRemove){
7
-     return null;  
18
+       String newString = "";
19
+ 
20
+       for (int i = 0; i < value.length(); i ++) {
21
+           if (value.charAt(i) != charToRemove) newString += value.charAt(i);
22
+        }
23
+ 
24
+    return newString;  
8 25
    }
9 26
    
10 27
    public String getLastWord(String value) {
11
-       return null;
28
+       return value.substring(value.lastIndexOf(" ")+1);
12 29
    }
13 30
 }

+ 15
- 16
package.bluej View File

@@ -2,24 +2,24 @@
2 2
 dependency1.from=StringUtilitiesTest
3 3
 dependency1.to=StringUtilities
4 4
 dependency1.type=UsesDependency
5
-dependency2.from=BonusTest
6
-dependency2.to=Bonus
5
+dependency2.from=LoopFunTest
6
+dependency2.to=LoopFun
7 7
 dependency2.type=UsesDependency
8 8
 dependency3.from=MathUtilitiesTest
9 9
 dependency3.to=MathUtilities
10 10
 dependency3.type=UsesDependency
11
-editor.fx.0.height=722
12
-editor.fx.0.width=876
13
-editor.fx.0.x=158
14
-editor.fx.0.y=216
11
+editor.fx.0.height=567
12
+editor.fx.0.width=1172
13
+editor.fx.0.x=288
14
+editor.fx.0.y=98
15 15
 objectbench.height=164
16 16
 objectbench.width=669
17 17
 package.divider.horizontal=0.6
18 18
 package.divider.vertical=0.7628294036061026
19 19
 package.editor.height=543
20 20
 package.editor.width=567
21
-package.editor.x=557
22
-package.editor.y=43
21
+package.editor.x=23
22
+package.editor.y=23
23 23
 package.frame.height=779
24 24
 package.frame.width=693
25 25
 package.numDependencies=3
@@ -40,20 +40,19 @@ target1.width=110
40 40
 target1.x=110
41 41
 target1.y=150
42 42
 target2.height=50
43
-target2.name=BonusTest
43
+target2.name=LoopFunTest
44 44
 target2.showInterface=false
45 45
 target2.type=UnitTestTargetJunit4
46
-target2.width=80
47
-target2.x=120
48
-target2.y=270
49
-target3.association=BonusTest
46
+target2.width=110
47
+target2.x=10
48
+target2.y=240
50 49
 target3.height=50
51
-target3.name=Bonus
50
+target3.name=LoopFun
52 51
 target3.showInterface=false
53 52
 target3.type=ClassTarget
54 53
 target3.width=80
55
-target3.x=90
56
-target3.y=300
54
+target3.x=200
55
+target3.y=210
57 56
 target4.association=MathUtilitiesTest
58 57
 target4.height=50
59 58
 target4.name=MathUtilities