Dev

pom.xml

@@ -9,4 +9,20 @@
     <version>1.0-SNAPSHOT</version>
 
 
+
+    <dependencies>
+        <dependency>
+            <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>test</scope>
+        </dependency>
+    </dependencies>
+
 </project>

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

@@ -15,18 +15,125 @@ public static void println(String output, Object... args) {
         print(output + "\n", args);
     }
 
+    public static Scanner scanner;
+
     public static String getStringInput(String prompt) {
-        Scanner scanner = new Scanner(System.in);
+
+        scanner = new Scanner(System.in);
         println(prompt);
         String userInput = scanner.nextLine();
-        return userInput;
+        return "Hello there " + userInput + "!";
     }
 
-    public static Integer getIntegerInput(String prompt) {
-        return null;
+    public static int getIntegerInput(String prompt) {
+
+        int userInput;
+
+        scanner = new Scanner(System.in);
+        println(prompt);
+        String nextNum = scanner.nextLine();
+
+        try{
+            userInput = Integer.parseInt(nextNum);
+            return userInput;
+        }catch (Exception e) {
+            return Console.getIntegerInput(prompt);
+        }
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
+
+        double userInput;
+        Display dis = new Display();
+
+        scanner = new Scanner(System.in);
+        println(prompt);
+        String nextNum = scanner.nextLine();
+
+        try{
+            userInput = Double.parseDouble(nextNum);
+            dis.update(userInput);
+            return userInput;
+        }catch (Exception e) {
+            return Console.getDoubleInput(prompt);
+        }
+
+    }
+
+    public static int getOperand(String prompt){
+
+        scanner = new Scanner(System.in);
+        println(prompt);
+        String nextOperand = scanner.nextLine();
+
+        if(nextOperand.equals("+")){
+            return 1;
+        }else if(nextOperand.equals("-")){
+            return 2;
+        }else if(nextOperand.equals("*")){
+            return 3;
+        }else if(nextOperand.equals("/")){
+            return 4;
+        }else if(nextOperand.equalsIgnoreCase("x^2")){
+            return 5;
+        }else if(nextOperand.equalsIgnoreCase("sqrt")){
+            return 6;
+        }else if(nextOperand.equalsIgnoreCase("x^n")){
+            return 7;
+        }else if(nextOperand.equalsIgnoreCase("1/x")){
+            return 8;
+        }else if(nextOperand.equalsIgnoreCase("+/-")){
+            return 9;
+        }else if(nextOperand.equalsIgnoreCase("sin")){
+            return 10;
+        }else if(nextOperand.equalsIgnoreCase("cos")){
+            return 11;
+        }else if(nextOperand.equalsIgnoreCase("tan")){
+            return 12;
+        }else if(nextOperand.equalsIgnoreCase("invSin")){
+            return 13;
+        }else if(nextOperand.equalsIgnoreCase("invCos")){
+            return 14;
+        }else if(nextOperand.equalsIgnoreCase("invTan")){
+            return 15;
+        }else if(nextOperand.equalsIgnoreCase("log")){
+            return 16;
+        }else if(nextOperand.equalsIgnoreCase("invLog")){
+            return 17;
+        }else if(nextOperand.equalsIgnoreCase("Ln")){
+            return 18;
+        }else if(nextOperand.equalsIgnoreCase("invLn")){
+            return 19;
+        }else if(nextOperand.equalsIgnoreCase("!")){
+            return 20;
+        }else if(nextOperand.equalsIgnoreCase("m+")){
+            return 21;
+        }else if(nextOperand.equalsIgnoreCase("mc")){
+            return 22;
+        }else if(nextOperand.equalsIgnoreCase("mrc")){
+            return 23;
+        }else if(nextOperand.equalsIgnoreCase("mode")){
+            return 24;
+        }else if(nextOperand.equalsIgnoreCase("mode x")){
+            return 25;
+        }else if(nextOperand.equalsIgnoreCase("rd")){
+            return 26;
+        }else if(nextOperand.equalsIgnoreCase("rd x")){
+            return 27;
+        }else if(nextOperand.equalsIgnoreCase("prime")){
+            return 28;
+        }else if(nextOperand.equalsIgnoreCase("year%")){
+            return 29;
+        }else if(nextOperand.equalsIgnoreCase("c")){
+            return 0;
+        }else if(nextOperand.equalsIgnoreCase("off")){
+            return 100;
+        }else{
+            if(Display.error) System.out.println("Please clear before continuing!");
+            return getOperand(prompt);
+        }
     }
 }
+
+
+

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

@@ -0,0 +1,136 @@
+package com.zipcodewilmington.scientificcalculator;
+
+import sun.applet.Main;
+
+public class Display {
+    public boolean checkState = true;
+    public static boolean error = false;
+    public int displayMode = 0;
+    public int unitMode = 0;
+
+    public void clearDisplay() {
+        checkState = true;
+        update(0);
+        error = false;
+
+    }
+    public void changeNumberDisplay() {
+
+        int intTotal = (int) Math.round(MainApplication.total);
+        switch (displayMode){
+            case 0:
+                update(intTotal);
+                displayMode++;
+                break;
+            case 1:
+                update(ScientificCalc.Hexadecimal(intTotal));
+                displayMode++;
+                break;
+            case 2:
+                update(ScientificCalc.Octal(intTotal));
+                displayMode++;
+                break;
+            case 3:
+                update(ScientificCalc.Binary(intTotal));
+                displayMode = 0;
+                break;
+        }
+    }
+
+    public void changeNumberDisplay(String mode) {
+
+        int intTotal = (int) Math.round(MainApplication.total);
+        if(mode.equalsIgnoreCase("hexa")){
+            update(ScientificCalc.Hexadecimal(intTotal));
+        }else if(mode.equalsIgnoreCase("binary")) {
+            update(ScientificCalc.Binary(intTotal));
+        }else if(mode.equalsIgnoreCase("octal")){
+            update(ScientificCalc.Octal(intTotal));
+        }else if(mode.equalsIgnoreCase("deci")){
+            update(intTotal);
+        }else{
+            displayErr();
+        }
+    }
+
+    public void changeUnitDisplay(){
+
+        switch (unitMode){
+            case 0:
+                update(ScientificCalc.radian(MainApplication.total));
+                unitMode++;
+                break;
+            case 1:
+                update(ScientificCalc.degree(MainApplication.total));
+                unitMode = 0;
+                break;
+        }
+    }
+
+    public void changeUnitDisplay(String unit){
+
+        if(unit.equalsIgnoreCase("rad")){
+            update(ScientificCalc.radian(MainApplication.total));
+        }else if(unit.equalsIgnoreCase("deg")){
+            update(ScientificCalc.degree(MainApplication.total));
+        }else {
+            displayErr();
+        }
+    }
+
+    public void displayErr() {
+        //if math calculations don't work, display 'Err')
+        error = true;
+        update("Err. Clear screen.");
+    }
+
+    public void update(double update){
+        String[][] calc = { {"C", " RD", "RD X ", " SIN", "invSin", "Off"},
+                            {"+", "X^2", " Sqrt", " COS", "invCos", "   "},
+                            {"-", "X^N", " 1/x ", " TAN", "invTan", "   "},
+                            {"*", " M+", "Prime", " Log", "invLog", "   "},
+                            {"/", " MC", "Year%", " Ln ", " invLn", "   "},
+                            {"!", "MRC", " +/- ", "Mode", "Mode X", "   "}};
+
+        String dis = String.format("|%27s| ", update);
+
+        System.out.print("\033[H\033[2J");
+        System.out.flush();
+        System.out.println("-----------------------------");
+        System.out.println(dis);
+        System.out.println("-----------------------------");
+        for(int i = 0; i < calc.length; i++){
+            for (int j = 0; j < calc.length; j++){
+                System.out.print("|" + calc[i][j]);
+            }
+            System.out.print("|");
+            System.out.println();
+            System.out.println(" - --- ----- ---- ------ ---");
+        }
+    }
+
+    public void update(String update){
+        String[][] calc = { {"C", " RD", "RD X ", " SIN", "invSin", "Off"},
+                {"+", "X^2", " Sqrt", " COS", "invCos", "   "},
+                {"-", "X^N", " 1/x ", " TAN", "invTan", "   "},
+                {"*", " M+", "Prime", " Log", "invLog", "   "},
+                {"/", " MC", "Year%", " Ln ", " invLn", "   "},
+                {"!", "MRC", " +/- ", "Mode", "Mode X", "   "}};
+
+        String dis = String.format("|%27s| ", update);
+
+        System.out.print("\033[H\033[2J");
+        System.out.flush();
+        System.out.println("-----------------------------");
+        System.out.println(dis);
+        System.out.println("-----------------------------");
+        for(int i = 0; i < calc.length; i++){
+            for (int j = 0; j < calc.length; j++){
+                System.out.print("|" + calc[i][j]);
+            }
+            System.out.print("|");
+            System.out.println();
+            System.out.println(" - --- ----- ---- ------ ---");
+        }
+    }
+}