update

Calculator.java

@@ -10,6 +10,7 @@ public class Calculator
 
         DisplayMode conversion = new DisplayMode();
         int modeOrdinal = 0;
+        int trigMode = 0; //0 - degrees (default); 1 - radians
 
         String initial = Console.getStringInput("Enter number");
         display.setDisplay(initial);
@@ -137,9 +138,27 @@ public class Calculator
                 Console.println(Double.toString(out));
                 display.setDisplay(Double.toString(out));
             }
+            if (command.equalsIgnoreCase("deg")) {
+                    trigMode = 0;
+                    Console.println("Trigonometric units are degrees");
+            }
+            if (command.equalsIgnoreCase("rad")) {
+                    trigMode = 1;
+                    Console.println("Trigonometric units are radians");
+            }
+            if (command.equalsIgnoreCase("trigSwitch")) {
+                if (trigMode == 0) {
+                    trigMode = 1;
+                    Console.println("Trigonometric units are radians");
+                } else  
+                {
+                    trigMode = 0;
+                    Console.println("Trigonometric units are degrees");
+                }
+            }
             if (command.equalsIgnoreCase("sin")) {
                 double first = Double.parseDouble(display.getDisplay());
-                double out = Scientific.sine(first);
+                double out = Scientific.sine(first, trigMode);
                 if (Double.toString(out) == "NaN") {
                     display.errorDisplay();
                 } else {
@@ -149,7 +168,7 @@ public class Calculator
             }
             if (command.equalsIgnoreCase("cos")) {
                 double first = Double.parseDouble(display.getDisplay());
-                double out = Scientific.cosine(first);
+                double out = Scientific.cosine(first, trigMode);
                 if (Double.toString(out) == "NaN") {
                     display.errorDisplay();
                 } else {
@@ -159,7 +178,7 @@ public class Calculator
             }
             if (command.equalsIgnoreCase("tan")) {
                 double first = Double.parseDouble(display.getDisplay());
-                double out = Scientific.tangent(first);
+                double out = Scientific.tangent(first, trigMode);
                 if (Double.toString(out) == "NaN") {
                     display.errorDisplay();
                 } else {
@@ -169,7 +188,7 @@ public class Calculator
             }
             if (command.equalsIgnoreCase("asin")) {
                 double first = Double.parseDouble(display.getDisplay());
-                double out = Scientific.inverseSin(first);
+                double out = Scientific.inverseSin(first, trigMode);
                 if (Double.toString(out) == "NaN") {
                     display.errorDisplay();
                 } else {
@@ -179,7 +198,7 @@ public class Calculator
             }
             if (command.equalsIgnoreCase("acos")) {
                 double first = Double.parseDouble(display.getDisplay());
-                double out = Scientific.inverseCosine(first);
+                double out = Scientific.inverseCosine(first, trigMode);
                 if (Double.toString(out) == "NaN") {
                     display.errorDisplay();
                 } else {
@@ -189,7 +208,7 @@ public class Calculator
             }
             if (command.equalsIgnoreCase("atan")) {
                 double first = Double.parseDouble(display.getDisplay());
-                double out = Scientific.inverseTangent(first);
+                double out = Scientific.inverseTangent(first, trigMode);
                 if (Double.toString(out) == "NaN") {
                     display.errorDisplay();
                 } else {
@@ -197,7 +216,7 @@ public class Calculator
                     display.setDisplay(Double.toString(out));
                 }
             }
-            if (command.equalsIgnoreCase("fact") || command.equalsIgnoreCase("!x")) {
+            if (command.equalsIgnoreCase("fact") || command.equalsIgnoreCase("x!")) {
                 double first = Custom.round(Double.parseDouble(display.getDisplay()));
                 BigInteger out = Scientific.factorial(first);
                 Console.println(out.toString());

CoreTest.java

@@ -42,7 +42,8 @@ public class CoreTest
     }
 
     @Test
-    public void testAdd(){
+    public void testAdd()
+    {
         //expected
         double expected = 2.0;
         //actual

Scientific.java

@@ -14,41 +14,54 @@ public class Scientific
         x = 0;
     }
 
-    public static double sine(double angle)
+    public static double sine(double angle, int mode)
     {
-        angle = Math.toRadians(angle);
+        if (mode == 0) {
+            angle = Math.toRadians(angle);
+        }
         return Math.sin(angle) ;
     }
 
-    public static double cosine(double angle)
+    public static double cosine(double angle, int mode)
     {
-        angle = Math.toRadians(angle);
+        if (mode == 0) {
+            angle = Math.toRadians(angle);
+        }
         return Math.cos(angle) ;
     }
 
-    public static double tangent(double angle)
+    public static double tangent(double angle, int mode)
     {
-        angle = Math.toRadians(angle);
+        if (mode == 0) {
+            angle = Math.toRadians(angle);
+        }
         return Math.tan(angle) ;
     }
 
-    public static double inverseSin(double angle)
-    {   angle = Math.toRadians(angle);
+    public static double inverseSin(double angle, int mode)
+    {   
+        if (mode == 0) {
+            angle = Math.toRadians(angle);
+        }
         return Math.asin(angle) ;
-
     }
 
-    public static double inverseCosine(double angle)
+    public static double inverseCosine(double angle, int mode)
     {
-        angle = Math.toRadians(angle);
+        if (mode == 0) {
+            angle = Math.toRadians(angle);
+        }
         return Math.acos(angle) ;
     }
 
-    public static double inverseTangent(double angle)
+    public static double inverseTangent(double angle, int mode)
     {
-        angle = Math.toRadians(angle);
+        if (mode == 0) {
+            angle = Math.toRadians(angle);
+        }
         return Math.atan(angle) ;
     }
+
     public static BigInteger factorial(double x)
     {
         int y = (int) x;
@@ -57,7 +70,7 @@ public class Scientific
             factorialValue = factorialValue.multiply(BigInteger.valueOf(i));
         }
         return factorialValue;
-        }
-
     }
 
+}
+

ScientificDegrees.java

@@ -0,0 +1,76 @@
+
+/**
+ * Write a description of class ScientificDegrees here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class ScientificDegrees
+{
+    // instance variables - replace the example below with your own
+    private int x;
+
+    /**
+     * Constructor for objects of class ScientificDegrees
+     */
+    public ScientificDegrees()
+    {
+        // initialise instance variables
+        x = 0;
+    }
+
+    public static double sine(double angle)
+    {
+        
+
+        return Math.sin(angle) ;
+    }
+
+    public static double cosine(double angle)
+    {
+        
+
+        return Math.cos(angle) ;
+    }
+
+    public static double tangent(double angle)
+    {
+        
+
+        return Math.tan(angle) ;
+    }
+
+    public static double inverseSin(double angle)
+    {   
+
+        return Math.asin(angle) ;
+
+    }
+
+    public static double inverseCosine(double angle)
+    {
+        
+
+        return Math.acos(angle) ;
+    }
+
+    public static double inverseTangent(double angle)
+    {
+        
+
+        return Math.atan(angle) ;
+    }
+
+    /*public static BigInteger factorial(double number) {
+        double result = double.ValueOf(1);
+
+        for (double factor = 2; factor <= number.longValue(); factor++) {
+            result = result.multiply(double.valueOf(factor));
+        }
+
+        return result;
+    }*/
+}
+
+
+

ScientificDegreesTest.java

@@ -0,0 +1,47 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+/**
+ * The test class ScientificDegreesTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class ScientificDegreesTest
+{
+    private Scientific test;
+    public ScientificDegreesTest(){
+    }
+
+    /**
+     * Sets up the test fixture.
+     *
+     * Called before every test case method.
+     */
+    @Before
+    public void setUp()
+    {
+        Scientific test = new Scientific();
+    }
+
+    /**
+     * Tears down the test fixture.
+     *
+     * Called after every test case method.
+     */
+    @Test
+    public void testSine()
+    {
+        //expected
+        double expected = 1.0;
+        //actual
+        
+        double actual = test.sine(90.0,0);
+        //assertion
+        assertEquals(expected, actual, 0.1);
+    }
+    }
+

ScientificTest.java

@@ -13,11 +13,8 @@ import org.junit.Test;
  */
 public class ScientificTest
 {
-    /**
-     * Default constructor for test class ScientificTest
-     */
-    public ScientificTest()
-    {
+    private Scientific test;
+    public ScientificTest(){
     }
 
     /**
@@ -28,6 +25,7 @@ public class ScientificTest
     @Before
     public void setUp()
     {
+        Scientific test = new Scientific();
     }
 
     /**
@@ -35,8 +33,17 @@ public class ScientificTest
      *
      * Called after every test case method.
      */
-    @After
-    public void tearDown()
+    @Test
+    public void testSine()
     {
+        //expected
+        double expected = 0.8;
+        //actual
+        
+        double actual = Math.toRadians(90);
+        double actualSine = test.sine(actual);
+        //assertion
+        assertEquals(expected, actualSine, 0.1);
     }
-}
+    }
+

package.bluej

@@ -8,14 +8,17 @@ dependency10.type=UsesDependency
 dependency11.from=Calculator
 dependency11.to=Scientific
 dependency11.type=UsesDependency
+dependency12.from=ScientificDegreesTest
+dependency12.to=Scientific
+dependency12.type=UsesDependency
 dependency2.from=MainApplication
 dependency2.to=Calculator
 dependency2.type=UsesDependency
-dependency3.from=CoreTest
-dependency3.to=Core
+dependency3.from=Display
+dependency3.to=Console
 dependency3.type=UsesDependency
-dependency4.from=Display
-dependency4.to=Console
+dependency4.from=CoreTest
+dependency4.to=Core
 dependency4.type=UsesDependency
 dependency5.from=Calculator
 dependency5.to=Display
@@ -34,20 +37,20 @@ dependency9.to=Core
 dependency9.type=UsesDependency
 editor.fx.0.height=722
 editor.fx.0.width=1223
-editor.fx.0.x=142
-editor.fx.0.y=110
+editor.fx.0.x=170
+editor.fx.0.y=107
 objectbench.height=101
 objectbench.width=677
 package.divider.horizontal=0.6
 package.divider.vertical=0.8459343794579173
 package.editor.height=586
 package.editor.width=1034
-package.editor.x=64
-package.editor.y=87
+package.editor.x=51
+package.editor.y=70
 package.frame.height=759
 package.frame.width=1160
-package.numDependencies=11
-package.numTargets=15
+package.numDependencies=12
+package.numTargets=17
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -57,113 +60,127 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=ScientificTest
+target1.name=ScientificDegrees
 target1.showInterface=false
-target1.type=UnitTestTargetJunit4
-target1.width=80
-target1.x=740
-target1.y=140
-target10.association=ConversionTest
+target1.type=ClassTarget
+target1.width=140
+target1.x=780
+target1.y=270
 target10.height=50
-target10.name=DisplayMode
+target10.name=CoreTest
 target10.showInterface=false
-target10.type=ClassTarget
-target10.width=110
-target10.x=80
-target10.y=300
+target10.type=UnitTestTargetJunit4
+target10.width=80
+target10.x=740
+target10.y=20
 target11.height=50
-target11.name=Calculator
+target11.name=MemoryTest
 target11.showInterface=false
-target11.type=ClassTarget
-target11.width=90
-target11.x=440
-target11.y=170
+target11.type=UnitTestTargetJunit4
+target11.width=80
+target11.x=140
+target11.y=230
+target12.association=ConversionTest
 target12.height=50
-target12.name=Console
+target12.name=DisplayMode
 target12.showInterface=false
 target12.type=ClassTarget
-target12.width=80
-target12.x=380
-target12.y=440
+target12.width=110
+target12.x=110
+target12.y=380
 target13.height=50
-target13.name=MainApplication
+target13.name=Calculator
 target13.showInterface=false
 target13.type=ClassTarget
-target13.width=120
-target13.x=290
-target13.y=100
-target14.association=CoreTest
+target13.width=90
+target13.x=440
+target13.y=170
 target14.height=50
-target14.name=Core
+target14.name=Console
 target14.showInterface=false
 target14.type=ClassTarget
 target14.width=80
-target14.x=710
-target14.y=50
-target15.association=DisplayTest
+target14.x=380
+target14.y=460
 target15.height=50
-target15.name=Display
+target15.name=MainApplication
 target15.showInterface=false
 target15.type=ClassTarget
-target15.width=80
-target15.x=80
+target15.width=120
+target15.x=300
 target15.y=50
-target2.association=MemoryTest
+target16.association=CoreTest
+target16.height=50
+target16.name=Core
+target16.showInterface=false
+target16.type=ClassTarget
+target16.width=80
+target16.x=710
+target16.y=50
+target17.association=DisplayTest
+target17.height=50
+target17.name=Display
+target17.showInterface=false
+target17.type=ClassTarget
+target17.width=80
+target17.x=30
+target17.y=120
 target2.height=50
-target2.name=Memory
+target2.name=ScientificTest
 target2.showInterface=false
-target2.type=ClassTarget
+target2.type=UnitTestTargetJunit4
 target2.width=80
-target2.x=80
-target2.y=170
-target3.association=ScientificTest
+target2.x=740
+target2.y=140
 target3.height=50
-target3.name=Scientific
+target3.name=ScientificDegreesTest
 target3.showInterface=false
-target3.type=ClassTarget
-target3.width=80
-target3.x=710
-target3.y=170
+target3.type=UnitTestTargetJunit4
+target3.width=160
+target3.x=800
+target3.y=240
+target4.association=MemoryTest
 target4.height=50
-target4.name=CustomTest
+target4.name=Memory
 target4.showInterface=false
-target4.type=UnitTestTargetJunit4
+target4.type=ClassTarget
 target4.width=80
-target4.x=740
-target4.y=250
-target5.association=CustomTest
+target4.x=110
+target4.y=260
+target5.association=ScientificTest
 target5.height=50
-target5.name=Custom
+target5.name=Scientific
 target5.showInterface=false
 target5.type=ClassTarget
 target5.width=80
 target5.x=710
-target5.y=280
+target5.y=170
 target6.height=50
-target6.name=ConversionTest
+target6.name=CustomTest
 target6.showInterface=false
 target6.type=UnitTestTargetJunit4
-target6.width=110
-target6.x=110
-target6.y=270
+target6.width=80
+target6.x=740
+target6.y=350
+target7.association=CustomTest
 target7.height=50
-target7.name=DisplayTest
+target7.name=Custom
 target7.showInterface=false
-target7.type=UnitTestTargetJunit4
+target7.type=ClassTarget
 target7.width=80
-target7.x=110
-target7.y=20
+target7.x=710
+target7.y=380
 target8.height=50
-target8.name=CoreTest
+target8.name=ConversionTest
 target8.showInterface=false
 target8.type=UnitTestTargetJunit4
-target8.width=80
-target8.x=740
-target8.y=20
+target8.width=110
+target8.x=140
+target8.y=350
 target9.height=50
-target9.name=MemoryTest
+target9.name=DisplayTest
 target9.showInterface=false
 target9.type=UnitTestTargetJunit4
 target9.width=80
-target9.x=110
-target9.y=140
+target9.x=60
+target9.y=90