Merge branch 'master' into master

Author: charnaexw

.DS_Store

@@ -13,11 +13,4 @@ public int subtract(int firstNum, int secondNum) {
         result = firstNum - secondNum;
         return result;
     }
-/*<<<<<<< HEAD
-
-//>>>>>>> 67032e40a3e1b20aaf10917261cc55a57dbfe45b
 }
-=======
-
->>>>>>> 009177cc9de68c1f0401d32805d4a54e699cc1e5
-*/

src/.idea/.gitignore

@@ -1,4 +1,26 @@
 package com.zipcodewilmington.scientificcalculator;
 
 public class CalculatorDisplay {
+
+    public static void menuOption1() {
+        String prompt;
+        do {
+            prompt = Console.getStringInput("");
+            switch (prompt.toLowerCase()) {
+                case "1":
+                    System.out.println("Here are some Basic Functions. \n(+) - Addition \n(-) - Subtraction \n(/) - Division \n(*) - Multiplication");
+                    break;
+                case "2":
+                    System.out.println("Here are some Scientific Functions. \nSine() \nCosine() \nTangent()");
+                    break;
+                case "3":
+                    System.out.println("Return to menu? \n ( Y / N?)");
+                            Console.getStringInput("");
+                    break;
+                default:
+                    Console.println("[ %s ] is not a valid input!", prompt);
+                    break;
+            }
+        } while (true);
+    }
 }

src/.idea/misc.xml

@@ -1,47 +1,25 @@
 package com.zipcodewilmington.scientificcalculator;
 
 public class CalculatorEngine {
-    CalculatorEngine calculatorEngine = new CalculatorEngine();
+   // CalculatorEngine calculatorEngine = new CalculatorEngine();
+    private static Double value;
 
-    public void run(){
-        Console.println("Welcome to the calculator!\nWhat would you like to do?");
-        Console.println("1. Basic Functions \n2. Scientific Functions \n3. Something Fun!");
-        menuOption1();
+    public static Double sum(double firstNum, double secondNum) {
+        value = firstNum + secondNum;
+        return value;
     }
-
-
-    public void menuOption1() {
-        String firstChoice;
-        do {
-            firstChoice = Console.getStringInput("1, 2, 3");
-            switch (firstChoice.toLowerCase()) {
-                case "1":
-                    System.out.println("Here are some Basic Functions. \n+ \nAddition , - \n-Subtraction , / \n-Division , * \n-Multiplication");
-                    break;
-                case "2":
-                    System.out.println("Here are some Scientific Functions. \nSine() \nCosine()");
-                    break;
-                case "3":
-                    System.out.println("Something Fun!");
-                    break;
-                default:
-                    Console.println("[ %s ] is not a valid input!", firstChoice);
-                    break;
-            }
-        } while (true);
+    public Double subtract(Double firstNum, Double secondNum) {
+        value = firstNum - secondNum;
+        return value;
     }
 
-    private static int result;
-
-    public static int sum(int firstNum, int secondNum) {
-        result = firstNum + secondNum;
-        return result;
+    public Double divide(Double firstNum, Double secondNum) {
+        value = firstNum / secondNum;
+        return value;
     }
 
-    public int subtract(int firstNum, int secondNum) {
-        result = firstNum - secondNum;
-        return result;
+    public Double multiply(double firstNum, double secondNum) {
+        value = firstNum * secondNum;
+        return value;
     }
-
-
 }

src/.idea/modules.xml

@@ -33,6 +33,9 @@ public static Integer getIntegerInput(String prompt) {
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        System.out.println(prompt);
+        Double userInput = scanner.nextDouble();
+        return userInput;
     }
 }

src/.idea/vcs.xml

@@ -1,64 +1,42 @@
 package com.zipcodewilmington.scientificcalculator;
-
 import java.util.Scanner;
 
 /**
  * Created by leon on 2/9/18.
  */
 public class MainApplication {
 
+  private CalculatorEngine engine = new CalculatorEngine();
+  private CalculatorDisplay display = new CalculatorDisplay();
+
     public static void main(String[] args) {
-        public class Console =
-        CalculatorEngine  = new CalculatorEngine();
-    }
-}
+      System.out.println("Welcome! \nWhat would you like to do?");
+      System.out.println("1. Basic Functions \n2. Scientific Functions \n3. Return to Menu");
+      CalculatorDisplay.menuOption1();
 
 
-        public static String menuOption1() {
-            String prompt;
-            prompt = Console.getStringInput("1, 2, 3");
-            switch () {
-                case "1":
-                    System.out.println("Here are some Basic Functions. \n+ \nAddition , - \n-Subtraction , / \n-Division , * \n-Multiplication");
-                    break;
-                case "2":
-                    System.out.println("Here are some Scientific Functions. \nSine() \nCosine() \nTangant");
-                    break;
-                case "3":
-                    System.out.println("Something Fun!");
-                    break;
-                default:
-                    Console.println("[ %s ] is not a valid input!", prompt);
-                    break;
-            }
+      // String s = Console.getStringInput("Enter a string");
+      String s = Console.getStringInput("Enter a string");
+      // String s = Console.getStringInput("Enter a string");
+      // String s = CalculatorEngine.getStringInput("Enter a string");
+      Double d = Console.getDoubleInput("Enter a double.");
+      Console.println("The user input %s as a string", s);
+      // Console.println("The user input %s as a integer", i);
+      Console.println("The user input %s as a d", d);
 
 
+    }
+}
+
 /*
 
         System.out.println("Please enter a number");
-
-        y = scanObject.nextInt();
-        scanObject.nextLine();
-
        // System.out.println(y);
         // Connected the sum method
         System.out.println("Please enter another number");
-        z = scanObject.nextInt();
-       // scanObject.nextLine();
-
         System.out.println("Adding now...");
         int x = Calculator.sum(y, z);
         System.out.println(x);
-
-
-        String s = Console.getStringInput("Enter a string");
-        String s = Console.getStringInput("Enter a string");
-        String s = CalculatorEngine.getStringInput("Enter a string");
-
-        Double d = Console.getDoubleInput("Enter a double.");
-
-        Console.println("The user input %s as a string", s);
-        // Console.println("The user input %s as a integer", i);
-        Console.println("The user input %s as a d", d);
-    } */
+    }
+    */