commit2

TrigFunctions.java

@@ -0,0 +1,65 @@
+
+/**
+ * Write a description of class TrigFunctions here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+import java.lang.Math;
+import java.util.Scanner;
+
+public class TrigFunctions
+{
+    // instance variables - replace the example below with your own
+   
+
+    /**
+     * Constructor for objects of class TrigFunctions
+     */
+    public TrigFunctions()
+    {
+        ;// initialise instance variables
+        ;
+    }
+
+    public double sin(int number){
+     double value = Math.sin(number);
+     return value;
+    }
+    
+    
+    public double cos(int number){
+        double value = Math.cos(number);
+        return value;
+    }
+    
+    public double tan(int number){
+        double value = Math.tan(number);
+        return value;   
+    }
+    
+    public double invsin(int number){
+        double value = Math.asin(number);
+        return value;
+    }
+    
+    public double invcos(int number){
+        double value = Math.acos(number);
+        return value;
+    }
+    
+    public double invtan(int number){
+        double value = Math.atan(number);
+        return value;   
+    }
+    
+    public double deg(int number){
+        double value = Math.toDegrees(number);
+        return value;
+    }
+    
+    public double rad(int number){
+        double value = Math.toRadians(number);
+        return value;   
+    }
+} //end Class TrigFunctions

TrigFunctionsTest.java

@@ -0,0 +1,79 @@
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class TrigFunctionsTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class TrigFunctionsTest
+{
+   @Test
+   public void sinTest(){
+       TrigFunctions trigFunctions = new TrigFunctions();
+       double expected = -0.95;
+       double actual = trigFunctions.sin(5);
+       assertEquals(expected,actual,0.01);
+       
+    }
+    
+   @Test
+   public void cosTest(){
+       TrigFunctions trigFunctions = new TrigFunctions();
+       double expected = 0.28;
+       double actual = trigFunctions.cos(5);
+       assertEquals(expected,actual, 0.01);
+    }
+    
+    @Test
+    public void tanTest(){
+      TrigFunctions trigFunctions = new TrigFunctions();
+      double expected = -3.38;
+      double actual = trigFunctions.tan(5);
+      assertEquals(expected,actual, 0.01);
+    }
+    
+   @Test
+   public void invsinTest(){
+     TrigFunctions trigFunctions = new TrigFunctions();
+     double expected = 1.57;
+     double actual = trigFunctions.invsin(1);
+     assertEquals(expected,actual, 0.01);
+    }
+    
+    @Test
+    public void invcosTest(){
+     TrigFunctions trigFunctions = new TrigFunctions();
+     double expected = 0;
+     double actual = trigFunctions.invcos(1);
+     assertEquals(expected,actual, 0.01);
+    }
+    
+    @Test
+    public void invtanTest(){
+     TrigFunctions trigFunctions = new TrigFunctions();
+     double expected = 0.79;
+     double actual = trigFunctions.invtan(1);
+     assertEquals(expected,actual, 0.01);
+    }
+    
+    @Test
+    public void degTest(){
+    TrigFunctions trigFunctions = new TrigFunctions();
+    double expected = 286.48;
+    double actual = trigFunctions.deg(5);
+    assertEquals(expected,actual, 0.01);
+    }
+    
+    @Test
+    public void radTest(){
+     TrigFunctions trigFunctions = new TrigFunctions();
+     double expected = 0.87;
+     double actual = trigFunctions.rad(50);
+     assertEquals(expected,actual, 0.01);
+    }
+}

package.bluej

@@ -1,7 +1,8 @@
 #BlueJ package file
-dependency1.from=MainApplication
-dependency1.to=Console
+dependency1.from=BasicMathTest
+dependency1.to=BasicMath
 dependency1.type=UsesDependency
+<<<<<<< HEAD
 dependency2.from=BasicMathTest
 dependency2.to=BasicMath
 dependency2.type=UsesDependency
@@ -9,6 +10,18 @@ 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.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
@@ -19,8 +32,13 @@ package.editor.x=35
 package.editor.y=23
 package.frame.height=722
 package.frame.width=619
+<<<<<<< HEAD
 package.numDependencies=2
 package.numTargets=5
+=======
+package.numDependencies=3
+package.numTargets=7
+>>>>>>> 7d1ea52de1c614ccaeb20bec6a6c3ced4ce15339
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -35,8 +53,13 @@ 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
 target2.height=50
 target2.name=MainApplicationTest
 target2.showInterface=false
@@ -51,6 +74,7 @@ target3.type=ClassTarget
 target3.width=80
 target3.x=80
 target3.y=200
+<<<<<<< HEAD
 target4.height=50
 target4.name=BasicMathTest
 target4.showInterface=false
@@ -66,3 +90,35 @@ target5.type=ClassTarget
 target5.width=120
 target5.x=70
 target5.y=70
+=======
+target4.association=TrigFunctionsTest
+target4.height=50
+target4.name=TrigFunctions
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=110
+target4.x=40
+target4.y=300
+target5.height=50
+target5.name=BasicMathTest
+target5.showInterface=false
+target5.type=UnitTestTargetJunit4
+target5.width=120
+target5.x=330
+target5.y=170
+target6.height=50
+target6.name=TrigFunctionsTest
+target6.showInterface=false
+target6.type=UnitTestTargetJunit4
+target6.width=110
+target6.x=70
+target6.y=270
+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