added log

Console.java

@@ -254,6 +254,9 @@ public class Console {
                         trigAnswer = trigMenu.calcArctan(trigInput);
 
                     } else if (trigMode.equals("7")) {
+                        trigAnswer = trigMenu.calcLog(trigInput);
+
+                    } else if (trigMode.equals("8")) {
                         break;
 
                     } else {

Trig.java

@@ -20,7 +20,8 @@ public class Trig
             + "\n4: arcsin"
             + "\n5: arccosin"
             + "\n6: arctan"
-            + "\n7: Cancel - returns to Main Menu");   
+            + "\n7: log"
+            + "\n8: Cancel - returns to Main Menu");   
 
         
     }
@@ -61,6 +62,12 @@ public class Trig
         return answer;
     }
 
+    //Log Method
+    public double calcLog(double x) {
+        answer = Math.log10(x);
+        return answer;
+    }
+    
     //Converting from Radians to Degrees
     public double toDegrees(double answer) 
     {
@@ -69,5 +76,7 @@ public class Trig
         return answer;
 
     }
+    
+    
 }
 

TrigTest.java

@@ -88,6 +88,13 @@ public class TrigTest
         Trig trig1 = new Trig();
         assertEquals(1.04719755, trig1.calcArccos(0.5), 0.1);
     }
+
+    @Test
+    public void testLog()
+    {
+        Trig trig1 = new Trig();
+        assertEquals(1, trig1.calcLog(10), 0.1);
+    }
 }
 
 
@@ -96,3 +103,4 @@ public class TrigTest
 
 
 
+

package.bluej

@@ -1,31 +1,8 @@
 #BlueJ package file
-dependency1.from=MainMenu
+dependency1.from=Basic
 dependency1.to=Console
 dependency1.type=UsesDependency
 dependency10.from=Console
-<<<<<<< HEAD
-dependency10.to=RealAdvanced
-dependency10.type=UsesDependency
-dependency11.from=Console
-dependency11.to=SciCalc
-dependency11.type=UsesDependency
-dependency12.from=Console
-dependency12.to=MemoryFunc
-dependency12.type=UsesDependency
-dependency13.from=Console
-dependency13.to=SwitchDisplay
-dependency13.type=UsesDependency
-dependency14.from=Console
-dependency14.to=Trig
-dependency14.type=UsesDependency
-dependency15.from=SwitchDisplay
-dependency15.to=Console
-dependency15.type=UsesDependency
-dependency2.from=SciCalc
-dependency2.to=Console
-dependency2.type=UsesDependency
-dependency3.from=MainApplication
-=======
 dependency10.to=Basic
 dependency10.type=UsesDependency
 dependency11.from=Console
@@ -43,50 +20,43 @@ dependency14.type=UsesDependency
 dependency15.from=Console
 dependency15.to=Trig
 dependency15.type=UsesDependency
-dependency16.from=RealAdvancedTest
-dependency16.to=RealAdvanced
+dependency16.from=Trig
+dependency16.to=Console
 dependency16.type=UsesDependency
-dependency2.from=SciCalc
-dependency2.to=Console
+dependency17.from=SwitchDisplay
+dependency17.to=Console
+dependency17.type=UsesDependency
+dependency18.from=MainApplication
+dependency18.to=Console
+dependency18.type=UsesDependency
+dependency2.from=TrigTest
+dependency2.to=Trig
 dependency2.type=UsesDependency
-dependency3.from=MemoryFunc
->>>>>>> 49d5555735b5e26b8076429d9dd1666b4918738c
->>>>>>> 3fa2b863a93d1b5548a82c34b3920f059a52833d
-dependency3.to=Console
+dependency3.from=BasicTest
+dependency3.to=Basic
 dependency3.type=UsesDependency
-dependency4.from=Trig
-dependency4.to=Console
+dependency4.from=RealAdvancedTest
+dependency4.to=RealAdvanced
 dependency4.type=UsesDependency
-dependency5.from=Basic
+dependency5.from=MainMenu
 dependency5.to=Console
 dependency5.type=UsesDependency
-<<<<<<< HEAD
-dependency6.from=RealAdvanced
-dependency6.to=Console
-dependency6.type=UsesDependency
-dependency7.from=MemoryFunc
-=======
-dependency6.from=SwitchDisplay
+dependency6.from=SciCalc
 dependency6.to=Console
 dependency6.type=UsesDependency
-dependency7.from=MainMenu
->>>>>>> 3fa2b863a93d1b5548a82c34b3920f059a52833d
+dependency7.from=RealAdvanced
 dependency7.to=Console
 dependency7.type=UsesDependency
-dependency8.from=Console
-dependency8.to=MainMenu
+dependency8.from=MemoryFunc
+dependency8.to=Console
 dependency8.type=UsesDependency
 dependency9.from=Console
-<<<<<<< HEAD
-dependency9.to=Basic
-=======
 dependency9.to=MainMenu
->>>>>>> 3fa2b863a93d1b5548a82c34b3920f059a52833d
 dependency9.type=UsesDependency
-editor.fx.0.height=749
-editor.fx.0.width=1215
-editor.fx.0.x=144
-editor.fx.0.y=72
+editor.fx.0.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
 objectbench.height=214
 objectbench.width=595
 package.divider.horizontal=0.6
@@ -97,8 +67,8 @@ package.editor.x=35
 package.editor.y=59
 package.frame.height=759
 package.frame.width=619
-package.numDependencies=15
-package.numTargets=9
+package.numDependencies=18
+package.numTargets=12
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -107,6 +77,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
@@ -114,59 +85,81 @@ target1.type=ClassTarget
 target1.width=80
 target1.x=320
 target1.y=180
+target10.association=TrigTest
+target10.height=50
+target10.name=Trig
+target10.showInterface=false
+target10.type=ClassTarget
+target10.width=80
+target10.x=320
+target10.y=70
+target11.height=50
+target11.name=SwitchDisplay
+target11.showInterface=false
+target11.type=ClassTarget
+target11.width=110
+target11.x=80
+target11.y=350
+target12.height=50
+target12.name=MainApplication
+target12.showInterface=false
+target12.type=ClassTarget
+target12.width=120
+target12.x=70
+target12.y=70
 target2.height=50
-target2.name=SciCalc
+target2.name=TrigTest
 target2.showInterface=false
-target2.type=ClassTarget
+target2.type=UnitTestTargetJunit4
 target2.width=80
-target2.x=10
-target2.y=280
+target2.x=350
+target2.y=40
 target3.height=50
-target3.name=RealAdvanced
+target3.name=BasicTest
 target3.showInterface=false
-target3.type=ClassTarget
-target3.width=110
-target3.x=170
-target3.y=10
+target3.type=UnitTestTargetJunit4
+target3.width=80
+target3.x=350
+target3.y=150
 target4.height=50
-target4.name=MemoryFunc
+target4.name=RealAdvancedTest
 target4.showInterface=false
-target4.type=ClassTarget
-target4.width=110
-target4.x=210
-target4.y=350
+target4.type=UnitTestTargetJunit4
+target4.width=140
+target4.x=100
+target4.y=230
 target5.height=50
-target5.name=Console
+target5.name=MainMenu
 target5.showInterface=false
 target5.type=ClassTarget
-target5.width=80
+target5.width=90
 target5.x=70
-target5.y=170
+target5.y=10
 target6.height=50
-target6.name=Trig
+target6.name=SciCalc
 target6.showInterface=false
 target6.type=ClassTarget
 target6.width=80
-target6.x=320
-target6.y=70
+target6.x=10
+target6.y=280
 target7.height=50
-target7.name=SwitchDisplay
+target7.name=RealAdvanced
 target7.showInterface=false
 target7.type=ClassTarget
 target7.width=110
-target7.x=80
-target7.y=350
+target7.x=170
+target7.y=10
 target8.height=50
-target8.name=MainMenu
+target8.name=MemoryFunc
 target8.showInterface=false
 target8.type=ClassTarget
-target8.width=90
-target8.x=70
-target8.y=10
+target8.width=110
+target8.x=210
+target8.y=350
 target9.height=50
-target9.name=MainApplication
+target9.name=Console
 target9.showInterface=false
 target9.type=ClassTarget
-target9.width=120
+target9.width=80
 target9.x=70
-target9.y=70
+target9.y=170