pre-merge maggie

Calculator.java

@@ -6,9 +6,8 @@ import java.util.*;
  * @author (your name)
  * @version (a version number or a date)
  */
-
-class Calculator{
-
+public class Calculator{
+    public static double lastAns = 0;
     public static void main(String args[]){
 
         String toDo;                //what the user wants to do
@@ -16,7 +15,6 @@ class Calculator{
         double num2 = 0;            //The user's second input
         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();
 
@@ -31,148 +29,164 @@ class Calculator{
 
             }                              
             else {
-
-            //System.out.println("toDO is: " + toDo);
-
-            System.out.println(toDo + " -- Enter first number:");
-            num1 = input1.nextDouble();
-            //System.out.println("num1 is: " + num1);
-
-            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);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "subtract":
-                result = calc.subtract(num1, num2);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "multiply":
-                result = calc.multiply(num1, num2);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "divide":
-                result = calc.divide(num1, num2);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "exponent":
-                result = calc.exponent(num1, num2);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "cosine":
-                result = calc.cosine(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "inverse cosine":
-                result = calc.invCosine(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "square root":
-                result = calc.squareRoot(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "invert":
-                result = calc.invert(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "sine":
-                result = calc.sin(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "inverse sine":
-                result = calc.iSin(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "degree to radian":
-                result = calc.degToRad(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "radian to degree":
-                result = calc.radToDeg(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "square":
-                result = calc.square(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "inverse":
-                result = calc.inverse(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "tangent":
-                result = calc.tangent(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break;
-
-                case "inverse tangent":
-                result = calc.iTan(num1);
-                memory = result;
-                calc.printAns(String.valueOf(result));
-                break; 
-
-                case "MR" :
-                result = Memory.memRead();
-                Memory.printAns(String.valueOf(result));
-                break;
-                    
-                case "M+" :
-                System.out.println("Enter number:");
-                num1 = input1.nextDouble();
-                result = Memory.memUpdate(num1);
-                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":
+                    case "cosine" :
+                    case "inverse cosine" :
+                    case "square root" :
+                    case "invert" :
+                    case "sine" :
+                    case "inverse sine" :
+                    case "degree to radian" :
+                    case "radian to degree" :
+                    case "tangent" :
+                    case "inverse tangent" :
+                    case "square" :                 
+                    case "M+" :
+                   
+
+                    //System.out.println("toDO is: " + toDo);
+                    System.out.println(toDo + " -- Enter first number:");
+                    num1 = input1.nextDouble();
+                    //System.out.println("num1 is: " + num1);
+                }   
+                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 "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+" :
+                    System.out.println("Enter number:");               
+                    result = Memory.memUpdate(lastAns);
+                    Memory.printAns(String.valueOf(result));
+                    break;
+
+                    case "MC" :
+                    result = Memory.memClear();
+                    Memory.printAns(String.valueOf(result));
+                    break;
+
+                }
             }
         }
     }
 }
-}

Memory.java

@@ -20,9 +20,9 @@ public class Memory
         return mem;    
     }
     
-    public static double memUpdate(double n1) 
+    public static double memUpdate(double lastAns) 
     {
-        return mem = n1;
+        return mem = lastAns;
     }
     
     public static double memClear()