lab submission

LargestInteger.java

@@ -4,13 +4,14 @@
 public class LargestInteger {
 
     public Integer findLargestNumberUsingConditional(Integer[] integers){
-        //loop will through
-        
-        
-        return null;
-    }
-
+        Integer largerInteger = (integers[0]<integers[1]) ? integers[1]:integers[0];
+        Integer largestInteger = (largerInteger<integers[2]) ? integers[2]:largerInteger;
+        return largestInteger;
+    }  
+    
     public Integer findLargestNumberUsingMathMax(Integer[] integers){
-        return null;
+        Integer largerInteger = Math.max(integers[0],integers[1]);
+        Integer largestInteger = Math.max(integers[1],integers[2]);
+        return largestInteger;
     }
 }

NormalizeAngle.ctxt

@@ -2,8 +2,10 @@
 comment0.target=NormalizeAngle
 comment1.params=angle
 comment1.target=java.lang.Integer\ normalizeValueUsingModulo(java.lang.Integer)
-comment2.params=integer
-comment2.target=java.lang.Integer\ normalizeValueUsingFloorMod(java.lang.Integer)
-comment3.params=args
-comment3.target=void\ main(java.lang.String[])
-numComments=4
+comment2.params=angle
+comment2.target=java.lang.Integer\ mod360(java.lang.Integer)
+comment3.params=integer
+comment3.target=java.lang.Integer\ normalizeValueUsingFloorMod(java.lang.Integer)
+comment4.params=args
+comment4.target=void\ main(java.lang.String[])
+numComments=5

NormalizeAngle.java

@@ -4,11 +4,22 @@
 public class NormalizeAngle {
 
     public Integer normalizeValueUsingModulo(Integer angle){
-        return 0;
+        Integer normalizedAngle = mod360(angle);
+        if(normalizedAngle<0){
+            normalizedAngle = normalizedAngle * (-1);
+        }
+        return normalizedAngle;
+    }
+    
+    public Integer mod360 (Integer angle){
+        Integer modulus360 = angle%360;
+        return modulus360;
     }
 
     public Integer normalizeValueUsingFloorMod(Integer integer){
-        return 0;
+        int x = Math.floorMod(integer, 360);
+        
+        return x;
     }
 
     public static void main(String[] args){

ShortCalculator.ctxt

@@ -1,3 +1,13 @@
 #BlueJ class context
 comment0.target=ShortCalculator
-numComments=1
+comment1.params=x\ y
+comment1.target=short\ sum(short,\ short)
+comment2.params=x\ y
+comment2.target=short\ difference(short,\ short)
+comment3.params=x\ y
+comment3.target=short\ product(short,\ short)
+comment4.params=x\ y
+comment4.target=short\ quotient(short,\ short)
+comment5.params=x\ y
+comment5.target=short\ remainder(short,\ short)
+numComments=6

ShortCalculator.java

@@ -2,4 +2,19 @@
 
 
 public class ShortCalculator {
+    public short sum(short x,short y){
+        return (short)(x + y);
+    }
+    public short difference(short x, short y){
+        return (short)(x-y);
+    }
+    public short product(short x, short y){
+        return (short)(x*y);
+    }
+    public short quotient(short x, short y){
+        return (short)(x/y);
+    }
+    public short remainder(short x, short y){
+        return (short)(x%y);
+    }
 }

ShortCalculatorTest.ctxt

@@ -1,3 +1,13 @@
 #BlueJ class context
 comment0.target=ShortCalculatorTest
-numComments=1
+comment1.params=
+comment1.target=void\ sumTest()
+comment2.params=
+comment2.target=void\ differenceTest()
+comment3.params=
+comment3.target=void\ productTest()
+comment4.params=
+comment4.target=void\ quotientTest()
+comment5.params=
+comment5.target=void\ remainderTest()
+numComments=6

ShortCalculatorTest.java

@@ -1,5 +1,38 @@
- 
 
+import org.junit.Assert;
+import org.junit.Test;
 
-public class ShortCalculatorTest {
+public class ShortCalculatorTest 
+{   
+    ShortCalculator test = new ShortCalculator();
+    @Test
+    public void sumTest(){
+        short expected = (short)131070;
+        short actual = test.sum((short)65535,(short)65535);
+        Assert.assertEquals(expected,actual);
+    }
+    @Test
+    public void differenceTest(){
+        short expected = 679;
+        short actual = test.difference((short)700,(short)21);
+        Assert.assertEquals(expected,actual);
+    }
+    @Test
+    public void productTest(){
+        short expected = 6000;
+        short actual = test.product((short)200,(short)30);
+        Assert.assertEquals(expected,actual);    
+    }
+    @Test
+    public void quotientTest(){
+        short expected = 600;
+        short actual = test.quotient((short)18000,(short)30);
+        Assert.assertEquals(expected,actual);
+    }
+    @Test
+    public void remainderTest(){
+        short expected = 1;
+        short actual = test.remainder((short)18001,(short)18000);
+        Assert.assertEquals(expected,actual);
+    }
 }

package.bluej

@@ -5,15 +5,18 @@ dependency1.type=UsesDependency
 dependency2.from=FactorialTest
 dependency2.to=Factorial
 dependency2.type=UsesDependency
-dependency3.from=LargestIntegerTest
-dependency3.to=LargestInteger
+dependency3.from=NormalizeAngleTest
+dependency3.to=NormalizeAngle
 dependency3.type=UsesDependency
-dependency4.from=NormalizeAngleTest
-dependency4.to=NormalizeAngle
+dependency4.from=LargestIntegerTest
+dependency4.to=LargestInteger
 dependency4.type=UsesDependency
+dependency5.from=ShortCalculatorTest
+dependency5.to=ShortCalculator
+dependency5.type=UsesDependency
 editor.fx.0.height=709
 editor.fx.0.width=800
-editor.fx.0.x=28
+editor.fx.0.x=645
 editor.fx.0.y=23
 objectbench.height=98
 objectbench.width=637
@@ -21,11 +24,11 @@ package.divider.horizontal=0.5996275605214153
 package.divider.vertical=0.8387096774193549
 package.editor.height=539
 package.editor.width=968
-package.editor.x=296
+package.editor.x=186
 package.editor.y=23
 package.frame.height=709
 package.frame.width=1094
-package.numDependencies=4
+package.numDependencies=5
 package.numTargets=10
 package.showExtends=true
 package.showUses=true
@@ -87,7 +90,7 @@ target6.y=190
 target7.height=50
 target7.name=ShortCalculatorTest
 target7.showInterface=false
-target7.type=ClassTarget
+target7.type=UnitTestTargetJunit4
 target7.width=150
 target7.x=240
 target7.y=50