pull request

README.md

@@ -3,7 +3,7 @@
 
 ## Description
 
-In this project your team will build a small app to function as a calculator. This app  will be built in Java, and will use the topics and techniques discussed during the week.
+In this project your team will build a small app to function as a calculatorEngine. This app  will be built in Java, and will use the topics and techniques discussed during the week.
 
 Your team should work on this project in a single repository. Click the `fork` button in the top right corner to create a copy of this repository in one of your github accounts. You can go through the [GitHub forking tutorial](https://help.github.com/articles/fork-a-repo/) if you need additional practice with this.
 
@@ -23,7 +23,7 @@ You must produce UML diagrams for your program. All classes (excluding test clas
 
 All calculators should have the following features:
 
-- A state, representing the value currently displayed on the calculator (default 0) *
+- A state, representing the value currently displayed on the calculatorEngine (default 0) *
 - Get the current number on the display *
 - Clear the display *
 - Change the number on the display *
@@ -67,7 +67,7 @@ Each operation should automatically update the display
 
 ### Custom Features
 
-In addition to the Core and Scientific features, you are required to create at least two of your own features for the calculator. They can be any two features that are not already covered and that you can implement as you see fit. These features must be properly tested.
+In addition to the Core and Scientific features, you are required to create at least two of your own features for the calculatorEngine. They can be any two features that are not already covered and that you can implement as you see fit. These features must be properly tested.
 
 ### Hints
 

pom.xml

@@ -7,6 +7,26 @@
     <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>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 
 </project>

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

@@ -0,0 +1,16 @@
+package com.zipcodewilmington.scientificcalculator;
+
+public class Calculator {
+
+    private static int result;
+
+    public static int sum(int firstNum, int secondNum) {
+        result = firstNum + secondNum;
+        return result;
+    }
+
+    public int subtract(int firstNum, int secondNum) {
+        result = firstNum - secondNum;
+        return result;
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.zipcodewilmington.scientificcalculator;
+
+public class CalculatorDisplay {
+
+    public static void menuOption1() {
+        String prompt;
+        outerLoop:
+        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":
+                    String userInput = Console.getStringInput("Time for some math? \n ( Y / N )");
+                    if (userInput.equalsIgnoreCase("Y")) {
+                        break outerLoop;
+                    }
+                    break;
+                default:
+                    Console.println("[ %s ] is not a valid input!", prompt);
+                    break;
+            }
+        } while (true);
+    }
+    public static void basicOperators(){
+
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.zipcodewilmington.scientificcalculator;
+
+public class CalculatorEngine {
+   // CalculatorEngine calculatorEngine = new CalculatorEngine();
+    private static Double value;
+
+    public static Double sum(Double firstNum, Double secondNum) {
+        return firstNum + secondNum;
+    }
+
+    public static Double subtract(Double firstNum, Double secondNum) {
+              return firstNum - secondNum;
+    }
+
+    public static Double divide(Double firstNum, Double secondNum) {
+        return firstNum / secondNum;
+    }
+
+    public static Double multiply(Double firstNum, Double secondNum) {
+        return firstNum * secondNum;
+    }
+
+    public static Double squareRoot(Double firstNum){
+        double s;
+        double value = firstNum / 2;
+        do {
+            s = value;
+            value = (s +(firstNum / s)) / 2;
+        }
+        while ((s - value) != 0);
+        return value;
+    }
+
+    public static Double square(Double firstNum){
+        return firstNum * firstNum;
+    }
+
+    public static Double squareY(Double firstNum, Double secondNum) {
+ return Math.pow(firstNum, secondNum);
+
+    }
+
+    public static Double squareRootY(Double firstNum, Double secondNum){
+        double xPre = Math.random() % 10;
+        double eps = 0.001;
+        double delX = 2147483647;
+        double xK = 0.00;
+       double A = firstNum;
+       double N = secondNum;
+
+
+        while (delX > eps){
+            xK = ((N - 1.0) * xPre + A / Math.pow(xPre, N - 1)) / N;
+            delX = Math.abs(xK - xPre);
+            xPre = xK;
+        }
+        double value = Math.round(xK * 1000.00) / 1000.00;
+        return value;
+        }
+
+        public static Double inverse(Double firstNum){
+        return 1 / firstNum;
+        }
+
+        public static Double signSwitch(Double firstNum){
+        return firstNum * (-1);
+        }
+
+    }

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

@@ -10,7 +10,6 @@ public class Console {
     public static void print(String output, Object... args) {
         System.out.printf(output, args);
     }
-
     public static void println(String output, Object... args) {
         print(output + "\n", args);
     }
@@ -23,10 +22,16 @@ public static String getStringInput(String prompt) {
     }
 
     public static Integer getIntegerInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        System.out.println(prompt);
+        Integer userInput = scanner.nextInt();
+        return userInput;
     }
 
     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/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java

@@ -1,17 +1,72 @@
 package com.zipcodewilmington.scientificcalculator;
+import java.util.Scanner;
 
 /**
  * Created by leon on 2/9/18.
  */
 public class MainApplication {
-    public static void main(String[] args) {
-        Console.println("Welcome to my calculator!");
-        String s = Console.getStringInput("Enter a string");
-        Integer i = Console.getIntegerInput("Enter an integer");
-        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);
+
+  private CalculatorEngine engine = new CalculatorEngine();
+  private CalculatorDisplay display = new CalculatorDisplay();
+
+  public static void main(String[] args) {
+    System.out.println("Welcome! \nTake a look at some of our functions!");
+    System.out.println("(1) Basic Functions \n(2) Scientific Functions \n(3) Math time!");
+    CalculatorDisplay.menuOption1();
+
+    System.out.println("Please choose an operator ( +, - , / , * )");
+    String operator = Console.getStringInput("");
+    Console.println("You entered %s\n", operator);
+    System.out.println("Enter your first number");
+    Double firstNum = Console.getDoubleInput("");
+    Console.println("%s", firstNum);
+    System.out.println("Enter your second number");
+    Double secondNum = Console.getDoubleInput("");
+    Console.println("%s", secondNum);
+
+    String basicMathOperator = operator;
+
+    switch (basicMathOperator) {
+      case "+":
+        System.out.println(CalculatorEngine.sum(firstNum, secondNum));
+        break;
+      case "-":
+        System.out.println();
+        CalculatorEngine.subtract(firstNum, secondNum);
+        break;
+      case "/":
+        System.out.println(CalculatorEngine.divide(firstNum, secondNum));
+        break;
+      case "*":
+        System.out.println(CalculatorEngine.multiply(firstNum, secondNum));
+        break;
+      default:
+        System.out.println("Unable to do math.");
     }
+
+  String scientificOperator = operator;
+    switch (scientificOperator) {
+      case "cos":
+        System.out.println(Math.cos(firstNum));
+        break;
+      case "tan":
+        System.out.println(Math.sin(firstNum));
+        break;
+      case "sin":
+        System.out.println(Math.tan(firstNum));
+        break;
+      default:
+        System.out.println("Unable to do math.");
+    }
+  }
 }
+
+/*
+      String s = Console.getStringInput("Enter a string");
+      Integer i = Console.getIntegerInput("Enter an integer");
+      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 double", d);
+*/
+