updated commit

Calculator.java

@@ -6,47 +6,67 @@ import java.lang.Math;
  * @1.0   05/27/2018
  */
 
-public class Calculator{      
-    
+public class Calculator extends Main{         
+
         public double add(double x, double y){
-            return x + y;           
+            return x + y;        
         }
-        
+
         public double subtract(double x, double y){
             return x - y;
         }        
-        
+
         public double multiply(double x, double y){
             return x * y;
         }
-        
+
         public double divide(double x, double y){
             return x / y;
         }
-        
+
+        public double getPow(double x, double y){
+            return Math.pow(x, y);    
+        }
+            
         public double invert(double x){
             return x * (-1);
         }       
-        
+
         public double square(double x){
             return x * x;
         }
-        
+
         public double squareRoot(double x){
             return Math.sqrt(x);
         }
-        
-        public double getPow(double x, double y){
-            Scanner in = new Scanner(System.in);
-            System.out.println("Enter base value: ");
-            double first = in.nextInt();
-            System.out.println("Enter exponent value: ");
-            double second = in.nextInt();
-            return Math.pow(x, y);    
+
+        public double getInverse(double x){
+            return (1/x);           
         }
-        //public double getInverse(double x){
-            
-            
+
+        public double getCosine(double x){         
+            return Math.cos(Math.toRadians(x));
+        }
+
+        public double getSine(double x){
+            return Math.sin(Math.toRadians(x));
+        }
+
+        public double getTan(double x){
+            return Math.tan(Math.toRadians(x));
+        }
+
+        public double inverseSin(double x){
+            return Math.asin(x);
+        }
+
+        public double inverseCos(double x){
+            return Math.acos(x);
         }
-       
-    //}
+
+        public double inverseTan(double x){
+            return Math.atan(x);
+        }
+    }
+
+

Console.java

@@ -27,7 +27,7 @@ public class Console {
     public static Double getDoubleInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
-        double y = scanner.nextDouble();
-        return y;
+        double userInput = scanner.nextDouble();
+        return userInput;
     }
 }

Main.java

@@ -7,72 +7,114 @@ public class Main{
 
         //Calls class Calculator, Console, and Memory
         Calculator calc = new Calculator();
-        Memory memory = new Memory();
+        Memory memo = new Memory();
 
         //User input
         Scanner reader = new Scanner(System.in);
-        System.out.println("Welcome to Calculator!");        
+        Console.println("Welcome to Calculator!");        
         double value = 0; 
+        double saveValue = 0;
 
-        while(true){
-            System.out.println("0");
-            Console.println("(-) to Invert");
-            double x = reader.nextDouble();
-            String toggleInvert = reader.next();
-            reader.nextLine();
-            
-            
-            switch(toggleInvert){
+                      
+        while(true){               
+            Console.println("Pick Operation: Clear  (-)  +  -  *  /  Sq  SqRt  Power\nPick Operation: Cos  Sin  Tan  -Cos  -Sin  -Tan");
+            String button = reader.nextLine();
+            double x = saveValue;
+            ArrayList<String> button1 = Arrays.asList("(-)", "Sq", "SqRt", "Cos", "Sin", "Tan", "-Cos", "-Sin", "-Tan");
+            ArrayList<String> button2 = Arrays.asList("+","-","*","/","Power");
+                                   
+            if(saveValue == 0){
+                 x = Console.getDoubleInput("Input number:");                
+            }else if(button.equalsIgnoreCase("Clear")){
+                 continue;
+            }else if(button1.contains(
+               
+                                                          
+            switch(button1){                
                 case "(-)":
                     value = calc.invert(x);
-                    System.out.print(value);
-                while(true){   
-                    
-                    Console.println("Choose an operation:OFF +  -  *  /");
-                    String button = reader.nextLine();
-                    reader.nextLine();
-                    System.out.println("");
-                    double y = reader.nextDouble();            
-
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+                case "Sq":
+                    value = calc.square(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+                case "SqRt":
+                    value = calc.squareRoot(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+                case "Cos":
+                    value = calc.getCosine(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+                case "Sin":
+                    value = calc.getSine(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+                case "Tan":
+                    value = calc.getTan(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+                case "-Cos":
+                    value = calc.inverseCos(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+                case "-Sin":
+                    value = calc.inverseSin(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+                case "-Tan":
+                    value = calc.inverseTan(x);   
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+               }
+            
+            double y = Console.getDoubleInput("Input Number:");            
+            
+            switch(button2){
+                case "Clear":
+                    value = 0; 
+                    break;                                     
+                case "+":
+                    value = calc.add(x, y);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+                case "-":
+                    value = calc.subtract(x, y);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+                case "*":
+                    value = calc.multiply(x, y);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
+                case "/":
+                    value = calc.divide(x, y);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;                                                   
+                case "Power":
+                    value = calc.getPow(x, y);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;                  
+                default:
+                    Console.print("Err"); 
+                    break;                   
+            }   
             
-                    switch(button){
-                        case "OFF":
-                            return;
-                        case "+":
-                            value = calc.add(x, y);
-                            System.out.print(value);
-                            break;
-                        case "-":
-                            value = calc.subtract(x, y);
-                            System.out.print(value);
-                            break;
-                        case "*":
-                            value = calc.multiply(x, y);
-                            System.out.print(value);
-                            break;
-                        case "/":
-                            value = calc.divide(x, y);
-                            System.out.print(value);
-                            break;                    
-                        case "Sq":
-                            value = calc.square(x);
-                            System.out.print(value);
-                            break;
-                        case "SqRoot":
-                            value = calc.squareRoot(x);
-                            System.out.print(value);
-                            break;
-                        case "Power":
-                            value = calc.getPow(x, y);
-                            System.out.print(value);
-                            break;               
-                        default:
-                            System.out.println("Error");        
-                    }               
-                }
-
-            }
-
         }
     }
-}
+}
+

Memory.java

@@ -1,33 +1,14 @@
-
-/**
- * Write a description of class Memory here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
-public class Memory
-{
-    // instance variables - replace the example below with your own
-    private int x;
-
-    /**
-     * Constructor for objects of class Memory
-     */
-    public Memory()
-    {
-        // initialise instance variables
-        x = 0;
+public class Memory{
+      
+    public void saveNumber(double value){
+        double saved = value;
     }
-
-    /**
-     * An example of a method - replace this comment with your own
-     *
-     * @param  y  a sample parameter for a method
-     * @return    the sum of x and y
-     */
-    public int sampleMethod(int y)
-    {
-        // put your code here
-        return x + y;
+    
+    public void eraseNumber(double saveNumber){
+        saveNumber = 0;
+    }
+    
+    public void recallNumber(double value){
+        double saved = value;
     }
 }

package.bluej

@@ -1,23 +1,29 @@
 #BlueJ package file
-dependency1.from=MainApplication
-dependency1.to=Console
+dependency1.from=Main
+dependency1.to=Calculator
 dependency1.type=UsesDependency
-editor.fx.0.height=709
-editor.fx.0.width=800
-editor.fx.0.x=151
+dependency2.from=Main
+dependency2.to=Console
+dependency2.type=UsesDependency
+dependency3.from=Memory
+dependency3.to=Console
+dependency3.type=UsesDependency
+editor.fx.0.height=989
+editor.fx.0.width=1494
+editor.fx.0.x=1706
 editor.fx.0.y=23
 objectbench.height=80
-objectbench.width=489
-package.divider.horizontal=0.8280467445742905
+objectbench.width=352
+package.divider.horizontal=0.5993322203672788
 package.divider.vertical=0.8112798264642083
 package.editor.height=367
 package.editor.width=493
-package.editor.x=1280
-package.editor.y=559
+package.editor.x=1314
+package.editor.y=141
 package.frame.height=519
 package.frame.width=619
-package.numDependencies=1
-package.numTargets=2
+package.numDependencies=3
+package.numTargets=4
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,16 +33,30 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Console
+target1.name=Memory
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=80
-target1.x=80
+target1.x=260
 target1.y=200
 target2.height=50
-target2.name=MainApplication
+target2.name=Calculator
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=120
-target2.x=70
-target2.y=70
+target2.width=90
+target2.x=10
+target2.y=140
+target3.height=50
+target3.name=Console
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=80
+target3.x=310
+target3.y=90
+target4.height=50
+target4.name=Main
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=80
+target4.x=120
+target4.y=30