changes

Calculator.java

@@ -29,31 +29,7 @@ class Calculator{
                 off = true;
                 System.out.println("Goodbye!!");
 
-            } else if(toDo.equalsIgnoreCase("memory")){
-                System.out.println("Read, Change or Clear?");
-                String mem = input1.next();
-                switch(mem) {
-                    case "Read" :
-                    result = Memory.memRead();
-                    Memory.printAns(String.valueOf(result));
-                    break;
-                    
-                    case "Change" :
-                    System.out.println("Enter number:");
-                    num1 = input1.nextDouble();
-                    result = Memory.memUpdate(num1);
-                    Memory.printAns(String.valueOf(result));
-                    break;
-                    
-                    case "Clear" :
-                    result = Memory.memClear();
-                    Memory.printAns(String.valueOf(result));
-                    break;
-                    
-                }
-            }
-        
-            
+            }                              
             else {
 
             //System.out.println("toDO is: " + toDo);
@@ -177,101 +153,26 @@ class Calculator{
                 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;
+                    
+                
             }
         }
     }
 }
 }
-
-// /**
-// * Created by leon on 2/9/18.
-// */
-// public class Console {
-// Calculator calc = new Calculator();
-
-// 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 static String getMethod() {
-// Scanner scanner = new Scanner(System.in);
-// String userInput = scanner.nextLine();
-// return userInput;
-// }
-
-// public static String switchStatment() {
-// Scanner scanner = new Scanner(System.in);
-// String ultimateAnswer = "";
-// Boolean turnOff = false;
-
-// switch (getMethod()) {
-// case "add" :
-// System.out.println("Enter your numbers:");
-// double userInput = scanner.nextDouble();
-// double nextInput = scanner.nextDouble();
-
-// double answer = Calculator.add(userInput, nextInput);
-// ultimateAnswer = Double.toString(answer);
-// return Double.toString(answer);
-
-// case "subtract" :
-// System.out.println("Enter your numbers:");
-// userInput = scanner.nextDouble();
-// nextInput = scanner.nextDouble();
-
-// answer = Calculator.subtract(userInput, nextInput);
-// ultimateAnswer = Double.toString(answer);
-// return ultimateAnswer;
-
-// case "multiply" :
-// System.out.println("Enter your numbers:");
-// userInput = scanner.nextDouble();
-// nextInput = scanner.nextDouble();
-
-// answer = Calculator.multiply(userInput, nextInput);
-// ultimateAnswer = Double.toString(answer);
-// return ultimateAnswer;
-
-// case "divide" :
-// System.out.println("Enter your numbers:");
-// userInput = scanner.nextDouble();
-// nextInput = scanner.nextDouble();
-
-// answer = Calculator.divide(userInput, nextInput);
-// ultimateAnswer = Double.toString(answer);
-// return ultimateAnswer;
-
-// case "Square Root" :
-
-// }
-// return ultimateAnswer;
-// }
-
-// /*public static String getStringInput(String prompt) {
-// Scanner scanner = new Scanner(System.in);
-// println(prompt);
-// String userInput = scanner.nextLine();
-// return userInput;
-// }
-
-// public static Integer getIntegerInput(String prompt) {
-// Scanner scanner = new Scanner(System.in);
-// println(prompt);
-// int userInput = scanner.nextInt();
-// return null;
-// }
-
-// public static Double getDoubleInput(String prompt) {
-// Scanner scanner = new Scanner(System.in);
-// println(prompt);
-// double userInput = scanner.nextDouble();
-// double nextInput = scanner.nextDouble();
-// double answer = Calculator.add(userInput, nextInput);
-// return answer;
-// }*/
-
-// }

MathMethods.java

@@ -90,47 +90,3 @@ public class MathMethods
 
 }
 
-    
-    
-// public static double squareRoot(double n1) {
-// double result = Math.sqrt(x);
-// return result;
-// }
-
-// public static double invert(double n1) {
-// double result = x*-1;
-// return result;
-// }
-
-// public static double sin(double n1){
-// double result = Math.sin(x);
-// return result;
-// }
-
-// public static double iSin(double n1){
-// double result = Math.asin(x);
-// return result;
-// }
-
-// public static double degToRad(double n1) {
-// double result = Math.toRadians(x);
-// return result;
-// }
-
-// public static double radToDeg(double n1) {
-// double result = Math.toDegrees(x);
-// return result;
-// }
-
-// public static Double exponent(double n1, double n2){
-// return (Math.pow(n1, n2));
-// }
-
-// public static Double cosine(double n1){
-// return (Math.cos(n1));
-// }
-
-// public static Double invCosine(double n1){
-// return (Math.acos(n1));
-// }
-

package.bluej

@@ -2,27 +2,27 @@
 dependency1.from=MathMethodsTest
 dependency1.to=MathMethods
 dependency1.type=UsesDependency
-dependency2.from=Calculator
-dependency2.to=MathMethods
+dependency2.from=MemoryTest
+dependency2.to=Memory
 dependency2.type=UsesDependency
 dependency3.from=Calculator
-dependency3.to=Memory
+dependency3.to=MathMethods
 dependency3.type=UsesDependency
-dependency4.from=MemoryTest
+dependency4.from=Calculator
 dependency4.to=Memory
 dependency4.type=UsesDependency
-editor.fx.0.height=797
-editor.fx.0.width=1247
-editor.fx.0.x=87
-editor.fx.0.y=23
+editor.fx.0.height=814
+editor.fx.0.width=1191
+editor.fx.0.x=201
+editor.fx.0.y=-974
 objectbench.height=80
 objectbench.width=595
 package.divider.horizontal=0.5993322203672788
 package.divider.vertical=0.8465608465608465
 package.editor.height=473
 package.editor.width=493
-package.editor.x=102
-package.editor.y=23
+package.editor.x=-188
+package.editor.y=-610
 package.frame.height=625
 package.frame.width=619
 package.numDependencies=4
@@ -55,20 +55,20 @@ target3.name=Calculator
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=90
-target3.x=240
+target3.x=220
 target3.y=80
 target4.height=50
 target4.name=MathMethodsTest
 target4.showInterface=false
 target4.type=UnitTestTargetJunit4
 target4.width=110
-target4.x=170
-target4.y=280
+target4.x=90
+target4.y=250
 target5.association=MathMethodsTest
 target5.height=50
 target5.name=MathMethods
 target5.showInterface=false
 target5.type=ClassTarget
 target5.width=110
-target5.x=140
-target5.y=310
+target5.x=60
+target5.y=280