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

Console.java

@@ -4,29 +4,29 @@ import java.lang.*;
  * Created by leon on 2/9/18.
  */
 public class Console {
-
+    //GIVEN TO US 
     public static void print(String output, Object... args) {
         System.out.printf(output, args);
     }
-
+    //GIVEN TO US
     public static void println(String output, Object... args) {
         print(output + "\n", args);
     }
-    
+    //GIVEN TO US
     public static String getStringInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
         String userInput = scanner.nextLine();
         return userInput;
     }
-
+    //GIVEN TO US
     public static Integer  getIntInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
         int userInput = scanner.nextInt();
         return userInput;
     }
-
+    //GIVEN TO US
     public static Double getDoubleInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
@@ -40,22 +40,18 @@ public class Console {
             //return display;
     }
     
-    public static void clear(){
-        //CLEARS SCREEN / SET TO ZERO ??
-    }
-    
-    public static double getInput(String numberString){
-        //GETS INPUT FROM PERSON ( X )
-            //String numberString = getStringInput("Please choose a number.");
-            quit(numberString);
-        try{
-            double number1 = Double.parseDouble(numberString);
-            //System.out.println(number1);
-            return number1;
-        }catch(Exception e){
-            return getInput(numberString);
-        }
-    }
+    // public static double getInput(String numberString){
+        // //GETS INPUT FROM PERSON ( X )
+            // //String numberString = getStringInput("Please choose a number.");
+            // quit(numberString);
+        // try{
+            // double number1 = Double.parseDouble(numberString);
+            // //System.out.println(number1);
+            // return number1;
+        // }catch(Exception e){
+            // return getInput(numberString);
+        // }
+    // }
     /*
     public static double invert(double number){
         //TURNS NEGATIVE TO POSITIVE OR POSITIVE TO NEGATIVE
@@ -69,17 +65,17 @@ public class Console {
     }
     */
     public static double getNumber(String numberString){
-        //GETS INPUT FROM PERSON ( Y )
-            //System.out.println(first + " " + op);
-            //String numberString = getStringInput("Please choose a number.");
-            quit(numberString);
-        try{
-            double number2 = Double.parseDouble(numberString);
-            //System.out.println(number2);
-            return number2;
-        }catch(Exception e){
-            return getNumber(numberString);
-        }
+            if(numberString.equals("quit") || numberString.equals("reset") || numberString.equals("clear")){
+                quit(numberString);
+                simpleOp.currentNumber = 0;
+            }else if(numberString.equals("pi")){
+                simpleOp.currentNumber = Math.PI;
+            }else if(numberString.equals("e")){
+                simpleOp.currentNumber = Math.E;
+            }else{
+                simpleOp.currentNumber = Double.parseDouble(numberString);
+            }
+            return simpleOp.currentNumber;
     }
     
     public static String getOp(){
@@ -96,14 +92,14 @@ public class Console {
     }
     
     public static void quit(String answer){
-        if(answer.equals("quit") || answer.equals("exit")){
+        if(answer.equals("quit")){
             System.exit(0);
         } else if(answer.equals("clear")) {
             System.out.print('\f');
         } else if(answer.equals("reset")){
             simpleOp.currentNumber = 0;
-            System.out.println(simpleOp.currentNumber);
+            //getNumber(Console.getStringInput("Enter Number."));
         }
     }
    
-}
+}

MainApplication.java

@@ -4,8 +4,16 @@
  */
 public class MainApplication {
     public static void main(String[] args) {
+        //SWITCH DISPLAY MODE 
+        //display.SwitchDisplayMode();
+        System.out.println("Current Number: " + simpleOp.currentNumber);
+        //simpleOp.currentNumber = Console.getNumber(Console.getStringInput("Enter First Number."));
         while(true){
-            Console.getOp();
+            // if(simpleOp.currentNumber == 0){
+                // simpleOp.currentNumber = Console.getNumber(Console.getStringInput("Enter First Number."));
+            // }else{
+                Console.getOp();
+            //}
         }
     }
 }

Trigonometry.java

@@ -0,0 +1,41 @@
+
+/**
+ * Write a description of class Trigonometry here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class Trigonometry
+{
+    /**
+     * Constructor for objects of class Trigonometry
+     */
+    public Trigonometry()
+    {
+    }
+    //sin
+    public static double sin(double x){
+        double sin = Math.sin(x);
+        return sin;
+    }
+    //cos
+    public static double cos(double x){
+        return null;
+    }
+    //tan
+    public static double tan(double x){
+        return null;
+    }
+    //inverse of sin
+    public static double sinInverse(double x){
+        return null;
+    }
+    //inverse of cos
+    public static double cosInverse(double x){
+        return null;
+    }
+    //inver of tan
+    public static double tanInverse(double x){
+        return null;
+    }
+}

opSwitch.java

@@ -27,7 +27,17 @@ public class opSwitch
                 +"invert"+"\n"
                 +"quit"+"\n"
                 +"clear"+"\n"
-                +"reset"+"\n");
+                +"reset"+"\n"
+                +"x rooted WIP"+"\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");
                 break;
             case "+": 
                 //x = Console.getStringInput("Please enter first number.");
@@ -72,17 +82,27 @@ public class opSwitch
             // default:
                 // System.out.println("You have not provided valid input. Please enter \"?\" for a list of commands.");
                 // break;
+            case "x rooted":
+                break;
+            case "log":
+                break;
+            case "ln":
+                break;
+            case "log (change of base)":
+                break;
+            case "sin":
+                break;
+            case "cos":
+                break;
+            case "tan":
+                break;
+            case "inverse of sin":
+                break;
+            case "inverse of cos":
+                break;
+            case "inverse of tan":
+                break;
         }
-        
-        // //if/else state
-        // if(opInput.equals("add") || opInput.equals("+")){
-            // String addRequest1 = Console.getStringInput("Whats the first number you'll like to add?");
-            // String addRequest2 = Console.getStringInput("Whats the second number you'll like to add?");
-            // simpleOp.add(Console.getInput(addRequest1), Console.getNumber(addRequest2));
-        // }else if(opInput.equals("invert")){
-            // String invertRequest = Console.getStringInput("What number would you like to invert?");
-            // simpleOp.invert(Console.getInput(invertRequest));
-        // 
     }
     
     

package.bluej

@@ -2,33 +2,39 @@
 dependency1.from=ConsoleTest
 dependency1.to=Console
 dependency1.type=UsesDependency
-dependency2.from=MainApplication
-dependency2.to=Console
+dependency2.from=opSwitch
+dependency2.to=simpleOp
 dependency2.type=UsesDependency
-dependency3.from=Console
-dependency3.to=opSwitch
+dependency3.from=opSwitch
+dependency3.to=Console
 dependency3.type=UsesDependency
-dependency4.from=opSwitch
-dependency4.to=Console
+dependency4.from=Console
+dependency4.to=simpleOp
 dependency4.type=UsesDependency
-dependency5.from=opSwitch
-dependency5.to=simpleOp
+dependency5.from=Console
+dependency5.to=opSwitch
 dependency5.type=UsesDependency
+dependency6.from=MainApplication
+dependency6.to=simpleOp
+dependency6.type=UsesDependency
+dependency7.from=MainApplication
+dependency7.to=Console
+dependency7.type=UsesDependency
 editor.fx.0.height=711
-editor.fx.0.width=811
-editor.fx.0.x=585
-editor.fx.0.y=114
+editor.fx.0.width=802
+editor.fx.0.x=475
+editor.fx.0.y=24
 objectbench.height=199
 objectbench.width=444
 package.divider.horizontal=0.6
 package.divider.vertical=0.6845329249617151
-package.editor.height=440
+package.editor.height=424
 package.editor.width=342
-package.editor.x=35
-package.editor.y=81
+package.editor.x=6
+package.editor.y=24
 package.frame.height=711
 package.frame.width=468
-package.numDependencies=5
+package.numDependencies=7
 package.numTargets=5
 package.showExtends=true
 package.showUses=true
@@ -43,34 +49,34 @@ target1.name=simpleOp
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=80
-target1.x=130
-target1.y=220
+target1.x=170
+target1.y=210
+target2.association=ConsoleTest
 target2.height=50
-target2.name=opSwitch
+target2.name=Console
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=40
-target2.y=160
-target3.association=ConsoleTest
+target2.x=100
+target2.y=110
 target3.height=50
-target3.name=Console
+target3.name=opSwitch
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=80
-target3.x=130
-target3.y=100
+target3.x=30
+target3.y=170
 target4.height=50
 target4.name=ConsoleTest
 target4.showInterface=false
 target4.type=UnitTestTargetJunit4
 target4.width=80
-target4.x=160
-target4.y=70
-target5.height=40
+target4.x=130
+target4.y=80
+target5.height=50
 target5.name=MainApplication
 target5.showInterface=false
 target5.type=ClassTarget
-target5.width=60
-target5.x=80
-target5.y=30
+target5.width=120
+target5.x=210
+target5.y=10

simpleOp.java

@@ -10,6 +10,12 @@ public class simpleOp
 {
     public static double currentNumber = 0;
     
+    // public static double NumberOne(){
+        // String getFirst = Console.getStringInput("Please enter number.");
+        // currentNumber = Console.getNumber(getFirst);
+        // return currentNumber;
+    // }
+    
     public static double add(double x, double y){
         //CALULATES THE SUM OF TWO NUMBERS
         currentNumber = x + y;
@@ -41,7 +47,7 @@ public class simpleOp
     public static double squ(double x){
         //CALULATES THE SQUARE OF ONE NUMBER
         //CASTED TO double FOR NOW... IT'S IN ALPHA, YOU DIG?
-        currentNumber = (int) Math.pow(x,2);
+        currentNumber = Math.pow(x,2);
         //System.out.println(currentNumber);
         return currentNumber;
     }
@@ -49,7 +55,7 @@ public class simpleOp
     public static double sqrt(double x){
         //CALULATES THE SQUARE ROOT OF ONE NUMBER
         //CASTED TO double FOR NOW... IT'S IN ALPHA, YOU DIG?
-        currentNumber = (int) Math.sqrt(x);
+        currentNumber = Math.sqrt(x);
         //System.out.println(currentNumber);
         return currentNumber;
     }
@@ -57,7 +63,7 @@ public class simpleOp
     public static double exp(double x, double y){
         //CALULATES EXPONENTIATION OF X TO POWER OF Y
         //CASTED TO double FOR NOW... IT'S IN ALPHA, YOU DIG?
-        currentNumber = (int) Math.pow(x,y);
+        currentNumber = Math.pow(x,y);
         //System.out.println(currentNumber);
         return currentNumber;
     }