fixed merged conflict

Console.java

@@ -23,10 +23,16 @@ public class Console {
     }
 
     public static Integer getIntegerInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        Integer userInput = scanner.nextInt();
+        return userInput;
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        Double userInput = scanner.nextDouble();
+        return userInput;
     }
 }

MainApplication.java

@@ -1,17 +1,78 @@
- 
-
 /**
  * Created by leon on 2/9/18.
  */
+import java.util.*;
+
 public class MainApplication {
+    
     public static void main(String[] args) {
+        // Create all instances of classes to be used for this program
+        MainMenu mainMenu = new MainMenu();
+        SciCalc scientificCalc = new SciCalc();
+        MemoryFunc memory = new MemoryFunc();
+        SwitchDisplay baseChange = new SwitchDisplay();
+        
+        // Stored memory value should be able to be used throughout whole application
+        Double memoryValue = memory.memory;
+        
+        // if any input = "m", that input now = the memory value
+        
+        // Menu Input
+        String menuInput = " ";
+        // Giant while loop that links back to main menu
+        while (!menuInput.equals("4")) {
+            mainMenu.mainMenuDisplay();
+            menuInput = Console.getStringInput("Enter the calculator you want to use by key. (ie. 1 for basic, etc.)");
+           
+            switch (menuInput) {
+                case "1":
+                
+                    // Sends to basic calculator functions
+                    break;
+                
+                case "2":
+                
+                    // Sends to Advanced Calculator Functions
+                    break;
+                
+                case "3":
+                
+                    // Sends to Scientific Calculator Functions
+                    // displays the menu for scientific calc
+                    scientificCalc.toSciMenu();
+                    String sciMenuInput = Console.getStringInput("Enter the function you'd like to use by key.");
+                    // if statement to use various calc functions
+                    if (sciMenuInput.equals("1")) {
+                        // Base Conversions
+                        baseChange.switchDisplay();
+                        
+                    } else if (sciMenuInput.equals("2")) {
+                        // Memory
+                        memory.memoryMenu();
+                    } else if (sciMenuInput.equals("3")) {
+                        // To Trig Menu
+                        
+                    } else {
+                        break;
+                    }
+                    break;
+                    
+                case "4":
+                    // Quits the calculator
+                    break;
+                }
+
+        }
+
         Console.println("Welcome to my calculator!");
-        String s = Console.getStringInput("Enter a string");
+        /** String s = Console.getStringInput("Enter a string");
         Integer i = Console.getIntegerInput("Enter an integer");
         Double d = Console.getDoubleInput("Enter a double.");
 
         Console.println("The user input %s as a string", s);
         Console.println("The user input %s as a integer", i);
         Console.println("The user input %s as a d", d);
+        */
+
     }
 }

MainMenu.java

@@ -16,25 +16,17 @@
  */
 public class MainMenu
 {
-    // instance variables - replace the example below with your own
-    private int x;
-
-    /**
-     * Constructor for objects of class MainMenu
-     */
-    public MainMenu()
-    {
-        // initialise instance variables
-        x = 0;
-    }
-
     /**
      * Method to display the main menu
      */
     
     public void mainMenuDisplay()
     {
-        // put your code here
+        Console.println("Calculator Options:"
+                         + "\n1: Basic Calculator (+ - * /)"
+                         + "\n2: Advanced Calculator (Exponential Functions)"
+                         + "\n3: Scientific Functions (Base Conversion, Memory, Trigonometry)"
+                         + "\n4: Exit the calculator");
         
     }
 }

MemoryFunc.java

@@ -1,48 +1,69 @@
 
 /**
- * Scientific Calculator Lab
- * Trinh Tong
- * Memory Class
+
  */
-public class MemoryFunc
-{
-    // instance variables - replace the example below with your own
-    private double memory = 0;
+public class MemoryFunc {
+    public Double memory;
+    public static final Double DEFAULT_MEMORY_VALUE = new Double(0);
 
+    public MemoryFunc() {
+        this.memory = DEFAULT_MEMORY_VALUE;
+    }
     /**
-     * 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
+     * Menu
+     * Clear
+     * Print
+     * Update
      */
-    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");
+    
+    public void memoryMenu() {
+        
+        Console.println("Memory Menu"
+                         + "\n1: M+ - Update stored memory value"
+                         + "\n2: nMC - Clear to default memory value"
+                         + "\n3: nMCR - Display stored memory value"
+                         + "\n4: Cancel - Returns to Main Menu");
                          
-        String memorySelect = Console.getStringInput("What would you like to do? (Enter the key)");
-
+        String memoryOpt = "";
         
-        if (memorySelect.equals("M+") == true) {
-            // M+
-            memory = memoryInput;
+        while (!memoryOpt.equals("4")) {
             
-        } else if (memorySelect.equals("MC") == true) {
-            // MC
-            memory = 0;
+            memoryOpt = Console.getStringInput("Select option by typing the key. (ie 1 for M+)").toLowerCase();
             
-        } else if (memorySelect.equals("MCR") == true) {
-            // MCR
-            Console.println(Double.toString(memory));
-        
+            if (memoryOpt.equals("1")) {
+                
+                Double newMemory = Console.getDoubleInput("Enter the value to store");
+                updateMemory(newMemory);
+                break;
+                
+            } else if (memoryOpt.equals("2")) {
+                
+                clearMemory();
+                break;
+                
+            } else if (memoryOpt.equals("3")) {
+                
+                displayMemory();
+                break;
+                
+            } else {
+                
+                Console.println("Invalid Option");
+                
+            }
         }
-        
-    }  
+    }
+    
+    public void updateMemory(Double memoryInput) {
+        this.memory = memoryInput;
+    }
+    
+    public void clearMemory() {
+        this.memory = DEFAULT_MEMORY_VALUE;
+    }
+    
+    public void displayMemory() {
+        Console.println(memory.toString());
+    }
+    
 }

SciCalc.java

@@ -7,88 +7,13 @@
 public class SciCalc 
 {
 
-    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
 
+    public void toSciMenu() {
+        Console.println("Scientific Calculator Functions:"
+                         + "\n1: Base Conversion - Converts input to selected base"
+                         + "\n2: Memory - Memory functions"
+                         + "\n3: Trigonometry "
+                         + "\n4: Return to Main Menu");        
+        
     }
 }

SwitchDisplay.java

@@ -29,34 +29,54 @@ public class SwitchDisplay
      * switchDisplayMode() rotates through the options
      * switchDisplayMode(String mode) sets the display to the mode given
      */
-    public void switchDisplay(String mode)
+    
+    public void switchDisplay()
     {
-        int baseInput = Console.getIntegerInput("Enter an integer to see the base conversions.");
-        // try catch for int vs double or other input
-        Console.println("Display Options" 
-                         + "\nBinary"
-                         + "\nOctal"
-                         + "\nDecimal"
-                         + "\nHexadecimal"
-                         + "\nCancel: returns to Main Menu");
-        // Accepts next input to display mode.
-        mode = Console.getStringInput("Enter the base option to display.").toLowerCase();
+        String mode = "Invalid Input";
         
-        if (mode.equals("binary") == true) {
-            Console.println(baseInput + "in binary: " + toBinary(baseInput));
-        } else if (mode.equals("octal") == true) {
-            Console.println(baseInput + "in octal: " + toOctal(baseInput));
-        } else if (mode.equals("decimal") == true) {
-            Console.println(baseInput + "in decimal: " + baseInput);
-        } else if (mode.equals("hexadecimal") == true) {
-            Console.println(baseInput + "in hexadecimal: " + toHexa(baseInput));
-        } else if (mode.equals("cancel") == true) {
-            Console.println("Returning to Main Menu");
-            // calls back to main application menu
-        } else {
-            Console.println("Invalid input.");
+        while (mode.equals("Invalid Input")) {
+            int baseInput = Console.getIntegerInput("Enter an integer to see the base conversions.");
+    
+            Console.println("Display Options" 
+                             + "\n1: Binary"
+                             + "\n2: Octal"
+                             + "\n3: Decimal"
+                             + "\n4: Hexadecimal"
+                             + "\n5: Cancel - returns to Main Menu");
+                             
+            // Asks for the mode
+            mode = Console.getStringInput("Enter the desired display mode: ");
+            
+            String convertedInput = switchDisplayOutput(mode, baseInput);
+            
+            Console.println(convertedInput); 
+            // passes to switchDisplayOutput(mode) >> returns string
+            // displays the returned string
+            // while loops !cancel
+        }
+                         
+    }
+    
+    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";
         }
-        
     }
     
     /**

package.bluej

@@ -1,7 +1,8 @@
 #BlueJ package file
-dependency1.from=MainApplication
+dependency1.from=MainMenu
 dependency1.to=Console
 dependency1.type=UsesDependency
+<<<<<<< HEAD
 dependency2.from=SciCalc
 dependency2.to=Console
 dependency2.type=UsesDependency
@@ -15,17 +16,51 @@ editor.fx.0.height=0
 editor.fx.0.width=0
 editor.fx.0.x=0
 editor.fx.0.y=0
+=======
+dependency2.from=SwitchDisplay
+dependency2.to=Console
+dependency2.type=UsesDependency
+dependency3.from=SciCalc
+dependency3.to=Console
+dependency3.type=UsesDependency
+dependency4.from=MainApplication
+dependency4.to=MainMenu
+dependency4.type=UsesDependency
+dependency5.from=MainApplication
+dependency5.to=SciCalc
+dependency5.type=UsesDependency
+dependency6.from=MainApplication
+dependency6.to=MemoryFunc
+dependency6.type=UsesDependency
+dependency7.from=MainApplication
+dependency7.to=SwitchDisplay
+dependency7.type=UsesDependency
+dependency8.from=MainApplication
+dependency8.to=Console
+dependency8.type=UsesDependency
+dependency9.from=MemoryFunc
+dependency9.to=Console
+dependency9.type=UsesDependency
+editor.fx.0.height=722
+editor.fx.0.width=1120
+editor.fx.0.x=320
+editor.fx.0.y=119
+>>>>>>> trinhsCalc
 objectbench.height=214
 objectbench.width=595
 package.divider.horizontal=0.6
 package.divider.vertical=0.6847360912981455
 package.editor.height=473
-package.editor.width=477
+package.editor.width=493
 package.editor.x=35
-package.editor.y=60
+package.editor.y=59
 package.frame.height=759
 package.frame.width=619
+<<<<<<< HEAD
 package.numDependencies=4
+=======
+package.numDependencies=9
+>>>>>>> trinhsCalc
 package.numTargets=8
 package.showExtends=true
 package.showUses=true
@@ -54,8 +89,13 @@ target3.name=MemoryFunc
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=110
+<<<<<<< HEAD
 target3.x=150
 target3.y=410
+=======
+target3.x=210
+target3.y=350
+>>>>>>> trinhsCalc
 target4.height=50
 target4.name=Console
 target4.showInterface=false