g

BasicMath.java

@@ -13,22 +13,22 @@ public class BasicMath
    public static double add(double a,double b) {  
             return a + b;
         }
-    public static double Subtract(double a,double b){
+   public static double Subtract(double a,double b){
             return a - b;
         }
-    public static double multiply(double a,double b){
+   public static double multiply(double a,double b){
             return a * b;
         }
-    public static double divide(double a,double b){
+   public static double divide(double a,double b){
             return a / b;
         }
-    public static double power(double a, double b){
+   public static double power(double a, double b){
             return Math.pow(a,b);
         } 
-    public static double squareRoot(double a){
+   public static double squareRoot(double a){
             return Math.sqrt(a);
         }   
-    public static double inverse(double a){
+   public static double inverse(double a){
         return 1/a;
     }
 }

Console.java

@@ -1,10 +1,8 @@
- 
-
-import java.util.Scanner;
-
 /**
  * Created by leon on 2/9/18.
  */
+import java.util.Scanner;
+
 public class Console {
 
     public static void print(String output, Object... args) {
@@ -23,10 +21,16 @@ public class Console {
     }
 
     public static Integer getIntegerInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        int userInput = scanner.nextInt();
+        return userInput;
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        double userInput = scanner.nextDouble();
+        return userInput;
     }
 }

MainApplication.java

@@ -1,17 +1,188 @@
- 
+import java.util.*;
 
 /**
  * Created by leon on 2/9/18.
  */
 public class MainApplication {
     public static void main(String[] args) {
+
+        double value = 0;//answer
+        double memoryValue = 0;
+
         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 double", d);
+        `*/
+        Scanner input = new Scanner(System.in);
+        // Calculator calc = new ....
+        while (true) {
+            System.out.print("Enter a command: ");
+            String command = input.next();
+            if (command.equalsIgnoreCase("exit"))  {
+                Console.println("Thanks for calculating with us!");
+                break;
+            }
+            if (command.equalsIgnoreCase("add"))  {
+                // read first number
+                // read second number
+                // call the add method on calc and display
+                double x = Console.getDoubleInput("Input your first number");
+                double y = Console.getDoubleInput("Input your second number");
+                double answer = BasicMath.add(x,y);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if(command.equalsIgnoreCase("Subtract")){
+                double x = Console.getDoubleInput("Input your first number");
+                double y = Console.getDoubleInput("Input your second number");
+                double answer = BasicMath.Subtract(x,y);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("multiply"))  {
+                double x = Console.getDoubleInput("Input your first number");
+                double y = Console.getDoubleInput("Input your second number");
+                double answer = BasicMath.multiply(x,y);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("divide"))  {
+                // call the square method on calc and display
+                double x = Console.getDoubleInput("Input your first number");
+                double y = Console.getDoubleInput("Input your second number");
+                double answer = BasicMath.divide(x,y);
+                value = answer; 
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("power"))  {
+                // call the square method on calc and display
+                double x = Console.getDoubleInput("Input your first number");
+                double y = Console.getDoubleInput("Input your exponent");
+                double answer = BasicMath.power(x,y);
+                value = answer; 
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("inverse"))  {
+                // call the square method on calc and display
+                double x = Console.getDoubleInput("Input your number");
+                double answer = BasicMath.inverse(x);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("square"))  {
+                // read first number
+                // call the method on calc and display
+                double x = Console.getDoubleInput("Input your number");
+                double answer = BasicMath.squareRoot(x);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("hex"))  {
+                int no = (int)value;
+                String hex = Integer.toHexString(no);
+                Console.println(hex);
+            }
+            if (command.equalsIgnoreCase("binary"))  {
+                int no = (int)value;
+                String binary = Integer.toBinaryString(no);
+                Console.println(binary);
+            }
+            if(command.equalsIgnoreCase("octal")){
+                int no = (int)value;
+                String octal = Integer.toOctalString(no);
+                Console.println(octal);
+            }
+
+            if (command.equalsIgnoreCase("sin"))  {
+                double x = Console.getDoubleInput("Input your number");
+                double answer = TrigFunctions.sin(x);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+
+            if (command.equalsIgnoreCase("cos"))  {
+                double x = Console.getDoubleInput("Input your number");
+                double answer = TrigFunctions.cos(x);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("tan"))  {
+                double x = Console.getDoubleInput("Input your number");
+                double answer = TrigFunctions.tan(x);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("invsin"))  {
+                double x = Console.getDoubleInput("Input your number");
+                double answer = TrigFunctions.invsin(x);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("invcos"))  {
+                double x = Console.getDoubleInput("Input your number");
+                double answer = TrigFunctions.invcos(x);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("invtan"))  {
+                double x = Console.getDoubleInput("Input your number");
+                double answer = TrigFunctions.invtan(x);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("deg"))  {
+                double x = Console.getDoubleInput("Input your number");
+                double answer = TrigFunctions.deg(x);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if (command.equalsIgnoreCase("rad"))  {
+                double x = Console.getDoubleInput("Input your number");
+                double answer = TrigFunctions.rad(x);
+                value = answer;
+                Console.println(String.valueOf(answer));
+            }
+            if(command.equalsIgnoreCase("negpos")){
+                if(value > 0){
+                    value = value * (-1);
+                    Console.println(String.valueOf(value));
+                }
+                else{
+                    Console.println("ERROR");
+                }
+            }
+            if(command.equalsIgnoreCase("clear")){
+                value = 0;
+                Console.println(String.valueOf(value));
+            }
+            if(command.equalsIgnoreCase("memory")){
+                memoryValue = Console.getDoubleInput("Input the number you want to save:");
+                Console.println("SAVED!!!");
+                Console.println(String.valueOf(0));
+            }// and on and on
+            if(command.equalsIgnoreCase("recall")){
+                Console.println(String.valueOf(memoryValue));
+            }
+            // Pythagorean theorem
+            if(command.equalsIgnoreCase("custom1")){
+                double x = Console.getDoubleInput("Input your first number");
+                double y = Console.getDoubleInput("Input your exponent");
+                double answer = Math.sqrt(Math.pow(x, 2)+ Math.pow(y, 2));
+                value = answer; 
+                Console.println(String.valueOf(value));
+            }
+            if(command.equalsIgnoreCase("PI")){
+                value = Math.PI;
+                Console.println("PIEEEEEEEEEEEEEEEEEEEEE");
+                Console.println(String.valueOf(value));
+            }
+        }
+
     }
 }

TrigFunctions.java

@@ -22,43 +22,43 @@ public class TrigFunctions
         ;
     }
 
-    public double sin(int number){
+    public static double sin(double number){
      double value = Math.sin(number);
      return value;
     }
     
     
-    public double cos(int number){
+    public static double cos(double number){
         double value = Math.cos(number);
         return value;
     }
     
-    public double tan(int number){
+    public static double tan(double number){
         double value = Math.tan(number);
         return value;   
     }
     
-    public double invsin(int number){
+    public static double invsin(double number){
         double value = Math.asin(number);
         return value;
     }
     
-    public double invcos(int number){
+    public static double invcos(double number){
         double value = Math.acos(number);
         return value;
     }
     
-    public double invtan(int number){
+    public static double invtan(double number){
         double value = Math.atan(number);
         return value;   
     }
     
-    public double deg(int number){
+    public static double deg(double number){
         double value = Math.toDegrees(number);
         return value;
     }
     
-    public double rad(int number){
+    public static double rad(double number){
         double value = Math.toRadians(number);
         return value;   
     }

package.bluej

@@ -2,43 +2,28 @@
 dependency1.from=BasicMathTest
 dependency1.to=BasicMath
 dependency1.type=UsesDependency
-<<<<<<< HEAD
-dependency2.from=BasicMathTest
-dependency2.to=BasicMath
+dependency2.from=TrigFunctionsTest
+dependency2.to=TrigFunctions
 dependency2.type=UsesDependency
-editor.fx.0.height=0
-editor.fx.0.width=0
-editor.fx.0.x=0
-editor.fx.0.y=0
-=======
-dependency2.from=MainApplication
-dependency2.to=Console
-dependency2.type=UsesDependency
-dependency3.from=TrigFunctionsTest
-dependency3.to=TrigFunctions
+dependency3.from=MainApplication
+dependency3.to=Console
 dependency3.type=UsesDependency
 editor.fx.0.height=722
 editor.fx.0.width=800
 editor.fx.0.x=155
 editor.fx.0.y=23
->>>>>>> 7d1ea52de1c614ccaeb20bec6a6c3ced4ce15339
 objectbench.height=202
-objectbench.width=352
-package.divider.horizontal=0.5993322203672788
+objectbench.width=536
+package.divider.horizontal=0.56153050672182
 package.divider.vertical=0.6852409638554217
 package.editor.height=448
-package.editor.width=493
+package.editor.width=861
 package.editor.x=35
 package.editor.y=23
 package.frame.height=722
-package.frame.width=619
-<<<<<<< HEAD
-package.numDependencies=2
-package.numTargets=5
-=======
+package.frame.width=987
 package.numDependencies=3
 package.numTargets=7
->>>>>>> 7d1ea52de1c614ccaeb20bec6a6c3ced4ce15339
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -53,72 +38,50 @@ target1.name=BasicMath
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=90
-<<<<<<< HEAD
-target1.x=320
-target1.y=130
-=======
-target1.x=220
-target1.y=160
->>>>>>> 7d1ea52de1c614ccaeb20bec6a6c3ced4ce15339
+target1.x=270
+target1.y=120
 target2.height=50
 target2.name=MainApplicationTest
 target2.showInterface=false
 target2.type=UnitTestTargetJunit4
 target2.width=120
-target2.x=100
-target2.y=40
+target2.x=60
+target2.y=80
 target3.height=50
 target3.name=Console
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=80
-target3.x=80
-target3.y=200
-<<<<<<< HEAD
-target4.height=50
-target4.name=BasicMathTest
-target4.showInterface=false
-target4.type=UnitTestTargetJunit4
-target4.width=90
-target4.x=350
-target4.y=100
-target5.association=MainApplicationTest
-target5.height=50
-target5.name=MainApplication
-target5.showInterface=false
-target5.type=ClassTarget
-target5.width=120
-target5.x=70
-target5.y=70
-=======
+target3.x=250
+target3.y=180
 target4.association=TrigFunctionsTest
 target4.height=50
 target4.name=TrigFunctions
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=110
-target4.x=40
-target4.y=300
+target4.x=50
+target4.y=240
+target5.association=MainApplicationTest
 target5.height=50
 target5.name=BasicMathTest
 target5.showInterface=false
 target5.type=UnitTestTargetJunit4
-target5.width=120
-target5.x=330
-target5.y=170
+target5.width=90
+target5.x=300
+target5.y=90
 target6.height=50
 target6.name=TrigFunctionsTest
 target6.showInterface=false
 target6.type=UnitTestTargetJunit4
 target6.width=110
-target6.x=70
-target6.y=270
+target6.x=80
+target6.y=210
 target7.association=MainApplicationTest
 target7.height=50
 target7.name=MainApplication
 target7.showInterface=false
 target7.type=ClassTarget
 target7.width=120
-target7.x=70
-target7.y=70
->>>>>>> 7d1ea52de1c614ccaeb20bec6a6c3ced4ce15339
+target7.x=30
+target7.y=110