fixed merging conflict

Basic.java

@@ -1,4 +1,4 @@
-import java.util.Scanner;
+
 
 /**
  * Basic class to perform basic functions for our Graphing Calculator
@@ -8,58 +8,80 @@ import java.util.Scanner;
  */
 public class Basic
 {
-    int input1 = 0;
-    int input2 = 0;
-    int answer;
+    double input1 = 0;
+    double input2 = 0;
+    String operation = "";
+    double answer;
     
-    public Basic()
+    public double 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.getDoubleInput("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.getDoubleInput("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);
-            validInput = true;
-            
+            getSum(input1, input2);
+        
+        //subtraction    
         } else if (operation.equals("-")) {
-            answer = input1 - input2;
-            System.out.println(answer);
-            validInput = true;
-            
+            getDiff(input1, input2);
+        
+        //multiplication
         } else if (operation.equals("*")) {
-            answer = input1 * input2;
-            System.out.println(answer);
-            validInput = true;
+            getProduct(input1, input2);
             
+        //division    
         } else if (operation.equals("/")) {
-            answer = input1 / input2;
-            System.out.println(answer);
-            validInput = true;
-            
+            //error message when trying to divide by 0.
+            if (input2 == 0) {
+                Console.println("undefined");
+                //Insert return to main menu.
+            } else {
+            getQuotient(input1, input2);
+        }
         } else {
-            System.out.println("Error, try again \n");
+            //error if wrong input was entered
+            answer = Double.NaN;
+            
             
     }
+        
+        return answer;
+
 }
-    //Insert return to main menu.
-}
+    //addition method
+    public double getSum(double x, double y) {
+        answer = x + y;
+        return answer;
+    }
+    
+    //subtraction method
+    public double getDiff(double x, double y) {
+        answer = x - y;
+        return answer;
+    }
+    
+    //multiplication method
+    public double getProduct(double x, double y) {
+        answer = x * y;
+        return answer;
+    }
+    
+    //division method
+    public double getQuotient(double x, double y) {
+        answer = x / y;
+        return answer;
+    }
 }
 
         

Trig.java

@@ -1,5 +1,4 @@
 
-import java.util.Scanner;
 
 /**
  * Trig class to perform trig function for our Graphing Calculator
@@ -9,79 +8,120 @@ import java.util.Scanner;
  */
 public class Trig
 {
-    int input = 0;
+    double input = 0.0;
     double answer;
+    String operation = "";
     
-    public Trig()
+    public double Trig() {
+        TrigFunctions();
+        
+        //Ask if they would like to convert.
+        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);
+    }
+    
+        return answer;
+}
+    
+    public double TrigFunctions()
     {
+        //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.getDoubleInput("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);
-            validInput = true;
+            calcSin(input);
+        
             
+        //COS
         } else if (operation.equals("cos")) {
-            answer = Math.cos(input);
-            System.out.println(answer);
-            validInput = true;
+            calcCos(input);
+        
             
+        //TAN
         } else if (operation.equals("tan")) {
-            answer = Math.tan(input);
-            System.out.println(answer);
-            validInput = true;
+            calcTan(input);
+        
             
+        //ARCSIN
         } else if (operation.equals("arcsin")) {
-            answer = Math.asin(input);
-            System.out.println(answer);
-            validInput = true;
+            calcArcsin(input);
+        
             
+        //ARCCOS
         } else if (operation.equals("arccos")) {
-            answer = Math.acos(input);
-            System.out.println(answer);
-            validInput = true;
+            calcArccos(input);
+        
             
+        //ARCTAN
         } else if (operation.equals("arctan")) {
-            answer = Math.atan(input);
-            System.out.println(answer);
-            validInput = true;
-            
+            calcArctan(input);
+        
+           
+        //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");
+            answer = Double.NaN;
             
     }
+        return answer;
+       
+    
 }
-        //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();
-        response = response.toLowerCase();
-        if (response.equals("y")) {
-            toDegrees(answer);
-    } else {
-        System.out.println("Have a nice day!");
-        //Insert Return to Main Menu
-}
+    
+    
+    //Sin method
+    public double calcSin(double x) {
+        answer = Math.sin(x);
+        return answer;
     }
-
-    public void toDegrees(double answer) 
+    
+    //Cos method
+    public double calcCos(double x) {
+        answer = Math.cos(x);
+        return answer;
+    }
+    
+    //Tan method
+    public double calcTan(double x) {
+        answer = Math.tan(x);
+        return answer;
+    }
+    
+    //Arcsin method
+    public double calcArcsin(double x) {
+        answer = Math.asin(x);
+        return answer;
+    }
+    
+    //Arccos method
+    public double calcArccos(double x) {
+        answer = Math.acos(x);
+        return answer;
+    }
+    
+    //Arctan method
+    public double calcArctan(double x) {
+        answer = Math.atan(x);
+        return answer;
+    }
+    
+    //Converting from Radians to Degrees
+    public double toDegrees(double answer) 
     {
         double conversion = Math.toDegrees(answer);
-        System.out.println(conversion);
-        //Insert Return to Main Menu
+        answer = conversion;
+        return answer;
+
     }
 }
 

package.bluej

@@ -1,54 +1,62 @@
 #BlueJ package file
-dependency1.from=MainMenu
+dependency1.from=Trig
 dependency1.to=Console
 dependency1.type=UsesDependency
-dependency2.from=SwitchDisplay
+dependency10.from=MainApplication
+dependency10.to=MemoryFunc
+dependency10.type=UsesDependency
+dependency11.from=MainApplication
+dependency11.to=SwitchDisplay
+dependency11.type=UsesDependency
+dependency12.from=MainApplication
+dependency12.to=Console
+dependency12.type=UsesDependency
+dependency2.from=Basic
 dependency2.to=Console
 dependency2.type=UsesDependency
-dependency3.from=SciCalc
-dependency3.to=Console
+dependency3.from=BasicTest
+dependency3.to=Basic
 dependency3.type=UsesDependency
-dependency4.from=MainApplication
-dependency4.to=MainMenu
+dependency4.from=SciCalc
+dependency4.to=Console
 dependency4.type=UsesDependency
-dependency5.from=MainApplication
-dependency5.to=SciCalc
+dependency5.from=MemoryFunc
+dependency5.to=Console
 dependency5.type=UsesDependency
-dependency6.from=MainApplication
-dependency6.to=MemoryFunc
+dependency6.from=SwitchDisplay
+dependency6.to=Console
 dependency6.type=UsesDependency
-dependency7.from=MainApplication
-dependency7.to=SwitchDisplay
+dependency7.from=MainMenu
+dependency7.to=Console
 dependency7.type=UsesDependency
 dependency8.from=MainApplication
-dependency8.to=Console
+dependency8.to=MainMenu
 dependency8.type=UsesDependency
-dependency9.from=MemoryFunc
-dependency9.to=Console
+dependency9.from=MainApplication
+dependency9.to=SciCalc
 dependency9.type=UsesDependency
-<<<<<<< HEAD
 editor.fx.0.height=0
 editor.fx.0.width=0
 editor.fx.0.x=0
 editor.fx.0.y=0
-=======
 editor.fx.0.height=722
 editor.fx.0.width=1120
 editor.fx.0.x=320
 editor.fx.0.y=119
->>>>>>> master
+=======
+>>>>>>> origin
 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
-package.frame.width=619
-package.numDependencies=9
-package.numTargets=8
+package.editor.y=60
+package.frame.height=848
+package.frame.width=730
+package.numDependencies=12
+package.numTargets=9
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -57,6 +65,7 @@ readme.name=@README
 readme.width=47
 readme.x=10
 readme.y=10
+target1.association=BasicTest
 target1.height=50
 target1.name=Basic
 target1.showInterface=false
@@ -69,47 +78,54 @@ target2.name=SciCalc
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=10
-target2.y=280
+target2.x=120
+target2.y=10
 target3.height=50
 target3.name=MemoryFunc
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=110
-target3.x=210
-target3.y=350
+target3.x=10
+target3.y=130
 target4.height=50
 target4.name=Console
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=80
-target4.x=70
-target4.y=170
+target4.x=80
+target4.y=200
 target5.height=50
-target5.name=Trig
+target5.name=BasicTest
 target5.showInterface=false
-target5.type=ClassTarget
+target5.type=UnitTestTargetJunit4
 target5.width=80
-target5.x=320
-target5.y=70
+target5.x=350
+target5.y=150
 target6.height=50
-target6.name=SwitchDisplay
+target6.name=Trig
 target6.showInterface=false
 target6.type=ClassTarget
-target6.width=110
-target6.x=80
-target6.y=350
+target6.width=80
+target6.x=320
+target6.y=70
 target7.height=50
-target7.name=MainMenu
+target7.name=SwitchDisplay
 target7.showInterface=false
 target7.type=ClassTarget
-target7.width=90
-target7.x=70
-target7.y=10
+target7.width=110
+target7.x=120
+target7.y=130
 target8.height=50
-target8.name=MainApplication
+target8.name=MainMenu
 target8.showInterface=false
 target8.type=ClassTarget
-target8.width=120
-target8.x=70
-target8.y=70
+target8.width=90
+target8.x=170
+target8.y=190
+target9.height=50
+target9.name=MainApplication
+target9.showInterface=false
+target9.type=ClassTarget
+target9.width=120
+target9.x=70
+target9.y=70