Sat aft

Calculator.java

@@ -1,3 +1,4 @@
+import java.util.*;
 
 /**
  * Write a description of class Calculator here.
@@ -5,46 +6,223 @@
  * @author (your name)
  * @version (a version number or a date)
  */
-public class Calculator
 
-{
-    public static double add(double x, double y) {
-    double result = x+y;
-    return result;
-    }
-    
-    public static double subtract(double x, double y) {
-    double result = x-y;
-    return result;
-    }
-    
-    public static double multiply(double x, double y) {
-    double result = x*y;
-    return result;
-    }
-    
-    public static double divide(double x, double y) {
-    double result = x/y;
-    return result;
-    }
-    
-    public static double square(double x) {
-    double result = Math.pow(x, 2);
-    return result;
-    }
-    
-    public static double inverse(double x) {
-    double result = x;
-    return result;
-    }
-    
-    public static double tangent(double x) {
-    double result = Math.tan(x);
-    return result;
-    }
+class Calculator{
     
-    public static double itan(double x) {
-    double result = Math.atan(x);
-    return result;
+    public static void main(String args[]){
+
+        String toDo;                //what the user wants to do
+        double num1 = 0;                //The user's first input
+        double num2 = 0;            //The user's second input
+        double result = 0;          //The user's answer
+        boolean off = false;        //The user typed quit, becomes true
+        double memory;
+        boolean error = false;
+        MathMethods calc = new MathMethods();
+
+        while (off == false){
+            Scanner input1 = new Scanner(System.in);
+            System.out.println("What do you want to do?");
+            toDo = input1.nextLine();
+
+            if (toDo.equals("quit")){
+                off = true;
+                System.out.println("Goodbye!!");
+
+            } else {
+
+                //System.out.println("toDO is: " + toDo);
+
+                System.out.println(toDo + " -- Enter first number:");
+                num1 = input1.nextDouble();
+                //System.out.println("num1 is: " + num1);
+
+                switch (toDo){
+                    case "add":
+                    case "subtract":
+                    case "multiply":
+                    case "divide":
+                    case "exponent":
+                    System.out.println(toDo + " -- Enter second number:");
+                    num2 = input1.nextDouble();
+                    //System.out.println("num2 is: " + num2);
+
+                }
+
+                switch (toDo) {        
+                    case "add":
+                    result = calc.add(num1, num2);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+
+                    case "subtract":
+                    result = calc.subtract(num1, num2);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+
+                    case "multiply":
+                    result = calc.multiply(num1, num2);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+
+                    case "divide":
+                    result = calc.divide(num1, num2);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+
+                    case "exponent":
+                    result = calc.exponent(num1, num2);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+
+                    case "cosine":
+                    result = calc.cosine(num1);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+
+                    case "inverse cosine":
+                    result = calc.invCosine(num1);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+
+                    case "square root":
+                    result = calc.squareRoot(num1);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+                    
+                    case "invert":
+                    result = calc.invert(num1);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+                    
+                    case "sine":
+                    result = calc.sin(num1);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+                    
+                    case "inverse sine":
+                    result = calc.iSin(num1);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+                    
+                    case "degree to radian":
+                    result = calc.degToRad(num1);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+                    
+                    case "radian to degree":
+                    result = calc.radToDeg(num1);
+                    memory = result;
+                    calc.printAns(String.valueOf(result));
+                    break;
+                }
+            }
+        }
     }
 }
+
+        // /**
+        // * Created by leon on 2/9/18.
+        // */
+        // public class Console {
+        // Calculator calc = new Calculator();
+
+        // 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 getMethod() {
+        // Scanner scanner = new Scanner(System.in);
+        // String userInput = scanner.nextLine();
+        // return userInput;
+        // }
+
+        // public static String switchStatment() {
+        // Scanner scanner = new Scanner(System.in);
+        // String ultimateAnswer = "";
+        // Boolean turnOff = false;
+
+        // switch (getMethod()) {
+        // case "add" :
+        // System.out.println("Enter your numbers:");
+        // double userInput = scanner.nextDouble();
+        // double nextInput = scanner.nextDouble();
+
+        // double answer = Calculator.add(userInput, nextInput);
+        // ultimateAnswer = Double.toString(answer);
+        // return Double.toString(answer);
+
+        // case "subtract" :
+        // System.out.println("Enter your numbers:");
+        // userInput = scanner.nextDouble();
+        // nextInput = scanner.nextDouble();
+
+        // answer = Calculator.subtract(userInput, nextInput);
+        // ultimateAnswer = Double.toString(answer);
+        // return ultimateAnswer;
+
+        // case "multiply" :
+        // System.out.println("Enter your numbers:");
+        // userInput = scanner.nextDouble();
+        // nextInput = scanner.nextDouble();
+
+        // answer = Calculator.multiply(userInput, nextInput);
+        // ultimateAnswer = Double.toString(answer);
+        // return ultimateAnswer;
+
+        // case "divide" :
+        // System.out.println("Enter your numbers:");
+        // userInput = scanner.nextDouble();
+        // nextInput = scanner.nextDouble();
+
+        // answer = Calculator.divide(userInput, nextInput);
+        // ultimateAnswer = Double.toString(answer);
+        // return ultimateAnswer;
+
+        // case "Square Root" :
+
+           
+        // }
+        // return ultimateAnswer;
+        // }
+
+        // /*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) {
+        // Scanner scanner = new Scanner(System.in);
+        // println(prompt);
+        // int userInput = scanner.nextInt();
+        // return null;
+        // }
+
+        // public static Double getDoubleInput(String prompt) {
+        // Scanner scanner = new Scanner(System.in);
+        // println(prompt);
+        // double userInput = scanner.nextDouble();
+        // double nextInput = scanner.nextDouble();
+        // double answer = Calculator.add(userInput, nextInput);
+        // return answer;
+        // }*/
+
+        // }

Console.java

@@ -1,122 +0,0 @@
-
-import java.util.Scanner;
-/**
- * Created by leon on 2/9/18.
- */
-public class Console {
-    Calculator calc = new Calculator();
-
-    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 getMethod() {
-        Scanner scanner = new Scanner(System.in);
-        String userInput = scanner.nextLine();
-        return userInput;
-    }
-
-    public static String switchStatment() {
-        Scanner scanner = new Scanner(System.in);
-        String ultimateAnswer = "";
-        Boolean turnOff = false;
-        switch (getMethod()) {
-            case "add" :
-                System.out.println("Enter your numbers:");
-                double userInput = scanner.nextDouble();
-                double nextInput = scanner.nextDouble();
-                
-                double answer = Calculator.add(userInput, nextInput);
-                ultimateAnswer = Double.toString(answer);
-                return ultimateAnswer;
-                
-            case "subtract" :
-                System.out.println("Enter your numbers:");
-                userInput = scanner.nextDouble();
-                nextInput = scanner.nextDouble();
-                
-                answer = Calculator.subtract(userInput, nextInput);
-                ultimateAnswer = Double.toString(answer);
-                return ultimateAnswer;
-                
-            case "multiply" :
-                System.out.println("Enter your numbers:");
-                userInput = scanner.nextDouble();
-                nextInput = scanner.nextDouble();
-                
-                answer = Calculator.multiply(userInput, nextInput);
-                ultimateAnswer = Double.toString(answer);
-                return ultimateAnswer;
-                
-            case "divide" :
-                System.out.println("Enter your numbers:");
-                userInput = scanner.nextDouble();
-                nextInput = scanner.nextDouble();
-                
-                answer = Calculator.divide(userInput, nextInput);
-                ultimateAnswer = Double.toString(answer);
-                return ultimateAnswer;
-                
-            case "square" :
-                System.out.println("Enter your number:");
-                userInput = scanner.nextDouble();
-                answer = Calculator.square(userInput);
-                ultimateAnswer = Double.toString(answer);
-                return ultimateAnswer;
-                
-            case "inverse" :
-                System.out.println("Enter your number:");
-                userInput = scanner.nextDouble();
-                answer = Calculator.inverse(userInput);
-                ultimateAnswer = String.format("1/%.0f", answer);
-                return ultimateAnswer;   
-                
-            case "tangent" :
-                System.out.println("Enter your number:");
-                userInput = scanner.nextDouble();
-                answer = Calculator.tangent(userInput);
-                ultimateAnswer = Double.toString(answer);
-                return ultimateAnswer;
-                
-            case "inverse tangent" :
-                System.out.println("Enter your number:");
-                userInput = scanner.nextDouble();
-                answer = Calculator.itan(userInput);
-                ultimateAnswer = Double.toString(answer);
-                return ultimateAnswer;
-            case "quit" :
-                    return "quit";
-           
-
-        }
-        return ultimateAnswer;
-    }
-
-    /*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) {
-        Scanner scanner = new Scanner(System.in);
-        println(prompt);
-        int userInput = scanner.nextInt();
-        return null;
-    }
-
-    public static Double getDoubleInput(String prompt) {
-        Scanner scanner = new Scanner(System.in);
-        println(prompt);
-        double userInput = scanner.nextDouble();
-        double nextInput = scanner.nextDouble();
-        double answer = Calculator.add(userInput, nextInput);
-        return answer;
-    }*/
-
-}

MainApplication.java

@@ -1,24 +0,0 @@
- 
-
-/**
- * Created by leon on 2/9/18.
- */
-public class MainApplication {
-    
-    public static void main(String[] args) {
-        String d = "";
-        while (d != "quit") {
-        Console.println("Welcome to my calculator! What would you like to do?");
-        d = Console.switchStatment();
-        //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("Your answer is %s", d);
-    }
-}
-    
-    
-}

MathMethods.java

@@ -0,0 +1,136 @@
+import java.util.*;
+/**
+ * Write a description of class Calculator here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class MathMethods
+
+{
+
+    public static Double add(double n1, double n2){
+        return (n1 + n2);
+    }
+
+    public static Double subtract(double n1, double n2){
+        return (n1 - n2);
+    }
+
+    public static Double multiply(double n1, double n2){
+        return (n1 * n2);
+    }
+
+    public static Double divide(double n1, double n2){
+        return (n1 / n2);
+    }
+
+    public static Double exponent(double n1, double n2){
+        return (Math.pow(n1, n2));
+    }
+
+    public static Double cosine(double n1){
+        return (Math.cos(n1));
+    }
+
+    public static Double invCosine(double n1){
+        return (Math.acos(n1));
+    }
+
+    public static double squareRoot(double n1) {
+        return (Math.sqrt(n1));
+
+    }
+
+    public static double invert(double n1) {
+        return (n1*-1);
+
+    }
+
+    public static double sin(double n1){
+        return (Math.sin(n1));
+
+    }
+
+    public static double iSin(double n1){
+        return (Math.asin(n1));
+
+    }
+
+    public static double degToRad(double n1) {
+        return (Math.toRadians(n1));
+
+    }
+
+    public static double radToDeg(double n1) {
+        return (Math.toDegrees(n1));
+
+    }
+
+    public static double square(double n1) {
+        return Math.pow(n1, 2);
+
+    }
+
+    public static double inverse(double n1) {
+        return n1;
+    }
+
+    public static double tangent(double n1) {
+        return Math.tan(n1);
+    }
+
+    public static double itan(double n1) {
+        return Math.atan(n1);
+    }
+
+    public static void printAns(String printAnswer){
+        System.out.println("ANSWER: " + printAnswer);
+    }
+
+}
+
+    
+    
+// public static double squareRoot(double n1) {
+// double result = Math.sqrt(x);
+// return result;
+// }
+
+// public static double invert(double n1) {
+// double result = x*-1;
+// return result;
+// }
+
+// public static double sin(double n1){
+// double result = Math.sin(x);
+// return result;
+// }
+
+// public static double iSin(double n1){
+// double result = Math.asin(x);
+// return result;
+// }
+
+// public static double degToRad(double n1) {
+// double result = Math.toRadians(x);
+// return result;
+// }
+
+// public static double radToDeg(double n1) {
+// double result = Math.toDegrees(x);
+// return result;
+// }
+
+// public static Double exponent(double n1, double n2){
+// return (Math.pow(n1, n2));
+// }
+
+// public static Double cosine(double n1){
+// return (Math.cos(n1));
+// }
+
+// public static Double invCosine(double n1){
+// return (Math.acos(n1));
+// }
+

Memory.java

@@ -1,20 +0,0 @@
-
-/**
- * Write a description of class Memory here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
-public class Memory
-{
-    // instance variables - replace the example below with your ow
-
-
-
-    public void memorySet(double x)
-    {
-        mem = x;
-    }
-    
-    public void memoryRecall(double x)
-}

package.bluej

@@ -5,10 +5,17 @@ dependency1.type=UsesDependency
 dependency2.from=MainApplication
 dependency2.to=Console
 dependency2.type=UsesDependency
+<<<<<<< HEAD
 editor.fx.0.height=765
 editor.fx.0.width=863
 editor.fx.0.x=601
 editor.fx.0.y=-945
+=======
+editor.fx.0.height=1020
+editor.fx.0.width=1247
+editor.fx.0.x=1891
+editor.fx.0.y=66
+>>>>>>> 9d9574817b6e6ff98ab240c0e423add0236a0300
 objectbench.height=80
 objectbench.width=595
 package.divider.horizontal=0.5993322203672788