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

Console.java

@@ -116,8 +116,10 @@ public class Console {
                     advAnswer = advCalc.opposite(advInput1);
                 }else if (mode.equals("5")){
                     advAnswer = advCalc.absoluteValue(advInput1);
+                }else if (mode.equals("6")){
+                    advAnswer = advCalc.sqrt(advInput1);
 
-                }else if (mode.equals("6")) {
+                }else if (mode.equals("7")) {
                     break;
                 }else{
                     Console.println("Invalid input");

RealAdvanced.java

@@ -19,7 +19,8 @@ public class RealAdvanced
             "3: 1/x" + "\n"+
             "4: Switch Sign of x" + "\n"+
             "5: Absolute Value of x" + "\n"+
-            "6: Return to Main Menu");
+            "6: Square Root of x" + "\n"+
+            "7: Return to Main Menu");
 
     }
     // method to find x^2
@@ -42,5 +43,7 @@ public class RealAdvanced
     public double absoluteValue(double x){
         return Math.abs(x);
     }
-
+public double sqrt(double x){
+    return Math.sqrt(x);
+}
 }

RealAdvancedTest.java

@@ -74,9 +74,17 @@ public class RealAdvancedTest
         RealAdvanced realAdva1 = new RealAdvanced();
         assertEquals(4.0, realAdva1.absoluteValue(-4), 0.1);
     }
+
+    @Test
+    public void squareRootTest()
+    {
+        RealAdvanced realAdva1 = new RealAdvanced();
+        assertEquals(5.0, realAdva1.sqrt(25), 0.1);
+    }
 }
 
 
 
 
 
+

package.bluej

@@ -3,37 +3,25 @@ dependency1.from=Basic
 dependency1.to=Console
 dependency1.type=UsesDependency
 dependency10.from=Console
-dependency10.to=MainMenu
+dependency10.to=Basic
 dependency10.type=UsesDependency
 dependency11.from=Console
-dependency11.to=Basic
+dependency11.to=RealAdvanced
 dependency11.type=UsesDependency
 dependency12.from=Console
-dependency12.to=RealAdvanced
+dependency12.to=SciCalc
 dependency12.type=UsesDependency
 dependency13.from=Console
-dependency13.to=SciCalc
+dependency13.to=MemoryFunc
 dependency13.type=UsesDependency
 dependency14.from=Console
-dependency14.to=MemoryFunc
+dependency14.to=SwitchDisplay
 dependency14.type=UsesDependency
 dependency15.from=Console
-dependency15.to=SwitchDisplay
+dependency15.to=Trig
 dependency15.type=UsesDependency
-<<<<<<< HEAD
-dependency16.from=BasicTest
-dependency16.to=Basic
-dependency16.type=UsesDependency
-dependency17.from=TrigTest
-dependency17.to=Trig
-dependency17.type=UsesDependency
-dependency2.from=SciCalc
-dependency2.to=Console
-dependency2.type=UsesDependency
-dependency3.from=RealAdvanced
-=======
-dependency16.from=Console
-dependency16.to=Trig
+dependency16.from=RealAdvancedTest
+dependency16.to=RealAdvanced
 dependency16.type=UsesDependency
 dependency2.from=SciCalc
 dependency2.to=Console
@@ -48,24 +36,17 @@ dependency4.type=UsesDependency
 dependency5.from=Trig
 dependency5.to=Console
 dependency5.type=UsesDependency
-<<<<<<< HEAD
 dependency6.from=SwitchDisplay
 dependency6.to=Console
 dependency6.type=UsesDependency
 dependency7.from=MainMenu
-=======
-dependency6.from=MainMenu
-dependency6.to=Console
-dependency6.type=UsesDependency
-dependency7.from=MainApplication
->>>>>>> 49d5555735b5e26b8076429d9dd1666b4918738c
 dependency7.to=Console
 dependency7.type=UsesDependency
 dependency8.from=MainApplication
 dependency8.to=Console
 dependency8.type=UsesDependency
-dependency9.from=RealAdvancedTest
-dependency9.to=RealAdvanced
+dependency9.from=Console
+dependency9.to=MainMenu
 dependency9.type=UsesDependency
 editor.fx.0.height=709
 editor.fx.0.width=1215