Merge branch 'master' of nedredmond/ZCW-MacroLabs-OOP-ScientificCalculator into master

advOp.java

@@ -9,11 +9,20 @@ import java.util.*;
 public class advOp
 {
     
-    // public static double add(double x, double y){
-        // //CALULATES THE SUM OF TWO NUMBERS
-        // Console.currentNumber = x + y;
-        // //System.out.println(currentNumber);
-        // return Console.currentNumber;
-    // }
+    public static double log(double x){
+        //CALULATES THE LOG OF NUMBER
+        Console.currentNumber = Math.log(x);
+        //System.out.println(currentNumber);
+        return Console.currentNumber;
+    }
+    
+    public static double nthRoot(double x, double n){
+        //CALULATES THE LOG OF NUMBER
+        Console.currentNumber = Math.pow(Math.E, Math.log(x)/n);
+        //System.out.println(currentNumber);
+        return Console.currentNumber;
+    }
+    
+    
 
 }

opSwitch.java

@@ -31,16 +31,16 @@ public class opSwitch
                 +"M+"+"\n"
                 +"MC"+"\n"
                 +"MRC"+"\n"
-                +"x rooted WIP"+"\n"
+                +"nth root"+"\n"
                 +"log WIP"+"\n"
                 +"ln WIP"+"\n"
                 +"log (CHANGE OF BASE ) WIP"+"\n"
-                +"sin WIP"+"\n"
-                +"cos WIP"+"\n"
-                +"tan WIP"+"\n"
-                +"inverse of sin WIP"+"\n"
-                +"inver of cos WIP"+"\n"
-                +"inverse of tan WIP"+"\n");
+                +"sin"+"\n"
+                +"cos"+"\n"
+                +"tan"+"\n"
+                +"asin"+"\n"
+                +"acos"+"\n"
+                +"atan"+"\n");
             break;
             case "+": 
                 //x = Console.getStringInput("Please enter first number.");
@@ -94,31 +94,30 @@ public class opSwitch
             case "MRC":
                 Memory.recallMemory();
                 break;
-            case "x rooted":
+            case "nth root":
+                y = Console.getStringInput("Please enter the value of n.");
+                advOp.nthRoot(op.currentNumber, Console.getNumber(y));
                 break;
             case "log":
-                break;
-            case "ln":
-                break;
-            case "log (change of base)":
+                advOp.log(op.currentNumber);
                 break;
             case "sin":
                 Trigonometry.sin(op.currentNumber);
                 break;
             case "cos":
-            Trigonometry.cos(op.currentNumber);
+                Trigonometry.cos(op.currentNumber);
                 break;
             case "tan":
-            Trigonometry.tan(op.currentNumber);
+                Trigonometry.tan(op.currentNumber);
                 break;
-            case "inverse of sin":
-            Trigonometry.sinInverse(op.currentNumber);
+            case "asin":
+                Trigonometry.sinInverse(op.currentNumber);
                 break;
-            case "inverse of cos":
-            Trigonometry.cosInverse(op.currentNumber);
+            case "acos":
+                Trigonometry.cosInverse(op.currentNumber);
                 break;
-            case "inverse of tan":
-            Trigonometry.tanInverse(op.currentNumber);
+            case "atan":
+                Trigonometry.tanInverse(op.currentNumber);
                 break;
         }
     }