fixed merge

Console.java

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

RealAdvanced.java

@@ -20,7 +20,8 @@ public class RealAdvanced
             "4: Switch Sign of x" + "\n"+
             "5: Absolute Value of x" + "\n"+
             "6: Square Root of x" + "\n"+
-            "7: Return to Main Menu");
+            "7: Factorial x!"+"\n"+
+            "8: Return to Main Menu");
 
     }
     // method to find x^2
@@ -46,4 +47,11 @@ public class RealAdvanced
 public double sqrt(double x){
     return Math.sqrt(x);
 }
+public double factorial(double x){
+    double answer = 1;
+    for (double i = x; i >0; i--){
+        answer = answer * i;
+    }
+    return answer;
+}
 }

RealAdvancedTest.java

@@ -81,6 +81,13 @@ public class RealAdvancedTest
         RealAdvanced realAdva1 = new RealAdvanced();
         assertEquals(5.0, realAdva1.sqrt(25), 0.1);
     }
+
+    @Test
+    public void factorialTest()
+    {
+        RealAdvanced realAdva1 = new RealAdvanced();
+        assertEquals(120.0, realAdva1.factorial(5), 0.1);
+    }
 }
 
 
@@ -88,3 +95,4 @@ public class RealAdvancedTest
 
 
 
+

SwitchDisplay.java

@@ -59,7 +59,7 @@ public class SwitchDisplay
     
     public String toDecimal(int userInput) {
         
-        return Integer.toBinaryString((int)userInput);
+        return Integer.toString(userInput);
         
     }
     

SwitchDisplayTest.java

@@ -0,0 +1,74 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class SwitchDisplayTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class SwitchDisplayTest
+{
+    /**
+     * Default constructor for test class SwitchDisplayTest
+     */
+    public SwitchDisplayTest()
+    {
+    }
+
+    /**
+     * 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 toBinary()
+    {
+        SwitchDisplay switchDi1 = new SwitchDisplay();
+        assertEquals("101101", switchDi1.toBinary(45));
+    }
+
+    @Test
+    public void toOctal()
+    {
+        SwitchDisplay switchDi1 = new SwitchDisplay();
+        assertEquals("55", switchDi1.toOctal(45));
+    }
+
+    @Test
+    public void toHexa()
+    {
+        SwitchDisplay switchDi1 = new SwitchDisplay();
+        assertEquals("2d", switchDi1.toHexa(45));
+    }
+
+    @Test
+    public void toDecimal()
+    {
+        SwitchDisplay switchDi1 = new SwitchDisplay();
+        assertEquals("45", switchDi1.toDecimal(45));
+    }
+}
+
+
+
+

package.bluej

@@ -18,7 +18,7 @@ dependency14.from=Console
 dependency14.to=SwitchDisplay
 dependency14.type=UsesDependency
 dependency15.from=Console
-dependency15.to=Trig
+dependency15.to=SwitchDisplay
 dependency15.type=UsesDependency
 dependency16.from=Trig
 dependency16.to=Console
@@ -60,12 +60,12 @@ editor.fx.0.y=0
 objectbench.height=214
 objectbench.width=595
 package.divider.horizontal=0.6
-package.divider.vertical=0.6847360912981455
-package.editor.height=473
+package.divider.vertical=0.685099846390169
+package.editor.height=439
 package.editor.width=493
 package.editor.x=35
-package.editor.y=59
-package.frame.height=759
+package.editor.y=23
+package.frame.height=709
 package.frame.width=619
 package.numDependencies=18
 package.numTargets=12