Merge branch 'development' of https://git.zipcode.rocks/tennesseegibbs/ZCW-MacroLabs-OOP-ScientificCalculator into development

CoreTest.java

@@ -87,18 +87,18 @@ public class CoreTest
     }
 
     @Test
-    public void squareRoot()
+    public void testsquareRoot()
     {
         //expected
-        double expected = 1.4;
+        double expected = 3.0;
         //actual
-        double actual = test.squareRoot(2.0);
+        double actual = test.squareRoot(9.0);
         //assertion
         assertEquals(expected, actual, 0.1);
     }
 
     @Test
-    public void exponentiation()
+    public void testexponentiation()
     {
         //expected
         double expected = 4;
@@ -109,7 +109,7 @@ public class CoreTest
     }
 
     @Test
-    public void inverse()
+    public void testinverse()
     {
         //expected
         double expected = 0.25;
@@ -120,12 +120,12 @@ public class CoreTest
     }
 
     @Test
-    public void reverse()
+    public void testreverse()
     {
         //expected
-        double expected = 0.25;
+        double expected = -4.0;
         //actual
-        double actual = test.inverse(4.0);
+        double actual = test.reverse(4.0);
         //assertion
         assertEquals(expected, actual, 0.1);
     }

Scientific.java

@@ -19,15 +19,54 @@ public class Scientific
         x = 0;
     }
 
-    /**
-     * An example of a method - replace this comment with your own
-     *
-     * @param  y  a sample parameter for a method
-     * @return    the sum of x and y
-     */
-    public int sampleMethod(int y)
+    public static double sine(double angle)
+    {
+        angle = Math.toRadians(angle);
+
+        return Math.sin(angle) ;
+    }
+
+    public static double cosine(double angle)
+    {
+        angle = Math.toRadians(angle);
+
+        return Math.cos(angle) ;
+    }
+
+    public static double tangent(double angle)
+    {
+        angle = Math.toRadians(angle);
+
+        return Math.tan(angle) ;
+    }
+
+    public static double inverseSin(double angle)
+    {   angle = Math.toRadians(angle);
+
+        return Math.asin(angle) ;
+
+    }
+
+    public static double inverseCosine(double angle)
     {
-        // put your code here
-        return x + y;
+        angle = Math.toRadians(angle);
+
+        return Math.acos(angle) ;
+    }
+
+    public static double inverseTangent(double angle)
+    {
+        angle = Math.toRadians(angle);
+
+        return Math.atan(angle) ;
+    }
+    public static double factorial(double x)
+    {
+        double result = double.valueof(number);
+        for (double factor = y; factor <= x.doubleValue(); factor++){
+        result = result.multiply(double.valueof(factor));
+        }
+
+        return result ;
     }
 }

package.bluej

@@ -1,41 +1,44 @@
 #BlueJ package file
-dependency1.from=MainApplication
-dependency1.to=Console
+dependency1.from=Calculator
+dependency1.to=Display
 dependency1.type=UsesDependency
-dependency2.from=MainApplication
-dependency2.to=Calculator
+dependency2.from=Calculator
+dependency2.to=Console
 dependency2.type=UsesDependency
-dependency3.from=CoreTest
+dependency3.from=Calculator
 dependency3.to=Core
 dependency3.type=UsesDependency
-dependency4.from=Calculator
-dependency4.to=Display
+dependency4.from=MainApplication
+dependency4.to=Console
 dependency4.type=UsesDependency
-dependency5.from=Calculator
-dependency5.to=Console
+dependency5.from=MainApplication
+dependency5.to=Calculator
 dependency5.type=UsesDependency
-dependency6.from=Calculator
-dependency6.to=Core
+dependency6.from=Core
+dependency6.to=Display
 dependency6.type=UsesDependency
 dependency7.from=Core
 dependency7.to=Console
 dependency7.type=UsesDependency
+dependency8.from=CoreTest
+dependency8.to=Core
+dependency8.type=UsesDependency
 editor.fx.0.height=722
 editor.fx.0.width=800
-editor.fx.0.x=867
-editor.fx.0.y=-805
+editor.fx.0.x=-133
+editor.fx.0.y=-1023
 objectbench.height=101
 objectbench.width=677
 package.divider.horizontal=0.6
-package.divider.vertical=0.8459343794579173
-package.editor.height=586
+package.divider.vertical=0.8470254957507082
+package.editor.height=591
 package.editor.width=1034
-package.editor.x=138
-package.editor.y=-854
-package.frame.height=759
+package.editor.x=465
+package.editor.y=-1037
+package.frame.height=764
 package.frame.width=1160
-package.numDependencies=7
-package.numTargets=10
+package.numDependencies=8
+package.numTargets=9
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -49,16 +52,8 @@ target1.name=CoreTest
 target1.showInterface=false
 target1.type=UnitTestTargetJunit4
 target1.width=80
-target1.x=530
-target1.y=230
-target10.association=DisplayTest
-target10.height=50
-target10.name=Display
-target10.showInterface=false
-target10.type=ClassTarget
-target10.width=80
-target10.x=40
-target10.y=310
+target1.x=420
+target1.y=130
 target2.height=50
 target2.name=ScientificTest
 target2.showInterface=false
@@ -67,53 +62,54 @@ target2.width=80
 target2.x=530
 target2.y=130
 target3.height=50
-target3.name=Memory
+target3.name=Calculator
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=80
-target3.x=140
-target3.y=480
+target3.width=90
+target3.x=290
+target3.y=70
 target4.height=50
-target4.name=Calculator
+target4.name=Console
 target4.showInterface=false
 target4.type=ClassTarget
-target4.width=90
-target4.x=290
-target4.y=70
+target4.width=80
+target4.x=120
+target4.y=300
+target5.association=ScientificTest
 target5.height=50
-target5.name=Console
+target5.name=Scientific
 target5.showInterface=false
 target5.type=ClassTarget
 target5.width=80
-target5.x=70
-target5.y=390
-target6.association=ScientificTest
+target5.x=500
+target5.y=160
 target6.height=50
-target6.name=Scientific
+target6.name=DisplayTest
 target6.showInterface=false
-target6.type=ClassTarget
+target6.type=UnitTestTargetJunit4
 target6.width=80
-target6.x=500
-target6.y=160
+target6.x=480
+target6.y=40
 target7.height=50
-target7.name=DisplayTest
+target7.name=MainApplication
 target7.showInterface=false
-target7.type=UnitTestTargetJunit4
-target7.width=80
+target7.type=ClassTarget
+target7.width=120
 target7.x=70
-target7.y=280
+target7.y=70
+target8.association=CoreTest
 target8.height=50
-target8.name=MainApplication
+target8.name=Core
 target8.showInterface=false
 target8.type=ClassTarget
-target8.width=120
-target8.x=70
-target8.y=70
-target9.association=CoreTest
+target8.width=80
+target8.x=390
+target8.y=160
+target9.association=DisplayTest
 target9.height=50
-target9.name=Core
+target9.name=Display
 target9.showInterface=false
 target9.type=ClassTarget
 target9.width=80
-target9.x=500
-target9.y=260
+target9.x=450
+target9.y=70