Added memory statements to console

Console.java

@@ -1,5 +1,6 @@
 
 import java.util.Scanner;
+import java.util.*;
 /**
  * Created by leon on 2/9/18.
  */
@@ -50,6 +51,9 @@ public class Console {
                             basicInput1 = memory.memory;
                             basicInput2 = memory.memory;
                         }
+                    } else {
+                        basicInput1 = Console.getDoubleInput("Enter the first input: ");
+                        basicInput2 = Console.getDoubleInput("Enter the second input: ");
                     }
                 }
 
@@ -90,19 +94,40 @@ public class Console {
                 break;
 
                 case "2":
+
                 advCalc.realAdvanced();
                 String mode = Console.getStringInput("Enter the mode: ");
-
-                double advInput1 = Console.getDoubleInput("Enter the first input: ");
+                double advInput1 = 0,
+                advInput2 = 0;
+                // checking if user wants to use memory
+                if (memory.memoryChanged != true) {
+                    advInput1 = Console.getDoubleInput("Enter the first 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")) {
+                        advInput1 = memory.memory;
+                    } else if (useMemory.equals("n")) {
+                        advInput1 = Console.getDoubleInput("Enter the first input: ");
+                    }
+                }
 
                 double advAnswer = 0;
-
                 if (mode.equals("1")){
                     advAnswer = advCalc.squared(advInput1);
 
                 }else if (mode.equals("2")){
 
-                    double advInput2 = Console.getDoubleInput("Enter the exponent value: ");
+                    // checking if user wants to use memory
+                    if (memory.memoryChanged != true) {
+                        advInput2 = Console.getDoubleInput("Enter the exponent value: ");
+                    } 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")) {
+                            advInput2 = memory.memory;
+                        } else if (useMemory.equals("n")) {
+                            advInput2 = Console.getDoubleInput("Enter the first input: ");
+                        }
+                    }
                     advAnswer = advCalc.exponent(advInput1,advInput2);
 
                 }else if (mode.equals("3")){
@@ -110,8 +135,8 @@ public class Console {
                         Console.println("undefined");
                         advAnswer = Double.NaN;
                     } else {
-                    advAnswer = advCalc.inverse(advInput1);
-                }
+                        advAnswer = advCalc.inverse(advInput1);
+                    }
                 }else if (mode.equals("4")){
                     advAnswer = advCalc.opposite(advInput1);
                 }else if (mode.equals("5")){
@@ -143,20 +168,31 @@ public class Console {
                     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: ");
+                    double userInput = 0;
+
+                    if (memory.memoryChanged != true) {
+                        userInput = (Console.getDoubleInput("Enter the exponent value: "));
+                    } 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")) {
+                            userInput = memory.memory;
+                        } else if (useMemory.equals("n")) {
+                            userInput = Console.getDoubleInput("Enter the number you want to convert to selected base: ");
+                        }
+                    }
 
                     switch (baseMode) {
                         case "1":
-                        baseAnswer = baseChange.toBinary(userInput);
+                        baseAnswer = baseChange.toBinary((int)userInput);
 
                         case "2":
-                        baseAnswer = baseChange.toOctal(userInput);
+                        baseAnswer = baseChange.toOctal((int)userInput);
 
                         case "3":
-                        baseAnswer = baseChange.toDecimal(userInput);
+                        baseAnswer = baseChange.toDecimal((int)userInput);
 
                         case "4":
-                        baseAnswer = baseChange.toHexa(userInput);
+                        baseAnswer = baseChange.toHexa((int)userInput);
 
                         case "5":
                         break;
@@ -169,9 +205,7 @@ public class Console {
                     Console.println(baseAnswer);
 
                     break;
-                    // display mode
-                    // gets mode
-                    // asks for input
+
                 } else if (sciMenuInput.equals("2")) {
                     // Memory
                     // access memory menu
@@ -182,8 +216,20 @@ public class Console {
                     trigMenu.trigFunctions();
                     String trigMode = Console.getStringInput("Enter trignometric function by key: (ie. 1 for sin)");
 
-                    double trigInput = Console.getDoubleInput("Enter the input for the trignometric function: ");
-                    double trigAnswer = 0;
+                    double trigInput = 0;
+
+                    if (memory.memoryChanged != true) {
+                        trigInput = Console.getDoubleInput("Enter the input for the trignometric function: ");
+                    } 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")) {
+                            trigInput = memory.memory;
+                        } else if (useMemory.equals("n")) {
+                            trigInput = Console.getDoubleInput("Enter the input for the trignometric function: ");
+                        }
+                    }
+
+                    double trigAnswer;
                     if (trigMode.equals("1")) {
                         trigAnswer = trigMenu.calcSin(trigInput);
 

SwitchDisplay.java

@@ -45,27 +45,27 @@ public class SwitchDisplay
      * Converts the user input into corresponding base types
      */
     
-    public String toBinary(int userInput) {
+    public String toBinary(double userInput) {
         
-        return Integer.toBinaryString(userInput);
+        return Integer.toBinaryString((int)userInput);
         
     }
     
-    public String toOctal(int userInput) {
+    public String toOctal(double userInput) {
         
-        return Integer.toOctalString(userInput);
+        return Integer.toOctalString((int)userInput);
         
     }
     
     public String toDecimal(int userInput) {
         
-        return Integer.toBinaryString(userInput);
+        return Integer.toBinaryString((int)userInput);
         
     }
     
     public String toHexa(int userInput) {
     
-        return Integer.toHexString(userInput);
+        return Integer.toHexString((int)userInput);
     
     }
 }