added more changes

DiplayMode.java

@@ -0,0 +1,57 @@
+
+/**
+ * Write a description of class DiplayMode here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+import java.util.Scanner;
+public class DiplayMode
+{
+
+    private String currentMode = "decimal";
+    private double userInput;
+
+    public void setResult(double result){
+        userInput = result;
+    }
+    
+    public String enterMode(){
+        Console.println("Enter mode: decimal, binary, octal, hexadecimal");
+        Scanner scanner = new Scanner(System.in);
+        String modeInput = scanner.nextLine();
+        return modeInput;
+        
+    }
+
+    public void switchDisplayMode(String mode){
+        this.currentMode = mode;
+        String value = convertNumber(this.currentMode);
+        System.out.println(value);
+    }
+
+    public void switchDisplayMode()
+    {  
+        String[] modes = {"decimal", "binary", "octal", "hexadecimal"};
+        currentMode = modes[0];
+        String value = convertNumber(currentMode);
+        System.out.println(value);
+
+    }
+
+    public String convertNumber(String command){
+        String value = "";
+        if (command.equalsIgnoreCase("decimal")){
+            value = Double.toString(userInput);
+        } else if (command.equalsIgnoreCase("binary")){
+            value = Integer.toBinaryString((int)userInput);
+        } else if (command.equalsIgnoreCase("octal")){
+            value = Integer.toOctalString((int)userInput);
+        } else if (command.equalsIgnoreCase("hexadecimal")){
+            value = Double.toHexString(userInput);
+        }
+        return value;
+    }
+
+}
+

MainApplication.java

@@ -1,6 +1,6 @@
 
 /**
- * Created by leon on 2/9/18.
+ * Created by Roy Mpanju on 5/29/18.
  */
 public class MainApplication {
     //Operations Operations = new Operations();

Memory.java

@@ -0,0 +1,34 @@
+
+/**
+ * Write a description of class Memory here.
+ *
+ * @author (Roy Mpanju)
+ * @version (a version number or a date)
+ */
+public class Memory extends Operations
+{
+    Double numberInMemory = 0.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 Double storeInMemory(Double currentDisplay)
+    {
+        // put your code here
+        numberInMemory = currentDisplay;
+        return numberInMemory;
+    }
+    
+    public Double clearMemory(){
+        return numberInMemory = 0.0;
+    }
+    
+    public Double retrieveFromMemory(){
+        return numberInMemory;
+    }
+    
+    //public String 
+}

Operations.java

@@ -8,26 +8,10 @@
 import java.util.Scanner;
 public class Operations
 {
-    // instance variables - replace the example below with your own
-    private int x;
-    scienticFunctions scientificOperator = new scienticFunctions();
-
-    /**
-     * Constructor for objects of class Operations
-     */
-    public Operations()
-    {
-        // 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
+     * prompting a user for a command solving for that command
      */
-    public static void runCommand()
+    public static Double runCommand()
     {
         // put your code here
 
@@ -35,6 +19,8 @@ public class Operations
         Double result = 0.0;
         //String userInput = scanner.nextLine();
         scienticFunctions ScientificFunctions = new scienticFunctions();
+        Memory memory = new Memory();
+        DiplayMode displayMode = new DiplayMode();
         // Calculator calc = new ....
         while (true) {
             System.out.print("Enter a command: ");
@@ -67,9 +53,26 @@ public class Operations
                 result = ScientificFunctions.inverseTangent(Console.getDoubleInput("Enter number"));
                 Console.printResult(result);
             }
+            if(command.equalsIgnoreCase("m+")){
+                memory.storeInMemory(result);
+                Console.printResult(result);
+            }
+            
+            if (command.equalsIgnoreCase("m-")){
+                Console.printResult(memory.retrieveFromMemory());
+            }
+            
+            if (command.equalsIgnoreCase("switchmode")){
+                displayMode.setResult(result);
+                String mode = displayMode.enterMode();
+                //System.out.println(mode);
+                displayMode.switchDisplayMode(mode);
+                
+            }
             //firstNumber = result;
             // and on and on
         }
+        return result;
 
     }
 

scienticFunctions.java

@@ -9,28 +9,8 @@
 import java.lang.*;
 public class scienticFunctions
 {
-    // instance variables - replace the example below with your own
-    //private int x;
-
-    /**
-     * Constructor for objects of class scienticFunctions
-     */
-    // public scienticFunctions()
-    // {
-    // // initialise instance variables
-    // x = 0;
-    // }
-
-    /**
-     * A method - find the cosine of a given number
-     *
-     * @param  y  a sample parameter for a method
-     * @return    the cosine of y
-     */
-    
-
     /**
-     * A method - find the sine of a given number by converting it to radians
+     * A method - find solve for the trignometry functions of a given number by converting it to radians
      *
      * @param  y  a sample parameter for a method
      * @return    the sine of y