Finished Core

CoreFeatures.java

@@ -18,10 +18,12 @@ public class CoreFeatures extends MainApplication {
     //divide
     private double squaredNumber;
     //square
-    private double sqRt;
+    private double squareRoot;
     //square root
     private boolean calcRunning;
-
+    //calculator status
+    private double invertedNumber;
+    //changing the sign of a number
     /**
      * Constructor for objects of class CoreFeatures
      */
@@ -43,7 +45,7 @@ public class CoreFeatures extends MainApplication {
         return multipliedNumbers;}
 
     public double divideNumbers(double dividing1, double dividing2){
-        if (dividing2 = 0){
+        if (dividing2 == 0){
             System.out.println("**ERROR** CANNOT DIVIDE BY ZERO.");} else {
             dividedNumbers = dividing1 / dividing2;
             return dividedNumbers;}
@@ -53,16 +55,21 @@ public class CoreFeatures extends MainApplication {
 
         /*dividedNumbers = dividing1 / dividing2;
         return dividedNumbers;*/
-    }
+    return dividedNumbers;}
 
     public double squareNumber(double squaring){
         squaredNumber = squaring * squaring;
         return squaredNumber;}
 
-    public double squareRoot(double sqRting){
-        sqRt = squareRoot(sqRting);
-        return sqRt;}
-
+    public double squareRoot(double squareRooting){
+        squareRoot = squareRoot(squareRooting);
+        return squareRoot;}
+    
+    public double invertSign(double inverting){
+        invertedNumber = inverting * -1;
+        return invertedNumber;
+    }
+        
     public boolean calcRunning(){
         calcRunning = false;
         return calcRunning;

MainApplication.java

@@ -9,9 +9,15 @@ public class MainApplication {
         CoreFeatures switchCoreFeatures = new CoreFeatures();
         
         //User instructions 
-       String userInput = Console.getStringInput("Choose a symbol for the corresponding function : " + "\n"
-       + " |'+' = addition|" + "\n"+
-       "|'-' = subtraction|");
+       String userInput = Console.getStringInput("Choose a symbol for the corresponding function: " + "\n"+ 
+       "'+' = addition \n"+
+       "'-' = subtraction \n" +
+       "'*' = multiplication \n" +
+       "'/' = division \n" +
+       "'^' = square \n" +
+       "'^/' = square root \n" +
+       "'-/' = invert sign \n" +
+       "'off' = turns calculator off \n\n");
         
     switch(userInput){
     case "+": 
@@ -32,6 +38,30 @@ public class MainApplication {
     System.out.println(Console.result);
     break;
     
+    case "/":
+    double userInput5 = Console.getDoubleInput("Enter number to be multiplied. ");
+    Console.result = switchCoreFeatures.multiplyNumbers(Console.result, userInput5);
+    System.out.println(Console.result);
+    break;
+    
+    case "^":
+    double userInput6 = Console.getDoubleInput("Enter number to be squared. ");
+    Console.result = switchCoreFeatures.squareNumber(userInput6);
+    System.out.println(Console.result);
+    break;
+    
+    case "^/":
+    double userInput7 = Console.getDoubleInput("Enter number to be squared rooted. ");
+    Console.result = switchCoreFeatures.squareRoot(userInput7);
+    System.out.println(Console.result);
+    break;
+    
+    case "-/":
+    double userInput8 = Console.getDoubleInput("Enter number to be inverted. ");
+    Console.result = switchCoreFeatures.invertSign(userInput8);
+    System.out.println(Console.result);
+    break;
+    
     case "off":
     Console.calcRunning = false;
     break;