Pull#3 Testing update

src/main/java/com/zipcodewilmington/scientificcalculator/Calculator.java

@@ -0,0 +1,120 @@
+package com.zipcodewilmington.scientificcalculator;
+
+import java.io.Console;
+import java.lang.Math;
+
+
+public class Calculator {
+    Double x, y, mem, result;
+    String ans;
+    String choiceString = "+";
+    // MainApplication activeCalc = new MainApplication();
+
+    // Input section
+    public void Arithmetic(String[] args) {
+        switch (choiceString) {
+            // Case 1
+            case "+" -> {
+                // Print statement corresponding case
+
+                // break keyword terminates the
+                result = add(x, y);
+                System.out.printf("adding %.4f and %.4f",x,y);
+            }
+            // Case 2
+            case "-" -> {
+                // Print statement corresponding case
+                result = subtract(x, y);
+                System.out.printf("subtracting %.4f from %.4f gives",y,x,result);
+            }
+
+            // Case 3
+            case "*" -> {
+                // Print statement corresponding case
+                result = multiply(x, y);
+                System.out.printf("multiplying %.4f by %.4f gives",x,y,result);
+            }
+            // Case 4
+            case "/" -> {
+                // Print statement corresponding case
+                result = divide(x,y);
+                System.out.printf("dividing %.4f by %.4f gives %.4f",x,y,result);
+            }
+            case "square" -> {
+                // Print statement corresponding case
+                result = sqr(x);
+                System.out.printf("the square of %.4f is %.4f",x,result);
+            }
+            case "sqrt" -> {
+                // Print statement corresponding case
+                result = root(x);
+                System.out.printf("the square root of %.4f is %.4f",x,result);
+            }
+            case "1/x" -> {
+                // Print statement corresponding case
+                result = inverse(x);
+                System.out.printf("the inverse of %.4f is %.4f",x,result);
+            }
+            case "+/-" -> {
+                // Print statement corresponding case
+                result = invertSign(x);
+                System.out.printf("reversed sign: %.4f",result);
+            }
+            case "x^y" -> {
+                // Print statement corresponding case
+                result = sqrY(x, y);
+                System.out.printf("%.4f to the power of %.4f is %.4f",x,y,result);
+            }
+            default ->
+                // Print statement corresponding case
+                System.out.println("Err, no match");
+        }
+        ans = String.format(String.valueOf(result));
+
+    }
+
+
+    // Operator Choice
+
+	// System.out.println("Choose an operator from '+' '-' '*' '/' '^sq' '^exp' '^y' '^neg 'inv'");
+
+    public double add(double x, double y) {
+        return x + y;
+    }
+
+    public double subtract(double x, double y) {
+        return x - y;
+    }
+
+    public double multiply(double x, double y) {
+        return x * y;
+    }
+
+    public double divide(double x, double y) {
+        return x / y;
+    }
+
+    public double sqr(double x) {
+        return Math.pow(x, 2);  //
+    }
+
+    public double sqrY(double x, double y) {
+        return Math.pow(x, y);
+    }
+
+    public double root(double x) {
+        return Math.sqrt(x);
+    }
+
+    public double inverse(double x) {
+        return Math.expm1(x);
+    }
+
+    public double invertSign(double x) {
+        return x*-1;
+    }
+
+
+    ///////////////// refer to private functions here
+
+}

src/main/java/com/zipcodewilmington/scientificcalculator/Console.java

@@ -22,11 +22,25 @@ public static String getStringInput(String prompt) {
         return userInput;
     }
 
-    public static Integer getIntegerInput(String prompt) {
-        return null;
+    public static char getCharInput(String prompt) {
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        char userInput = scanner.next().charAt(0);
+        return userInput;
+    }
+
+    public static int getIntegerInput(String prompt) {
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        String userInput = String.valueOf(scanner.nextInt());
+        return Integer.parseInt(userInput);
     }
 
-    public static Double getDoubleInput(String prompt) {
-        return null;
+    public static double getDoubleInput(String prompt) {
+        //while (!prompt.)
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        double userInput = scanner.nextDouble();
+        return userInput;
     }
 }

src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java

@@ -4,6 +4,9 @@
  * Created by leon on 2/9/18.
  */
 public class MainApplication {
+
+    boolean activeCalc = true;
+
     public static void main(String[] args) {
         Console.println("Welcome to my calculator!");
         String s = Console.getStringInput("Enter a string");