Eugene

pom.xml

@@ -7,6 +7,24 @@
     <groupId>com.zipcodewilmington</groupId>
     <artifactId>scientific_calculator</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.9.0-M1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <maven.compiler.source>18</maven.compiler.source>
+        <maven.compiler.target>18</maven.compiler.target>
+    </properties>
 
 
 </project>

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

@@ -0,0 +1,21 @@
+package com.zipcodewilmington.scientificcalculator;
+
+public class BasicCalculator {
+    String name;
+
+    public double add(double screen, double num2 ) {
+        return screen + num2;
+    }
+    public double subtract(double screen, double num2 ) {
+        return screen - num2;
+    }
+    public double multiply(double screen, double num2 ) {
+        return screen * num2;
+    }
+    public double divide(double screen, double num2 ) {
+        return screen / num2;
+    }
+    public double modulus(double screen, double num2 ) {
+        return screen % num2;
+    }
+}

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

@@ -23,10 +23,16 @@ public static String getStringInput(String prompt) {
     }
 
     public static Integer getIntegerInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        int userInput = scanner.nextInt();
+        return userInput;
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        double userInput = scanner.nextDouble();
+        return userInput;
     }
 }

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

@@ -1,17 +1,162 @@
 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);
+        Console.println("Welcome to my calculator! Default units are degrees, display mode is Decimal.");
+//        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);
+        Scanner input = new Scanner(System.in);
+        ScientificFunctionality sf = new ScientificFunctionality();
+        BasicCalculator bc = new BasicCalculator();
+
+        boolean loop = true;
+        double screen = 0;
+
+        do {
+
+            if (screen == 0) {
+                System.out.print("Enter number: ");
+                screen = input.nextDouble();
+            } else {
+
+            System.out.print("Enter operation: ");
+            String operation = input.next();
+            String operator = operation.toLowerCase();
+
+            switch (operator) {
+                case "clear":
+                    screen = 0;
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "add":
+                    System.out.println("Enter number: ");
+                    double num2 = input.nextDouble();
+                    screen = bc.add(screen, num2);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "subtract":
+                    System.out.println("Enter number: ");
+                    num2 = input.nextDouble();
+                    screen = bc.subtract(screen, num2);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "multiply":
+                    System.out.println("Enter number: ");
+                    num2 = input.nextDouble();
+                    screen = bc.multiply(screen, num2);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "divide":
+                    System.out.println("Enter number: ");
+                    num2 = input.nextDouble();
+                    if (num2 == 0) {
+                        System.out.println("Divide by 0 error");
+                    } else {
+                        screen = bc.divide(screen, num2);
+                        Console.println("Answer: %s", screen);
+                    }
+                    break;
+                case "modulus":
+                    System.out.println("Enter number: ");
+                    num2 = input.nextDouble();
+                    if (num2 == 0) {
+                        System.out.println("Divide by 0 error");
+                    } else {
+                        screen = bc.modulus(screen, num2);
+                        Console.println("Answer: %s", screen);
+                    }
+                    break;
+                case "square":
+                    screen *= screen;
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "squareroot":
+                    screen = Math.sqrt(screen);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "exponent":
+                    System.out.println("Enter number: ");
+                    num2 = input.nextDouble();
+                    screen = Math.pow(screen, num2);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "inverse":
+                    screen = 1 / screen;
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "negative":
+                    screen = -screen;
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "sin":
+                    screen = sf.calcSine(screen);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "cos":
+                    screen = sf.calcCoSine(screen);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "tan":
+                    screen = sf.calcTangent(screen);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "arcsin":
+                    screen = sf.calcInverseSine(screen);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "arccos":
+                    screen = sf.calcInverseCosine(screen);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "arctan":
+                    screen = sf.calcInverseTangent(screen);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "log":
+                    screen = sf.calcLog(screen);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "inverselog":
+                    screen = sf.calcInverseLog(screen);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "ln":
+                    screen = sf.calcNaturalLog(screen);
+                    Console.println("Answer: %s", screen);
+                    break;
+                case "inverseln":
+                    screen = sf.calcInverseNaturalLog(screen);
+                    Console.println("Answer: %s", screen);
+                    break;
+
+                case "units":
+                    System.out.println("Degrees or Radians? ");
+                    String units = input.next();
+                    System.out.println(sf.switchUnitsMode(units));
+                    break;
+                case "mode":
+                    System.out.println("Binary, Octal, Decimal or Hexadecimal? ");
+                    String mode = input.next();
+                    System.out.println(sf.switchDisplayMode(mode));
+                    break;
+                default:
+                    System.out.println("Command not recognized.");
+                    break;
+                    }
+            System.out.println("Continue? Y or N: ");
+            String more = input.next();
+            if (more.equals("N")) {
+                loop = false;
+            }}
+        } while(loop);
     }
 }