EVERYTHING COMING TOGETHER

Console.java

@@ -6,10 +6,11 @@ import java.util.Scanner;
 public class Console {
 
     public static void main(String[] args) {
-        double answer;
+
         // Create all instances of classes to be used for this program
         MainMenu mainMenu = new MainMenu();
         Basic basicCalc = new Basic();
+        RealAdvanced advCalc = new RealAdvanced();
         SciCalc scientificCalc = new SciCalc();
         MemoryFunc memory = new MemoryFunc();
         SwitchDisplay baseChange = new SwitchDisplay();
@@ -35,11 +36,11 @@ public class Console {
                 // Basic Calculator
                 case "1":
                 basicCalc.Basic();
-                
+
                 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 (basicMode.equals("1")) {
@@ -72,10 +73,36 @@ public class Console {
                     Console.println("Invalid Input");
                 }
                 Console.println(Double.toString(basicAnswer));
-                
+
                 break;
                 case "2":
-                // Sends to Advanced Calculator Functions
+                advCalc.realAdvanced();
+                String mode = Console.getStringInput("Enter the mode: ");
+
+                double 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: ");
+                    advAnswer = advCalc.exponent(advInput1,advInput2);
+
+                }else if (mode.equals("3")){
+
+                    advAnswer = advCalc.inverse(advInput1);
+
+                }else if (mode.equals("4")){
+                    advAnswer = advCalc.opposite(advInput1);
+
+                }else {
+                    Console.println("Invalid input");
+                }
+
+                Console.println(Double.toString(advAnswer));
                 break;
 
                 case "3":
@@ -88,15 +115,17 @@ public class Console {
                 if (sciMenuInput.equals("1")) {
                     // Base Conversions
                     // while loop for display 
-                    String mode = "";
-                    while (!mode.equals("Invalid Input")) {
-                        baseChange.switchDisplay(); 
-                        mode = Console.getStringInput("Enter the desired display mode: ");
-                    }
+                    String baseMode = "";
+
+                    baseChange.switchDisplay(); 
+                    baseMode = Console.getStringInput("Enter the desired display mode: ");
 
                     int userInput = getIntegerInput("Enter the number you want to convert to selected base: ");
-                    baseChange.switchDisplayOutput(mode, userInput);
 
+                    String baseOutput = baseChange.switchDisplayOutput(baseMode, userInput);
+                    Console.println(baseOutput);
+
+                    break;
                     // display mode
                     // gets mode
                     // asks for input
@@ -106,50 +135,51 @@ public class Console {
                 } else if (sciMenuInput.equals("3")) {
                     // To Trig Menu
                     trigMenu.trigFunctions();
-                    String mode = Console.getStringInput("Enter trignometric function by key: (ie. 1 for sin)");
+                    String trigMode = Console.getStringInput("Enter trignometric function by key: (ie. 1 for sin)");
 
                     double trigInput = Console.getDoubleInput("Enter the input for the trignometric function: ");
-
-                    if (mode.equals("1")) {
-                        answer = trigMenu.calcSin(trigInput);
+                    double trigAnswer = 0;
+                    if (trigMode.equals("1")) {
+                        trigAnswer = trigMenu.calcSin(trigInput);
 
                         //COS
-                    } else if (mode.equals("2")) {
-                        answer = trigMenu.calcCos(trigInput);
+                    } else if (trigMode.equals("2")) {
+                        trigAnswer = trigMenu.calcCos(trigInput);
 
                         //TAN
-                    } else if (mode.equals("3")) {
-                        answer = trigMenu.calcTan(trigInput);
+                    } else if (trigMode.equals("3")) {
+                        trigAnswer = trigMenu.calcTan(trigInput);
 
                         //ARCSIN
-                    } else if (mode.equals("4")) {
-                        answer = trigMenu.calcArcsin(trigInput);
+                    } else if (trigMode.equals("4")) {
+                        trigAnswer = trigMenu.calcArcsin(trigInput);
 
                         //ARCCOS
-                    } else if (mode.equals("5")) {
-                        answer = trigMenu.calcArccos(trigInput);
+                    } else if (trigMode.equals("5")) {
+                        trigAnswer = trigMenu.calcArccos(trigInput);
 
                         //ARCTAN
-                    } else if (mode.equals("6")) {
-                        answer = trigMenu.calcArctan(trigInput);
+                    } else if (trigMode.equals("6")) {
+                        trigAnswer = trigMenu.calcArctan(trigInput);
 
-                    } else if (mode.equals("7")) {
+                    } else if (trigMode.equals("7")) {
                         break;
 
                     } else {
                         //Error message if input does not match options, loops back to the top so they can try again.
-                        answer = Double.NaN;
+                        trigAnswer = Double.NaN;
 
                     }
 
-                    String trigAnswer = Double.toString(answer);
-                    Console.println(trigAnswer);
+                    String trigAnswerString = Double.toString(trigAnswer);
+                    Console.println(trigAnswerString);
 
                     String trigDefRad =  Console.getStringInput("Do you want to convert your answer from radians to degrees?"
                             + "\nEnter Y or N").toLowerCase();
 
                     if (trigDefRad.equals("y") ) {
-                        trigMenu.toDegrees(answer);
+                        double convertAnswer = trigMenu.toDegrees(trigAnswer);
+                        Console.println(Double.toString(convertAnswer));
                     }
                     break;
                 } else {

RealAdvanced.java

@@ -11,61 +11,37 @@ import java.util.*;
 public class RealAdvanced
 {
 
-    public void RealAdvanced()
+    public void realAdvanced()
     {
-        String prompt1 = "Please Select one of the following Calculations: " +"\n"+
-            "Option 1: x^2" + "\n"+
-            "Option 2: x^y" + "\n"+
-            "Option 3: 1/x" + "\n"+
-            "Option 4: Switch Sign of x" + "\n"+
-            "Option 5: Return to Main Menu";
+        Console.println("Please Select one of the following Calculations: " +"\n"+
+            "1: x^2" + "\n"+
+            "2: x^y" + "\n"+
+            "3: 1/x" + "\n"+
+            "4: Switch Sign of x" + "\n"+
+            "5: Return to Main Menu");
 
-        Integer option = Console.getIntegerInput(prompt1);
-        String prompt = "Enter value of x";
-        double x = Console.getDoubleInput(prompt1);
-        while (option != 5){
-            if (option == 1){
-                squared(x);
-
-            }else if (option == 2){
-                String prompt2= "Enter Value of y";
-                double y = Console.getDoubleInput(prompt2);
-                exponent(x,y);
-
-            }else if (option == 3){
-                String prompt3= "Enter Value of x";
-                int input = Console.getIntegerInput(prompt3);
-                inverse(input);
-
-            }else if (option == 4){
-                opposite(x);
-
-            }else {
-                Console.println("Invalid input");
-            }
-        } 
     }
     // method to find x^2
-    public void squared(double x){
+    public double squared(double x){
 
-        Console.println(Double.toString(Math.pow(x,2)));
+        return Math.pow(x,2);
     }
     // method to find x^y
-    public void exponent(double x, double y){
+    public double exponent(double x, double y){
 
-        Console.println(Double.toString(Math.pow(x,y)));
+        return Math.pow(x,y);
     }
     // method to find the inverse of x
-    public void inverse(int x){
+    public double inverse(double x){
 
-        Console.println(Integer.toString(Integer.reverse(x)));
+        return 1/x;
     }
     // method to switch sign of x
-    public void opposite(double x){
+    public double opposite(double x){
 
         double opposite1 = -1 * x;
-        Console.println(Double.toString(opposite1));
 
+        return opposite1;
     }
 
 }

SwitchDisplay.java

@@ -30,19 +30,14 @@ public class SwitchDisplay
      * switchDisplayMode(String mode) sets the display to the mode given
      */
     
-    public String switchDisplay()
+    public void switchDisplay()
     {
-        String mode = "Invalid Input";
-        
-        while (mode.equals("Invalid Input")) {
             Console.println("Display Options" 
                              + "\n1: Binary"
                              + "\n2: Octal"
                              + "\n3: Decimal"
                              + "\n4: Hexadecimal"
                              + "\n5: Cancel - returns to Main Menu");
-        }
-        return mode = Console.getStringInput("Enter the desired display mode: ");
                          
     }
     

package.bluej

@@ -1,26 +1,65 @@
 #BlueJ package file
-dependency1.from=MainApplication
+dependency1.from=MainMenu
 dependency1.to=Console
 dependency1.type=UsesDependency
-dependency2.from=RealAdvanced
+dependency10.from=Console
+dependency10.to=Basic
+dependency10.type=UsesDependency
+dependency11.from=Console
+dependency11.to=RealAdvanced
+dependency11.type=UsesDependency
+dependency12.from=Console
+dependency12.to=SciCalc
+dependency12.type=UsesDependency
+dependency13.from=Console
+dependency13.to=MemoryFunc
+dependency13.type=UsesDependency
+dependency14.from=Console
+dependency14.to=SwitchDisplay
+dependency14.type=UsesDependency
+dependency15.from=Console
+dependency15.to=Trig
+dependency15.type=UsesDependency
+dependency2.from=SciCalc
 dependency2.to=Console
 dependency2.type=UsesDependency
-editor.fx.0.height=709
-editor.fx.0.width=800
-editor.fx.0.x=338
-editor.fx.0.y=23
-objectbench.height=198
+dependency3.from=MainApplication
+dependency3.to=Console
+dependency3.type=UsesDependency
+dependency4.from=MemoryFunc
+dependency4.to=Console
+dependency4.type=UsesDependency
+dependency5.from=SwitchDisplay
+dependency5.to=Console
+dependency5.type=UsesDependency
+dependency6.from=Trig
+dependency6.to=Console
+dependency6.type=UsesDependency
+dependency7.from=Basic
+dependency7.to=Console
+dependency7.type=UsesDependency
+dependency8.from=RealAdvanced
+dependency8.to=Console
+dependency8.type=UsesDependency
+dependency9.from=Console
+dependency9.to=MainMenu
+dependency9.type=UsesDependency
+editor.fx.0.height=749
+editor.fx.0.width=1215
+editor.fx.0.x=145
+editor.fx.0.y=74
+objectbench.height=214
 objectbench.width=595
 package.divider.horizontal=0.6
-package.divider.vertical=0.685099846390169
-package.editor.height=439
+package.divider.vertical=0.6847360912981455
+package.editor.height=473
 package.editor.width=493
 package.editor.x=35
-package.editor.y=23
-package.frame.height=709
+package.editor.y=59
+package.frame.height=759
 package.frame.width=619
-package.numDependencies=2
-package.numTargets=3
+package.numDependencies=15
+package.numTargets=9
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -30,23 +69,65 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=RealAdvanced
+target1.name=Basic
 target1.showInterface=false
 target1.type=ClassTarget
-target1.width=110
-target1.x=300
-target1.y=40
+target1.width=80
+target1.x=320
+target1.y=180
 target2.height=50
-target2.name=Console
+target2.name=SciCalc
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=80
-target2.y=200
+target2.x=10
+target2.y=280
 target3.height=50
-target3.name=MainApplication
+target3.name=RealAdvanced
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=120
-target3.x=70
-target3.y=70
+target3.width=110
+target3.x=170
+target3.y=10
+target4.height=50
+target4.name=MemoryFunc
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=110
+target4.x=210
+target4.y=350
+target5.height=50
+target5.name=Console
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=80
+target5.x=70
+target5.y=170
+target6.height=50
+target6.name=Trig
+target6.showInterface=false
+target6.type=ClassTarget
+target6.width=80
+target6.x=320
+target6.y=70
+target7.height=50
+target7.name=SwitchDisplay
+target7.showInterface=false
+target7.type=ClassTarget
+target7.width=110
+target7.x=80
+target7.y=350
+target8.height=50
+target8.name=MainMenu
+target8.showInterface=false
+target8.type=ClassTarget
+target8.width=90
+target8.x=70
+target8.y=10
+target9.height=50
+target9.name=MainApplication
+target9.showInterface=false
+target9.type=ClassTarget
+target9.width=120
+target9.x=70
+target9.y=70