#29 lewis

Offen
LewisDominguez möchte 2 Commits von LewisDominguez/ZCW-BasicComputations-BlueJ:master nach master zusammenführen

BIN
.DS_Store Datei anzeigen


BIN
Factorial.class Datei anzeigen


+ 5
- 0
Factorial.ctxt Datei anzeigen

@@ -0,0 +1,5 @@
1
+#BlueJ class context
2
+comment0.target=Factorial
3
+comment1.params=value
4
+comment1.target=java.math.BigInteger\ factorialOf(java.lang.Integer)
5
+numComments=2

+ 6
- 1
Factorial.java Datei anzeigen

@@ -6,7 +6,12 @@ import java.math.BigInteger;
6 6
 public class Factorial {
7 7
 
8 8
     public BigInteger factorialOf(Integer value){
9
-        return null;
9
+        BigInteger factorial = new BigInteger("1");
10
+        for(int i = 1; i <= value; i++) {
11
+            factorial = factorial.multiply(new BigInteger(Integer.toString(i)));
12
+        }
13
+        return factorial;
14
+        
10 15
     }
11 16
 
12 17
 }

BIN
FactorialTest.class Datei anzeigen


+ 7
- 0
FactorialTest.ctxt Datei anzeigen

@@ -0,0 +1,7 @@
1
+#BlueJ class context
2
+comment0.target=FactorialTest
3
+comment1.params=
4
+comment1.target=void\ setUp()
5
+comment2.params=
6
+comment2.target=void\ factorialOfTest()
7
+numComments=3

BIN
IntegerPrinter.class Datei anzeigen


+ 11
- 0
IntegerPrinter.ctxt Datei anzeigen

@@ -0,0 +1,11 @@
1
+#BlueJ class context
2
+comment0.target=IntegerPrinter
3
+comment1.params=value
4
+comment1.target=java.lang.String\ printIntegerAsBinary(int)
5
+comment2.params=value
6
+comment2.target=java.lang.String\ printIntegerAsOctal(int)
7
+comment3.params=value
8
+comment3.target=java.lang.String\ printIntegerAsHexadecimal(int)
9
+comment4.params=args
10
+comment4.target=void\ main(java.lang.String[])
11
+numComments=5

+ 3
- 3
IntegerPrinter.java Datei anzeigen

@@ -4,15 +4,15 @@
4 4
 public class IntegerPrinter {
5 5
 
6 6
     public String printIntegerAsBinary(int value){
7
-        return null;
7
+        return Integer.toString(value, 2);                     
8 8
     }
9 9
 
10 10
     public String printIntegerAsOctal(int value){
11
-        return null;
11
+        return Integer.toString(value, 8);
12 12
     }
13 13
 
14 14
     public String printIntegerAsHexadecimal(int value){
15
-        return null;
15
+        return Integer.toString(value, 16);
16 16
     }
17 17
 
18 18
     public static void main(String[] args){

BIN
IntegerPrinterTest.class Datei anzeigen


+ 11
- 0
IntegerPrinterTest.ctxt Datei anzeigen

@@ -0,0 +1,11 @@
1
+#BlueJ class context
2
+comment0.target=IntegerPrinterTest
3
+comment1.params=
4
+comment1.target=void\ setUp()
5
+comment2.params=
6
+comment2.target=void\ printIntegerAsBinaryTest()
7
+comment3.params=
8
+comment3.target=void\ printIntegerAsHexadecimal()
9
+comment4.params=
10
+comment4.target=void\ printIntegerAsOctalTest()
11
+numComments=5

BIN
LargestInteger.class Datei anzeigen


+ 7
- 0
LargestInteger.ctxt Datei anzeigen

@@ -0,0 +1,7 @@
1
+#BlueJ class context
2
+comment0.target=LargestInteger
3
+comment1.params=integers
4
+comment1.target=java.lang.Integer\ findLargestNumberUsingConditional(java.lang.Integer[])
5
+comment2.params=integers
6
+comment2.target=java.lang.Integer\ findLargestNumberUsingMathMax(java.lang.Integer[])
7
+numComments=3

+ 10
- 3
LargestInteger.java Datei anzeigen

@@ -1,13 +1,20 @@
1 1
  
2 2
 
3
-
3
+import java.lang.Math;
4 4
 public class LargestInteger {
5 5
 
6 6
     public Integer findLargestNumberUsingConditional(Integer[] integers){
7
-        return null;
7
+        int largest = 0;
8
+        for(int i = 0; i < integers.length; i++) {
9
+            if(largest < integers[i]) {
10
+            largest = integers[i];
11
+            }
12
+        }
13
+        return largest;
8 14
     }
9 15
 
10 16
     public Integer findLargestNumberUsingMathMax(Integer[] integers){
11
-        return null;
17
+        int maxNumber = Math.max(integers[0], Math.max(integers[1], integers[2]));
18
+        return maxNumber;
12 19
     }
13 20
 }

BIN
LargestIntegerTest.class Datei anzeigen


+ 9
- 0
LargestIntegerTest.ctxt Datei anzeigen

@@ -0,0 +1,9 @@
1
+#BlueJ class context
2
+comment0.target=LargestIntegerTest
3
+comment1.params=
4
+comment1.target=void\ setUp()
5
+comment2.params=
6
+comment2.target=void\ findLargestNumberUsingConditionalTest()
7
+comment3.params=
8
+comment3.target=void\ findLargestNumberUsingMathMaxTest()
9
+numComments=4

BIN
NormalizeAngle.class Datei anzeigen


+ 9
- 0
NormalizeAngle.ctxt Datei anzeigen

@@ -0,0 +1,9 @@
1
+#BlueJ class context
2
+comment0.target=NormalizeAngle
3
+comment1.params=angle
4
+comment1.target=java.lang.Integer\ normalizeValueUsingModulo(java.lang.Integer)
5
+comment2.params=integer
6
+comment2.target=java.lang.Integer\ normalizeValueUsingFloorMod(java.lang.Integer)
7
+comment3.params=args
8
+comment3.target=void\ main(java.lang.String[])
9
+numComments=4

+ 2
- 2
NormalizeAngle.java Datei anzeigen

@@ -4,11 +4,11 @@
4 4
 public class NormalizeAngle {
5 5
 
6 6
     public Integer normalizeValueUsingModulo(Integer angle){
7
-        return 0;
7
+        return angle % 360;
8 8
     }
9 9
 
10 10
     public Integer normalizeValueUsingFloorMod(Integer integer){
11
-        return 0;
11
+        return Math.floorMod(780, 360);
12 12
     }
13 13
 
14 14
     public static void main(String[] args){

BIN
NormalizeAngleTest.class Datei anzeigen


+ 9
- 0
NormalizeAngleTest.ctxt Datei anzeigen

@@ -0,0 +1,9 @@
1
+#BlueJ class context
2
+comment0.target=NormalizeAngleTest
3
+comment1.params=
4
+comment1.target=void\ setUp()
5
+comment2.params=
6
+comment2.target=void\ normalizeValueUsingModuloTest()
7
+comment3.params=
8
+comment3.target=void\ normalizeValueUsingFloorModTest()
9
+numComments=4

BIN
ShortCalculator.class Datei anzeigen


+ 3
- 0
ShortCalculator.ctxt Datei anzeigen

@@ -0,0 +1,3 @@
1
+#BlueJ class context
2
+comment0.target=ShortCalculator
3
+numComments=1

BIN
ShortCalculatorTest.class Datei anzeigen


+ 3
- 0
ShortCalculatorTest.ctxt Datei anzeigen

@@ -0,0 +1,3 @@
1
+#BlueJ class context
2
+comment0.target=ShortCalculatorTest
3
+numComments=1

+ 50
- 50
package.bluej Datei anzeigen

@@ -1,30 +1,30 @@
1 1
 #BlueJ package file
2
-dependency1.from=LargestIntegerTest
3
-dependency1.to=LargestInteger
2
+dependency1.from=IntegerPrinterTest
3
+dependency1.to=IntegerPrinter
4 4
 dependency1.type=UsesDependency
5
-dependency2.from=NormalizeAngleTest
6
-dependency2.to=NormalizeAngle
5
+dependency2.from=FactorialTest
6
+dependency2.to=Factorial
7 7
 dependency2.type=UsesDependency
8
-dependency3.from=FactorialTest
9
-dependency3.to=Factorial
8
+dependency3.from=NormalizeAngleTest
9
+dependency3.to=NormalizeAngle
10 10
 dependency3.type=UsesDependency
11
-dependency4.from=IntegerPrinterTest
12
-dependency4.to=IntegerPrinter
11
+dependency4.from=LargestIntegerTest
12
+dependency4.to=LargestInteger
13 13
 dependency4.type=UsesDependency
14
-editor.fx.0.height=0
15
-editor.fx.0.width=0
16
-editor.fx.0.x=0
17
-editor.fx.0.y=0
14
+editor.fx.0.height=709
15
+editor.fx.0.width=1079
16
+editor.fx.0.x=201
17
+editor.fx.0.y=31
18 18
 objectbench.height=101
19
-objectbench.width=1070
19
+objectbench.width=822
20 20
 package.divider.horizontal=0.6
21
-package.divider.vertical=0.837593984962406
22
-package.editor.height=550
23
-package.editor.width=968
24
-package.editor.x=59
25
-package.editor.y=82
26
-package.frame.height=723
27
-package.frame.width=1094
21
+package.divider.vertical=0.823240589198036
22
+package.editor.height=496
23
+package.editor.width=720
24
+package.editor.x=35
25
+package.editor.y=80
26
+package.frame.height=669
27
+package.frame.width=846
28 28
 package.numDependencies=4
29 29
 package.numTargets=10
30 30
 package.showExtends=true
@@ -40,68 +40,68 @@ target1.name=Factorial
40 40
 target1.showInterface=false
41 41
 target1.type=ClassTarget
42 42
 target1.width=80
43
-target1.x=160
44
-target1.y=10
43
+target1.x=280
44
+target1.y=90
45 45
 target10.height=50
46 46
 target10.name=IntegerPrinterTest
47 47
 target10.showInterface=false
48 48
 target10.type=UnitTestTargetJunit4
49
-target10.width=140
50
-target10.x=10
51
-target10.y=370
49
+target10.width=150
50
+target10.x=50
51
+target10.y=60
52 52
 target2.height=50
53 53
 target2.name=NormalizeAngle
54 54
 target2.showInterface=false
55 55
 target2.type=ClassTarget
56
-target2.width=120
57
-target2.x=70
58
-target2.y=70
56
+target2.width=130
57
+target2.x=10
58
+target2.y=210
59 59
 target3.height=50
60 60
 target3.name=IntegerPrinter
61 61
 target3.showInterface=false
62 62
 target3.type=ClassTarget
63
-target3.width=110
64
-target3.x=10
65
-target3.y=130
63
+target3.width=120
64
+target3.x=20
65
+target3.y=90
66 66
 target4.height=50
67 67
 target4.name=ShortCalculator
68 68
 target4.showInterface=false
69 69
 target4.type=ClassTarget
70
-target4.width=120
71
-target4.x=130
72
-target4.y=130
70
+target4.width=130
71
+target4.x=280
72
+target4.y=310
73 73
 target5.height=50
74 74
 target5.name=LargestInteger
75 75
 target5.showInterface=false
76 76
 target5.type=ClassTarget
77 77
 target5.width=120
78
-target5.x=10
79
-target5.y=190
78
+target5.x=20
79
+target5.y=340
80 80
 target6.height=50
81 81
 target6.name=LargestIntegerTest
82 82
 target6.showInterface=false
83 83
 target6.type=UnitTestTargetJunit4
84
-target6.width=140
85
-target6.x=250
86
-target6.y=190
84
+target6.width=150
85
+target6.x=10
86
+target6.y=310
87 87
 target7.height=50
88 88
 target7.name=ShortCalculatorTest
89 89
 target7.showInterface=false
90 90
 target7.type=ClassTarget
91
-target7.width=150
92
-target7.x=10
93
-target7.y=250
91
+target7.width=160
92
+target7.x=270
93
+target7.y=230
94 94
 target8.height=50
95
-target8.name=NormalizeAngleTest
95
+target8.name=FactorialTest
96 96
 target8.showInterface=false
97 97
 target8.type=UnitTestTargetJunit4
98
-target8.width=150
99
-target8.x=10
100
-target8.y=310
98
+target8.width=110
99
+target8.x=270
100
+target8.y=60
101 101
 target9.height=50
102
-target9.name=FactorialTest
102
+target9.name=NormalizeAngleTest
103 103
 target9.showInterface=false
104 104
 target9.type=UnitTestTargetJunit4
105
-target9.width=110
106
-target9.x=410
107
-target9.y=260
105
+target9.width=160
106
+target9.x=10
107
+target9.y=180