Roy made changes

MainApplication.java

@@ -7,6 +7,7 @@ public class MainApplication {
     public static void main(String[] args) {
 
         Console.println("Welcome to my calculator!");
+        Console.println("for HELP press ?");
         Operations.runCommand();
 
     }

Operations.java

@@ -10,7 +10,16 @@ public class Operations
 {
     /**
      * prompting a user for a command solving for that command
+     * 
      */
+    public static void printHelp(){
+        System.out.println("\n? | + | - | * | / |");
+        System.out.println("^ | sqrt | exp | inverse |");
+        System.out.println("cos | sine | tan | cos-1 | sin-1 | m+ | m- | MRC");
+        System.out.println("log | ln | ex |");
+        System.out.println("to clear display enter clrDisplay\n");
+    }
+
     public static Double runCommand()
     {
         // put your code here
@@ -30,55 +39,98 @@ public class Operations
                 System.out.print("Thanks for calculating with us!");
                 break;
             }
-            if (command.equalsIgnoreCase("sine"))  {
-                result = ScientificFunctions.sine(Console.getDoubleInput("Enter number"));
+            else if (command.equalsIgnoreCase("sine"))  {
+                if (result != 0){
+                    result = ScientificFunctions.sine(result);
+                }
+                else{
+                    result = ScientificFunctions.sine(Console.getDoubleInput("Enter number"));
+                }
                 Console.printResult(result);
             }
-            if (command.equalsIgnoreCase("cos"))  {
-                result = ScientificFunctions.cosine(Console.getDoubleInput("Enter number"));
+            else if (command.equalsIgnoreCase("cos"))  {
+                if (result != 0){
+                    result = ScientificFunctions.cosine(result);
+                }
+                else{
+                    result = ScientificFunctions.cosine(Console.getDoubleInput("Enter number"));
+                }
                 Console.printResult(result);
             }
-            if (command.equalsIgnoreCase("tan"))  {
-                result = ScientificFunctions.tangent(Console.getDoubleInput("Enter number"));
+            else if (command.equalsIgnoreCase("tan"))  {
+                if (result != 0){
+                    result = ScientificFunctions.tangent(result);
+                }
+                else{
+                    result = ScientificFunctions.tangent(Console.getDoubleInput("Enter number"));
+                }
                 Console.printResult(result);
             }
-            if (command.equalsIgnoreCase("cos-1"))  {
-                result = ScientificFunctions.inverseCosine(Console.getDoubleInput("Enter number"));
+            else if (command.equalsIgnoreCase("cos-1"))  {
+                if (result != 0){
+                    result = ScientificFunctions.inverseCosine(result);
+                }
+                else{
+                    result = ScientificFunctions.inverseCosine(Console.getDoubleInput("Enter number"));
+                }
                 Console.printResult(result);
             }
-            if (command.equalsIgnoreCase("sin-1"))  {
-                result = ScientificFunctions.inverseSine(Console.getDoubleInput("Enter number"));
+            else if (command.equalsIgnoreCase("sin-1"))  {
+                if (result != 0){
+                    result = ScientificFunctions.inverseSine(result);
+                }
+                else{
+                    result = ScientificFunctions.inverseSine(Console.getDoubleInput("Enter number"));
+                }
                 Console.printResult(result);
             }
-            if (command.equalsIgnoreCase("tan-1"))  {
-                result = ScientificFunctions.inverseTangent(Console.getDoubleInput("Enter number"));
+            else if (command.equalsIgnoreCase("tan-1"))  {
+                if (result != 0){
+                    result = ScientificFunctions.inverseTangent(result);
+                }
+                else{
+                    result = ScientificFunctions.inverseTangent(Console.getDoubleInput("Enter number"));
+                }
                 Console.printResult(result);
             }
-            if(command.equalsIgnoreCase("m+")){
+            else if(command.equalsIgnoreCase("M+")){
                 memory.storeInMemory(result);
                 Console.printResult(result);
             }
-            
-            if (command.equalsIgnoreCase("m-")){
+
+            else if (command.equalsIgnoreCase("M-")){
+                Console.printResult(memory.clearMemory());
+            }
+
+            else if (command.equalsIgnoreCase("MRC")){
                 Console.printResult(memory.retrieveFromMemory());
             }
-            
-            if (command.equalsIgnoreCase("switchmode")){
+
+            else if (command.equalsIgnoreCase("switchmode")){
                 displayMode.setResult(result);
                 String mode = displayMode.enterMode();
                 //System.out.println(mode);
                 displayMode.switchDisplayMode(mode);
-                
+
             }
-            if (command.equalsIgnoreCase("log")){
+            else if (command.equalsIgnoreCase("log")){
                 Console.printResult(bonusFunctions.LogBaseTenOfAnumber(result));
             }
-            if (command.equalsIgnoreCase("ln")){
+            else if (command.equalsIgnoreCase("ln")){
                 Console.printResult(bonusFunctions.naturalLogLn(result));
             }
-            if (command.equalsIgnoreCase("ex")){
+            else if (command.equalsIgnoreCase("ex")){
                 Console.printResult(bonusFunctions.exponential(result));
             }
+            else if(command.equalsIgnoreCase("?")){
+                printHelp();
+            }
+            else if(command.equalsIgnoreCase("clrDisplay")){
+                result = 0.0;
+            }
+            else{
+                Console.println("Invalid command please press ? for help");
+            }
             //firstNumber = result;
             // and on and on
         }

bonusFunctionsTest.java

@@ -0,0 +1,58 @@
+
+
+import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class bonusFunctionsTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class bonusFunctionsTest
+{
+    private bonusFunctions bonusFunctions;
+    @Before
+    public void setUp(){
+        bonusFunctions = new bonusFunctions();
+    }
+
+    @Test
+    public void naturalLogLnTest(){
+        // :Given
+        Double expected = 0.0;
+
+        // :When
+        Double actual = bonusFunctions.naturalLogLn(1.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void LogBaseTenOfAnumberTest(){
+        // :Given
+        Double expected = 1.0;
+
+        // :When
+        Double actual = bonusFunctions.LogBaseTenOfAnumber(10.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void exponentialTest(){
+        // :Given
+        Double expected = 2.7182818285;
+
+        // :When
+        Double actual = bonusFunctions.exponential(1.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+}

scienticFunctionsTest.java

@@ -0,0 +1,94 @@
+
+
+import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class scienticFunctionsTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class scienticFunctionsTest
+{
+    private scienticFunctions scientificFunctions;
+    
+    @Before
+    public void setUp(){
+        scientificFunctions = new scienticFunctions();
+    }
+
+    @Test
+    public void sineTest(){
+        // :Given
+        Double expected = 0.0;
+
+        // :When
+        Double actual = scientificFunctions.sine(0.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void cosineTest(){
+        // :Given
+        Double expected = 1.0;
+
+        // :When
+        Double actual = scientificFunctions.cosine(0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void tangentTest(){
+        // :Given
+        Double expected = 0.0;
+
+        // :When
+        Double actual = scientificFunctions.tangent(0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void inverseTangentTest(){
+        // :Given
+        Double expected = 45.0;
+
+        // :When
+        Double actual = scientificFunctions.inverseTangent(1);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void inverseCosineTest(){
+        // :Given
+        Double expected = 90.0;
+
+        // :When
+        Double actual = scientificFunctions.inverseCosine(0.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void inverseSineTest(){
+        // :Given
+        Double expected = 0.0;
+
+        // :When
+        Double actual = scientificFunctions.inverseSine(0.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+}