merge conflict resolved

BasicTest.java

@@ -0,0 +1,139 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class BasicTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class BasicTest
+{
+    /**
+     * Default constructor for test class BasicTest
+     */
+    public BasicTest()
+    {
+    }
+
+    /**
+     * 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 testAdd()
+    {
+        Basic basic1 = new Basic();
+        assertEquals(14, basic1.getSum(4, 10), 0.1);
+    }
+
+    @Test
+    public void testAddDec()
+    {
+        Basic basic1 = new Basic();
+        assertEquals(13.27, basic1.getSum(13.2, 0.07), 0.1);
+    }
+
+    @Test
+    public void testAddNeg()
+    {
+        Basic basic1 = new Basic();
+        basic1.Basic();
+        assertEquals(6, basic1.getSum(-3, 9), 0.1);
+    }
+
+    @Test
+    public void testSub()
+    {
+        Basic basic1 = new Basic();
+        assertEquals(5, basic1.getDiff(10, 5), 0.1);
+    }
+
+    @Test
+    public void testSubDec()
+    {
+        Basic basic1 = new Basic();
+        assertEquals(4.65, basic1.getDiff(13.2, 8.55), 0.1);
+    }
+
+    @Test
+    public void testSubNeg()
+    {
+        Basic basic1 = new Basic();
+        assertEquals(18, basic1.getDiff(6, -12), 0.1);
+    }
+
+    @Test
+    public void testMul()
+    {
+        Basic basic1 = new Basic();
+        assertEquals(15, basic1.getProduct(3, 5), 0.1);
+    }
+
+    @Test
+    public void testMulDec()
+    {
+        Basic basic1 = new Basic();
+        assertEquals(6.8, basic1.getProduct(3.4, 2), 0.1);
+    }
+
+    @Test
+    public void testMulNeg()
+    {
+        Basic basic1 = new Basic();
+        assertEquals(10, basic1.getProduct(-2, -5), 0.1);
+    }
+
+    @Test
+    public void testDiv()
+    {
+        Basic basic1 = new Basic();
+        assertEquals(4, basic1.getQuotient(12, 3), 0.1);
+    }
+
+    @Test
+    public void testDivDec()
+    {
+        Basic basic1 = new Basic();
+        assertEquals(7.4, basic1.getQuotient(14.8, 2), 0.1);
+    }
+
+    @Test
+    public void testDivNeg()
+    {
+        Basic basic1 = new Basic();
+        assertEquals(-3, basic1.getQuotient(-12, 4), 0.1);
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+

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,11 +65,12 @@ 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) {
                         Console.println("undefined");
+                        basicAnswer = Double.NaN;
                         //Insert return to main menu.
                     } else {
                         basicAnswer = basicCalc.getQuotient(basicInput1, basicInput2);
@@ -72,9 +84,11 @@ public class Console {
                     basicAnswer = Double.NaN;
                     Console.println("Invalid Input");
                 }
+
                 Console.println(Double.toString(basicAnswer));
 
                 break;
+
                 case "2":
                 advCalc.realAdvanced();
                 String mode = Console.getStringInput("Enter the mode: ");
@@ -92,8 +106,12 @@ public class Console {
                     advAnswer = advCalc.exponent(advInput1,advInput2);
 
                 }else if (mode.equals("3")){
+                    if (advInput1 == 0) {
+                        Console.println("undefined");
+                        advAnswer = Double.NaN;
+                    } else {
                     advAnswer = advCalc.inverse(advInput1);
-
+                }
                 }else if (mode.equals("4")){
                     advAnswer = advCalc.opposite(advInput1);
                 }else if (mode.equals("5")){
@@ -119,16 +137,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
@@ -136,7 +174,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();

MainMenu.java

@@ -22,7 +22,7 @@ public class MainMenu
     
     public void mainMenuDisplay()
     {
-        Console.println("Calculator Options:"
+        Console.println("\nCalculator Options:"
                          + "\n1: Basic Calculator (+ - * /)"
                          + "\n2: Advanced Calculator (Exponential Functions)"
                          + "\n3: Scientific Functions (Base Conversion, Memory, Trigonometry)"

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")) {

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
      */

TrigTest.java

@@ -0,0 +1,98 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class TrigTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class TrigTest
+{
+    /**
+     * Default constructor for test class TrigTest
+     */
+    public TrigTest()
+    {
+    }
+
+    /**
+     * 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 testSIN()
+    {
+        Trig trig1 = new Trig();
+        assertEquals(-0.54402111088, trig1.calcSin(10), 0.1);
+    }
+
+    @Test
+    public void testCOS()
+    {
+        Trig trig1 = new Trig();
+        assertEquals(-0.83907152907, trig1.calcCos(10), 0.1);
+    }
+
+    @Test
+    public void testTAN()
+    {
+        Trig trig1 = new Trig();
+        assertEquals(0.64836082745, trig1.calcTan(10), 0.1);
+    }
+
+    @Test
+    public void testRadtoDeg()
+    {
+        Trig trig1 = new Trig();
+        assertEquals(37.14833901458697, trig1.toDegrees(0.64836082745), 0.1);
+    }
+
+    @Test
+    public void testArcSin()
+    {
+        Trig trig2 = new Trig();
+        assertEquals(0.523598776, trig2.calcArcsin(0.5), 0.1);
+    }
+
+    @Test
+    public void testArcTan()
+    {
+        Trig trig1 = new Trig();
+        assertEquals(0.463647609, trig1.calcArctan(0.5), 0.1);
+    }
+
+    @Test
+    public void testArcCos()
+    {
+        Trig trig1 = new Trig();
+        assertEquals(1.04719755, trig1.calcArccos(0.5), 0.1);
+    }
+}
+
+
+
+
+
+
+

package.bluej

@@ -27,21 +27,22 @@ dependency2.from=SciCalc
 dependency2.to=Console
 dependency2.type=UsesDependency
 dependency3.from=MemoryFunc
+>>>>>>> 49d5555735b5e26b8076429d9dd1666b4918738c
 dependency3.to=Console
 dependency3.type=UsesDependency
 dependency4.from=Trig
 dependency4.to=Console
 dependency4.type=UsesDependency
-dependency5.from=SwitchDisplay
+dependency5.from=Trig
 dependency5.to=Console
 dependency5.type=UsesDependency
-dependency6.from=MainMenu
+dependency6.from=SwitchDisplay
 dependency6.to=Console
 dependency6.type=UsesDependency
-dependency7.from=MainApplication
+dependency7.from=MainMenu
 dependency7.to=Console
 dependency7.type=UsesDependency
-dependency8.from=RealAdvanced
+dependency8.from=MainApplication
 dependency8.to=Console
 dependency8.type=UsesDependency
 dependency9.from=Console
@@ -61,8 +62,13 @@ package.editor.x=35
 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
@@ -71,6 +77,7 @@ readme.name=@README
 readme.width=47
 readme.x=10
 readme.y=10
+target1.association=BasicTest
 target1.height=50
 target1.name=Basic
 target1.showInterface=false
@@ -79,12 +86,28 @@ target1.width=80
 target1.x=320
 target1.y=180
 target10.height=50
+<<<<<<< HEAD
+target10.name=MainMenu
+target10.showInterface=false
+target10.type=ClassTarget
+target10.width=90
+target10.x=70
+target10.y=10
+target11.height=50
+target11.name=MainApplication
+target11.showInterface=false
+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
@@ -101,12 +124,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
@@ -115,20 +147,36 @@ target5.width=110
 target5.x=210
 target5.y=350
 target6.height=50
-target6.name=Trig
+target6.name=Console
 target6.showInterface=false
 target6.type=ClassTarget
 target6.width=80
-target6.x=320
-target6.y=70
+target6.x=70
+target6.y=170
 target7.height=50
-target7.name=SwitchDisplay
+target7.name=BasicTest
 target7.showInterface=false
-target7.type=ClassTarget
-target7.width=110
-target7.x=80
-target7.y=350
+target7.type=UnitTestTargetJunit4
+target7.width=80
+target7.x=350
+target7.y=150
+target8.association=TrigTest
 target8.height=50
+<<<<<<< HEAD
+target8.name=Trig
+target8.showInterface=false
+target8.type=ClassTarget
+target8.width=80
+target8.x=320
+target8.y=70
+target9.height=50
+target9.name=SwitchDisplay
+target9.showInterface=false
+target9.type=ClassTarget
+target9.width=110
+target9.x=80
+target9.y=350
+=======
 target8.name=RealAdvancedTest
 target8.showInterface=false
 target8.type=UnitTestTargetJunit4
@@ -142,3 +190,4 @@ target9.type=ClassTarget
 target9.width=90
 target9.x=70
 target9.y=10
+>>>>>>> 49d5555735b5e26b8076429d9dd1666b4918738c