Input accepts numbers or operators

Console.java

@@ -4,6 +4,9 @@ import java.lang.*;
  * Created by leon on 2/9/18.
  */
 public class Console {
+    public static double currentNumber = 0;
+    public static String regexNum = "\\d+";
+    
     //GIVEN TO US 
     public static void print(String output, Object... args) {
         System.out.printf(output, args);
@@ -64,30 +67,42 @@ public class Console {
         }
     }
     */
+   public static void getInput() {
+       System.out.println(currentNumber); 
+       String input = getStringInput("Please enter an operation or number. Enter '?' for a list of commands.");
+       quit(input);
+       if (input.matches(regexNum) || input.equals("pi") || input.equals("e")) {
+           getNumber(input);
+        } else {
+            getOp(input);
+        }
+    }
+   
     public static double getNumber(String numberString){
             if(numberString.equals("quit") || numberString.equals("reset") || numberString.equals("clear")){
                 quit(numberString);
-                simpleOp.currentNumber = 0;
+                currentNumber = 0;
             }else if(numberString.equals("pi")){
-                simpleOp.currentNumber = Math.PI;
+                currentNumber = Math.PI;
             }else if(numberString.equals("e")){
-                simpleOp.currentNumber = Math.E;
+                currentNumber = Math.E;
             }else{
-                simpleOp.currentNumber = Double.parseDouble(numberString);
+                currentNumber = Double.parseDouble(numberString);
             }
-            return simpleOp.currentNumber;
+            return currentNumber;
     }
     
-    public static String getOp(){
+    public static String getOp(String operation){
         //GET OPERATION FROM PERSON
-            System.out.println("Current Number: " + simpleOp.currentNumber);
-            String operation = getStringInput("Please choose your operation.");
+            //System.out.println(simpleOp.currentNumber);
+            //String operation = getStringInput("Please choose your operation.");
             if (operation == null) {
                 System.out.println("You have not provided valid input. Please enter \"?\" for a list of commands.");
-            }
-            quit(operation);
+            } else {
+            //quit(operation);
             opSwitch.choose(operation);
             //return opSwitch.choose(operation1);
+        }
             return operation;
     }
     
@@ -97,7 +112,7 @@ public class Console {
         } else if(answer.equals("clear")) {
             System.out.print('\f');
         } else if(answer.equals("reset")){
-            simpleOp.currentNumber = 0;
+            currentNumber = 0;
             //getNumber(Console.getStringInput("Enter Number."));
         }
     }

MainApplication.java

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

Trigonometry.java

@@ -15,27 +15,32 @@ public class Trigonometry
     }
     //sin
     public static double sin(double x){
-        double sin = Math.sin(x);
-        return sin;
+        Console.currentNumber = Math.sin(x);
+        return Console.currentNumber;
     }
     //cos
     public static double cos(double x){
-        return null;
+        Console.currentNumber = Math.cos(x);
+        return Console.currentNumber;
     }
     //tan
     public static double tan(double x){
-        return null;
+        Console.currentNumber = Math.tan(x);
+        return Console.currentNumber;
     }
     //inverse of sin
     public static double sinInverse(double x){
-        return null;
+        Console.currentNumber = Math.asin(x);
+        return Console.currentNumber;
     }
     //inverse of cos
     public static double cosInverse(double x){
-        return null;
+        Console.currentNumber = Math.acos(x);
+        return Console.currentNumber;
     }
     //inver of tan
     public static double tanInverse(double x){
-        return null;
+        Console.currentNumber = Math.atan(x);
+        return Console.currentNumber;
     }
 }

opSwitch.java

@@ -8,14 +8,14 @@
 public class opSwitch
 {
     public static void choose(String opInput){
-        simpleOp op = new simpleOp();
-        
+        Console op = new Console();
+
         String x;
         String y;
         // switchboard for operations
         switch (opInput) {
             case "?":
-                System.out.println("Commands include:\n"
+            System.out.println("Commands include:\n"
                 +"+"+"\n"
                 +"-"+"\n"
                 +"*"+"\n"
@@ -38,7 +38,7 @@ public class opSwitch
                 +"inverse of sin WIP"+"\n"
                 +"inver of cos WIP"+"\n"
                 +"inverse of tan WIP"+"\n");
-                break;
+            break;
             case "+": 
                 //x = Console.getStringInput("Please enter first number.");
                 y = Console.getStringInput("Please enter number.");
@@ -91,19 +91,24 @@ public class opSwitch
             case "log (change of base)":
                 break;
             case "sin":
+                Trigonometry.sin(op.currentNumber);
                 break;
             case "cos":
+            Trigonometry.cos(op.currentNumber);
                 break;
             case "tan":
+            Trigonometry.tan(op.currentNumber);
                 break;
             case "inverse of sin":
+            Trigonometry.sinInverse(op.currentNumber);
                 break;
             case "inverse of cos":
+            Trigonometry.cosInverse(op.currentNumber);
                 break;
             case "inverse of tan":
+            Trigonometry.tanInverse(op.currentNumber);
                 break;
         }
     }
-    
-    
+
 }

simpleOp.java

@@ -8,7 +8,7 @@
 import java.util.*;
 public class simpleOp
 {
-    public static double currentNumber = 0;
+    
     
     // public static double NumberOne(){
         // String getFirst = Console.getStringInput("Please enter number.");
@@ -18,69 +18,69 @@ public class simpleOp
     
     public static double add(double x, double y){
         //CALULATES THE SUM OF TWO NUMBERS
-        currentNumber = x + y;
+        Console.currentNumber = x + y;
         //System.out.println(currentNumber);
-        return currentNumber;
+        return Console.currentNumber;
     }
     
     public static double sub(double x, double y){
         //CALULATES THE DIFFERENCE OF TWO NUMBERS
-        currentNumber = x - y;
+        Console.currentNumber = x - y;
         //System.out.println(currentNumber);
-        return currentNumber;
+        return Console.currentNumber;
     }
     
     public static double mul(double x, double y){
         //CALULATES THE PRODUCT OF TWO NUMBERS
-        currentNumber = x * y;
+        Console.currentNumber = x * y;
         //System.out.println(currentNumber);
-        return currentNumber;
+        return Console.currentNumber;
     }
     
     public static double div(double x, double y){
         //CALULATES THE QUOTIENT OF TWO NUMBERS
-        currentNumber = x / y;
+        Console.currentNumber = x / y;
         //System.out.println(currentNumber);
-        return currentNumber;
+        return Console.currentNumber;
     }
     
     public static double squ(double x){
         //CALULATES THE SQUARE OF ONE NUMBER
         //CASTED TO double FOR NOW... IT'S IN ALPHA, YOU DIG?
-        currentNumber = Math.pow(x,2);
+        Console.currentNumber = Math.pow(x,2);
         //System.out.println(currentNumber);
-        return currentNumber;
+        return Console.currentNumber;
     }
     
     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 = Math.sqrt(x);
+        Console.currentNumber = Math.sqrt(x);
         //System.out.println(currentNumber);
-        return currentNumber;
+        return Console.currentNumber;
     }
     
     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 = Math.pow(x,y);
+        Console.currentNumber = Math.pow(x,y);
         //System.out.println(currentNumber);
-        return currentNumber;
+        return Console.currentNumber;
     }
     
     public static double inv(double x){
         //CALULATES THE INVERSE OF NUMBER
         //CASTED TO double FOR NOW... IT'S IN ALPHA, YOU DIG?
-        currentNumber = (1/x);
+        Console.currentNumber = (1/x);
         //System.out.println(currentNumber);
-        return currentNumber;
+        return Console.currentNumber;
     }
     
     public static double invert(double x){
         //TURNS NEGATIVE TO POSITIVE OR POSITIVE TO NEGATIVE
-        currentNumber = -x;
+        Console.currentNumber = -x;
         //System.out.println(currentNumber);
-        return currentNumber;
+        return Console.currentNumber;
     }
     
 }