backup

Calculator.java

@@ -27,6 +27,24 @@ public class Calculator
     double result = x/y;
     return result;
     }
-
-  
+    
+    public static double square(double x) {
+    double result = Math.pow(x, 2);
+    return result;
+    }
+    
+    public static double inverse(double x) {
+    double result = x;
+    return result;
+    }
+    
+    public static double tangent(double x) {
+    double result = Math.tan(x);
+    return result;
+    }
+    
+    public static double itan(double x) {
+    double result = Math.atan(x);
+    return result;
+    }
 }

Console.java

@@ -61,6 +61,33 @@ public class Console {
                 ultimateAnswer = Double.toString(answer);
                 return ultimateAnswer;
                 
+            case "square" :
+                System.out.println("Enter your number:");
+                userInput = scanner.nextDouble();
+                answer = Calculator.square(userInput);
+                ultimateAnswer = Double.toString(answer);
+                return ultimateAnswer;
+                
+            case "inverse" :
+                System.out.println("Enter your number:");
+                userInput = scanner.nextDouble();
+                answer = Calculator.inverse(userInput);
+                ultimateAnswer = String.format("1/%.0f", answer);
+                return ultimateAnswer;   
+                
+            case "tangent" :
+                System.out.println("Enter your number:");
+                userInput = scanner.nextDouble();
+                answer = Calculator.tangent(userInput);
+                ultimateAnswer = Double.toString(answer);
+                return ultimateAnswer;
+                
+            case "inverse tangent" :
+                System.out.println("Enter your number:");
+                userInput = scanner.nextDouble();
+                answer = Calculator.itan(userInput);
+                ultimateAnswer = Double.toString(answer);
+                return ultimateAnswer;
             case "quit" :
                     return "quit";
            

Memory.java

@@ -0,0 +1,20 @@
+
+/**
+ * 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 ow
+
+
+
+    public void memorySet(double x)
+    {
+        mem = x;
+    }
+    
+    public void memoryRecall(double x)
+}

package.bluej

@@ -1,26 +1,26 @@
 #BlueJ package file
-dependency1.from=MainApplication
-dependency1.to=Console
+dependency1.from=Console
+dependency1.to=Calculator
 dependency1.type=UsesDependency
-dependency2.from=Console
-dependency2.to=Calculator
+dependency2.from=MainApplication
+dependency2.to=Console
 dependency2.type=UsesDependency
-editor.fx.0.height=1020
-editor.fx.0.width=1247
-editor.fx.0.x=2093
-editor.fx.0.y=165
+editor.fx.0.height=765
+editor.fx.0.width=863
+editor.fx.0.x=601
+editor.fx.0.y=-945
 objectbench.height=80
-objectbench.width=352
+objectbench.width=595
 package.divider.horizontal=0.5993322203672788
 package.divider.vertical=0.8465608465608465
-package.editor.height=473
+package.editor.height=457
 package.editor.width=493
-package.editor.x=1446
-package.editor.y=445
+package.editor.x=102
+package.editor.y=-1057
 package.frame.height=625
 package.frame.width=619
 package.numDependencies=2
-package.numTargets=3
+package.numTargets=4
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -30,23 +30,30 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Calculator
+target1.name=Memory
 target1.showInterface=false
 target1.type=ClassTarget
-target1.width=90
-target1.x=200
-target1.y=310
+target1.width=80
+target1.x=400
+target1.y=120
 target2.height=50
-target2.name=Console
+target2.name=Calculator
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=80
-target2.x=80
-target2.y=200
+target2.width=90
+target2.x=200
+target2.y=310
 target3.height=50
-target3.name=MainApplication
+target3.name=Console
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=120
-target3.x=70
-target3.y=70
+target3.width=80
+target3.x=80
+target3.y=200
+target4.height=50
+target4.name=MainApplication
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=120
+target4.x=70
+target4.y=70