Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master

Basic.java

@@ -1,4 +1,4 @@
-import java.util.Scanner;
+
 
 /**
  * Basic class to perform basic functions for our Graphing Calculator
@@ -10,56 +10,82 @@ public class Basic
 {
     int input1 = 0;
     int input2 = 0;
+    String operation = "";
     int answer;
     
     public Basic()
     {
+        //a check to make sure user input is valid.
         boolean validInput = false;
         
         while(!validInput) {
         //Get input of first number
-        Scanner in2 = new Scanner(System.in);
-        System.out.println("What is the first number?");
-        input1 = in2.nextInt();
+        input1 = Console.getIntegerInput("What is the first number?");
             
-        //Get input of type of function
-        Scanner in1 = new Scanner(System.in);
-        System.out.println("Which operation would you like to perform? \n +, -, *, /");
-        String operation = in1.nextLine(); 
+        //Get input of operation
+        operation = Console.getStringInput("Which operation would you like to perform? \n +, -, *, /");
   
         //Get input of second number
-        Scanner in3 = new Scanner(System.in);
-        System.out.println("What is the second number?");
-        input2 = in3.nextInt();
+        input2 = Console.getIntegerInput("What is the second number?");
         
-        //Do the math depending on the input.
+        //Do the math depending on the inputs.
+        //addition
         if (operation.equals("+")) {
-            answer = input1 + input2;
-            System.out.println(answer);
+            getSum(input1, input2);
             validInput = true;
-            
+        
+        //subtraction    
         } else if (operation.equals("-")) {
-            answer = input1 - input2;
-            System.out.println(answer);
+            getDiff(input1, input2);
             validInput = true;
-            
+        
+        //multiplication
         } else if (operation.equals("*")) {
-            answer = input1 * input2;
-            System.out.println(answer);
+            getProduct(input1, input2);
             validInput = true;
             
+        //division    
         } else if (operation.equals("/")) {
-            answer = input1 / input2;
-            System.out.println(answer);
+            //error message when trying to divide by 0.
+            if (input2 == 0) {
+                Console.println("undefined");
+                //Insert return to main menu.
+            } else {
+            getQuotient(input1, input2);
             validInput = true;
-            
+        }
         } else {
-            System.out.println("Error, try again \n");
+            //error if wrong input was entered
+            Console.println("Error, try again \n");
             
     }
+    
 }
-    //Insert return to main menu.
+         //Insert return to main menu.
 }
+    //addition method
+    public void getSum(int x, int y) {
+        answer = x + y;
+        Console.println(Double.toString(answer));
+    }
+    
+    //subtraction method
+    public void getDiff(int x, int y) {
+        answer = x - y;
+        Console.println(Double.toString(answer));
+    }
+    
+    //multiplication method
+    public void getProduct(int x, int y) {
+        answer = x * y;
+        Console.println(Double.toString(answer));
+    }
+    
+    //division method
+    public void getQuotient(int x, int y) {
+        answer = x / y;
+        Console.println(Double.toString(answer));
+    }
 }
 
         

Trig.java

@@ -1,5 +1,4 @@
 
-import java.util.Scanner;
 
 /**
  * Trig class to perform trig function for our Graphing Calculator
@@ -11,76 +10,109 @@ public class Trig
 {
     int input = 0;
     double answer;
+    String operation = "";
     
     public Trig()
     {
+        //a check to make sure user input is valid
         boolean validInput = false;
         
         while(!validInput) {
         //Get input of type of function
-        Scanner in1 = new Scanner(System.in);
-        System.out.println("Which trignometric function would you like to run? \n sin, cos, tan, arcsin, arccos, arctan");
-        String operation = in1.nextLine(); 
+        operation = Console.getStringInput("Which trignometric function would you like to run? \n sin, cos, tan, arcsin, arccos, arctan");
         operation = operation.toLowerCase();
         
         //Get input of number
-        Scanner in2 = new Scanner(System.in);
-        System.out.println("What number would you like to find the " + operation + " of?");
-        int input = in2.nextInt();
+        input = Console.getIntegerInput("What number would you like to find the " + operation + " of?");
         
         //Do the math depending on the input.
+        //SIN
         if (operation.equals("sin")) {
-            answer = Math.sin(input);
-            System.out.println(answer);
+            calcSin(input);
             validInput = true;
             
+        //COS
         } else if (operation.equals("cos")) {
-            answer = Math.cos(input);
-            System.out.println(answer);
+            calcCos(input);
             validInput = true;
             
+        //TAN
         } else if (operation.equals("tan")) {
-            answer = Math.tan(input);
-            System.out.println(answer);
+            calcTan(input);
             validInput = true;
             
+        //ARCSIN
         } else if (operation.equals("arcsin")) {
-            answer = Math.asin(input);
-            System.out.println(answer);
+            calcArcsin(input);
             validInput = true;
             
+        //ARCCOS
         } else if (operation.equals("arccos")) {
-            answer = Math.acos(input);
-            System.out.println(answer);
+            calcArccos(input);
             validInput = true;
             
+        //ARCTAN
         } else if (operation.equals("arctan")) {
-            answer = Math.atan(input);
-            System.out.println(answer);
+            calcArctan(input);
             validInput = true;
-            
+           
+        //Error message if input does not match options, loops back to the top so they can try again.
         } else {
-            System.out.println("Error, try again \n");
+            Console.println("Error, try again \n");
             
     }
 }
         //Ask if they would like to convert.
-        System.out.println("Would you like to convert your answer from radian to degrees?  Y or N");
-        Scanner in3 = new Scanner(System.in);
-        String response = in3.nextLine();
+        String response = Console.getStringInput("Would you like to convert your answer from radian to degrees?  Y or N");
         response = response.toLowerCase();
         if (response.equals("y")) {
             toDegrees(answer);
     } else {
-        System.out.println("Have a nice day!");
+        Console.println("Have a nice day!");
         //Insert Return to Main Menu
 }
     }
-
+    //Sin method
+    public void calcSin(int x) {
+        answer = Math.sin(x);
+        Console.println(Double.toString(answer));
+    }
+    
+    //Cos method
+    public void calcCos(int x) {
+        answer = Math.cos(x);
+        Console.println(Double.toString(answer));
+    }
+    
+    //Tan method
+    public void calcTan(int x) {
+        answer = Math.tan(x);
+        Console.println(Double.toString(answer));
+    }
+    
+    //Arcsin method
+    public void calcArcsin(int x) {
+        answer = Math.asin(x);
+        Console.println(Double.toString(answer));
+    }
+    
+    //Arccos method
+    public void calcArccos(int x) {
+        answer = Math.acos(x);
+        Console.println(Double.toString(answer));
+    }
+    
+    //Arctan method
+    public void calcArctan(int x) {
+        answer = Math.atan(x);
+        Console.println(Double.toString(answer));
+    }
+    
+    //Converting from Radians to Degrees
     public void toDegrees(double answer) 
     {
         double conversion = Math.toDegrees(answer);
-        System.out.println(conversion);
+        Console.println(Double.toString(conversion));
         //Insert Return to Main Menu
     }
 }

package.bluej

@@ -45,13 +45,13 @@ editor.fx.0.height=722
 editor.fx.0.width=1120
 editor.fx.0.x=320
 editor.fx.0.y=119
->>>>>>> trinhsCalc
+>>>>>>> 5b0bd69a84477726debf8e0b897ce7f6e0cbe025
 objectbench.height=214
-objectbench.width=595
+objectbench.width=706
 package.divider.horizontal=0.6
-package.divider.vertical=0.6847360912981455
-package.editor.height=473
-package.editor.width=493
+package.divider.vertical=0.720253164556962
+package.editor.height=562
+package.editor.width=604
 package.editor.x=35
 package.editor.y=59
 package.frame.height=759
@@ -60,8 +60,8 @@ package.frame.width=619
 package.numDependencies=4
 =======
 package.numDependencies=9
->>>>>>> trinhsCalc
 package.numTargets=8
+>>>>>>> 5b0bd69a84477726debf8e0b897ce7f6e0cbe025
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -71,12 +71,12 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Basic
+target1.name=AdvCalc
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=80
-target1.x=320
-target1.y=180
+target1.x=90
+target1.y=10
 target2.height=50
 target2.name=SciCalc
 target2.showInterface=false
@@ -95,7 +95,7 @@ target3.y=410
 =======
 target3.x=210
 target3.y=350
->>>>>>> trinhsCalc
+>>>>>>> 5b0bd69a84477726debf8e0b897ce7f6e0cbe025
 target4.height=50
 target4.name=Console
 target4.showInterface=false