fixed merge conflicts

Adv.java

@@ -0,0 +1,58 @@
+
+/**
+* Scientific Calculator Lab
+* Advanced Calculator Scientific Menu Options
+*/
+public class Adv
+{
+    // instance variables - replace the example below with your own
+    private int memory = 0;
+ 
+    
+    /**
+    * switch display mode
+    * - Binary
+    * - Octal
+    * - Decimal
+    * - Hexadecimal
+    */
+    public int sampleMethod(int y)
+    {
+        // Base Mode
+        Console.println("Base Mode");
+        // Ask for input
+        Integer i = Console.getIntegerInput("Enter an integer");
+        // Display base options
+        // Ask for base option input
+        
+        return 2;
+    }
+    
+    /**
+     * 
+    * Memory Mode
+    * M+ = add currently displaced value to the value in memory default 0
+    * MC = clear memory
+    * MCR = display memory
+    * 
+    */
+    public void memory()
+    {
+        // Memory Mode
+        // Ask for input
+        // Display memory menu
+        // memory option input, if statement
+    }
+    
+    /**
+    * switch display mode
+    * - Binary
+    * - Octal
+    * - Decimal
+    * - Hexadecimal
+    */
+    public void toTrig(int y)
+    {
+        //calls to the trig menu
+    }
+}

AdvCalc.java

@@ -0,0 +1,94 @@
+    
+/**
+* 4.2 Scientific Calculator Group Project
+* Trinh Tong, Lauren Green, Michelle Dimarino
+* Advanced Calculator Menu
+*/
+public class AdvCalc 
+{
+
+    private double memory = 0;
+
+    /**
+     * Switch Display Mode method 
+     * -> binary, octal, decimal, hexadecimal
+     * switchDisplayMode() rotates through the options
+     * switchDisplayMode(String mode) sets the display to the mode given
+     */
+    public void switchDisplay(String mode)
+    {
+        int baseInput = Console.getIntegerInput("Enter an integer to see the base conversions.");
+        
+        Console.println("Display Options" 
+                         + "\nBinary: " + null
+                         + "\nOctal: " + null
+                         + "\nDecimal: " + null
+                         + "\nHexadecimal: " + null
+                         + "\n");
+        
+        mode = Console.getStringInput("Enter the base option to display.");
+        if (mode.toLowerCase().equals("binary") == true) {
+            
+        } else if (mode.toLowerCase().equals("octal") == true) {
+            
+        }
+        
+
+    }
+    
+    /**
+     * Converts the user input into octal and returns a string of that octal.
+     */
+    public String toOctal(int userInput) {
+        
+        return Integer.toOctalString(userInput);
+        
+    }
+    /**
+     * Store 1 numeric value in memory for recall later
+     * M+ = add currently displayed value to the value in memorie (default = 0)
+     * MC = reset memory
+     * MRC = recall current valie from memory to display
+     */
+    public void memory()
+    {
+        // Memory menu
+        Console.println("Memory Mode");
+        // Ask for input of a number
+        double memoryInput = Console.getDoubleInput("Enter a number to store. ");
+        // Display memory keys
+        Console.println("Memory Options: " 
+                         + "\nM+ : adds input to memory"
+                         + "\nMC : clears current memory"
+                         + "\nMRC : displays current memory input");
+                         
+        String memorySelect = Console.getStringInput("What would you like to do? (Enter the key)");
+
+        
+        if (memorySelect.equals("M+") == true) {
+            // M+
+            memory = memoryInput;
+            
+        } else if (memorySelect.equals("MC") == true) {
+            // MC
+            memory = 0;
+            
+        } else if (memorySelect.equals("MCR") == true) {
+            // MCR
+            Console.println(Double.toString(memory));
+        
+        }
+        
+    }  
+    
+    
+    /**
+     * To Trig -
+     * sends user to trig functions of the calculator
+     */
+    public void toTrig(int y)
+    {
+        // calls the trig menu
+        
+    }
+}

README.md

@@ -89,4 +89,4 @@ The following functions should take the displayed value (x) and updated it accor
 
 ## Submission
 
-Completed projects should be submitted by submitting a pull request against the [original repository](https://git.zipcode.rocks/ZipCodeWilmington/ZCW-MacroLabs-OOP-ScientificCalculator). All work should be done in your own repository.
+Completed projects should be submitted by submitting a pull request against the [original repository](https://git.zipcode.rocks/Cohort4.2/ZCW-MacroLabs-OOP-ScientificCalculator). All work should be done in your own repository.

package.bluej

@@ -1,11 +1,14 @@
 #BlueJ package file
-dependency1.from=MainApplication
+dependency1.from=AdvCalc
 dependency1.to=Console
 dependency1.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=801
-editor.fx.0.y=23
+dependency2.from=MainApplication
+dependency2.to=Console
+dependency2.type=UsesDependency
+editor.fx.0.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
 objectbench.height=214
 objectbench.width=595
 package.divider.horizontal=0.6
@@ -16,7 +19,7 @@ package.editor.x=35
 package.editor.y=60
 package.frame.height=759
 package.frame.width=619
-package.numDependencies=1
+package.numDependencies=2
 package.numTargets=4
 package.showExtends=true
 package.showUses=true