Updated

Console.java

@@ -1,9 +1,14 @@
 
+
 import java.util.Scanner;
+
+import java.util.*;
+
+
 /**
  * Created by leon on 2/9/18.
  */
-public class Console {
+public class Console extends DiplayMode {
 
     public static void print(String output, Object... args) {
         System.out.printf(output, args);
@@ -38,8 +43,5 @@ public class Console {
         return userInput;
     }
 
-    //public static Double getNumberForUniOperators(){
-        
 
-   // }
 }

package.bluej

@@ -1,20 +1,50 @@
 #BlueJ package file
-dependency1.from=MainApplication
-dependency1.to=Console
+dependency1.from=bonusFunctionsTest
+dependency1.to=bonusFunctions
 dependency1.type=UsesDependency
-dependency2.from=MainApplication
-dependency2.to=Operations
+dependency10.from=Operations
+dependency10.to=Console
+dependency10.type=UsesDependency
+dependency11.from=ConsoleTest
+dependency11.to=Console
+dependency11.type=UsesDependency
+dependency12.from=MainApplication
+dependency12.to=Console
+dependency12.type=UsesDependency
+dependency13.from=MainApplication
+dependency13.to=Operations
+dependency13.type=UsesDependency
+dependency2.from=scienticFunctionsTest
+dependency2.to=scienticFunctions
 dependency2.type=UsesDependency
-dependency3.from=Operations
-dependency3.to=scienticFunctions
+dependency3.from=DiplayMode
+dependency3.to=Console
 dependency3.type=UsesDependency
+dependency4.from=Calculator
+dependency4.to=CoreFunctions
+dependency4.type=UsesDependency
+dependency5.from=Calculator
+dependency5.to=Operations
+dependency5.type=UsesDependency
+dependency6.from=Operations
+dependency6.to=scienticFunctions
+dependency6.type=UsesDependency
+dependency7.from=Operations
+dependency7.to=Memory
+dependency7.type=UsesDependency
+dependency8.from=Operations
+dependency8.to=DiplayMode
+dependency8.type=UsesDependency
+dependency9.from=Operations
+dependency9.to=bonusFunctions
+dependency9.type=UsesDependency
 editor.fx.0.height=717
 editor.fx.0.width=800
-editor.fx.0.x=480
+editor.fx.0.x=371
 editor.fx.0.y=23
 objectbench.height=200
-objectbench.width=518
-package.divider.horizontal=0.5639097744360902
+objectbench.width=552
+package.divider.horizontal=0.6004296455424275
 package.divider.vertical=0.6854103343465046
 package.editor.height=444
 package.editor.width=825
@@ -22,8 +52,8 @@ package.editor.x=35
 package.editor.y=23
 package.frame.height=716
 package.frame.width=951
-package.numDependencies=3
-package.numTargets=6
+package.numDependencies=13
+package.numTargets=17
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -33,44 +63,123 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Console
+target1.name=CoreFunctionsCo
 target1.showInterface=false
 target1.type=ClassTarget
-target1.width=80
-target1.x=80
-target1.y=200
+target1.width=130
+target1.x=10
+target1.y=120
+target10.height=50
+target10.name=CoreFunctionsTest
+target10.showInterface=false
+target10.type=ClassTarget
+target10.width=140
+target10.x=10
+target10.y=240
+target11.height=50
+target11.name=Calculator
+target11.showInterface=false
+target11.type=ClassTarget
+target11.width=90
+target11.x=160
+target11.y=260
+target12.height=50
+target12.name=Console
+target12.showInterface=false
+target12.type=ClassTarget
+target12.width=80
+target12.x=240
+target12.y=200
+target13.association=bonusFunctionsTest
+target13.height=50
+target13.name=bonusFunctions
+target13.showInterface=false
+target13.type=ClassTarget
+target13.width=120
+target13.x=500
+target13.y=330
+target14.height=50
+target14.name=Operations
+target14.showInterface=false
+target14.type=ClassTarget
+target14.width=90
+target14.x=380
+target14.y=370
+target15.height=50
+target15.name=ConsoleTest
+target15.showInterface=false
+target15.type=ClassTarget
+target15.width=100
+target15.x=10
+target15.y=300
+target16.height=50
+target16.name=MainApplication
+target16.showInterface=false
+target16.type=ClassTarget
+target16.width=120
+target16.x=140
+target16.y=60
+target17.height=50
+target17.name=Display
+target17.showInterface=false
+target17.type=ClassTarget
+target17.width=80
+target17.x=160
+target17.y=320
 target2.height=50
-target2.name=scienticFunctions
+target2.name=CoreFunctionsCoTest
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=130
-target2.x=240
-target2.y=290
+target2.width=160
+target2.x=10
+target2.y=180
 target3.height=50
-target3.name=calculatorCoreFunctions
+target3.name=Memory
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=180
-target3.x=30
-target3.y=290
+target3.width=80
+target3.x=640
+target3.y=370
 target4.height=50
-target4.name=bonusFunctions
+target4.name=bonusFunctionsTest
 target4.showInterface=false
-target4.type=ClassTarget
+target4.type=UnitTestTargetJunit4
 target4.width=120
-target4.x=380
-target4.y=290
+target4.x=530
+target4.y=300
+target5.association=scienticFunctionsTest
 target5.height=50
-target5.name=Operations
+target5.name=scienticFunctions
 target5.showInterface=false
 target5.type=ClassTarget
-target5.width=90
-target5.x=180
-target5.y=370
+target5.width=130
+target5.x=500
+target5.y=230
 target6.height=50
-target6.name=MainApplication
+target6.name=scienticFunctionsTest
 target6.showInterface=false
-target6.type=ClassTarget
-target6.width=120
-target6.x=70
-target6.y=70
+target6.type=UnitTestTargetJunit4
+target6.width=130
+target6.x=530
+target6.y=200
+target7.height=50
+target7.name=calculatorCoreFunctions
+target7.showInterface=false
+target7.type=ClassTarget
+target7.width=180
+target7.x=460
+target7.y=150
+target8.height=50
+target8.name=CoreFunctions
+target8.showInterface=false
+target8.type=ClassTarget
+target8.width=120
+target8.x=150
+target8.y=120
+target9.height=50
+target9.name=DiplayMode
+target9.showInterface=false
+target9.type=ClassTarget
+target9.width=100
+target9.x=50
+target9.y=360