pull request

pom.xml

@@ -7,6 +7,18 @@
     <groupId>com.zipcodewilmington</groupId>
     <artifactId>scientific_calculator</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>7</source>
+                    <target>7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <dependency>
             <groupId>junit</groupId>

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

@@ -1,8 +1,7 @@
 package com.zipcodewilmington.scientificcalculator;
 
 public class Calculator {
-<<<<<<< HEAD
-=======
+
     private static int result;
 
     public static int sum(int firstNum, int secondNum) {
@@ -14,6 +13,11 @@ public int subtract(int firstNum, int secondNum) {
         result = firstNum - secondNum;
         return result;
     }
+/*<<<<<<< HEAD
 
 //>>>>>>> 67032e40a3e1b20aaf10917261cc55a57dbfe45b
 }
+=======
+
+>>>>>>> 009177cc9de68c1f0401d32805d4a54e699cc1e5
+*/

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

@@ -1,6 +1,36 @@
 package com.zipcodewilmington.scientificcalculator;
 
 public class CalculatorEngine {
+    CalculatorEngine calculatorEngine = new CalculatorEngine();
+
+    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 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);
+    }
+
     private static int result;
 
     public static int sum(int firstNum, int secondNum) {

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

@@ -7,19 +7,12 @@
  */
 public class MainApplication {
 
-    static Integer y = 0;
-    static Integer z = 0;
-    private static String prompt;
-
-
     public static void main(String[] args) {
-
-        Scanner scanObject = new Scanner(System.in);
-
-        Console.println("Welcome to the calculator!\nWhat would you like to do?");
-        System.out.println("1. Basic Functions \n2. Scientific Functions \n3. Something Fun!");
-        menuOption1();
+        public class Console =
+        CalculatorEngine  = new CalculatorEngine();
     }
+}
+
 
         public static String menuOption1() {
             String prompt;
@@ -39,6 +32,7 @@ public static String menuOption1() {
                     break;
             }
 
+
 /*
 
         System.out.println("Please enter a number");
@@ -55,22 +49,16 @@ public static String menuOption1() {
         System.out.println("Adding now...");
         int x = Calculator.sum(y, z);
         System.out.println(x);
-*/
 
-//<<<<<<< HEAD:src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
-        String s = Console.getStringInput("Enter a string");
-=======
-        String
 
+        String s = Console.getStringInput("Enter a string");
+        String s = Console.getStringInput("Enter a string");
         String s = CalculatorEngine.getStringInput("Enter a string");
-//>>>>>>> 67032e40a3e1b20aaf10917261cc55a57dbfe45b:src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorInterface.java
-
-
 
         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);
-    }
-}
+    } */
+

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

@@ -6,31 +6,31 @@ public class Scientific {
 
     public static void main(String[] args) {
         int firstNum = 0;
-        double answer = 0.0;
+        double value = 0.0;
         char operator = 0;
 
         switch (operator) {
             case "cos":
-                answer = Math.cos(firstNum);
+                value = Math.cos(firstNum);
                 break;
             case "tan":
-                answer = Math.sin(firstNum);
+                value = Math.sin(firstNum);
                 break;
 
             case "sin":
-                answer = Math.tan(firstNum);
+                value = Math.tan(firstNum);
                 break;
 
             case "acos":
-                answer = Math.acos(firstNum);
+                value = Math.acos(firstNum);
                 break;
 
             case "atan":
-                answer = Math.atan(firstNum);
+                value = Math.atan(firstNum);
                 break;
 
             case "asin":
-                answer = Math.asin(firstNum);
+                value = Math.asin(firstNum);
                 break;
 
             default:
@@ -39,31 +39,56 @@ public static void main(String[] args) {
 
         switch (operator) {
             case "x2":
-                answer = Math.pow(firstNum, 2);
+                value = Math.pow(firstNum, 2);
                 break;
             case "x^":
-                answer = Math.sqrt(firstNum);
+                value = Math.sqrt(firstNum);
                 break;
 
             case "x3":
-                answer = Math.pow(firstNum, 3);
+                value = Math.pow(firstNum, 3);
                 break;
 
             case "!x":
                 long fact = 1;
                 for (int i = 2; i <= firstNum; i++) {
-                    answer = fact * i;}
+                    value = fact * i;}
                 break;
             default:
-                System.out.println("ERR");
-        }
-        public Integer {
+                System.out.println("ERR");}
+
+        switch (operator) {
+            case ".log":
+                value = Math.log10(firstNum);
+                break;
+            case "e":
+                value = Math.exp(firstNum);
+                break;
+            case "10x":
+                value = Math.exp(firstNum, 10);
+                break;
+            case "-x":
+                value = firstNum * -1;
+                break;
+            case "Ln":
+                value = Math.log(firstNum);
+                break;
+
+            default
+                System.out.println("ERR");}
+        public Double (value){
+            if (Math.toRadians(value))
+
+
+
 
-            switch {
 
 
 
-                    }
         }
 
-}
+    }
+
+}
+
+