fixed merge conflicts

Console.java

@@ -16,15 +16,6 @@ public class Console {
         SwitchDisplay baseChange = new SwitchDisplay();
         Trig trigMenu = new Trig();
 
-        // Stored memory value should be able to be used throughout whole application
-        Double memoryValue = memory.memory;
-
-        // blanket input statement 
-        // create input methods to call when we need them with specific types
-        // we use 1 input variable statement to call the user to input, then manipulate
-        // Can user input M if native type is double
-        // if any input = "m", that input now = memoryValue;
-
         // Menu Input
         String menuInput = " ";
         // Giant while loop that links back to main menu
@@ -37,16 +28,36 @@ public class Console {
                 case "1":
                 basicCalc.Basic();
 
+                double basicInput1 = 0,
+                basicInput2 = 0;
+
                 String basicMode = Console.getStringInput("Enter the mode: ");
-                double basicInput1 = Console.getDoubleInput("Enter the first input: ");
-                double basicInput2 = Console.getDoubleInput("Enter the second input: ");
 
-                double basicAnswer = 0;
+                if (memory.memoryChanged != true) {
+                    basicInput1 = Console.getDoubleInput("Enter the first input: ");
+                    basicInput2 = Console.getDoubleInput("Enter the second input: ");
+                } else if (memory.memoryChanged == true) {
+                    String useMemory = Console.getStringInput("Do you want to use the stored memory value? Y or N: ").toLowerCase();
+                    if (useMemory.equals("y")) {
+                        String whichBasInput = Console.getStringInput("Which input? 1 or 2 or both").toLowerCase();
+                        if (whichBasInput.equals("1")) {
+                            basicInput1 = memory.memory;
+                            basicInput2 = Console.getDoubleInput("Enter the second input: ");
+                        } else if (whichBasInput.equals("2")) {
+                            basicInput2 = memory.memory;
+                            basicInput1 = Console.getDoubleInput("Enter the first input: ");
+                        } else if (whichBasInput.equals("both")) {
+                            basicInput1 = memory.memory;
+                            basicInput2 = memory.memory;
+                        }
+                    }
+                }
 
+                double basicAnswer = 0;
                 if (basicMode.equals("1")) {
                     basicAnswer = basicCalc.getSum(basicInput1, basicInput2);
 
-                    //subtraction    
+                    //subtraction
                 } else if (basicMode.equals("2")) {
                     basicAnswer = basicCalc.getDiff(basicInput1, basicInput2);
 
@@ -54,7 +65,7 @@ public class Console {
                 } else if (basicMode.equals("3")) {
                     basicAnswer = basicCalc.getProduct(basicInput1, basicInput2);
 
-                    //division    
+                    //division
                 } else if (basicMode.equals("4")) {
                     //error message when trying to divide by 0.
                     if (basicInput2 == 0) {
@@ -103,8 +114,12 @@ public class Console {
                 }
                 }else if (mode.equals("4")){
                     advAnswer = advCalc.opposite(advInput1);
+                }else if (mode.equals("5")){
+                    advAnswer = advCalc.absoluteValue(advInput1);
 
-                }else {
+                }else if (mode.equals("6")) {
+                    break;
+                }else{
                     Console.println("Invalid input");
                 }
 
@@ -120,16 +135,36 @@ public class Console {
                 // if statement to use various calc functions
                 if (sciMenuInput.equals("1")) {
                     // Base Conversions
-                    // while loop for display 
+                    // while loop for display
                     String baseMode = "";
 
-                    baseChange.switchDisplay(); 
+                    baseChange.switchDisplay();
+                    String baseAnswer = "";
                     baseMode = Console.getStringInput("Enter the desired display mode: ");
-
                     int userInput = getIntegerInput("Enter the number you want to convert to selected base: ");
 
-                    String baseOutput = baseChange.switchDisplayOutput(baseMode, userInput);
-                    Console.println(baseOutput);
+                    switch (baseMode) {
+                        case "1":
+                        baseAnswer = baseChange.toBinary(userInput);
+
+                        case "2":
+                        baseAnswer = baseChange.toOctal(userInput);
+
+                        case "3":
+                        baseAnswer = baseChange.toDecimal(userInput);
+
+                        case "4":
+                        baseAnswer = baseChange.toHexa(userInput);
+
+                        case "5":
+                        break;
+
+                        default:
+                        Console.println("Invalid Input");
+                        break;
+                    }
+
+                    Console.println(baseAnswer);
 
                     break;
                     // display mode
@@ -137,7 +172,9 @@ public class Console {
                     // asks for input
                 } else if (sciMenuInput.equals("2")) {
                     // Memory
+                    // access memory menu
                     memory.memoryMenu();
+
                 } else if (sciMenuInput.equals("3")) {
                     // To Trig Menu
                     trigMenu.trigFunctions();

MemoryFunc.java

@@ -4,11 +4,14 @@
  */
 public class MemoryFunc {
     public Double memory;
+    public Boolean memoryChanged;
     public static final Double DEFAULT_MEMORY_VALUE = new Double(0);
 
     public MemoryFunc() {
         this.memory = DEFAULT_MEMORY_VALUE;
+        this.memoryChanged = false;
     }
+    
     /**
      * Menu
      * Clear
@@ -20,20 +23,21 @@ public class MemoryFunc {
         
         Console.println("Memory Menu"
                          + "\n1: M+ - Update stored memory value"
-                         + "\n2: nMC - Clear to default memory value"
-                         + "\n3: nMCR - Display stored memory value"
+                         + "\n2: MC - Clear to default memory value"
+                         + "\n3: MCR - Display stored memory value"
                          + "\n4: Cancel - Returns to Main Menu");
                          
         String memoryOpt = "";
         
         while (!memoryOpt.equals("4")) {
             
-            memoryOpt = Console.getStringInput("Select option by typing the key. (ie 1 for M+)");
+            memoryOpt = Console.getStringInput("Select option by typing the key. (ie. 1 for M+)");
             
             if (memoryOpt.equals("1")) {
                 
                 Double newMemory = Console.getDoubleInput("Enter the value to store");
                 this.memory = updateMemory(newMemory);
+                this.memoryChanged = true;
                 break;
                 
             } else if (memoryOpt.equals("2")) {

RealAdvanced.java

@@ -18,30 +18,29 @@ public class RealAdvanced
             "2: x^y" + "\n"+
             "3: 1/x" + "\n"+
             "4: Switch Sign of x" + "\n"+
-            "5: Return to Main Menu");
+            "5: Absolute Value of x" + "\n"+
+            "6: Return to Main Menu");
 
     }
     // method to find x^2
     public double squared(double x){
-
         return Math.pow(x,2);
     }
     // method to find x^y
     public double exponent(double x, double y){
-
         return Math.pow(x,y);
     }
     // method to find the inverse of x
     public double inverse(double x){
-
         return 1/x;
     }
     // method to switch sign of x
     public double opposite(double x){
-
         double opposite1 = -1 * x;
-
         return opposite1;
     }
+    public double absoluteValue(double x){
+        return Math.abs(x);
+    }
 
 }

RealAdvancedTest.java

@@ -0,0 +1,82 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class RealAdvancedTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class RealAdvancedTest
+{
+    /**
+     * Default constructor for test class RealAdvancedTest
+     */
+    public RealAdvancedTest()
+    {
+    }
+
+    /**
+     * 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 squaredTest()
+    {
+        RealAdvanced realAdva1 = new RealAdvanced();
+        assertEquals(9.0, realAdva1.squared(3), 0.1);
+    }
+
+    @Test
+    public void exponentTest()
+    {
+        RealAdvanced realAdva1 = new RealAdvanced();
+        assertEquals(8.0, realAdva1.exponent(2, 3), 0.1);
+    }
+
+    @Test
+    public void oppositeTest()
+    {
+        RealAdvanced realAdva1 = new RealAdvanced();
+        assertEquals(2.0, realAdva1.opposite(-2), 0.1);
+    }
+
+    @Test
+    public void inverseTest()
+    {
+        RealAdvanced realAdva1 = new RealAdvanced();
+        assertEquals(0.5, realAdva1.inverse(2), 0.1);
+    }
+
+    @Test
+    public void absoluteTest()
+    {
+        RealAdvanced realAdva1 = new RealAdvanced();
+        assertEquals(4.0, realAdva1.absoluteValue(-4), 0.1);
+    }
+}
+
+
+
+
+

SwitchDisplay.java

@@ -40,29 +40,7 @@ public class SwitchDisplay
                              + "\n5: Cancel - returns to Main Menu");
                          
     }
-    
-    public String switchDisplayOutput(String mode, int baseInput) {
-        switch (mode) {
-            case "1":
-                return toBinary(baseInput);
-                
-            case "2":
-                return toOctal(baseInput);
-                
-            case "3":
-                return toDecimal(baseInput);
-                
-            case "4":
-                return toHexa(baseInput);
-                
-            case "5":
-                return mode;
-                
-            default:
-                return "Invalid Input";
-        }
-    }
-    
+
     /**
      * Converts the user input into corresponding base types
      */

package.bluej

@@ -3,23 +3,24 @@ dependency1.from=Basic
 dependency1.to=Console
 dependency1.type=UsesDependency
 dependency10.from=Console
-dependency10.to=Basic
+dependency10.to=MainMenu
 dependency10.type=UsesDependency
 dependency11.from=Console
-dependency11.to=RealAdvanced
+dependency11.to=Basic
 dependency11.type=UsesDependency
 dependency12.from=Console
-dependency12.to=SciCalc
+dependency12.to=RealAdvanced
 dependency12.type=UsesDependency
 dependency13.from=Console
-dependency13.to=MemoryFunc
+dependency13.to=SciCalc
 dependency13.type=UsesDependency
 dependency14.from=Console
-dependency14.to=SwitchDisplay
+dependency14.to=MemoryFunc
 dependency14.type=UsesDependency
 dependency15.from=Console
-dependency15.to=Trig
+dependency15.to=SwitchDisplay
 dependency15.type=UsesDependency
+<<<<<<< HEAD
 dependency16.from=BasicTest
 dependency16.to=Basic
 dependency16.type=UsesDependency
@@ -30,42 +31,63 @@ dependency2.from=SciCalc
 dependency2.to=Console
 dependency2.type=UsesDependency
 dependency3.from=RealAdvanced
+=======
+dependency16.from=Console
+dependency16.to=Trig
+dependency16.type=UsesDependency
+dependency2.from=SciCalc
+dependency2.to=Console
+dependency2.type=UsesDependency
+dependency3.from=MemoryFunc
+>>>>>>> 49d5555735b5e26b8076429d9dd1666b4918738c
 dependency3.to=Console
 dependency3.type=UsesDependency
-dependency4.from=MemoryFunc
+dependency4.from=Trig
 dependency4.to=Console
 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=Console
-dependency9.to=MainMenu
+dependency9.from=RealAdvancedTest
+dependency9.to=RealAdvanced
 dependency9.type=UsesDependency
-editor.fx.0.height=749
+editor.fx.0.height=709
 editor.fx.0.width=1215
-editor.fx.0.x=145
-editor.fx.0.y=74
-objectbench.height=214
+editor.fx.0.x=65
+editor.fx.0.y=23
+objectbench.height=198
 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
+<<<<<<< HEAD
 package.numDependencies=17
 package.numTargets=11
+=======
+package.numDependencies=16
+package.numTargets=10
+>>>>>>> 49d5555735b5e26b8076429d9dd1666b4918738c
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -83,6 +105,7 @@ target1.width=80
 target1.x=320
 target1.y=180
 target10.height=50
+<<<<<<< HEAD
 target10.name=MainMenu
 target10.showInterface=false
 target10.type=ClassTarget
@@ -96,6 +119,14 @@ target11.type=ClassTarget
 target11.width=120
 target11.x=70
 target11.y=70
+=======
+target10.name=MainApplication
+target10.showInterface=false
+target10.type=ClassTarget
+target10.width=120
+target10.x=70
+target10.y=70
+>>>>>>> 49d5555735b5e26b8076429d9dd1666b4918738c
 target2.height=50
 target2.name=SciCalc
 target2.showInterface=false
@@ -103,6 +134,7 @@ target2.type=ClassTarget
 target2.width=80
 target2.x=10
 target2.y=280
+target3.association=RealAdvancedTest
 target3.height=50
 target3.name=RealAdvanced
 target3.showInterface=false
@@ -111,12 +143,21 @@ target3.width=110
 target3.x=170
 target3.y=10
 target4.height=50
+<<<<<<< HEAD
 target4.name=TrigTest
 target4.showInterface=false
 target4.type=UnitTestTargetJunit4
 target4.width=80
 target4.x=350
 target4.y=40
+=======
+target4.name=Console
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=80
+target4.x=70
+target4.y=170
+>>>>>>> 49d5555735b5e26b8076429d9dd1666b4918738c
 target5.height=50
 target5.name=MemoryFunc
 target5.showInterface=false
@@ -140,6 +181,7 @@ target7.x=350
 target7.y=150
 target8.association=TrigTest
 target8.height=50
+<<<<<<< HEAD
 target8.name=Trig
 target8.showInterface=false
 target8.type=ClassTarget
@@ -153,3 +195,18 @@ target9.type=ClassTarget
 target9.width=110
 target9.x=80
 target9.y=350
+=======
+target8.name=RealAdvancedTest
+target8.showInterface=false
+target8.type=UnitTestTargetJunit4
+target8.width=110
+target8.x=200
+target8.y=-20
+target9.height=50
+target9.name=MainMenu
+target9.showInterface=false
+target9.type=ClassTarget
+target9.width=90
+target9.x=70
+target9.y=10
+>>>>>>> 49d5555735b5e26b8076429d9dd1666b4918738c