calc

Console.java

@@ -1,7 +1,5 @@
- 
 
 import java.util.Scanner;
-
 /**
  * Created by leon on 2/9/18.
  */
@@ -9,8 +7,9 @@ public class Console {
 
     public static void print(String output, Object... args) {
         System.out.printf(output, args);
-    }
 
+    }
+    
     public static void println(String output, Object... args) {
         print(output + "\n", args);
     }
@@ -21,12 +20,22 @@ public class Console {
         String userInput = scanner.nextLine();
         return userInput;
     }
-
+    
+    public static Double getDoubleInput(String prompt) {
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        String userInput = scanner.nextLine();
+        return userInput.parseDouble();
+    }
+    
     public static Integer getIntegerInput(String prompt) {
         return null;
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
+        Scanner sc = new Scanner(System.in);
+        Double userNumber1 = sc.nextDouble();
+        return userNumber1;
+        
     }
 }

MainApplication.java

@@ -1,17 +1,16 @@
- 
 
 /**
  * Created by leon on 2/9/18.
  */
-public class MainApplication {
-    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.");
+// public class MainApplication {
+    // 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);
-    }
-}
+        // 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);
+    // }
+// }

Operations.java

@@ -0,0 +1,33 @@
+import java.util.*;
+
+public class Operations
+{
+    // instance variables - replace the example below with your own
+    private int x;
+
+    /**
+     * Constructor for objects of class Operations
+     */
+    public Operations()
+    {
+        // 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 factorial(int number)
+    {
+        int fact = 1;
+          for(int i = 1; i <= number; i++) {
+              fact *= i;
+          }
+          return fact;
+    }
+    
+    public int 
+}

calculator.java

@@ -1,33 +1,133 @@
+import java.util.*;
 
-/**
- * Write a description of class calculator here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
-public class calculator
-{
-    // instance variables - replace the example below with your own
-    private int x;
-
-    /**
-     * Constructor for objects of class calculator
-     */
-    public calculator()
-    {
-        // 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 add(int y)
-    {
-        // put your code here
-        return x + y;
+public class Calculator {
+
+
+  public static void main(String[] args) {
+
+    double displayNum = 0;
+    boolean calcOn = true;
+    double num;
+
+    Scanner sc = new Scanner(System.in);
+
+    while (calcOn) {
+
+      System.out.println(displayNum);
+      
+      System.out.println("Enter an option:  ");
+      System.out.println("0 - ENTER NUMBER");
+      System.out.println("1 - ADD ");
+      System.out.println("2 - SUBTRACT");
+      System.out.println("3 - MULTIPLY");
+      System.out.println("4 - DIVIDE");
+      System.out.println("5 - SQUARE");
+      System.out.println("6 - SQUARE ROOT");
+      System.out.println("7 - EXPONENT");
+      System.out.println("8 - Invert +/-");
+      System.out.println("9 - INVERSE");
+      System.out.println("10 - SIN");
+      System.out.println("11 - COS");
+      System.out.println("12 - TAN");
+      System.out.println("13 - INVERSE SIN");
+      System.out.println("14 - INVERSE COS");
+      System.out.println("15 - INVERSE TAN");
+      System.out.println("16 - QUIT");
+      
+      
+
+
+      int userInput = sc.nextInt();
+      //displayNum = userInput;
+      System.out.println(displayNum);
+      
+      switch(userInput) {
+        case 0: System.out.println("enter number");
+                num = sc.nextDouble();
+                displayNum = num;
+                break;
+        case 1: System.out.println("enter number to ADD to " + displayNum);
+                num = sc.nextDouble();
+                displayNum = num + displayNum;
+                break;
+        case 2: System.out.println("enter number to SUBTRACT from " + displayNum);
+                num = sc.nextDouble();
+                displayNum = displayNum - num;
+                break;
+        case 3: System.out.println("enter number to MULTIPLY to" + displayNum);
+                num = sc.nextDouble();
+                displayNum = num * displayNum;
+                break;
+         case 4: System.out.println("enter number to DIVIDE from " + displayNum);
+                num = sc.nextDouble();
+                displayNum = displayNum / num;
+                break;
+         case 5: System.out.println("square result: " + displayNum * displayNum);
+                num = sc.nextDouble();
+               // displayNum = displayNum * displayNum;
+                break;
+         case 6: System.out.println("square root result: " + Math.sqrt(displayNum));
+                num = sc.nextDouble();
+                break;
+         case 7: System.out.println("enter an exponent to the number: " + displayNum);
+                num = sc.nextDouble();
+                displayNum = Math.pow(displayNum, num);
+                break;
+         case 8: System.out.println("result: " + displayNum * -1);
+                num = sc.nextDouble();
+                break;
+         case 9: System.out.println("result: " + Math.sqrt(displayNum));
+                num = sc.nextDouble();
+               // displayNum = displayNum * displayNum;
+                break;
+         case 10: System.out.println("result: " + Math.sin(displayNum));
+                num = sc.nextDouble();
+               // displayNum = displayNum * displayNum;
+                break;
+         case 11: System.out.println("result: " + Math.cos(displayNum));
+                num = sc.nextDouble();
+               // displayNum = displayNum * displayNum;
+                break;
+         case 12: System.out.println("result: " + Math.tan(displayNum));
+                num = sc.nextDouble();
+               // displayNum = displayNum * displayNum;
+                break;
+         case 13: System.out.println("result: " + Math.asin(displayNum));
+                num = sc.nextDouble();
+               // displayNum = displayNum * displayNum;
+                break;
+         case 14: System.out.println("result: " + Math.acos(displayNum));
+                num = sc.nextDouble();
+               // displayNum = displayNum * displayNum;
+                break;
+         case 15: System.out.println("result: " + Math.atan(displayNum));
+                num = sc.nextDouble();
+               // displayNum = displayNum * displayNum;
+                break;
+         case 16: System.out.println("Quitting!");
+                calcOn = false;
+                break;
+         default: break;
+                
+        } 
+
     }
+
+
+
+
+
+
+
+
+  }
+
+
+
+
+
+
+
+
 }

calculatorTest.java

@@ -39,4 +39,12 @@ public class calculatorTest
     public void tearDown()
     {
     }
+
+    @Test
+    public void TestAdd()
+    {
+        //calculator calculat1 = new calculator();
+        //assertEquals(10, calculat1.add(5, 5));
+    }
 }
+

package.bluej

@@ -2,22 +2,22 @@
 dependency1.from=MainApplication
 dependency1.to=Console
 dependency1.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=480
-editor.fx.0.y=23
-objectbench.height=205
+editor.fx.0.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
+objectbench.height=201
 objectbench.width=595
 package.divider.horizontal=0.6
-package.divider.vertical=0.6845238095238095
-package.editor.height=453
+package.divider.vertical=0.6804915514592934
+package.editor.height=436
 package.editor.width=493
-package.editor.x=35
-package.editor.y=23
-package.frame.height=730
+package.editor.x=89
+package.editor.y=38
+package.frame.height=709
 package.frame.width=619
 package.numDependencies=1
-package.numTargets=4
+package.numTargets=5
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -28,10 +28,10 @@ readme.x=10
 readme.y=10
 target1.association=calculatorTest
 target1.height=50
-target1.name=calculator
+target1.name=Calculator
 target1.showInterface=false
 target1.type=ClassTarget
-target1.width=90
+target1.width=130
 target1.x=70
 target1.y=10
 target2.height=50
@@ -42,16 +42,23 @@ target2.width=80
 target2.x=80
 target2.y=200
 target3.height=50
-target3.name=calculatorTest
+target3.name=Operations
 target3.showInterface=false
-target3.type=UnitTestTargetJunit4
+target3.type=ClassTarget
 target3.width=90
-target3.x=100
-target3.y=-20
+target3.x=10
+target3.y=130
 target4.height=50
-target4.name=MainApplication
+target4.name=calculatorTest
 target4.showInterface=false
-target4.type=ClassTarget
-target4.width=120
-target4.x=70
-target4.y=70
+target4.type=UnitTestTargetJunit4
+target4.width=130
+target4.x=100
+target4.y=-20
+target5.height=50
+target5.name=MainApplication
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=120
+target5.x=70
+target5.y=70