memory class add

Calculator.java

@@ -8,7 +8,7 @@ import java.util.*;
  */
 
 class Calculator{
-    
+
     public static void main(String args[]){
 
         String toDo;                //what the user wants to do
@@ -23,232 +23,255 @@ class Calculator{
         while (off == false){
             Scanner input1 = new Scanner(System.in);
             System.out.println("What do you want to do?");
-            toDo = input1.nextLine();
+            toDo = input1.next();
 
-            if (toDo.equals("quit")){
+            if (toDo.equalsIgnoreCase("quit")){
                 off = true;
                 System.out.println("Goodbye!!");
 
-            } 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));
+            } 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 "invert":
-                    result = calc.invert(num1);
-                    memory = result;
-                    calc.printAns(String.valueOf(result));
+                    case "Change" :
+                    System.out.println("Enter number:");
+                    num1 = input1.nextDouble();
+                    result = Memory.memUpdate(num1);
+                    Memory.printAns(String.valueOf(result));
                     break;
                     
-                    case "sine":
-                    result = calc.sin(num1);
-                    memory = result;
-                    calc.printAns(String.valueOf(result));
+                    case "Clear" :
+                    result = Memory.memClear();
+                    Memory.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.format("1/%.0f", 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;
-                    
-                    
                 }
             }
+        
+            
+            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; 
+
+            }
         }
     }
 }
+}
 
-        // /**
-        // * 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;
-        // }*/
-
-        // }
+// /**
+// * 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

@@ -73,7 +73,7 @@ public class MathMethods
     }
 
     public static double inverse(double n1) {
-        return n1;
+        return 1 / n1;
     }
 
     public static double tangent(double n1) {

MathMethodsTest.java

@@ -46,11 +46,6 @@ public class MathMethodsTest
         assertEquals(16, MathMethods.square(4), 0.1);
     }
 
-    @Test
-    public void inverseTest()
-    {
-        assertEquals(5, MathMethods.inverse(5), 0.1);
-    }
 
     @Test
     public void tangentTest()
@@ -63,8 +58,15 @@ public class MathMethodsTest
     {
         assertEquals(1.550798992821746, MathMethods.iTan(50), 0.1);
     }
+
+    @Test
+    public void inverseTest()
+    {
+        assertEquals(.1, MathMethods.inverse(10), 0.1);
+    }
 }
 
 
 
 
+

Memory.java

@@ -0,0 +1,36 @@
+
+/**
+ * Write a description of class Memory here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class Memory
+{
+    private static double mem;
+    
+    public Memory()
+    {
+        // initialise instance variables
+        mem = 0;
+    }
+
+    public static double memRead() 
+    {
+        return mem;    
+    }
+    
+    public static double memUpdate(double n1) 
+    {
+        return mem = n1;
+    }
+    
+    public static double memClear()
+    {
+        return mem = 0;
+    }
+    
+    public static void printAns(String printAnswer){
+        System.out.println(printAnswer);       
+    }
+}

MemoryTest.java

@@ -0,0 +1,66 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class MemoryTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class MemoryTest
+{
+    /**
+     * Default constructor for test class MemoryTest
+     */
+    public MemoryTest()
+    {
+    }
+
+    /**
+     * Sets up the test fixture.
+     *
+     * Called before every test case method.
+     */
+    @Before
+    public void setUp()
+    {
+    }
+
+    /**
+     * Tears down the test fixture.
+     *
+     * Called after every test case method.
+     */
+    @After
+    public void tearDown()
+    {
+    }
+
+    @Test
+    public void memTest()
+    {
+        assertEquals(0, Memory.memRead(), 0.1);
+    }
+
+    @Test
+    public void memUpdateTest()
+    {
+        assertEquals(10, Memory.memUpdate(10), 0.1);
+    }
+
+
+
+    @Test
+    public void memClearTest()
+    {
+        assertEquals(0, Memory.memClear(), 0.1);
+    }
+}
+
+
+
+

package.bluej

@@ -1,10 +1,19 @@
 #BlueJ package file
-dependency1.from=Calculator
+dependency1.from=MathMethodsTest
 dependency1.to=MathMethods
 dependency1.type=UsesDependency
+dependency2.from=Calculator
+dependency2.to=MathMethods
+dependency2.type=UsesDependency
+dependency3.from=Calculator
+dependency3.to=Memory
+dependency3.type=UsesDependency
+dependency4.from=MemoryTest
+dependency4.to=Memory
+dependency4.type=UsesDependency
 editor.fx.0.height=797
 editor.fx.0.width=1247
-editor.fx.0.x=78
+editor.fx.0.x=87
 editor.fx.0.y=23
 objectbench.height=80
 objectbench.width=595
@@ -16,8 +25,8 @@ package.editor.x=102
 package.editor.y=23
 package.frame.height=625
 package.frame.width=619
-package.numDependencies=1
-package.numTargets=2
+package.numDependencies=4
+package.numTargets=5
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,16 +36,39 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Calculator
+target1.name=MemoryTest
 target1.showInterface=false
-target1.type=ClassTarget
-target1.width=90
-target1.x=200
-target1.y=310
+target1.type=UnitTestTargetJunit4
+target1.width=80
+target1.x=400
+target1.y=140
+target2.association=MemoryTest
 target2.height=50
-target2.name=MathMethods
+target2.name=Memory
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=110
-target2.x=70
-target2.y=10
+target2.width=80
+target2.x=370
+target2.y=170
+target3.height=50
+target3.name=Calculator
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=90
+target3.x=240
+target3.y=80
+target4.height=50
+target4.name=MathMethodsTest
+target4.showInterface=false
+target4.type=UnitTestTargetJunit4
+target4.width=110
+target4.x=170
+target4.y=280
+target5.association=MathMethodsTest
+target5.height=50
+target5.name=MathMethods
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=110
+target5.x=140
+target5.y=310