finished

Console.java

@@ -1,32 +0,0 @@
- 
-
-import java.util.Scanner;
-
-/**
- * Created by leon on 2/9/18.
- */
-public class Console {
-
-    public static void print(String output, Object... args) {
-        System.out.printf(output, args);
-    }
-
-    public static void println(String output, Object... args) {
-        print(output + "\n", args);
-    }
-
-    public static String getStringInput(String prompt) {
-        Scanner scanner = new Scanner(System.in);
-        println(prompt);
-        String userInput = scanner.nextLine();
-        return userInput;
-    }
-
-    public static Integer getIntegerInput(String prompt) {
-        return null;
-    }
-
-    public static Double getDoubleInput(String prompt) {
-        return null;
-    }
-}

DisplayVal.java

@@ -0,0 +1,78 @@
+import java.util.Scanner;
+import java.lang.*;
+
+public class DisplayVal{
+
+  private double value = 0;
+  private String numSys = "Decimal";
+  private String disVal = "0";
+  Scanner stdin = new Scanner(System.in);
+
+  NumSystemsConverter conv = new NumSystemsConverter();
+
+
+  //Scanner stdin = new Scanner(System.in);
+
+  public double getValue(){
+     return this.value;
+  }
+  public void setValue(double num){
+    this.value = num;
+  }
+
+  public void setNumSys(){
+    System.out.println("Select number system to use: (Enter # 1-4)");
+    System.out.println("(1)Decimal");
+    System.out.println("(2)Binary");
+    System.out.println("(3)Octal");
+    System.out.println("(4)Hexadecimal");
+    System.out.print("> ");
+    int num = stdin.nextInt();
+
+    switch(num){
+      case 1:
+              this.numSys = "Decimal";
+            break;
+      case 2:
+              this.numSys = "Binary";
+            break;
+      case 3:
+              this.numSys = "Octal";
+            break;
+      case 4:
+              this.numSys = "Hexadecimal";
+            break;
+  }
+  this.setDisVal(conv.updateDisplayNumber(this.value,num)); //not working
+}
+
+public void toggleNumSys(){
+  if(this.numSys == "Decimal"){
+    this.numSys = "Binary";
+  } else if(this.numSys == "Binary"){
+    this.numSys = "Octal";
+  } else if(this.numSys == "Octal"){
+    this.numSys = "Hexadecimal";
+  } else if(this.numSys == "Hexadecimal"){
+    this.numSys = "Decimal";
+  } else {
+    this.numSys = "Decimal";
+  }
+
+}
+
+public String getNumSys(){
+  return this.numSys;
+}
+
+public void setDisVal(String value){
+  this.disVal = value;
+}
+
+
+  public String valToString(double num){
+    String displayStr = new String();
+    displayStr += "" + num;
+    return displayStr;
+  }
+}

MainApplication.java

@@ -1,17 +0,0 @@
- 
-
-/**
- * Created by leon on 2/9/18.
- */
-public class MainApplication {
-    public static void main(String[] args) {
-        Console.println("Welcome to my calculator!");
-        String s = Console.getStringInput("Enter a string");
-        Integer i = Console.getIntegerInput("Enter an integer");
-        Double d = Console.getDoubleInput("Enter a double.");
-
-        Console.println("The user input %s as a string", s);
-        Console.println("The user input %s as a integer", i);
-        Console.println("The user input %s as a d", d);
-    }
-}

Memory.java

@@ -0,0 +1,18 @@
+import java.util.Scanner;
+import java.lang.*;
+
+public class Memory{
+
+  Scanner stdin = new Scanner(System.in);
+  private double memNum = 0;
+
+  public double getMemNum(){
+     return this.memNum;
+  }
+  public void setMemNum(){
+    System.out.println("Enter number to store to memory");
+    System.out.print("> ");
+    double num = stdin.nextDouble();
+    this.memNum = num;
+  }
+}

NumSystemsConverter.java

@@ -0,0 +1,29 @@
+public class NumSystemsConverter
+{
+    // display mode is sent along with displayNumber, could also be defined globally)
+    public String updateDisplayNumber(double displayNumber,int mode){
+        String str="";
+        switch(mode) {
+            case 1:{
+                str=Double.toString(displayNumber);
+                break;
+            }
+            case 2:{
+                str=Long.toBinaryString(Double.doubleToRawLongBits(displayNumber));
+                break;
+            }
+            case 3:{
+                str=Double.toHexString(displayNumber);
+                break;
+            }
+            case 4:{
+                double fraction = (displayNumber%1);
+                double integral = (displayNumber-fraction);
+                str=Integer.toOctalString((int)integral)+"."+Integer.toOctalString((int)(fraction+.5));
+                break;
+            }
+        }
+        return str;
+    }
+}
+

Operations.java

@@ -0,0 +1,243 @@
+import java.util.Scanner;
+import java.lang.*;
+
+public class Operations{
+
+  Scanner stdin = new Scanner(System.in);
+
+public double chooseOp(double num){
+
+  boolean isValid = false;
+  int choice;
+  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");
+    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: result = trigFunc(num);
+              isValid = true;
+              break;
+      case 3: result = advFunc(num);
+              isValid = true;
+              break;
+      default:
+              break;
+   }
+  }
+  return result;
+}
+
+public double coreFunc(double num){ //take displayNum as input parameter
+
+  boolean isValid = false;
+  int choice;
+  double entNum, result = 0;
+
+
+  while(!isValid){
+    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");
+    System.out.println("(3) Multiply");
+    System.out.println("(4) Divide");
+    System.out.println("(5) Square");
+    System.out.println("(6) Square Root");
+    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){
+      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 = Math.pow(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;
+      default:
+            break;
+    }
+  }
+  return result;
+}
+
+
+public double trigFunc(double num){ //take displayNum as input parameter
+
+  boolean isValid = false;
+  int choice;
+  double result = -0;
+
+  while(!isValid){
+    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");
+    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: System.out.println("Calculating sine of " + num);
+              result = Math.sin(num);
+              isValid = true;
+              break;
+      case 2: System.out.println("Calculating cosine of " + num);
+              result = Math.cos(num);
+              isValid = true;
+              break;
+      case 3: System.out.println("Calculating tangent of " + num);
+              result = Math.tan(num);
+              isValid = true;
+              break;
+      case 4: System.out.println("Calculating inverse sine (arcSin) of " + num);
+              result = Math.asin(num);
+              isValid = true;
+              break;
+      case 5: System.out.println("Calculating inverse cosine (arcCos) of " + num);
+              result = Math.acos(num);
+              isValid = true;
+              break;
+      case 6: System.out.println("Calculating inverse tangent (arcTan) of " + num);
+              result = Math.atan(num);
+              isValid = true;
+              break;
+
+    }
+  }
+  return result;
+}
+
+public double advFunc(double num){ //take displayNum as input parameter
+
+  boolean isValid = false;
+  int choice;
+  double result = 0;
+
+  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");
+    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) 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: System.out.println("Calculating factorial of " + num);
+              int i;
+              double fct = 1;
+              for(i=1; i<=num; i++){
+                fct *= i;
+              }
+              result = fct;
+              isValid = true;
+              break;
+      case 2: System.out.println("Calculating log of " + num);
+              result = Math.log10(num);
+              isValid = true;
+              break;
+      case 3: System.out.println("Calculating inverse log (10^x) of " + num);
+              result = Math.pow(10 , Math.log10(num));
+              isValid = true;
+              break;
+      case 4: System.out.println("Calculating natural log (Ln) of " + num);
+              result = Math.log(num);
+              isValid = true;
+              break;
+      case 5: System.out.println("Calculating inverese natural log (e^x) of " + num);
+              result = Math.exp(num);
+              isValid = true;
+              break;
+      case 6: System.out.println("Calculating cubed root of " + num);
+              result = Math.cbrt(num);
+              isValid = true;
+              break;
+      case 7: System.out.println("Calculating absolute value of " + num);
+              result = Math.abs(num);
+              isValid = true;
+              break;
+      default:
+            break;
+
+    }
+  }
+  return result;
+}
+
+}

SciCalculator.java

@@ -0,0 +1,98 @@
+import java.util.Scanner;
+import java.lang.*;
+
+public class SciCalculator{
+
+  public static void main(String[] args){
+
+    Scanner stdin = new Scanner(System.in);
+
+    boolean isOn = true;
+    int choice;
+
+    Memory memNumber = new Memory();
+    DisplayVal val = new DisplayVal();
+    Units unit = new Units();
+
+    while(isOn){
+        //display prompt
+      System.out.println("\n******************************************");
+      System.out.println(String.format("%"+30+"s", "Scientific Calculator"));
+      System.out.println("------------------------------------------");
+      System.out.println("Number System: " + val.getNumSys());
+      System.out.println("------------------------------------------");
+      System.out.println(val.valToString(val.getValue()));
+      System.out.println("==========================================");
+      System.out.println("Please choose a function (enter # 1-6)");
+      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) Change number system "); //may link to class
+      System.out.println("(5) Change units"); //may link to class
+      System.out.println("(6) Clear display");
+      System.out.println("------------------------------------------");
+      System.out.println("(7)Quit program");
+      System.out.println("******************************************");
+      System.out.print("> ");
+
+      choice = stdin.nextInt();
+
+      switch(choice){
+        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){
+                  val.setValue(memNumber.getMemNum());
+                }
+                else if(mem == 2){
+                  memNumber.setMemNum();
+                }
+                else{
+                  System.out.println("Value in memory is: " + memNumber.getMemNum());
+                }
+                break;
+        case 4:
+                System.out.println("\n------------------------------------------");
+                System.out.println("Select number system option (enter 1 or 2)");
+                System.out.println("(1) Toggle Number System");
+                System.out.println("(2) Choose Number System");
+                System.out.println("------------------------------------------");
+                System.out.print("> ");
+                int select = stdin.nextInt();
+                if(select == 1){
+                  val.toggleNumSys();
+                } else{
+                  val.setNumSys();
+                }
+              break;
+        case 5:
+                val.setValue(unit.choice(val.getValue()));//clear display
+              break;
+        case 6:
+                val.setValue(0.0);
+              break;
+        case 7:
+                System.out.println("Goodbye");//clear display
+                isOn = false;
+              break;
+        default:
+              break;
+      }
+    }
+  }
+}

Units.java

@@ -0,0 +1,74 @@
+import java.util.Scanner;
+
+public class Units
+{
+
+Scanner units = new Scanner(System.in);
+
+    public double choice (double num) {
+
+        boolean isValid = false;
+        int modechoice = 0;
+        double result = 0;
+
+    while(!isValid){
+    System.out.println("\n-------------------------------------------------");
+    System.out.println(num);
+    System.out.println("-------------------------------------------------");
+    System.out.println("Select which unit you would like to convert to (enter #1 or #2)");
+    System.out.println("(1) Degrees");
+    System.out.println("(2) Radians");
+    System.out.println("--------------------------------------------");
+    System.out.print("> ");
+    modechoice = units.nextInt();
+
+    switch(modechoice){
+        case 1: result = this.degrees(num);
+        isValid = true;
+        break;
+        case 2: result = this.radians(num);
+        isValid = true;
+        break; }
+    }
+    return result;
+    }
+
+    public double degrees (double num) {
+
+        System.out.println("Please enter your value for degree conversion");
+
+          boolean isValid = false;
+          double output = 0;
+          double input = units.nextInt();
+
+          if (!Double.isNaN(num)) {
+              System.out.println("Calculating degrees of " + input);
+              num = Math.toDegrees(input);
+              System.out.println(num);}
+          else {
+              System.out.println("Please enter your value");
+                      }
+          return num;
+    };
+    public double radians (double num) {
+
+        System.out.println("Please enter your value for radian conversion");
+
+    boolean isValid = true;
+    double output = 0;
+    double input = units.nextInt();
+
+        if (!Double.isNaN(num)) {
+              System.out.println("Calculating radians of " + input);
+              num = Math.toRadians(input);
+              System.out.println(num);}
+        else {
+            System.out.println("Please enter your value");
+        }
+        return num;
+
+}
+
+
+
+}

package.bluej

@@ -2,22 +2,25 @@
 dependency1.from=MainApplication
 dependency1.to=Console
 dependency1.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=640
+dependency2.from=UpdateDisplay
+dependency2.to=SwitchModes
+dependency2.type=UsesDependency
+editor.fx.0.height=717
+editor.fx.0.width=1280
+editor.fx.0.x=0
 editor.fx.0.y=23
-objectbench.height=214
-objectbench.width=595
+objectbench.height=92
+objectbench.width=1256
 package.divider.horizontal=0.6
-package.divider.vertical=0.6847360912981455
-package.editor.height=473
-package.editor.width=493
-package.editor.x=35
-package.editor.y=60
-package.frame.height=759
-package.frame.width=619
-package.numDependencies=1
-package.numTargets=2
+package.divider.vertical=0.8495440729483282
+package.editor.height=552
+package.editor.width=1154
+package.editor.x=0
+package.editor.y=23
+package.frame.height=716
+package.frame.width=1280
+package.numDependencies=2
+package.numTargets=7
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,16 +30,51 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Console
+target1.name=UpdateDisplay
 target1.showInterface=false
 target1.type=ClassTarget
-target1.width=80
-target1.x=80
-target1.y=200
+target1.width=120
+target1.x=130
+target1.y=130
 target2.height=50
-target2.name=MainApplication
+target2.name=Memory
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=120
-target2.x=70
-target2.y=70
+target2.width=80
+target2.x=190
+target2.y=10
+target3.height=50
+target3.name=Console
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=80
+target3.x=80
+target3.y=200
+target4.height=50
+target4.name=SwitchModes
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=110
+target4.x=10
+target4.y=130
+target5.height=50
+target5.name=NumSystemsConverter
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=170
+target5.x=10
+target5.y=320
+target6.height=50
+target6.name=SciCalculator
+target6.showInterface=false
+target6.type=ClassTarget
+target6.width=110
+target6.x=70
+target6.y=10
+target7.height=50
+target7.name=MainApplication
+target7.showInterface=false
+target7.type=ClassTarget
+target7.width=120
+target7.x=70
+target7.y=70