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

Operations.java

@@ -21,6 +21,7 @@ public class Operations
         scienticFunctions ScientificFunctions = new scienticFunctions();
         Memory memory = new Memory();
         DiplayMode displayMode = new DiplayMode();
+        bonusFunctions bonusFunctions = new bonusFunctions();
         // Calculator calc = new ....
         while (true) {
             System.out.print("Enter a command: ");
@@ -69,6 +70,15 @@ public class Operations
                 displayMode.switchDisplayMode(mode);
                 
             }
+            if (command.equalsIgnoreCase("log")){
+                Console.printResult(bonusFunctions.LogBaseTenOfAnumber(result));
+            }
+            if (command.equalsIgnoreCase("ln")){
+                Console.printResult(bonusFunctions.naturalLogLn(result));
+            }
+            if (command.equalsIgnoreCase("ex")){
+                Console.printResult(bonusFunctions.exponential(result));
+            }
             //firstNumber = result;
             // and on and on
         }

bonusFunctions.java

@@ -7,27 +7,27 @@
  */
 public class bonusFunctions
 {
-    // instance variables - replace the example below with your own
-    private int x;
-
-    /**
-     * Constructor for objects of class bonusFunctions
-     */
-    public bonusFunctions()
-    {
-        // initialise instance variables
-        x = 0;
-    }
-
     /**
      * An example of a method - replace this comment with your own
      *
      * @param  y  a sample parameter for a method
      * @return    the sum of x and y
      */
-    public int sampleMethod(int y)
+    public Double naturalLogLn(Double x)
+    {
+        // put your code here
+        return Math.log(x);
+    }
+    
+    public Double LogBaseTenOfAnumber(Double x)
+    {
+        // put your code here
+        return Math.log10(x);
+    }
+    
+    public Double exponential(Double x)
     {
         // put your code here
-        return x + y;
+        return Math.exp(x);
     }
 }