lab update

Factorial.ctxt

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

Factorial.java

@@ -1,4 +1,3 @@
- 
 
 
 import java.math.BigInteger;
@@ -6,7 +5,21 @@ import java.math.BigInteger;
 public class Factorial {
 
     public BigInteger factorialOf(Integer value){
-        return null;
+        BigInteger factorialValue = BigInteger.valueOf(1);
+        for (int i=1;i<=value;i++) {
+            factorialValue = factorialValue.multiply(BigInteger.valueOf(i));
+        }
+        return factorialValue;
     }
-
+    
+    /* Overflow
+    public String factorialOf1000(){
+        int value = 1000;
+        BigInteger factorialValue = new BigInteger("1");
+        for (int i=1;i<=value;i++) {
+            factorialValue = factorialValue.multiply(new BigInteger(i + ""));
+        }
+        return factorialValue.toString();
+    }
+    */
 }

FactorialTest.ctxt

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

IntegerPrinter.ctxt

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

IntegerPrinter.java

@@ -4,15 +4,15 @@
 public class IntegerPrinter {
 
     public String printIntegerAsBinary(int value){
-        return null;
+        return Integer.toBinaryString(value);
     }
 
     public String printIntegerAsOctal(int value){
-        return null;
+        return Integer.toOctalString(value);
     }
 
     public String printIntegerAsHexadecimal(int value){
-        return null;
+        return Integer.toHexString(value);
     }
 
     public static void main(String[] args){

IntegerPrinterTest.ctxt

@@ -0,0 +1,11 @@
+#BlueJ class context
+comment0.target=IntegerPrinterTest
+comment1.params=
+comment1.target=void\ setUp()
+comment2.params=
+comment2.target=void\ printIntegerAsBinaryTest()
+comment3.params=
+comment3.target=void\ printIntegerAsHexadecimal()
+comment4.params=
+comment4.target=void\ printIntegerAsOctalTest()
+numComments=5

LargestInteger.ctxt

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

LargestInteger.java

@@ -1,13 +1,22 @@
- 
 
 
 public class LargestInteger {
 
     public Integer findLargestNumberUsingConditional(Integer[] integers){
-        return null;
+        int largestInt=0;
+        if ((integers[0] > integers[1]) && (integers[0] > integers[2])){
+            largestInt = integers[0];
+        } else if ((integers[1] > integers[0]) && (integers[1] > integers[2])){
+            largestInt = integers[1];
+        } else if ((integers[2] > integers[0]) && (integers[2] > integers[1])){
+            largestInt = integers[2];
+        }
+        return largestInt;
     }
 
     public Integer findLargestNumberUsingMathMax(Integer[] integers){
-        return null;
+        int tempLargest = Math.max(integers[0], integers[1]);
+        int largestInt = Math.max (tempLargest, integers[2]);
+        return largestInt;
     }
 }

LargestIntegerTest.ctxt

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

NormalizeAngle.ctxt

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

NormalizeAngle.java

@@ -3,12 +3,12 @@
 
 public class NormalizeAngle {
 
-    public Integer normalizeValueUsingModulo(Integer angle){
-        return 0;
+    public int normalizeValueUsingModulo(int angle){
+        return angle%360;
     }
 
-    public Integer normalizeValueUsingFloorMod(Integer integer){
-        return 0;
+    public int normalizeValueUsingFloorMod(int integer){
+        return Math.floorMod(integer, 360);
     }
 
     public static void main(String[] args){

NormalizeAngleTest.ctxt

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

ShortCalculator.ctxt

@@ -0,0 +1,13 @@
+#BlueJ class context
+comment0.target=ShortCalculator
+comment1.params=x\ y
+comment1.target=short\ shortSum(short,\ short)
+comment2.params=x\ y
+comment2.target=short\ shortDifference(short,\ short)
+comment3.params=x\ y
+comment3.target=short\ shortProduct(short,\ short)
+comment4.params=x\ y
+comment4.target=short\ shortQuotient(short,\ short)
+comment5.params=x\ y
+comment5.target=short\ shortRemainder(short,\ short)
+numComments=6

ShortCalculator.java

@@ -1,5 +1,22 @@
  
 
 
-public class ShortCalculator {
+public class ShortCalculator{
+    public short shortSum(short x, short y){
+        return (short)(x+y);
+    }
+        public short shortDifference(short x, short y){
+        return (short)(x-y);
+    }
+        public short shortProduct(short x, short y){
+        return (short)(x*y);
+    }
+        public short shortQuotient(short x, short y){
+        return (short)(x/y);
+    }
+        public short shortRemainder(short x, short y){
+        return (short)(x%y);
+    }
+    
 }
+

ShortCalculatorTest.ctxt

@@ -0,0 +1,5 @@
+#BlueJ class context
+comment0.target=ShortCalculatorTest
+comment1.params=
+comment1.target=void\ shortSumTest()
+numComments=2

ShortCalculatorTest.java

@@ -1,5 +1,15 @@
- 
+import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test; 
 
 
 public class ShortCalculatorTest {
+    
+    @Test
+    public void shortSumTest(){
+        ShortCalculator calc = new ShortCalculator();
+        short x = calc.shortSum((short)23,(short)45);
+        Assert.assertEquals("68", x);
+    }
 }

package.bluej

@@ -11,21 +11,24 @@ dependency3.type=UsesDependency
 dependency4.from=IntegerPrinterTest
 dependency4.to=IntegerPrinter
 dependency4.type=UsesDependency
-editor.fx.0.height=0
-editor.fx.0.width=0
-editor.fx.0.x=0
-editor.fx.0.y=0
-objectbench.height=101
-objectbench.width=1070
-package.divider.horizontal=0.6
-package.divider.vertical=0.837593984962406
-package.editor.height=550
+dependency5.from=ShortCalculatorTest
+dependency5.to=ShortCalculator
+dependency5.type=UsesDependency
+editor.fx.0.height=722
+editor.fx.0.width=800
+editor.fx.0.x=591
+editor.fx.0.y=30
+objectbench.height=227
+objectbench.width=608
+package.divider.horizontal=0.5726256983240223
+package.divider.vertical=0.6481203007518797
+package.editor.height=424
 package.editor.width=968
-package.editor.x=59
-package.editor.y=82
+package.editor.x=374
+package.editor.y=177
 package.frame.height=723
 package.frame.width=1094
-package.numDependencies=4
+package.numDependencies=5
 package.numTargets=10
 package.showExtends=true
 package.showUses=true
@@ -54,8 +57,8 @@ target2.name=NormalizeAngle
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=120
-target2.x=70
-target2.y=70
+target2.x=560
+target2.y=60
 target3.height=50
 target3.name=IntegerPrinter
 target3.showInterface=false
@@ -68,36 +71,36 @@ target4.name=ShortCalculator
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=120
-target4.x=130
-target4.y=130
+target4.x=680
+target4.y=340
 target5.height=50
 target5.name=LargestInteger
 target5.showInterface=false
 target5.type=ClassTarget
 target5.width=120
-target5.x=10
-target5.y=190
+target5.x=280
+target5.y=80
 target6.height=50
 target6.name=LargestIntegerTest
 target6.showInterface=false
 target6.type=UnitTestTargetJunit4
 target6.width=140
-target6.x=250
-target6.y=190
+target6.x=230
+target6.y=180
 target7.height=50
 target7.name=ShortCalculatorTest
 target7.showInterface=false
-target7.type=ClassTarget
+target7.type=UnitTestTargetJunit4
 target7.width=150
-target7.x=10
-target7.y=250
+target7.x=300
+target7.y=340
 target8.height=50
 target8.name=NormalizeAngleTest
 target8.showInterface=false
 target8.type=UnitTestTargetJunit4
 target8.width=150
-target8.x=10
-target8.y=310
+target8.x=650
+target8.y=220
 target9.height=50
 target9.name=FactorialTest
 target9.showInterface=false