comitted

Console.java

@@ -1,32 +0,0 @@
- 
-
-import java.util.Scanner;
-
-/**
- * Created by leon on 2/9/18.
- */
-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);
-    }
-
-    public static String getStringInput(String prompt) {
-        Scanner scanner = new Scanner(System.in);
-        println(prompt);
-        String userInput = scanner.nextLine();
-        return userInput;
-    }
-
-    public static Integer getIntegerInput(String prompt) {
-        return null;
-    }
-
-    public static Double getDoubleInput(String prompt) {
-        return null;
-    }
-}

MainApplication.java

@@ -1,17 +1,87 @@
- 
 
 /**
  * Created by leon on 2/9/18.
  */
+import java.util.Scanner;
 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.");
+  
+   
+      ScientificOperations sos=new ScientificOperations();
+      
 
-        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);
+    public static void main(String[] args)
+    {
+        System.out.println("Enter first and second number:");
+        Scanner inp= new Scanner(System.in);
+        int num1,num2;
+        num1 = inp.nextInt();
+        num2 = inp.nextInt();
+        int ans;
+        System.out.println("Enter your selection: 1 for Addition, 2 for substraction 3 for Multiplication and 4 for division:");
+        int choose;
+        choose = inp.nextInt();
+        switch (choose){
+        case 1:
+            System.out.println(add( num1,num2));
+            break;
+        case 2:
+            System.out.println(sub( num1,num2));
+            break;      
+        case 3:
+            System.out.println(mult( num1,num2));
+            break;
+        case 4:
+            System.out.println(div( num1,num2));
+            break;
+            default:
+                System.out.println("Illigal Operation");
+         case 5:
+               System.out.println(ScientificOperations.Exponent(3,3));
+               break;
+         case 6:
+                System.out.println(ScientificOperations.Inverse(5));
+               break;
+          case 7:
+                System.out.println(ScientificOperations.ScientificSin(90));
+                break;  
+          case 8:
+                 System.out.println(ScientificOperations.ScientificCosin(90));
+                 break; 
+          case 9:
+                System.out.println(ScientificOperations.ScientificTan(90));
+                break; 
+           case 10:
+                 System.out.println(ScientificOperations.InverseCos(90));
+                 break;  
+           case 11:
+                System.out.println(ScientificOperations.InverseSin(90));
+                 break; 
+        }
+
+
+
+    }
+    public static int add(int x, int y)
+    {
+        int result = x + y;
+        return result;
     }
+    public static int sub(int x, int y)
+    {
+        int result = x-y;
+        return result;
+    }
+    public static int mult(int x, int y)
+    {
+        int result = x*y;
+        return result;
+    }
+    public static int div(int x, int y)
+    {
+        int result = x/y;
+        return result;
+    }
+
 }
+        
+    

MainApplicationTest.java

@@ -0,0 +1,42 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class MainApplicationTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class MainApplicationTest
+{
+    /**
+     * Default constructor for test class MainApplicationTest
+     */
+    public MainApplicationTest()
+    {
+    }
+
+    /**
+     * Sets up the test fixture.
+     *
+     * Called before every test case method.
+     */
+    @Before
+    public void setUp()
+    {
+    }
+
+    /**
+     * Tears down the test fixture.
+     *
+     * Called after every test case method.
+     */
+    @After
+    public void tearDown()
+    {
+    }
+}

ScientificOperations.java

@@ -0,0 +1,69 @@
+
+/**
+ * Write a description of class ScientificOperations here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public  class ScientificOperations
+{
+    // instance variables - replace the example below with your own
+    private int x;
+
+    /**
+     * Constructor for objects of class ScientificOperations
+     */
+    public ScientificOperations()
+    {
+        // initialise instance variables
+        x = 0;
+    }
+    
+    public static double product(double a,double b)
+    { return a*b;
+    }
+     public  static double Exponent(double a,double b)
+    {
+        return Math.pow(a,b);
+        
+    }
+   public static double Inverse(int x)
+   { 
+       double val=(double)x;
+       return 1/val;
+    }
+    public  static double ScientificSin(int x)
+    { 
+        double val=Math.sin((double)x);
+        return val;
+        
+    }
+    public static double ScientificCosin(int x)
+    {
+        double val=Math.cos((double)x);
+        return val;
+    }
+    public static double ScientificTan(int x)
+    {
+        double val=Math.tan((double)x);
+        return val;
+    }
+    public static double InverseSin(int x)
+    {
+        double val=Math.asin((double)x);
+        return val;
+        
+    }
+    public static double InverseCos(int x)
+    {
+        double val=Math.acos((double)x);
+        return val;
+    }
+    public static double add(double x,double y)
+    {
+        return x+y;
+    }
+    public static double sub(double x,double y)
+    { return x-y;
+    }
+}

package.bluej

@@ -1,23 +1,23 @@
 #BlueJ package file
 dependency1.from=MainApplication
-dependency1.to=Console
+dependency1.to=ScientificOperations
 dependency1.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=640
+editor.fx.0.height=709
+editor.fx.0.width=1280
+editor.fx.0.x=0
 editor.fx.0.y=23
-objectbench.height=214
-objectbench.width=595
-package.divider.horizontal=0.6
-package.divider.vertical=0.6847360912981455
-package.editor.height=473
+objectbench.height=198
+objectbench.width=352
+package.divider.horizontal=0.5993322203672788
+package.divider.vertical=0.685099846390169
+package.editor.height=439
 package.editor.width=493
 package.editor.x=35
-package.editor.y=60
-package.frame.height=759
+package.editor.y=23
+package.frame.height=709
 package.frame.width=619
 package.numDependencies=1
-package.numTargets=2
+package.numTargets=3
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,16 +27,24 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Console
+target1.name=MainApplicationTest
 target1.showInterface=false
-target1.type=ClassTarget
-target1.width=80
-target1.x=80
-target1.y=200
+target1.type=UnitTestTargetJunit4
+target1.width=120
+target1.x=100
+target1.y=40
 target2.height=50
-target2.name=MainApplication
+target2.name=ScientificOperations
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=120
-target2.x=70
-target2.y=70
+target2.width=150
+target2.x=100
+target2.y=190
+target3.association=MainApplicationTest
+target3.height=50
+target3.name=MainApplication
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=120
+target3.x=70
+target3.y=70