finished ops

Operations.java

@@ -13,20 +13,23 @@ public double chooseOp(double num){
   double result = -1;
 
   while(!isValid){
+    System.out.println("\n-------------------------------------------------");
     System.out.println("Select type of operation to perform (enter # 1-3)");
     System.out.println("(1) Core Functions");
     System.out.println("(2) Trigonometry");
     System.out.println("(3) Advanced Functions");
+    System.out.println("-------------------------------------------------");
+    System.out.print("> ");
     choice = stdin.nextInt();
 
     switch(choice){
       case 1: result = coreFunc(num);
               isValid = true;
               break;
-      case 2:trigFunc();
+      case 2: result = trigFunc(num);
               isValid = true;
               break;
-      case 3:advFunc();
+      case 3: result = advFunc(num);
               isValid = true;
               break;
       default:
@@ -40,11 +43,12 @@ public double coreFunc(double num){ //take displayNum as input parameter
 
   boolean isValid = false;
   int choice;
-  double entNum, result = -1;
+  double entNum, result = 0;
 
 
   while(!isValid){
-    System.out.println("Select core function to perform (enter # 1-3)");
+    System.out.println("\n---------------------------------------------");
+    System.out.println("Select core function to perform (enter # 1-9)");
     System.out.println("(1) Add");
     System.out.println("(2) Subtract");
     System.out.println("(3) Multiply");
@@ -54,6 +58,8 @@ public double coreFunc(double num){ //take displayNum as input parameter
     System.out.println("(7) Exponentiation");
     System.out.println("(8) Inverse (1/x)");
     System.out.println("(9) Change sign (+/-)");
+    System.out.println("---------------------------------------------");
+    System.out.print("> ");
     choice = stdin.nextInt();
 
     switch(choice){
@@ -71,125 +77,151 @@ public double coreFunc(double num){ //take displayNum as input parameter
               entNum = stdin.nextDouble();
               result = num * entNum;
               isValid = true;
-              break;
+            break;
       case 4: System.out.println("Enter number to divide from " + num + ": ");
               entNum = stdin.nextDouble();
               result = num / entNum; //use Double.isNaN(x)
               isValid = true;
-              break;
-      case 5:
+            break;
+      case 5: System.out.println("Squaring number on display (" + num + "^2) ");
+              result = num * num;
               isValid = true;
-              break;
-      case 6:
+            break;
+      case 6: System.out.println("Taking square root of " + num);//cant take negative #
+              result = Math.sqrt(num);
               isValid = true;
-              break;
-      case 7:
+            break;
+      case 7: System.out.println("Enter exponent to raise " + num + " to (" + num + "^n)");
+              entNum = stdin.nextDouble();
+              result = num * entNum;
               isValid = true;
-              break;
-      case 8:
+            break;
+      case 8: System.out.println("Calculating inverse of " + num + " (1/" + num + ")");
+              result = 1/num;
               isValid = true;
-              break;
-      case 9:
+            break;
+      case 9: System.out.println("Calculating negation of  " + num + " (n -> -n , -n -> n)");
+              result = num * -1;
               isValid = true;
-              break;
+            break;
       default:
-              break;
+            break;
     }
   }
   return result;
 }
 
 
-public double trigFunc(){ //take displayNum as input parameter
+public double trigFunc(double num){ //take displayNum as input parameter
 
   boolean isValid = false;
   int choice;
-  double result = -1;
+  double result = -0;
 
   while(!isValid){
-    System.out.println("Select trigonemtric function to perform (enter # 1-3)");
+    System.out.println("\n--------------------------------------------");
+    System.out.println("Select trigonemtric function (enter # 1-6)");
     System.out.println("(1) Sin");
     System.out.println("(2) Cos");
     System.out.println("(3) Tangent");
     System.out.println("(4) ArcSin");
     System.out.println("(5) ArcCos");
     System.out.println("(6) ArcTan");
+    System.out.println("--------------------------------------------");
+    System.out.print("> ");
     choice = stdin.nextInt();
 
     switch(choice){
-      case 1:
+      case 1: System.out.println("Calculating sine of " + num);
+              result = Math.sin(num);
               isValid = true;
               break;
-      case 2:
+      case 2: System.out.println("Calculating cosine of " + num);
+              result = Math.cos(num);
               isValid = true;
               break;
-      case 3:
+      case 3: System.out.println("Calculating tangent of " + num);
+              result = Math.tan(num);
               isValid = true;
               break;
-      case 4:
+      case 4: System.out.println("Calculating inverse sine (arcSin) of " + num);
+              result = Math.asin(num);
               isValid = true;
               break;
-      case 5:
+      case 5: System.out.println("Calculating inverse cosine (arcCos) of " + num);
+              result = Math.acos(num);
               isValid = true;
               break;
-      case 6:
+      case 6: System.out.println("Calculating inverse tangent (arcTan) of " + num);
+              result = Math.atan(num);
               isValid = true;
               break;
 
     }
   }
-  return 2;
+  return result;
 }
 
-public double advFunc(){ //take displayNum as input parameter
+public double advFunc(double num){ //take displayNum as input parameter
 
   boolean isValid = false;
   int choice;
+  double result = 0;
 
   while(!isValid){
-    System.out.println("Select advanced function to perform (enter # 1-3)");
+    System.out.println("\n-------------------------------------------------");
+    System.out.println("Select advanced function to perform (enter # 1-7)");
     System.out.println("(1) Factorial");
     System.out.println("(2) Log");
     System.out.println("(3) Inverse log (10^x)");
     System.out.println("(4) Natural log (Ln x)");
     System.out.println("(5) Inverse Natural log (e^x)");
-    System.out.println("(6) custom 1"); //add custom 1
-    System.out.println("(7) Exponentiation");//add custom 2
+    System.out.println("(6) Cubed root"); //add custom 1
+    System.out.println("(7) Absolute value");//add custom 2
+    System.out.println("-------------------------------------------------");
+    System.out.print("> ");
     choice = stdin.nextInt();
 
     switch(choice){
-      case 1:
+      case 1: System.out.println("Calculating factorial of " + num);
+              int i;
+              double fct = 1;
+              for(i=2; i<num; i++){
+                fct *= i;
+              }
+              result = fct;
               isValid = true;
               break;
-      case 2:
+      case 2: System.out.println("Calculating log of " + num);
+              result = Math.log10(num);
               isValid = true;
               break;
-      case 3:
+      case 3: System.out.println("Calculating inverse log (10^x) of " + num);
+              result = Math.pow(10 , Math.log10(num));
               isValid = true;
               break;
-      case 4:
+      case 4: System.out.println("Calculating natural log (Ln) of " + num);
+              result = Math.log(num);
               isValid = true;
               break;
-      case 5:
+      case 5: System.out.println("Calculating inverese natural log (e^x) of " + num);
+              result = Math.exp(num);
               isValid = true;
               break;
-      case 6:
+      case 6: System.out.println("Calculating cubed root of " + num);
+              result = Math.cbrt(num);
               isValid = true;
               break;
-      case 7:
-              isValid = true;
-              break;
-      case 8:
-              isValid = true;
-              break;
-      case 9:
+      case 7: System.out.println("Calculating absolute value of " + num);
+              result = Math.abs(num);
               isValid = true;
               break;
       default:
+            break;
 
     }
   }
-  return 3;
+  return result;
 }
 
 }

SciCalculator.java

@@ -13,9 +13,10 @@ public class SciCalculator{
 
     while(isOn){
         //display prompt
-      System.out.println("******************************************");
+      System.out.println("\n******************************************");
+      System.out.println(String.format("%"+32+"s", "Scientific Calculator"));
+      System.out.println("------------------------------------------");
       System.out.println(displayNumber);
-      System.out.println("******************************************");
       System.out.println("==========================================");
       System.out.println("Please choose a function (enter # 1-6)");
       System.out.println("(1) Change units");
@@ -25,7 +26,8 @@ public class SciCalculator{
       System.out.println("(5) Clear display");
       System.out.println("------------------------------------------");
       System.out.println("(6)Quit program");
-      System.out.println("==========================================");
+      System.out.println("******************************************");
+      System.out.print("> ");
 
       choice = stdin.nextInt();