Merge branch 'master' of mdimarino/ZCW-MacroLabs-OOP-ScientificCalculator into master

RealAdvanced.java

@@ -0,0 +1,71 @@
+
+/**
+ * Method for the RealAdvanced class
+ *
+ * @Michelle DiMarino
+ * @10.21.18
+ */
+
+import java.util.*;
+
+public class RealAdvanced
+{
+
+    public void RealAdvanced()
+    {
+        String prompt1 = "Please Select one of the following Calculations: " +"\n"+
+            "Option 1: x^2" + "\n"+
+            "Option 2: x^y" + "\n"+
+            "Option 3: 1/x" + "\n"+
+            "Option 4: Switch Sign of x" + "\n"+
+            "Option 5: Return to Main Menu";
+
+        Integer option = Console.getIntegerInput(prompt1);
+        String prompt = "Enter value of x";
+        double x = Console.getDoubleInput(prompt1);
+        while (option != 5){
+            if (option == 1){
+                squared(x);
+
+            }else if (option == 2){
+                String prompt2= "Enter Value of y";
+                double y = Console.getDoubleInput(prompt2);
+                exponent(x,y);
+
+            }else if (option == 3){
+                String prompt3= "Enter Value of x";
+                int input = Console.getIntegerInput(prompt3);
+                inverse(input);
+
+            }else if (option == 4){
+                opposite(x);
+
+            }else {
+                Console.println("Invalid input");
+            }
+        } 
+    }
+    // method to find x^2
+    public void squared(double x){
+
+        Console.println(Double.toString(Math.pow(x,2)));
+    }
+    // method to find x^y
+    public void exponent(double x, double y){
+
+        Console.println(Double.toString(Math.pow(x,y)));
+    }
+    // method to find the inverse of x
+    public void inverse(int x){
+
+        Console.println(Integer.toString(Integer.reverse(x)));
+    }
+    // method to switch sign of x
+    public void opposite(double x){
+
+        double opposite1 = -1 * x;
+        Console.println(Double.toString(opposite1));
+
+    }
+
+}

package.bluej

@@ -1,62 +1,26 @@
 #BlueJ package file
-dependency1.from=Trig
+dependency1.from=MainApplication
 dependency1.to=Console
 dependency1.type=UsesDependency
-dependency10.from=MainApplication
-dependency10.to=MemoryFunc
-dependency10.type=UsesDependency
-dependency11.from=MainApplication
-dependency11.to=SwitchDisplay
-dependency11.type=UsesDependency
-dependency12.from=MainApplication
-dependency12.to=Console
-dependency12.type=UsesDependency
-dependency2.from=Basic
+dependency2.from=RealAdvanced
 dependency2.to=Console
 dependency2.type=UsesDependency
-dependency3.from=BasicTest
-dependency3.to=Basic
-dependency3.type=UsesDependency
-dependency4.from=SciCalc
-dependency4.to=Console
-dependency4.type=UsesDependency
-dependency5.from=MemoryFunc
-dependency5.to=Console
-dependency5.type=UsesDependency
-dependency6.from=SwitchDisplay
-dependency6.to=Console
-dependency6.type=UsesDependency
-dependency7.from=MainMenu
-dependency7.to=Console
-dependency7.type=UsesDependency
-dependency8.from=MainApplication
-dependency8.to=MainMenu
-dependency8.type=UsesDependency
-dependency9.from=MainApplication
-dependency9.to=SciCalc
-dependency9.type=UsesDependency
-editor.fx.0.height=0
-editor.fx.0.width=0
-editor.fx.0.x=0
-editor.fx.0.y=0
-editor.fx.0.height=722
-editor.fx.0.width=1120
-editor.fx.0.x=320
-editor.fx.0.y=119
-=======
->>>>>>> origin
-objectbench.height=214
-objectbench.width=706
+editor.fx.0.height=709
+editor.fx.0.width=800
+editor.fx.0.x=338
+editor.fx.0.y=23
+objectbench.height=198
+objectbench.width=595
 package.divider.horizontal=0.6
-package.divider.vertical=0.720253164556962
-package.editor.height=562
-package.editor.width=604
+package.divider.vertical=0.685099846390169
+package.editor.height=439
+package.editor.width=493
 package.editor.x=35
-package.editor.y=60
-package.frame.height=848
-package.frame.width=730
-package.numDependencies=12
-package.numTargets=9
+package.editor.y=23
+package.frame.height=709
+package.frame.width=619
+package.numDependencies=2
+package.numTargets=3
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -65,67 +29,24 @@ readme.name=@README
 readme.width=47
 readme.x=10
 readme.y=10
-target1.association=BasicTest
 target1.height=50
-target1.name=Basic
+target1.name=RealAdvanced
 target1.showInterface=false
 target1.type=ClassTarget
-target1.width=80
-target1.x=320
-target1.y=180
+target1.width=110
+target1.x=300
+target1.y=40
 target2.height=50
-target2.name=SciCalc
+target2.name=Console
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=120
-target2.y=10
+target2.x=80
+target2.y=200
 target3.height=50
-target3.name=MemoryFunc
+target3.name=MainApplication
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=110
-target3.x=10
-target3.y=130
-target4.height=50
-target4.name=Console
-target4.showInterface=false
-target4.type=ClassTarget
-target4.width=80
-target4.x=80
-target4.y=200
-target5.height=50
-target5.name=BasicTest
-target5.showInterface=false
-target5.type=UnitTestTargetJunit4
-target5.width=80
-target5.x=350
-target5.y=150
-target6.height=50
-target6.name=Trig
-target6.showInterface=false
-target6.type=ClassTarget
-target6.width=80
-target6.x=320
-target6.y=70
-target7.height=50
-target7.name=SwitchDisplay
-target7.showInterface=false
-target7.type=ClassTarget
-target7.width=110
-target7.x=120
-target7.y=130
-target8.height=50
-target8.name=MainMenu
-target8.showInterface=false
-target8.type=ClassTarget
-target8.width=90
-target8.x=170
-target8.y=190
-target9.height=50
-target9.name=MainApplication
-target9.showInterface=false
-target9.type=ClassTarget
-target9.width=120
-target9.x=70
-target9.y=70
+target3.width=120
+target3.x=70
+target3.y=70