ok

Calculator.java

@@ -4,10 +4,14 @@ public class Calculator
     // instance variables - replace the example below with your own
     private double displayValue;
     private double memoryValue;
+<<<<<<< HEAD
 
     //private CoreFeatures core;
     //private ScientificFeatures science;
     //private BonusFeatures bonus;
+=======
+    private boolean err;
+>>>>>>> 85cb6e118e199051f7fc22d59044b58cdf7dcf01
 
     /**
      * Constructor for objects of class Calculator
@@ -16,6 +20,7 @@ public class Calculator
     {
         displayValue = 0;
         memoryValue = 0;
+        err = false;
     }
 
     //Memory set
@@ -37,6 +42,7 @@ public class Calculator
     //Clear and retrieve display value
     public double clear(){
         displayValue = 0;
+        err = false;
         return displayValue;
     }
 
@@ -148,6 +154,5 @@ public class Calculator
     displayValue = Math.E;
     return Math.E;
     }
-    
 
 }

CalculatorTest.java

@@ -25,14 +25,62 @@ public class CalculatorTest
     }
    @Test
     public void subtractionTest(){
+        //:Given
+        Double expected = Double.valueOf(2-1);
+        //:When
+        Calculator c = new Calculator();
+        Double actual = c.subtract(2, 1);
+        //Then
+        Assert.assertEquals(expected, actual);
     }
    @Test
    public void mutliplicationTest(){
+       //:Given
+       Double expected = Double.valueOf(2*3);
+       //:When
+       Calculator c = new Calculator();
+       Double actual = c.multiply(2, 3);
+       //:Then
+       Assert.assertEquals(expected, actual);
     }
    @Test
-   public void divisiionTest(){
+   public void divisionTest(){
+       //:Given
+       Double expected = Double.valueOf(4/3);
+       //:When
+       Calculator c = new Calculator();
+       Double actual = c.divide(4,3);
+       //:Then
+       Assert.assertEquals(expected, actual);
+    }
+   @Test
+   public void powTest(){
+       //:Given
+       Double expected = Double.valueOf(9);
+       //:When
+       Calculator c = new Calculator();
+       Double actual = c.pow(3,2);
+       //:Then
+       Assert.assertEquals(expected, actual);
+    }
+   @Test
+    public void squareTest(){
+        //:Given
+        Double expected = Double.valueOf(225);
+        //:When
+        Calculator c = new Calculator();
+        Double actual = c.square(15);
+        //:Then
+        Assert.assertEquals(expected, actual);
     }
    @Test
    public void sqrtTest(){
+       //:Given
+       Double expected = Double.valueOf(Math.sqrt(4));
+       //:When
+       Calculator c = new Calculator();
+       Double actual = c.squareRoot(4);
+       //:Then
+       Assert.assertEquals(expected, actual);
     }
 }

Console.java

@@ -1,7 +1,5 @@
- 
 
 import java.util.Scanner;
-
 /**
  * Created by leon on 2/9/18.
  * 
@@ -14,177 +12,230 @@ import java.util.Scanner;
  * 
  */
 public class Console {
-    
+
     private Calculator calc;
     private NumericInputParser parse;
-    
+
     public Console(){
         calc = new Calculator();
         parse = new NumericInputParser();
     }
-    
-    
+
     public void runCommandLoop() 
     {
         Scanner input = new Scanner(System.in);
-        Calculator calc = new Calculator();
         println("Welcome to this calculator!");
         println("For a user guide, enter '?'");
-        
+
         while (true) {
             print("Enter a command: ");
             String command = input.next();
-            if (command.equalsIgnoreCase("exit"))  {
-                print("Thanks for calculating with us!");
-                break;
-            }
-            else if (command.equalsIgnoreCase("clear")){
-                calc.clear();
-                println(parse.getFormattedNumber(calc.getDisplayValue()));
-            }
-            else if (command.equalsIgnoreCase("val")){
-                double val = calc.getDisplayValue();
-                println("The current value is: %s", parse.getFormattedNumber(val));
-            }
-            else if (command.equalsIgnoreCase("?")){
-                printGuide();
-            }
-            
-            //Core Features
-            
-            else if (command.equalsIgnoreCase("add"))  {
-                double d1 = getDoubleInput("First value: ");
-                double d2 = getDoubleInput("Second value: ");
-                double result = calc.add(d1, d2);
-                println("The sum is: %s", parse.getFormattedNumber(result));
-            }
-            else if (command.equalsIgnoreCase("subtract")) {
-               double d1 = getDoubleInput("First value: ");
-               double d2 = getDoubleInput("Second value: ");
-               double result = calc.subtract(d1, d2);
-               println("The difference is: %s", parse.getFormattedNumber(result));
-               
-            }
-            else if (command.equalsIgnoreCase("multiply")) {
-                double d1 = getDoubleInput("Multiplicand: ");
-                double d2 = getDoubleInput("Multiplier: ");
-                double result = calc.multiply(d1, d2);
-                println("The product is: %s", parse.getFormattedNumber(result));
-            }
-            else if (command.equalsIgnoreCase("divide")) {
-                double d1 = getDoubleInput("Dividend: ");
-                double d2 = getDoubleInput("Divisor: ");
-                double result = calc.multiply(d1, d2);
-                println("The quotient is: %s", parse.getFormattedNumber(result));
-            }
-            else if (command.equalsIgnoreCase("square"))  {
-                double d = getDoubleInput("Value: ");
-                double result = calc.square(d);
-                println("The square is: %s", parse.getFormattedNumber(result));
-                
-            }
-            else if (command.equalsIgnoreCase("pow")) {
-                double b = getDoubleInput("Base: ");
-                int e = getIntegerInput("Exponent: ");
-                double result = calc.pow(b, e);
-                println("The exponentiation is: %s", parse.getFormattedNumber(result));
-            }
-            else if (command.equalsIgnoreCase("sqrt")) {
-                double d = getDoubleInput("Value: ");
-                double result = calc.squareRoot(d);
-                println("The square root is: %s", parse.getFormattedNumber(result));
-                
-            }
-            else if (command.equalsIgnoreCase("inverse")) {
-                double d = getDoubleInput("Value: ");
-                double result = calc.inverse(d);
-                println("The inverse is: %s", result);
-            }
-            
-            //trig functions
-            else if (command.equalsIgnoreCase("sin")) {
-                double d = getDoubleInput("Value: ");
-                //call the sin method on calc and display
-                double result = calc.sin(d);
-                println("The sin is: %s", parse.getFormattedAngle(result));
-                
-            }
-            else if (command.equalsIgnoreCase("cos")) {
-                double d = getDoubleInput("Value: ");
-                //call the sin method on calc and display
-                double result = calc.cos(d);
-                println("The cos is: %s", parse.getFormattedAngle(result));
-                
-            }
-            else if (command.equalsIgnoreCase("tan")) {
-                double d = getDoubleInput("Value: ");
-                //call the tan method on calc and display
-                double result = calc.tan(d);
-                println("The tan is: %s", parse.getFormattedAngle(result));
-                
-            }
-            
-            //display mode changes
-            else if (command.equalsIgnoreCase("hex") ||
-                     command.equalsIgnoreCase("oct") ||
-                     command.equalsIgnoreCase("dec") ||
-                     command.equalsIgnoreCase("bin") ){
-                String displayMode = parse.switchDisplayMode(command);
-                println("Display mode changed to %s", displayMode);
-            }
-            else if (command.equalsIgnoreCase("display")) {
-                String displayMode = parse.switchDisplayMode();
-                println("Display mode changed to %s", displayMode);
-            }
-            
-            //trig units mode changes
-            else if (command.equalsIgnoreCase("rad") ||
-                     command.equalsIgnoreCase("deg")) {
-                String trigUnitsMode = parse.switchUnitsMode(command);
-                println("Trig units changed to %s", trigUnitsMode);
-            }
-            else if (command.equalsIgnoreCase("trig")) {
-                String trigUnitsMode = parse.switchUnitsMode();
-                println("Trig units changed to %s", trigUnitsMode);
-            }
-            
-            //memory features
-            else if (command.equalsIgnoreCase("M+")) {
-                //add the display value to memory
-                double mem = calc.memSet();
-                println("Memory value set to: %s", parse.getFormattedNumber(mem));
-            }
-            else if (command.equalsIgnoreCase("MC")) {
-                //clear the memory
-                double mem = calc.memClear();
-                println("Memory cleared.\nMemory value set to: %s", parse.getFormattedNumber(mem));
-            }
-            else if (command.equalsIgnoreCase("MRC")) {
-                double mem = calc.mrc();
-                
+
+            try {
+                if (command.equalsIgnoreCase("exit"))  {
+                    print("Thanks for calculating with us!");
+                    break;
+                }
+                else if (command.equalsIgnoreCase("clear")){
+                    calc.clear();
+                    println(parse.getFormattedNumber(calc.getDisplayValue()));
+                }
+                else if (command.equalsIgnoreCase("val")){
+                    double val = calc.getDisplayValue();
+                    println("The current value is: %s", parse.getFormattedNumber(val));
+                }
+                else if (command.equalsIgnoreCase("?")){
+                    printGuide();
+                }
+
+                //Core Features
+
+                else if (command.equalsIgnoreCase("add"))  {
+                    double d1 = getDoubleInput("First value: ");
+                    double d2 = getDoubleInput("Second value: ");
+                    double result = calc.add(d1, d2);
+                    println("The sum is: %s", parse.getFormattedNumber(result));
+                }
+                else if (command.equalsIgnoreCase("sub")) {
+                    double d1 = getDoubleInput("First value: ");
+                    double d2 = getDoubleInput("Second value: ");
+                    double result = calc.subtract(d1, d2);
+                    println("The difference is: %s", parse.getFormattedNumber(result));
+
+                }
+                else if (command.equalsIgnoreCase("mult")) {
+                    double d1 = getDoubleInput("Multiplicand: ");
+                    double d2 = getDoubleInput("Multiplier: ");
+                    double result = calc.multiply(d1, d2);
+                    println("The product is: %s", parse.getFormattedNumber(result));
+                }
+                else if (command.equalsIgnoreCase("div")) {
+                    double d1 = getDoubleInput("Dividend: ");
+                    double d2 = getDoubleInput("Divisor: ");
+                    if (d2 == 0){
+                        errMessage();
+                    }
+                    else { 
+                        double result = calc.divide(d1, d2);
+                        println("The quotient is: %s", parse.getFormattedNumber(result));
+                    }   
+                }
+                else if (command.equalsIgnoreCase("sq"))  {
+                    double d = getDoubleInput("Value: ");
+                    double result = calc.square(d);
+                    println("The square is: %s", parse.getFormattedNumber(result));
+
+                }
+                else if (command.equalsIgnoreCase("pow")) {
+                    double b = getDoubleInput("Base: ");
+                    int e = getIntegerInput("Exponent: ");
+                    double result = calc.pow(b, e);
+                    println("The exponentiation is: %s", parse.getFormattedNumber(result));
+                }
+                else if (command.equalsIgnoreCase("sqrt")) {
+                    double d = getDoubleInput("Value: ");
+                    double result = calc.squareRoot(d);
+                    println("The square root is: %s", parse.getFormattedNumber(result));
+
+                }
+                else if (command.equalsIgnoreCase("inv")) {
+                    double d = getDoubleInput("Value: ");
+                    if (d == 0){
+                        errMessage();
+                    }
+                    else {
+                        double result = calc.inverse(d);
+                        println("The inverse is: %s", result);
+                    }
+                }
+
+                //trig functions
+                else if (command.equalsIgnoreCase("sin")) {
+                    double d = getDoubleInput("Value: ");
+                    //call the sin method on calc and display
+                    double result = calc.sin(d);
+                    println("The sin is: %s", parse.getFormattedAngle(result));
+
+                }
+                else if (command.equalsIgnoreCase("cos")) {
+                    double d = getDoubleInput("Value: ");
+                    //call the sin method on calc and display
+                    double result = calc.cos(d);
+                    println("The cos is: %s", parse.getFormattedAngle(result));
+
+                }
+                else if (command.equalsIgnoreCase("tan")) {
+                    double d = getDoubleInput("Value: ");
+                    //call the tan method on calc and display
+                    double result = calc.tan(d);
+                    println("The tan is: %s", parse.getFormattedAngle(result));
+
+                }
+                else if (command.equalsIgnoreCase("cot")) {
+                    double d = getDoubleInput("Value: ");
+                    double result = calc.inverseTan(d);
+                    println("The cot is: %s", parse.getFormattedAngle(result));
+
+                }
+                else if (command.equalsIgnoreCase("csc")){
+                    double d = getDoubleInput("Value: ");
+                    double result = calc.inverseSin(d);
+                    println("The csc is: %s", parse.getFormattedAngle(result));
+                }
+                else if (command.equalsIgnoreCase("sec")){
+                    double d = getDoubleInput("Value: ");
+                    double result = calc.inverseCos(d);
+                    println("The sec is: %s", parse.getFormattedAngle(result));
+                }
+
+                //Bonus Functions
+                else if (command.equalsIgnoreCase("log")){
+                    double d = getDoubleInput("Value: ");
+                    double result = calc.log(d);
+                    println("The log is: %s", parse.getFormattedNumber(result));
+                }
+                else if (command.equalsIgnoreCase("antilog")){
+                    double d = getDoubleInput("Value: ");
+                    double result = calc.inverseLog(d);
+                    println("The inverse log (base 10) is: %s", parse.getFormattedNumber(result));
+                }
+                else if (command.equalsIgnoreCase("antiln")){
+                    double d = getDoubleInput("Value: ");
+                    double result = calc.inverseLn(d);
+                    println("The inverse natural log is: %s", parse.getFormattedNumber(result));
+                }
+                else if (command.equalsIgnoreCase("pi")){
+                    println("The current value is now: %s", parse.getFormattedNumber(calc.displayPi()));
+                }
+                else if (command.equalsIgnoreCase("e")){
+                    println("The current value is now: %s", parse.getFormattedNumber(calc.displayE()));
+                }
+                //display mode changes
+                else if (command.equalsIgnoreCase("hex") ||
+                command.equalsIgnoreCase("oct") ||
+                command.equalsIgnoreCase("dec") ||
+                command.equalsIgnoreCase("bin") ){
+                    String displayMode = parse.switchDisplayMode(command);
+                    println("Display mode changed to %s", displayMode);
+                }
+                else if (command.equalsIgnoreCase("display")) {
+                    String displayMode = parse.switchDisplayMode();
+                    println("Display mode changed to %s", displayMode);
+                }
+
+                //trig units mode changes
+                else if (command.equalsIgnoreCase("rad") ||
+                command.equalsIgnoreCase("deg")) {
+                    String trigUnitsMode = parse.switchUnitsMode(command);
+                    println("Trig units changed to %s", trigUnitsMode);
+                }
+                else if (command.equalsIgnoreCase("trig")) {
+                    String trigUnitsMode = parse.switchUnitsMode();
+                    println("Trig units changed to %s", trigUnitsMode);
+                }
+
+                //memory features
+                else if (command.equalsIgnoreCase("M+")) {
+                    //add the display value to memory
+                    double mem = calc.memSet();
+                    println("Memory value set to: %s", parse.getFormattedNumber(mem));
+                }
+                else if (command.equalsIgnoreCase("MC")) {
+                    //clear the memory
+                    double mem = calc.memClear();
+                    println("Memory cleared.\nMemory value set to: %s", parse.getFormattedNumber(mem));
+                }
+                else if (command.equalsIgnoreCase("MRC")) {
+                    double mem = calc.mrc();
+
+                }
+
+                else {
+                    System.out.println("Invalid input. Enter '?' for a user guide");
+                    System.out.println("Enter 'exit' to quit");
+                }
             }
-            
-            
-            else {
-                System.out.println("Invalid input. Enter '?' for a user guide");
-                System.out.println("Enter 'exit' to quit");
+            catch (ArithmeticException e) {
+                errMessage();
             }
         }
 
     }
-    
+
     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);
     }
-    
+
     public String getStringInput(String prompt) {
         Scanner s = new Scanner(System.in);
         print(prompt);
         return s.nextLine();
     }
+
     public Integer getIntegerInput(String prompt) {
         Scanner s = new Scanner(System.in);
         print(prompt);
@@ -211,6 +262,7 @@ public class Console {
         return i;
 
     }
+
     public Double getDoubleInput(String prompt) {
         Scanner s = new Scanner(System.in);
         print(prompt);
@@ -232,15 +284,26 @@ public class Console {
                     println("Current display mode is: " + parse.getDisplayMode());
                 }
             }
-        
+
         }
         return d;
     }
+
+    private void errMessage(){
+        while(true){
+            String clear = getStringInput("ERR\n");
+            if (clear.equalsIgnoreCase("clear")){
+                break;
+            }   
+        }
+    }
+
     public double getAngleInput(String prompt) {
         Scanner s = new Scanner(System.in);
         print(prompt);
         return parse.getAngle(s.nextLine());
     }
+
     public void printGuide(){
         println("Guide Under Construction");
     }

NumericInputParser.java

@@ -66,7 +66,7 @@ public class NumericInputParser
         double val = 0;
         switch (displayMode) {
             case "dec" :
-                val = Integer.parseInt(input, 10);
+                val = Double.parseDouble(input);
                 break;
             case "bin" :
                 val = Integer.parseInt(input, 2);

__SHELL16.java

@@ -0,0 +1,8 @@
+
+public class __SHELL16 extends bluej.runtime.Shell {
+public static void run() throws Throwable {
+
+java.lang.String[] __bluej_param0 = { };
+MainApplication.main(__bluej_param0);
+
+}}