From Saturday

Console.java

@@ -6,7 +6,10 @@ import java.util.Scanner;
  * Created by leon on 2/9/18.
  */
 public class Console {
-
+    
+    public static double result = 0;
+    public static boolean calcRunning = true;
+    
     public static void print(String output, Object... args) {
         System.out.printf(output, args);
     }
@@ -17,7 +20,7 @@ public class Console {
 
     public static String getStringInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
-        println(prompt);
+        System.out.print(prompt);
         String userInput = scanner.nextLine();
         return userInput;
     }
@@ -27,6 +30,9 @@ public class Console {
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
+       System.out.print(prompt);
+        Scanner scanner = new Scanner(System.in);
+        double userInput = scanner.nextDouble();
+        return userInput;
     }
 }

CoreFeatures.java

@@ -0,0 +1,71 @@
+
+/**
+ * Write a description of class CoreFeatures here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class CoreFeatures extends MainApplication {
+    // instance variables - replace the example below with your own
+    private double x;
+    private double addedNumbers;
+    //addition
+    private double subtractedNumbers;
+    //subtraction
+    private double multipliedNumbers;
+    //multiplication
+    private double dividedNumbers;
+    //divide
+    private double squaredNumber;
+    //square
+    private double sqRt;
+    //square root
+    private boolean calcRunning;
+
+    /**
+     * Constructor for objects of class CoreFeatures
+     */
+    public CoreFeatures(){
+        // initialise instance variables
+        x = 0;
+    }
+
+    public double addNumbers(double adding1, double adding2){
+        addedNumbers = adding1 + adding2;
+        return addedNumbers;}
+
+    public double subtractNumbers(double subtracting1, double subtracting2){
+        subtractedNumbers = subtracting1 - subtracting2;
+        return subtractedNumbers;}
+
+    public double multiplyNumbers(double multiplying1, double multiplying2){
+        multipliedNumbers = multiplying1 * multiplying2;
+        return multipliedNumbers;}
+
+    public double divideNumbers(double dividing1, double dividing2){
+        if (dividing2 = 0){
+            System.out.println("**ERROR** CANNOT DIVIDE BY ZERO.");} else {
+            dividedNumbers = dividing1 / dividing2;
+            return dividedNumbers;}
+
+        /*double userCorrectedInput = Console.getDoubleInput("**Err** CANNOT DIVIDE BY ZERO.  Please clear the calculator.");
+        return userCorrectedInput;*/
+
+        /*dividedNumbers = dividing1 / dividing2;
+        return dividedNumbers;*/
+    }
+
+    public double squareNumber(double squaring){
+        squaredNumber = squaring * squaring;
+        return squaredNumber;}
+
+    public double squareRoot(double sqRting){
+        sqRt = squareRoot(sqRting);
+        return sqRt;}
+
+    public boolean calcRunning(){
+        calcRunning = false;
+        return calcRunning;
+    }
+
+}

MainApplication.java

@@ -1,17 +1,56 @@
- 
 
 /**
  * Created by leon on 2/9/18.
  */
+
 public class MainApplication {
+    private void commandCenter(){
+        //All the different feature objects
+        CoreFeatures switchCoreFeatures = new CoreFeatures();
+        
+        //User instructions 
+       String userInput = Console.getStringInput("Choose a symbol for the corresponding function : " + "\n"
+       + " |'+' = addition|" + "\n"+
+       "|'-' = subtraction|");
+        
+    switch(userInput){
+    case "+": 
+    double userInput2 = Console.getDoubleInput("Enter number to be added. ");
+    Console.result = switchCoreFeatures.addNumbers(Console.result, userInput2);
+    System.out.println(Console.result);
+    break;
+    
+    case "-":
+    double userInput3 = Console.getDoubleInput("Enter number to be subtracted. ");
+    Console.result = switchCoreFeatures.subtractNumbers(Console.result, userInput3);
+    System.out.println(Console.result);
+    break;
+    
+    case "*":
+    double userInput4 = Console.getDoubleInput("Enter number to be multiplied. ");
+    Console.result = switchCoreFeatures.multiplyNumbers(Console.result, userInput4);
+    System.out.println(Console.result);
+    break;
+    
+    case "off":
+    Console.calcRunning = false;
+    break;
+    
+    }
+}
     public static void main(String[] args) {
         Console.println("Welcome to my calculator!");
-        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);
+        MainApplication mainApplication = new MainApplication();
+        //String s = Console.getStringInput("Enter a string");
+        //Integer i = Console.getIntegerInput("Enter an integer");
+        //Double d = Console.getDoubleInput("Enter a double.");
+        
+        
+        while (Console.calcRunning){
+            //some sort of commads that take user input for a number
+            mainApplication.commandCenter();
+        
+        }
+        
     }
 }

ScientificFeatures.java

@@ -0,0 +1,33 @@
+
+/**
+ * Write a description of class ScientificFeatures here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class ScientificFeatures extends MainApplication
+{
+    // instance variables - replace the example below with your own
+    private int x;
+
+    /**
+     * Constructor for objects of class ScientificFeatures
+     */
+    public ScientificFeatures()
+    {
+        // initialise instance variables
+        x = 0;
+    }
+
+    /**
+     * An example of a method - replace this comment with your own
+     *
+     * @param  y  a sample parameter for a method
+     * @return    the sum of x and y
+     */
+    public int sampleMethod(int y)
+    {
+        // put your code here
+        return x + y;
+    }
+}

TrigFeatures.java

@@ -0,0 +1,33 @@
+
+/**
+ * Write a description of class TrigFeatures here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class TrigFeatures extends MainApplication
+{
+    // instance variables - replace the example below with your own
+    private int x;
+
+    /**
+     * Constructor for objects of class TrigFeatures
+     */
+    public TrigFeatures()
+    {
+        // initialise instance variables
+        x = 0;
+    }
+
+    /**
+     * An example of a method - replace this comment with your own
+     *
+     * @param  y  a sample parameter for a method
+     * @return    the sum of x and y
+     */
+    public int sampleMethod(int y)
+    {
+        // put your code here
+        return x + y;
+    }
+}

package.bluej

@@ -1,23 +1,26 @@
 #BlueJ package file
 dependency1.from=MainApplication
-dependency1.to=Console
+dependency1.to=CoreFeatures
 dependency1.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=640
-editor.fx.0.y=23
-objectbench.height=214
-objectbench.width=595
+dependency2.from=MainApplication
+dependency2.to=Console
+dependency2.type=UsesDependency
+editor.fx.0.height=22
+editor.fx.0.width=0
+editor.fx.0.x=40
+editor.fx.0.y=686
+objectbench.height=66
+objectbench.width=1256
 package.divider.horizontal=0.6
-package.divider.vertical=0.6847360912981455
-package.editor.height=473
-package.editor.width=493
-package.editor.x=35
-package.editor.y=60
-package.frame.height=759
-package.frame.width=619
-package.numDependencies=1
-package.numTargets=2
+package.divider.vertical=0.9044502617801047
+package.editor.height=684
+package.editor.width=1154
+package.editor.x=0
+package.editor.y=0
+package.frame.height=800
+package.frame.width=1280
+package.numDependencies=2
+package.numTargets=6
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,16 +30,45 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Console
+target1.name=ScientificFeatures
 target1.showInterface=false
 target1.type=ClassTarget
-target1.width=80
-target1.x=80
-target1.y=200
+target1.width=140
+target1.x=350
+target1.y=160
 target2.height=50
-target2.name=MainApplication
+target2.name=CoreFeaturesTest
 target2.showInterface=false
-target2.type=ClassTarget
-target2.width=120
-target2.x=70
-target2.y=70
+target2.type=UnitTestTargetJunit4
+target2.width=110
+target2.x=160
+target2.y=150
+target3.height=50
+target3.name=Console
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=80
+target3.x=590
+target3.y=10
+target4.height=50
+target4.name=TrigFeatures
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=100
+target4.x=580
+target4.y=160
+target5.height=50
+target5.name=MainApplication
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=140
+target5.x=350
+target5.y=20
+target6.association=CoreFeaturesTest
+target6.height=50
+target6.name=CoreFeatures
+target6.showInterface=false
+target6.type=ClassTarget
+target6.width=110
+target6.x=130
+target6.y=180