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

Console.java

         return userInput;
     }
 
-    public static Integer getIntegerInput(String prompt) {
+    public static Integer  getIntInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
         int userInput = scanner.nextInt();
         //CLEARS SCREEN / SET TO ZERO ??
     }
     
-    public static int getInput(String numberString){
+    public static double getInput(String numberString){
         //GETS INPUT FROM PERSON ( X )
             //String numberString = getStringInput("Please choose a number.");
             quit(numberString);
         try{
-            int number1 = Integer.parseInt(numberString);
+            double number1 = Double.parseDouble(numberString);
             //System.out.println(number1);
             return number1;
         }catch(Exception e){
         }
     }
     /*
-    public static int invert(int number){
+    public static double invert(double number){
         //TURNS NEGATIVE TO POSITIVE OR POSITIVE TO NEGATIVE
         try{
-            int invertedNumber = -number;
+            double invertedNumber = -number;
             System.out.println(invertedNumber);
             return invertedNumber;
         } catch(Exception e){
         }
     }
     */
-    public static int getNumber(String numberString){
+    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{
-            int number2 = Integer.parseInt(numberString);
+            double number2 = Double.parseDouble(numberString);
             //System.out.println(number2);
             return number2;
         }catch(Exception e){
     
     public static String getOp(){
         //GET OPERATION FROM PERSON
+            System.out.println("Current Number: " + 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.");
     
     public static void quit(String answer){
         if(answer.equals("quit") || answer.equals("exit")){
-               System.exit(0);
+            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);
         }
     }
    

opSwitch.java

                 +"square root"+"\n"
                 +"exponent"+"\n"
                 +"inverse"+"\n"
+                +"invert"+"\n"
                 +"quit"+"\n"
-                +"clear"+"\n");
+                +"clear"+"\n"
+                +"reset"+"\n");
                 break;
             case "+": 
                 //x = Console.getStringInput("Please enter first number.");
                 simpleOp.add(op.currentNumber, Console.getNumber(y));
                 break;
             case "-": 
-                x = Console.getStringInput("Please enter first number.");
-                y = Console.getStringInput("Please enter second number.");
-                simpleOp.sub(Console.getNumber(x), Console.getNumber(y));
+                //x = Console.getStringInput("Please enter first number.");
+                y = Console.getStringInput("Please enter number.");
+                simpleOp.sub(op.currentNumber, Console.getNumber(y));
                 break;
             case "*": 
-                x = Console.getStringInput("Please enter multiplicand.");
-                y = Console.getStringInput("Please enter multiplier.");
-                simpleOp.mul(Console.getNumber(x), Console.getNumber(y));
+                //x = Console.getStringInput("Please enter multiplicand.");
+                y = Console.getStringInput("Please enter number.");
+                simpleOp.mul(op.currentNumber, Console.getNumber(y));
                 break;
             case "/": 
-                x = Console.getStringInput("Please enter dividend.");
-                y = Console.getStringInput("Please enter divisor.");
-                simpleOp.div(Console.getNumber(x), Console.getNumber(y));
+                //x = Console.getStringInput("Please enter dividend.");
+                y = Console.getStringInput("Please enter number.");
+                simpleOp.div(op.currentNumber, Console.getNumber(y));
                 break;
             case "square": 
-                x = Console.getStringInput("Please enter your number.");
-                simpleOp.squ(Console.getNumber(x));
+                //x = Console.getStringInput("Please enter your number.");
+                simpleOp.squ(op.currentNumber);
                 break;
             case "square root": 
-                x = Console.getStringInput("Please enter your number.");
-                simpleOp.sqrt(Console.getNumber(x));
+                //x = Console.getStringInput("Please enter your number.");
+                simpleOp.sqrt(op.currentNumber);
                 break;
             case "exponent": 
-                x = Console.getStringInput("Please enter base.");
-                y = Console.getStringInput("Please enter exponent.");
-                simpleOp.exp(Console.getNumber(x), Console.getNumber(y));
+                //x = Console.getStringInput("Please enter base.");
+                y = Console.getStringInput("Please enter the exponent.");
+                simpleOp.exp(op.currentNumber, Console.getNumber(y));
                 break;
             case "inverse":
-                x = Console.getStringInput("Please enter your number.");
-                simpleOp.inv(Console.getNumber(x));
+                //x = Console.getStringInput("Please enter your number.");
+                simpleOp.inv(op.currentNumber);
+                break;
+            case "invert":
+                simpleOp.invert(op.currentNumber);
                 break;
             // default:
                 // System.out.println("You have not provided valid input. Please enter \"?\" for a list of commands.");

simpleOp.java

 import java.util.*;
 public class simpleOp
 {
-    public static int currentNumber = 0;
+    public static double currentNumber = 0;
     
-    public static int add(int x, int y){
+    public static double add(double x, double y){
         //CALULATES THE SUM OF TWO NUMBERS
         currentNumber = x + y;
-        System.out.println(currentNumber);
+        //System.out.println(currentNumber);
         return currentNumber;
     }
     
-    public static int sub(int x, int y){
+    public static double sub(double x, double y){
         //CALULATES THE DIFFERENCE OF TWO NUMBERS
-        int currentNumber = x - y;
-        System.out.println(x + " - " + y + " = " + currentNumber);
+        currentNumber = x - y;
+        //System.out.println(currentNumber);
         return currentNumber;
     }
     
-    public static int mul(int x, int y){
+    public static double mul(double x, double y){
         //CALULATES THE PRODUCT OF TWO NUMBERS
-        int currentNumber = x * y;
-        System.out.println(x + " * " + y + " = " + currentNumber);
+        currentNumber = x * y;
+        //System.out.println(currentNumber);
         return currentNumber;
     }
     
-    public static int div(int x, int y){
+    public static double div(double x, double y){
         //CALULATES THE QUOTIENT OF TWO NUMBERS
-        int currentNumber = x / y;
-        System.out.println(x + " / " + y + " = " + currentNumber);
+        currentNumber = x / y;
+        //System.out.println(currentNumber);
         return currentNumber;
     }
     
-    public static int squ(int x){
+    public static double squ(double x){
         //CALULATES THE SQUARE OF ONE NUMBER
-        //CASTED TO INT FOR NOW... IT'S IN ALPHA, YOU DIG?
-        int currentNumber = (int) Math.pow(x,2);
-        System.out.println(x + "\u00B2 = " + currentNumber);
+        //CASTED TO double FOR NOW... IT'S IN ALPHA, YOU DIG?
+        currentNumber = (int) Math.pow(x,2);
+        //System.out.println(currentNumber);
         return currentNumber;
     }
     
-    public static int sqrt(int x){
+    public static double sqrt(double x){
         //CALULATES THE SQUARE ROOT OF ONE NUMBER
-        //CASTED TO INT FOR NOW... IT'S IN ALPHA, YOU DIG?
-        int currentNumber = (int) Math.sqrt(x);
-        System.out.println("√" + x + " = " + currentNumber);
+        //CASTED TO double FOR NOW... IT'S IN ALPHA, YOU DIG?
+        currentNumber = (int) Math.sqrt(x);
+        //System.out.println(currentNumber);
         return currentNumber;
     }
     
-    public static int exp(int x, int y){
+    public static double exp(double x, double y){
         //CALULATES EXPONENTIATION OF X TO POWER OF Y
-        //CASTED TO INT FOR NOW... IT'S IN ALPHA, YOU DIG?
-        int currentNumber = (int) Math.pow(x,y);
-        System.out.println(x + "^" + y + " = " + currentNumber);
+        //CASTED TO double FOR NOW... IT'S IN ALPHA, YOU DIG?
+        currentNumber = (int) Math.pow(x,y);
+        //System.out.println(currentNumber);
         return currentNumber;
     }
     
     public static double inv(double x){
         //CALULATES THE INVERSE OF NUMBER
-        //CASTED TO INT FOR NOW... IT'S IN ALPHA, YOU DIG?
-        double currentNumber = 1 / x;
-        System.out.println("1 / " + x + " = " + currentNumber);
+        //CASTED TO double FOR NOW... IT'S IN ALPHA, YOU DIG?
+        currentNumber = (1/x);
+        //System.out.println(currentNumber);
         return currentNumber;
     }
     
-    public static int invert(int number){
+    public static double invert(double x){
         //TURNS NEGATIVE TO POSITIVE OR POSITIVE TO NEGATIVE
-            currentNumber = -number;
-            System.out.println(currentNumber);
-            return currentNumber;
+        currentNumber = -x;
+        //System.out.println(currentNumber);
+        return currentNumber;
     }
     
 }