edits

Operations.java

@@ -5,15 +5,16 @@ public class Operations{
 
   Scanner stdin = new Scanner(System.in);
 
-
 public double chooseOp(double num){
 
   boolean isValid = false;
   int choice;
-  double result = -1;
+  double result = 0;
 
   while(!isValid){
     System.out.println("\n-------------------------------------------------");
+    System.out.println(num);
+    System.out.println("-------------------------------------------------");
     System.out.println("Select type of operation to perform (enter # 1-3)");
     System.out.println("(1) Core Functions");
     System.out.println("(2) Trigonometry");
@@ -47,7 +48,9 @@ public double coreFunc(double num){ //take displayNum as input parameter
 
 
   while(!isValid){
-    System.out.println("\n---------------------------------------------");
+    System.out.println("\n-------------------------------------------------");
+    System.out.println(num);
+    System.out.println("-------------------------------------------------");
     System.out.println("Select core function to perform (enter # 1-9)");
     System.out.println("(1) Add");
     System.out.println("(2) Subtract");
@@ -64,43 +67,52 @@ public double coreFunc(double num){ //take displayNum as input parameter
 
     switch(choice){
       case 1: System.out.println("Enter number to add to " + num + ": ");
+              System.out.print("> ");
               entNum = stdin.nextDouble();
               result = num + entNum;
               isValid = true;
             break;
       case 2: System.out.println("Enter number to subtract from " + num + ": ");
+              System.out.print("> ");
               entNum = stdin.nextDouble();
               result = num - entNum;
               isValid = true;
             break;
       case 3: System.out.println("Enter number to multiply to " + num + ": ");
+              System.out.print("> ");
               entNum = stdin.nextDouble();
               result = num * entNum;
               isValid = true;
             break;
       case 4: System.out.println("Enter number to divide from " + num + ": ");
+              System.out.print("> ");
               entNum = stdin.nextDouble();
               result = num / entNum; //use Double.isNaN(x)
               isValid = true;
             break;
       case 5: System.out.println("Squaring number on display (" + num + "^2) ");
+              System.out.print("> ");
               result = num * num;
               isValid = true;
             break;
       case 6: System.out.println("Taking square root of " + num);//cant take negative #
+              System.out.print("> ");
               result = Math.sqrt(num);
               isValid = true;
             break;
       case 7: System.out.println("Enter exponent to raise " + num + " to (" + num + "^n)");
+              System.out.print("> ");
               entNum = stdin.nextDouble();
               result = num * entNum;
               isValid = true;
             break;
       case 8: System.out.println("Calculating inverse of " + num + " (1/" + num + ")");
+              System.out.print("> ");
               result = 1/num;
               isValid = true;
             break;
       case 9: System.out.println("Calculating negation of  " + num + " (n -> -n , -n -> n)");
+              System.out.print("> ");
               result = num * -1;
               isValid = true;
             break;
@@ -119,7 +131,9 @@ public double trigFunc(double num){ //take displayNum as input parameter
   double result = -0;
 
   while(!isValid){
-    System.out.println("\n--------------------------------------------");
+    System.out.println("\n-------------------------------------------------");
+    System.out.println(num);
+    System.out.println("-------------------------------------------------");
     System.out.println("Select trigonemtric function (enter # 1-6)");
     System.out.println("(1) Sin");
     System.out.println("(2) Cos");
@@ -170,6 +184,8 @@ public double advFunc(double num){ //take displayNum as input parameter
 
   while(!isValid){
     System.out.println("\n-------------------------------------------------");
+    System.out.println(num);
+    System.out.println("-------------------------------------------------");
     System.out.println("Select advanced function to perform (enter # 1-7)");
     System.out.println("(1) Factorial");
     System.out.println("(2) Log");

SciCalculator.java

@@ -9,60 +9,68 @@ public class SciCalculator{
 
     boolean isOn = true;
     int choice;
-    double displayNumber = 0;
 
     Memory memNumber = new Memory();
+    DisplayVal val = new DisplayVal();
 
     while(isOn){
         //display prompt
       System.out.println("\n******************************************");
-      System.out.println(String.format("%"+32+"s", "Scientific Calculator"));
+      System.out.println(String.format("%"+30+"s", "Scientific Calculator"));
       System.out.println("------------------------------------------");
-      System.out.println(displayNumber);
+      System.out.println(val.valToString(val.getValue()));
       System.out.println("==========================================");
       System.out.println("Please choose a function (enter # 1-6)");
-      System.out.println("(1) Change units");
-      System.out.println("(2) Change number system");
+      System.out.println("(1) Input value to calculator");
+      System.out.println("(2) Execute calculation");
       System.out.println("(3) Access memory functions (M+, MC, MRC)");
-      System.out.println("(4) Execute calculation");
-      System.out.println("(5) Clear display");
+      System.out.println("(4) Change number system (maybe)"); //may link to class
+      System.out.println("(5) Change units (maybe)"); //may link to class
+      System.out.println("(6) Clear display");
       System.out.println("------------------------------------------");
-      System.out.println("(6)Quit program");
+      System.out.println("(7)Quit program");
       System.out.println("******************************************");
       System.out.print("> ");
 
       choice = stdin.nextInt();
 
       switch(choice){
-        case 1:System.out.println("call change units function");//call change units function
-                break;
-        case 2:System.out.println("call number system function");//call number system function
-                break;
-        case 3: System.out.println("------------------------------------------");
+        case 1: System.out.println("Enter the value you want to input to calculator:");//call change units function
+                System.out.print("> ");
+                double inVal = stdin.nextDouble();
+                val.setValue(inVal);
+              break;
+        case 2: Operations op = new Operations();
+                val.setValue(op.chooseOp(val.getValue()));//call operations function
+              break;
+        case 3: System.out.println("\n------------------------------------------");
                 System.out.println("Choose memory function (enter 1 or 2)");
                 System.out.println("(1) Recall value in memory");
                 System.out.println("(2) Update value in memory");
                 System.out.println("------------------------------------------");
                 System.out.print("> ");
                 int mem = stdin.nextInt();
-                if(mem == 1)
-                  displayNumber = memNumber.getMemNum();
-                else if(mem == 2)
+                if(mem == 1){
+                  val.setValue(memNumber.getMemNum());
+                }
+                else if(mem == 2){
                   memNumber.setMemNum();
+                }
                 else{
                   System.out.println("Value in memory is: " + memNumber.getMemNum());
                 }
                 break;
-        case 4: Operations op = new Operations();
-                displayNumber = op.chooseOp(displayNumber);//call operations function
-                break;
-        case 5:System.out.println("clear display");//clear display
-                break;
-        case 6:System.out.println("Goodbye");//clear display
+        case 4: System.out.println("maybe number systems func");//clear display
+              break;
+        case 5: System.out.println("change units function (maybe)");//clear display
+              break;
+        case 6: System.out.println("clear display function");
+              break;
+        case 7:System.out.println("Goodbye");//clear display
                 isOn = false;
-                break;
+              break;
         default:
-                break;
+              break;
       }
     }
   }

displayVal.java

@@ -1,18 +1,22 @@
 import java.util.Scanner;
 import java.lang.*;
 
-public class displayVal{
+public class DisplayVal{
 
-  Scanner stdin = new Scanner(System.in);
-  private double displayValue = 0;
+  private double value = 0;
 
-  public double getMemNum(){
-     return this.memNum;
+  //Scanner stdin = new Scanner(System.in);
+
+  public double getValue(){
+     return this.value;
+  }
+  public void setValue(double num){
+    this.value = num;
   }
-  public void setMemNum(){
-    System.out.println("Enter number to store to memory");
-    System.out.print("> ");
-    double num = stdin.nextDouble();
-    this.memNum = num;
+
+  public String valToString(double num){
+    String displayStr = new String();
+    displayStr += "" + num;
+    return displayStr;
   }
 }