push

ScientificFunctions.java

@@ -6,8 +6,6 @@ public class ScientificFunctions
     public static double memory = 0;
     public static boolean degMode = true;
     public static boolean radMode = false;
-<<<<<<< HEAD
-=======
     public static boolean decMode = true;
     public static boolean hexMode = false;
     public static boolean binMode = false;
@@ -15,7 +13,7 @@ public class ScientificFunctions
     public static String hexOut;
     public static String binOut;
     public static String octOut;
->>>>>>> 063d73dc4208e605d3684ff88c12d0e9d50875f4
+
 
     public static double sqr(double display) {
         System.out.println( display * display);
@@ -40,10 +38,9 @@ public class ScientificFunctions
 
     public static double setMem(double display) {
         System.out.println("Set to memory!");
-<<<<<<< HEAD
+
         return memory = display;
-=======
->>>>>>> 063d73dc4208e605d3684ff88c12d0e9d50875f4
+
 
     }
 
@@ -58,10 +55,7 @@ public class ScientificFunctions
         return display = memory; 
 
     }
-<<<<<<< HEAD
-=======
-    //Fixed trig functions to convert to radians before printing the equation.
->>>>>>> 063d73dc4208e605d3684ff88c12d0e9d50875f4
+
 
     public static double cosine(double display) {
         if (degMode == true){

package.bluej

@@ -9,17 +9,17 @@ dependency3.from=MainApplication
 dependency3.to=ScientificFunctions
 dependency3.type=UsesDependency
 editor.fx.0.height=709
-editor.fx.0.width=800
-editor.fx.0.x=375
-editor.fx.0.y=29
+editor.fx.0.width=1123
+editor.fx.0.x=139
+editor.fx.0.y=23
 objectbench.height=198
-objectbench.width=510
-package.divider.horizontal=0.5675082327113062
+objectbench.width=540
+package.divider.horizontal=0.6004390779363337
 package.divider.vertical=0.685099846390169
 package.editor.height=439
 package.editor.width=805
-package.editor.x=192
-package.editor.y=38
+package.editor.x=394
+package.editor.y=50
 package.frame.height=709
 package.frame.width=931
 package.numDependencies=3
@@ -37,8 +37,8 @@ target1.name=ScientificFunctions
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=140
-target1.x=560
-target1.y=110
+target1.x=320
+target1.y=200
 target2.height=50
 target2.name=Console
 target2.showInterface=false
@@ -58,5 +58,5 @@ target4.name=CoreFunctions
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=120
-target4.x=560
-target4.y=220
+target4.x=80
+target4.y=240