Calculator

pom.xml

@@ -7,6 +7,35 @@
     <groupId>com.zipcodewilmington</groupId>
     <artifactId>scientific_calculator</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <dependencies>
+        <dependency>
+<<<<<<< HEAD
+=======
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+>>>>>>> 5fc5379bcfd98a961ba3060a7a722a4d6924258b
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
 
 </project>

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

@@ -23,10 +23,18 @@ public static String getStringInput(String prompt) {
     }
 
     public static Integer getIntegerInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        Integer userInput = Integer.valueOf(scanner.nextLine());
+        return userInput;
     }
 
+
     public static Double getDoubleInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        Double userInput = Double.valueOf(scanner.nextLine());
+        return userInput;
     }
+
 }

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

@@ -0,0 +1,20 @@
+package com.zipcodewilmington.scientificcalculator;
+
+public class LogFunctions {
+    public Double log(double num1) {
+        return Math.log10(num1);
+    }
+
+    public Double inverseLog(double num1) {
+        return Math.pow(10, num1);
+    }
+
+    public Double naturalLog(double num1) {
+        return Math.log(num1);
+    }
+
+    public Double inverseNaturalLog(double num1) {
+        return Math.pow(2.71828182846, num1);
+    }
+}
+

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

@@ -4,14 +4,205 @@
  * 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);
+
+        Integer operation;
+        Integer choice;
+        Integer choice3 = 1;
+        String result;
+        Double num1 = 1.0;
+        Integer display = 4;
+
+
+
+        SimpleMath simpleMath = new SimpleMath();
+        LogFunctions logFunctions = new LogFunctions();
+        ScientificFunctions scientificFunctions = new ScientificFunctions();
+        SwitchDisplay switchDisplay = new SwitchDisplay();
+
+        Console.println("Welcome to my calculator!\n");
+
+        do {
+            Console.println("Please type one of the following options:\n" +
+                                    "1 = switchDisplay to change calculator to Binary, Octal, Decimal (normal), or Hexadecimal.\n" +
+                                    "2 = switchUnits to change between radians and degrees.\n" +
+                                    "3 = turn calculator off completely.\n" +
+                                    "4 = the calculator cause....  that's really what you need.\n");
+            choice = Console.getIntegerInput("Enter the choice you would like to make.");
+
+            if (choice == 1) {
+                Console.println("Pick one of the following please:\n");
+
+                do {
+                    Console.println( "1 = Binary\n" +
+                                            "2 = Octal\n" +
+                                            "3 = Hex\n" +
+                                            "4 = Decimal\n");
+
+                    display = Console.getIntegerInput("\n");
+
+                    if (display != 1 && display != 2 && display != 3 && display != 4){
+                        Console.println("You have entered something incorrectly");
+                    }
+
+                } while (display != 1 && display != 2 && display != 3 && display != 4);
+
+            } else if (choice == 2) {
+
+                Console.println("Pick one of the following please:\n");
+                do {
+                    Console.println(  "1 = Radians\n" +
+                                              "2 = Degrees\n");
+                    choice3 = Console.getIntegerInput("");
+                } while (choice3 != 1 && choice3 != 2);
+
+            } else if (choice == 3) {
+                Console.println("SHUTTING DOOOWWNNNNNN!!!!!!");
+
+            } else if (choice == 4) {
+                Console.println("0 will exit you out of the Calculator!!!!\n" +
+                        "1 for addition                         2 for subtraction\n" +
+                        "3 for multiplication                   4 for division\n" +
+                        "5 for squaring                         6 for exponent\n" +
+                        "7 for square root                      8 for inverse\n" +
+                        "9 for invert                           10 for logarithms\n" +
+                        "11 for natural logarithms              12 for inverse logarithms\n" +
+                        "13 for inverse natural logarithms      14 for sine\n" +
+                        "15 for cosine                          16 for tangent\n" +
+                        "17 for arcsine                         18 for arccosine\n" +
+                        "19 for arctangent                      20 for factorial\n" +
+                        "Any other number for HELLLPPPPPPP\n\n\n");
+
+                do {
+
+                    operation = Console.getIntegerInput("Enter the operation you would like to perform.");
+                    if (operation != 0 ) {
+                        num1 = Console.getDoubleInput("Enter your first number.");
+                    }
+
+                    switch (operation) {
+                        case 1:
+                            Double num2 = Console.getDoubleInput("Enter your second number.");
+                            result = switchDisplay.toDisplay(simpleMath.add(num1, num2), display);
+                            System.out.println(num1 + " + " + num2 + " = " + result);
+                            break;
+                        case 2:
+                            num2 = Console.getDoubleInput("Enter your second number.");
+                            result = switchDisplay.toDisplay(simpleMath.subtract(num1, num2), display);
+                            System.out.println(num1 + " - " + num2 + " = " + result);
+                            break;
+                        case 3:
+                            num2 = Console.getDoubleInput("Enter your second number.");
+                            result = switchDisplay.toDisplay(simpleMath.multiplication(num1, num2), display);
+                            System.out.println(num1 + " x " + num2 + " = " + result);
+                            break;
+                        case 4:
+                            num2 = Console.getDoubleInput("Enter your second number.");
+                            if (num2 != 0) {
+                                result = switchDisplay.toDisplay(simpleMath.division(num1, num2), display);
+                                System.out.println(num1 + " / " + num2 + " = " + result);
+                            } else {
+                                System.out.println("ERrER EeRRrRROO--OOOrrRR!?!?!");
+                            }
+                            break;
+                        case 5:
+                            result = switchDisplay.toDisplay(simpleMath.square(num1), display);
+                            System.out.println(num1 + " squared is " + result);
+                            break;
+                        case 6:
+                            num2 = Console.getDoubleInput("Enter your second number.");
+                            result = switchDisplay.toDisplay(simpleMath.expo(num1, num2), display);
+                            System.out.println(num1 + " to the power of " + num2 + " = " + result);
+                            break;
+                        case 7:
+                            result = switchDisplay.toDisplay(simpleMath.squareRoot(num1), display);
+                            System.out.println("The square root of " + num1 + " is " + result);
+                            break;
+                        case 8:
+                            result = switchDisplay.toDisplay(simpleMath.inverse(num1), display);
+                            if (num1 != 0) {
+                                System.out.println("The inverse of " + num1 + " is " + result);
+                            } else {
+                                System.out.println("ERrER EeRRrRROO--OOOrrRR!?!?!");
+                            }
+                            break;
+                        case 9:
+                            result = switchDisplay.toDisplay(simpleMath.invertSign(num1), display);
+                            if (num1 != 0) {
+                                System.out.println("The invert of " + num1 + " is " + result);
+                            } else {
+                                System.out.println("ERrER EeRRrRROO--OOOrrRR!?!?!");
+                            }
+                            break;
+                        case 10:
+                            result = switchDisplay.toDisplay(logFunctions.log(num1), display);
+                            System.out.println("The logarithm of " + num1 + " is " + result);
+                            break;
+                        case 11:
+                            result = switchDisplay.toDisplay(logFunctions.naturalLog(num1), display);
+                            System.out.println("The natural logarithm of " + num1 + " is " + result);
+                            break;
+                        case 12:
+                            result = switchDisplay.toDisplay(logFunctions.inverseLog(num1), display);
+                            System.out.println("The inverse logarithm of " + num1 + " is " + result);
+                            break;
+                        case 13:
+                            result = switchDisplay.toDisplay(logFunctions.inverseNaturalLog(num1), display);
+                            System.out.println("The inverse natural logarithm of " + num1 + " is " + result);
+                        case 14:
+                            result = switchDisplay.toDisplay(scientificFunctions.sin(scientificFunctions.switchUnits(num1, choice3)), display);
+                            System.out.println("The sine of " + num1 + " is " + result);
+                            break;
+                        case 15:
+                            result = switchDisplay.toDisplay(scientificFunctions.cos(scientificFunctions.switchUnits(num1, choice3)), display);
+                            System.out.println("The cosine of " + num1 + " is " + result);
+                            break;
+                        case 16:
+                            result = switchDisplay.toDisplay(scientificFunctions.tan(scientificFunctions.switchUnits(num1, choice3)), display);
+                            System.out.println("The tangent of " + num1 + " is " + result);
+                            break;
+                        case 17:
+                            result = switchDisplay.toDisplay(scientificFunctions.asin(scientificFunctions.switchUnits(num1, choice3)), display);
+                            System.out.println("The arcsine of " + num1 + " is " + result);
+                            break;
+                        case 18:
+                            result = switchDisplay.toDisplay(scientificFunctions.acos(scientificFunctions.switchUnits(num1, choice3)), display);
+                            System.out.println("The arccosine of " + num1 + " is " + result);
+                            break;
+                        case 19:
+                            result = switchDisplay.toDisplay(scientificFunctions.atan(scientificFunctions.switchUnits(num1, choice3)), display);
+                            System.out.println("The arctangent of " + num1 + " is " + result);
+                            break;
+                        case 20:
+                            result = switchDisplay.toDisplay(scientificFunctions.factorial(num1), display);
+                            System.out.println("The factorial of " + num1 + " is " + result);
+                            break;
+                        default:
+                            System.out.println("Your input was incorrect please type one of the following:\n" +
+                                    "0 will exit you out of the Calculator!!!!\n" +
+                                    "1 for addition                         2 for subtraction\n" +
+                                    "3 for multiplication                   4 for division\n" +
+                                    "5 for squaring                         6 for exponent\n" +
+                                    "7 for square root                      8 for inverse\n" +
+                                    "9 for invert                           10 for logarithms\n" +
+                                    "11 for natural logarithms              12 for inverse logarithms\n" +
+                                    "13 for inverse natural logarithms      14 for sine\n" +
+                                    "15 for cosine                          16 for tangent\n" +
+                                    "17 for arcsine                         18 for arccosine\n" +
+                                    "19 for arctangent                      20 for factorial\n" +
+                                    "Any other number for HELLLPPPPPPP\n\n\n");
+                            break;
+                    }
+
+
+                } while (operation != 0);
+            } else {
+                choice = 5;
+                Console.println("SOMETHING WROOoNNNNNGGGGgggggg!!!!\n");
+            }
+        } while (choice != 3);
     }
+
 }
+

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

@@ -0,0 +1,52 @@
+package com.zipcodewilmington.scientificcalculator;
+import java.lang.Math;
+public class ScientificFunctions {
+
+    public Boolean radians;
+    public Boolean degrees;
+
+    public static double sin(double a) {
+        double b = Math.toRadians(a);
+        return(Math.sin(b));
+    }
+    public static double cos(double a) {
+        double b = Math.toRadians(a);
+        return(Math.cos(b));
+    }
+    public static double tan(double a) {
+        double b = Math.toRadians(a);
+        return(Math.tan(b));
+    }
+    public static double asin(double a) {
+        a = Math.PI;
+        return(Math.asin(a));
+    }
+    public static double acos(double a) {
+        a = Math.PI / 2;
+        a = Math.toRadians(a);
+        return(Math.acos(a));
+    }
+    public static double atan(double a) {
+        a = Math.PI;
+        return(Math.atan(a));
+    }
+    public static double factorial(double n) {
+        int res = 1, i;
+        for(i =2; i<=n; i++)
+            res *=i;
+        return res;
+    }
+    public static double toDegrees(double rad) {
+        return(Math.toDegrees(rad));
+    }
+
+    public double switchUnits (double num1, int setter) {
+        if (setter == 1) {
+            double num2 = toDegrees(num1);
+            return num2;
+        } else {
+            return num1;
+        }
+    }
+
+}

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

@@ -0,0 +1,40 @@
+package com.zipcodewilmington.scientificcalculator;
+
+import static java.lang.Math.sqrt;
+
+public class SimpleMath {
+
+    //Simple Operations
+    public Double add(double num1, double num2) {
+        return num1 + num2;
+    }
+    public Double subtract(double num1, double num2) {
+        return num1 - num2;
+    }
+    public Double multiplication(double num1, double num2){
+        return num1 * num2;
+    }
+    public Double division(double num1, double num2){
+        return num1 / num2;
+    }
+
+    public Double square(double num1){
+        return num1 * num1;
+    }
+
+    public Double squareRoot(double num1){
+        return Math.sqrt(num1);
+    }
+
+    public Double expo(double num1, double num2){
+        return Math.pow(num1, num2);
+    }
+
+    public Double inverse(double num1){
+        return 1 / num1;
+    }
+
+    public Double invertSign(double num1){
+        return num1 * -1;
+    }
+}