merge changes

.gitignore

@@ -177,3 +177,6 @@ target/
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+# DS store
+*.DS_Store

Adv.java

@@ -1,58 +0,0 @@
-
-/**
-* 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

@@ -1,94 +0,0 @@
-    
-/**
-* 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
-        
-    }
-}

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

@@ -0,0 +1,32 @@
+
+/**
+ * Scientific Calculator Lab
+ * 
+ * This class will create the instance of the "Main Menu"
+ * 
+ * This serves to display the options the user can take to use the calculator
+ * 
+ * 1: Basic Menu - 4 basic functions + - * /
+ * 2: Advanced Menu - Exponents & inverse
+ * 3: Scientific Menu - Base Conversions, Memory Functions, Trig Options
+ * 
+ * The point of this method is for the MAIN Application while loop.
+ * Whenever the user opens the calculator OR completes an action
+ * in the submenus, the calculator will return to this main menu.
+ */
+public class MainMenu
+{
+    /**
+     * Method to display the main menu
+     */
+    
+    public void mainMenuDisplay()
+    {
+        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

@@ -0,0 +1,69 @@
+
+/**
+
+ */
+public class MemoryFunc {
+    public Double memory;
+    public static final Double DEFAULT_MEMORY_VALUE = new Double(0);
+
+    public MemoryFunc() {
+        this.memory = DEFAULT_MEMORY_VALUE;
+    }
+    /**
+     * Menu
+     * Clear
+     * Print
+     * Update
+     */
+    
+    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 memoryOpt = "";
+        
+        while (!memoryOpt.equals("4")) {
+            
+            memoryOpt = Console.getStringInput("Select option by typing the key. (ie 1 for M+)").toLowerCase();
+            
+            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

@@ -0,0 +1,19 @@
+
+/**
+* 4.2 Scientific Calculator Group Project
+* Trinh Tong, Lauren Green, Michelle Dimarino
+* Advanced Calculator Menu
+*/
+public class SciCalc 
+{
+
+
+    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

@@ -0,0 +1,109 @@
+
+/**
+ * Write a description of class SwitchDisplay here.
+ *
+ * Scientific Calculator Lab
+ * 
+ * Brings up the switch display menu
+ * Binary
+ * Octal
+ * Decimal
+ * Hexadecimal
+ * 
+ * Changes the mode for EVERYTHING
+ * 
+ * Find a way to store the input and the input as a diff base
+ * then whenever the base is changed, display the base.
+ * pass the input into the methods to return the string.
+ * EVERY TIME AN INPUT IS PLACED, IT WILL BE DISPLAYED AS AN OCTAL
+ * boolean baseChange == true; 
+ *      display the changed display
+ */
+public class SwitchDisplay
+{
+    // instance variables - replace the example below with your own
+
+    /**
+     * 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 = "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";
+        }
+    }
+    
+    /**
+     * Converts the user input into corresponding base types
+     */
+    
+    public String toBinary(int userInput) {
+        
+        return Integer.toBinaryString(userInput);
+        
+    }
+    
+    public String toOctal(int userInput) {
+        
+        return Integer.toOctalString(userInput);
+        
+    }
+    
+    public String toDecimal(int userInput) {
+        
+        return Integer.toBinaryString(userInput);
+        
+    }
+    
+    public String toHexa(int userInput) {
+    
+        return Integer.toHexString(userInput);
+    
+    }
+}

package.bluej

@@ -1,23 +1,51 @@
 #BlueJ package file
-dependency1.from=MainApplication
+dependency1.from=MainMenu
 dependency1.to=Console
 dependency1.type=UsesDependency
-dependency2.from=AdvCalc
+<<<<<<< HEAD
+dependency2.from=SciCalc
 dependency2.to=Console
 dependency2.type=UsesDependency
-dependency3.from=Adv
+dependency3.from=MemoryFunc
 dependency3.to=Console
 dependency3.type=UsesDependency
-dependency4.from=Basic
+dependency4.from=SwitchDisplay
 dependency4.to=Console
 dependency4.type=UsesDependency
-dependency5.from=Trig
-dependency5.to=Console
+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
-editor.fx.0.height=958
-editor.fx.0.width=904
-editor.fx.0.x=759
-editor.fx.0.y=23
+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
+>>>>>>> 5b0bd69a84477726debf8e0b897ce7f6e0cbe025
 objectbench.height=214
 objectbench.width=706
 package.divider.horizontal=0.6
@@ -25,11 +53,15 @@ package.divider.vertical=0.720253164556962
 package.editor.height=562
 package.editor.width=604
 package.editor.x=35
-package.editor.y=60
-package.frame.height=848
-package.frame.width=730
-package.numDependencies=5
-package.numTargets=6
+package.editor.y=59
+package.frame.height=759
+package.frame.width=619
+<<<<<<< HEAD
+package.numDependencies=4
+=======
+package.numDependencies=9
+package.numTargets=8
+>>>>>>> 5b0bd69a84477726debf8e0b897ce7f6e0cbe025
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -46,26 +78,31 @@ target1.width=80
 target1.x=90
 target1.y=10
 target2.height=50
-target2.name=Basic
+target2.name=SciCalc
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=320
-target2.y=180
+target2.x=10
+target2.y=280
 target3.height=50
-target3.name=Adv
+target3.name=MemoryFunc
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=80
-target3.x=180
-target3.y=10
+target3.width=110
+<<<<<<< HEAD
+target3.x=150
+target3.y=410
+=======
+target3.x=210
+target3.y=350
+>>>>>>> 5b0bd69a84477726debf8e0b897ce7f6e0cbe025
 target4.height=50
 target4.name=Console
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=80
-target4.x=80
-target4.y=200
+target4.x=70
+target4.y=170
 target5.height=50
 target5.name=Trig
 target5.showInterface=false
@@ -74,9 +111,23 @@ target5.width=80
 target5.x=320
 target5.y=70
 target6.height=50
-target6.name=MainApplication
+target6.name=SwitchDisplay
 target6.showInterface=false
 target6.type=ClassTarget
-target6.width=120
-target6.x=70
-target6.y=70
+target6.width=110
+target6.x=80
+target6.y=350
+target7.height=50
+target7.name=MainMenu
+target7.showInterface=false
+target7.type=ClassTarget
+target7.width=90
+target7.x=70
+target7.y=10
+target8.height=50
+target8.name=MainApplication
+target8.showInterface=false
+target8.type=ClassTarget
+target8.width=120
+target8.x=70
+target8.y=70