student před 6 roky
rodič
revize
58aab4368e
4 změnil soubory, kde provedl 79 přidání a 32 odebrání
  1. 37
    4
      LoopFun.java
  2. 10
    5
      MathUtilities.java
  3. 13
    3
      StringUtilities.java
  4. 19
    20
      package.bluej

+ 37
- 4
LoopFun.java Zobrazit soubor

@@ -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 factorial = 1;
12
+          for (int i = 1; i <= number; i++) {
13
+              factorial *= i;
14
+            }
15
+          
16
+          return factorial;
12 17
       }
13 18
 
14 19
       /**
@@ -19,13 +24,20 @@ 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
+          String acronym = "";
28
+          acronym += phrase.charAt(0);
29
+          for (int i = 1; i < phrase.length(); i++) {
30
+              if(phrase.charAt(i) == ' ') {
31
+                  acronym += phrase.charAt(i+1);
32
+                }
33
+            }
34
+          return acronym.toUpperCase();
23 35
       }
24 36
 
25 37
       /**
26 38
        * To prevent anyone from reading our messages, we can encrypt it so it will only be readable by its
27 39
        * intended audience. This method encrypt the message by shifting the letter by 3 characters. If the character is
28
-       * at the end of the alphabet, it will wraps around.
40
+       * at the end of the alphabet, it will wrap around.
29 41
        * For example:
30 42
        *  'a' => 'd'
31 43
        *  'w' => 'z'
@@ -35,6 +47,27 @@ public class LoopFun
35 47
        * @return the encrypted string by shifting each character by three character
36 48
        */
37 49
       public String encrypt(String word) {
38
-          return null;
50
+          String alphabet = "abcdefghijklmnopqrstuvwxyz";
51
+          String encryptedWord = "";
52
+          for (int i = 0; i < word.length(); i++) {
53
+              char letter = word.charAt(i);
54
+              int encryption = alphabet.indexOf(letter+3);
55
+              char encryptedLetter = ' '; 
56
+              // = alphabet.charAt(encryption);
57
+              //if (encryption == -1) {
58
+                  switch (letter) {
59
+                      case 'x': encryptedLetter = 'a';
60
+                      break;
61
+                      case 'y': encryptedLetter = 'b';
62
+                      break;
63
+                      case 'z': encryptedLetter = 'c';
64
+                      break;
65
+                      default: encryptedLetter = alphabet.charAt(encryption);
66
+                      break;
67
+                    }
68
+              //  }
69
+              encryptedWord += encryptedLetter;
70
+            }
71
+          return encryptedWord;
39 72
       }
40 73
 }

+ 10
- 5
MathUtilities.java Zobrazit soubor

@@ -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 (double) (num1 + num2);
20 20
   }
21 21
 
22 22
   /**
@@ -25,7 +25,11 @@ 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
+      if (number%2 == 0) {
29
+          return number/2;
30
+        } else {
31
+            return ((double) number)/2;
32
+        }
29 33
   }
30 34
 
31 35
   /**
@@ -34,7 +38,8 @@ public class MathUtilities{
34 38
    * @return true if the number is odd, false if it is even
35 39
    */
36 40
   public boolean isOdd(int number){
37
-      return false;
41
+      boolean x = (number%2 == 0) ? false : true;
42
+      return x;
38 43
   }
39 44
 
40 45
 
@@ -44,7 +49,7 @@ public class MathUtilities{
44 49
    * @return the result of the number multiply by itself
45 50
    */
46 51
   public int square(int number) {
47
-      return -1;
52
+      return (int) Math.pow(number, 2);
48 53
   }
49 54
 
50 55
 }

+ 13
- 3
StringUtilities.java Zobrazit soubor

@@ -1,13 +1,23 @@
1 1
 public class StringUtilities {
2 2
    public Character getMiddleCharacter(String word){
3
-       return null;
3
+       return word.charAt(word.length()/2);
4 4
    }
5 5
    
6 6
    public String removeCharacter(String value, char charToRemove){
7
-     return null;  
7
+       String newString = "";
8
+       for (int i = 0; i < value.length(); i++) {
9
+           if (value.charAt(i) != charToRemove) {
10
+               newString += value.charAt(i);
11
+           }
12
+       }
13
+       return newString;
8 14
    }
9 15
    
10 16
    public String getLastWord(String value) {
11
-       return null;
17
+       String reversedValue = new StringBuilder(value).reverse().toString();
18
+       int x = reversedValue.indexOf(' ');
19
+       String newValue = reversedValue.substring(0,x);
20
+       newValue = new StringBuilder(newValue).reverse().toString();
21
+       return newValue;
12 22
    }
13 23
 }

+ 19
- 20
package.bluej Zobrazit soubor

@@ -2,25 +2,25 @@
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
11
+editor.fx.0.height=712
12 12
 editor.fx.0.width=876
13
-editor.fx.0.x=158
14
-editor.fx.0.y=216
15
-objectbench.height=164
13
+editor.fx.0.x=11
14
+editor.fx.0.y=41
15
+objectbench.height=181
16 16
 objectbench.width=669
17 17
 package.divider.horizontal=0.6
18
-package.divider.vertical=0.7628294036061026
19
-package.editor.height=543
18
+package.divider.vertical=0.7112135176651305
19
+package.editor.height=456
20 20
 package.editor.width=567
21 21
 package.editor.x=557
22
-package.editor.y=43
23
-package.frame.height=779
22
+package.editor.y=23
23
+package.frame.height=709
24 24
 package.frame.width=693
25 25
 package.numDependencies=3
26 26
 package.numTargets=6
@@ -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
-target2.type=UnitTestTargetJunit4
46
-target2.width=80
47
-target2.x=120
48
-target2.y=270
49
-target3.association=BonusTest
45
+target2.type=ClassTarget
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
@@ -74,6 +73,6 @@ target6.height=50
74 73
 target6.name=MathUtilitiesTest
75 74
 target6.showInterface=false
76 75
 target6.type=UnitTestTargetJunit4
77
-target6.width=100
76
+target6.width=130
78 77
 target6.x=110
79 78
 target6.y=40