added Nates changes

Calculator.java

@@ -1,8 +1,8 @@
+
 import java.util.*;
 
 public class Calculator{
 
-
     /**
      * Write a description of class Calculator here.
      *
@@ -19,12 +19,15 @@ public class Calculator{
         double result = 0;          //The user's answer
         boolean off = false;        //The user typed quit, becomes true
 
+        double memory;
+
         boolean error = false;
         MathMethods calc = new MathMethods();
 
         while (off == false){
             Scanner input1 = new Scanner(System.in);
             System.out.println("What do you want to do?");
+
             toDo = input1.next();
 
             if (toDo.equalsIgnoreCase("quit")){
@@ -34,7 +37,7 @@ public class Calculator{
             } else {
                 switch (toDo) {
                     //System.out.println("toDO is: " + toDo);
-                    
+
                     case "add":
                     case "subtract":
                     case "multiply":
@@ -52,181 +55,182 @@ public class Calculator{
                     case "tangent" :
                     case "inverse tangent" :
                     case "inverse" :
-                    
+
                     System.out.println(toDo + " -- Enter first number:");
                     num1 = input1.nextDouble();
                     //System.out.println("num1 is: " + num1);
-                }
-                switch (toDo){
-                    // case "previous":
-                    // num1 = lastAns;
-                    // System.out.println(toDo + " -- Enter second number:");
-                    // num2 = input1.nextDouble();
-                    //break;
-                    case "add":
-                    case "subtract":
-                    case "multiply":
-                    case "divide":
-                    case "exponent":
-                    System.out.println(toDo + " -- Enter second number:");
-                    num2 = input1.nextDouble();
-                    //System.out.println("num2 is: " + num2);
-
-                }
-
-                switch (toDo) {        
-                    
-                    
-                    case "add":
-                    result = calc.add(num1, num2);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "subtract":
-                    result = calc.subtract(num1, num2);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "multiply":
-                    result = calc.multiply(num1, num2);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "divide":
-                    result = calc.divide(num1, num2);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "exponent":
-                    result = calc.exponent(num1, num2);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "cosine":
-                    result = calc.cosine(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "inverse cosine":
-                    result = calc.invCosine(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "square root":
-                    result = calc.squareRoot(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "invert":
-                    result = calc.invert(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "sine":
-                    result = calc.sin(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "inverse sine":
-                    result = calc.iSin(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "degree to radian":
-                    result = calc.degToRad(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "radian to degree":
-                    result = calc.radToDeg(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "fortune cookie":
-                    calc.printAns(calc.fortuneCookie());
-                    break;
-
-                    case "display mode decimal":
-                    calc.printAns(String.valueOf(lastAns));
-                    break;
-
-                    case "display mode hexadecimal":
-                    calc.printAns(calc.switchDisplayMode("hexadecimal"));
-
-                    case "display mode octal":
-                    calc.printAns(calc.switchDisplayMode("octal"));
-                    break;
-
-                    case "display mode binary":
-                    calc.printAns(calc.switchDisplayMode("binary"));
-                    break;
-
-                    case "display mode" :
-                    calc.printAns(calc.switchDisplayMode());
-                    break;
-
-                    case "random number":
-                    result = calc.randomNumber();
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;      
-
-                    case "square":
-                    result = calc.square(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "inverse":
-                    result = calc.inverse(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "tangent":
-                    result = calc.tangent(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break;
-
-                    case "inverse tangent":
-                    result = calc.iTan(num1);
-                    lastAns = result;
-                    calc.printAns(String.valueOf(result));
-                    break; 
-
-                    case "MR" :
-                    result = Memory.memRead();
-                    Memory.printAns(String.valueOf(result));
-                    break;
-
-                    case "M+" :
-                    result = Memory.memUpdate(lastAns);
-                    Memory.printAns(String.valueOf(result));
-                    break;
-
-                    case "MC" :
-                    result = Memory.memClear();
-                    Memory.printAns(String.valueOf(result));
-                    break;
 
+                    switch (toDo){
+                        case "add":
+                        case "subtract":
+                        case "multiply":
+                        case "divide":
+                        case "exponent":
+                        System.out.println(toDo + " -- Enter second number:");
+                        num2 = input1.nextDouble();
+                        //System.out.println("num2 is: " + num2);
+
+                    }
+
+                    switch (toDo) {        
+
+                        case "add":
+                        result = calc.add(num1, num2);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "subtract":
+                        result = calc.subtract(num1, num2);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "multiply":
+                        result = calc.multiply(num1, num2);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "divide":
+                        result = calc.divide(num1, num2);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "exponent":
+                        result = calc.exponent(num1, num2);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "cosine":
+                        result = calc.cosine(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "inverse cosine":
+                        result = calc.invCosine(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "square root":
+                        result = calc.squareRoot(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "invert":
+                        result = calc.invert(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "sine":
+                        result = calc.sin(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "inverse sine":
+                        result = calc.iSin(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "degree to radian":
+                        result = calc.degToRad(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "radian to degree":
+                        result = calc.radToDeg(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "fortune cookie":
+                        calc.printAns(calc.fortuneCookie());
+                        break;
+
+                        case "display mode decimal":
+                        calc.printAns(String.valueOf(lastAns));
+                        break;
+
+                        case "display mode hexadecimal":
+                        calc.printAns(calc.switchDisplayMode("hexadecimal"));
+
+                        case "display mode octal":
+                        calc.printAns(calc.switchDisplayMode("octal"));
+                        break;
+
+                        case "display mode binary":
+                        calc.printAns(calc.switchDisplayMode("binary"));
+                        break;
+
+                        case "display mode" :
+                        calc.printAns(calc.switchDisplayMode());
+                        break;
+
+                        case "random number":
+                        result = calc.randomNumber();
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;      
+
+                        case "square":
+                        result = calc.square(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "inverse":
+                        result = calc.inverse(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "tangent":
+                        result = calc.tangent(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break;
+
+                        case "inverse tangent":
+                        result = calc.iTan(num1);
+                        lastAns = result;
+                        calc.printAns(String.valueOf(result));
+                        break; 
+
+                        case "MR" :
+                        result = Memory.memRead();
+                        Memory.printAns(String.valueOf(result));
+                        break;
+
+                        case "M+" :
+                        result = Memory.memUpdate(lastAns);
+                        Memory.printAns(String.valueOf(result));
+                        break;
+
+                        case "MC" :
+                        result = Memory.memClear();
+                        Memory.printAns(String.valueOf(result));
+                        break;
+                        
+                        case "roundTo":
+                        memory = result;
+                        calc.roundTo(memory, (int)num1);
+                        break;
+
+                    }
                 }
             }
         }
-    }
 
+    }
 }
 
+    

MathMethods.java

@@ -1,5 +1,7 @@
 import java.util.*;
+
 import java.lang.*;
+
 /**
  * Write a description of class Calculator here.
  *
@@ -9,8 +11,10 @@ import java.lang.*;
 public class MathMethods
 
 {
+
     private static int displayModeCounter=4;
 
+
     public static Double add(double n1, double n2){
         return (n1 + n2);
     }
@@ -69,6 +73,7 @@ public class MathMethods
 
     }
 
+
     public static String fortuneCookie() {
         Random rand = new Random();
          
@@ -137,7 +142,7 @@ public class MathMethods
     }
 
     public static void printAns(String printAnswer){
-        System.out.println( String.valueOf(printAnswer));
+        System.out.println( "ANSWER: " + printAnswer + " \n \n");
     }
 
     public static double inverse(double n1) {
@@ -157,5 +162,11 @@ public class MathMethods
         return (display.lastAns);
     }
 
+    public static void roundTo(Double memory, int numPlaces){
+
+        System.out.printf("ANSWER: %." + (numPlaces)+ "f\n", memory);
+
+    }
 }
 
+

package.bluej

@@ -1,5 +1,6 @@
 #BlueJ package file
 <<<<<<< HEAD
+<<<<<<< HEAD
 dependency1.from=Calculator
 dependency1.to=MathMethods
 dependency1.type=UsesDependency
@@ -51,6 +52,24 @@ package.editor.width=493
 package.editor.x=-188
 package.editor.y=-610
 package.frame.height=625
+=======
+dependency1.from=Calculator
+dependency1.to=MathMethods
+dependency1.type=UsesDependency
+editor.fx.0.height=722
+editor.fx.0.width=800
+editor.fx.0.x=0
+editor.fx.0.y=132
+objectbench.height=205
+objectbench.width=595
+package.divider.horizontal=0.6
+package.divider.vertical=0.6849925705794948
+package.editor.height=454
+package.editor.width=493
+package.editor.x=35
+package.editor.y=23
+package.frame.height=731
+>>>>>>> a0c06052a8de50df57cd0a41d73ffc3f9ce302c2
 package.frame.width=619
 package.numDependencies=4
 package.numTargets=5
@@ -64,10 +83,15 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
+<<<<<<< HEAD
 target1.name=MemoryTest
+=======
+target1.name=Calculator
+>>>>>>> a0c06052a8de50df57cd0a41d73ffc3f9ce302c2
 target1.showInterface=false
 <<<<<<< HEAD
 target1.type=ClassTarget
+<<<<<<< HEAD
 target1.width=140
 target1.x=80
 target1.y=200
@@ -122,3 +146,15 @@ target5.width=110
 target5.x=60
 target5.y=280
 >>>>>>> 2a9a289e4239250cd6e2f776f8cc64f1130c5a52
+=======
+target1.width=120
+target1.x=70
+target1.y=70
+target2.height=50
+target2.name=MathMethods
+target2.showInterface=false
+target2.type=ClassTarget
+target2.width=110
+target2.x=80
+target2.y=200
+>>>>>>> a0c06052a8de50df57cd0a41d73ffc3f9ce302c2