merged pemdas

Calculations.java

@@ -5,6 +5,7 @@ import java.util.regex.Pattern;
 public class Calculations
 {
     public static Console console = new Console();
+    public static MainApplication calculator;
     public static ArrayList<String> library = new ArrayList<String>();
     public static String invalidArgumentsAmountError = "You have entered an invalid amount of arguments. Please only use two arguments, or switch to PEMDAS";
     public static Pemdas pemdas = new Pemdas();
@@ -27,10 +28,13 @@ public class Calculations
     library.add("resetM");
     library.add("recallM");
     library.add("displayM");
+    library.add("PEMDAS");
+    library.add("BASIC");
+    
         
     }
 
-    public static String getCommand(String userInput)
+    public String getCommand(String userInput)
     {
         boolean foundCommand = false;
         String command = "";
@@ -75,8 +79,19 @@ public class Calculations
             break;   
             
             case "clear":
-                 Clear();
+                Clear();
+            break;
+            
+            case "PEMDAS":   
+                System.out.println("You have just entered PEMDAS mode.");
+                this.calculator.state = "PEMDAS";
             break;
+            
+            case "BASIC":
+                System.out.println("You have just entered basic mode");
+                this.calculator.state = "basic";
+            break;
+            
         }
         return result;
     }

MainApplication.java

@@ -2,11 +2,12 @@ import java.util.Scanner;
 
 public class MainApplication {
     boolean on = false;
-    Calculations calculator = new Calculations();
+    public static String state = "basic";
+    public static Calculations calculator = new Calculations();
     Console console = calculator.console;
     
-    public static void main(String[] args) {
-        
+    public void main(String[] args) {
+        calculator.calculator = this;
         //Console.println("Welcome to my calculator!");
         //String s = Console.getStringInput("Enter a string");
         //Integer i = Console.getIntegerInput("Enter an integer");
@@ -23,8 +24,18 @@ public class MainApplication {
         while(this.on == true)
         {
             String userInput = scanner.nextLine();
-            result = calculator.getCommand(userInput);
-            System.out.println(result);
+            
+            switch(state){
+                case "basic":
+                    result = calculator.getCommand(userInput);
+                    System.out.println(result);
+                break;
+                
+                case "PEMDAS":
+                    result = calculator.pemdas.calculate(userInput);
+                    System.out.println(result);
+                break;    
+            }
         }
     }
     

Pemdas.java

@@ -14,7 +14,7 @@ public class Pemdas
     public static String calculate(String s)
     {
         
-        System.out.println("Original " + s);
+        //System.out.println("Original " + s);
         //String p = null;
         //if(getBetweenBraces(s) != null)
         //{
@@ -23,7 +23,7 @@ public class Pemdas
         //System.out.println(p);
 
         String e = null;
-        System.out.println("expo");
+        //System.out.println("expo");
         //create a duplicate of the method below, this one should have no print statemnts - testing purposes only.
         //instead of the above, remove everyting except for assignment and initiailization
         //this will work because getUpdateString2 cannot return null.
@@ -34,34 +34,34 @@ public class Pemdas
         }
         
         String m = null;
-        System.out.println("mult");
+        //System.out.println("mult");
         if(getUpdateString2(e,"*") != null)
         {
             m = getUpdateString2(e,"*");
         }
         
         String d = null;
-        System.out.println("div");
+        //System.out.println("div");
         if(getUpdateString2(m,"/") != null)
         {
             d = getUpdateString2(m,"/");
         }
          
         String a = null;
-        System.out.println("add");
+        //System.out.println("add");
         if(getUpdateString2(d,"+") != null)
         {
             a = getUpdateString2(d,"+");
         }
             
         String ss = null;
-        System.out.println("sub");
+        //System.out.println("sub");
        if(getUpdateString2(a,"-") != null)
        {
            ss = getUpdateString2(a,"-");
        }
        
-       System.out.println("calculate 1.) Answer: " + ss);
+       //System.out.println("calculate 1.) Answer: " + ss);
        return ss;
  
     }
@@ -98,7 +98,7 @@ public class Pemdas
 
         if(matcher.find())
         { 
-            System.out.println("searchReturnFirstString 1.) perform on " + s + ": " + matcher.group());
+            //System.out.println("searchReturnFirstString 1.) perform on " + s + ": " + matcher.group());
             return matcher.group();
         }
         
@@ -115,8 +115,8 @@ public class Pemdas
         //if anything is replaced, return an updated string with the appropriate replacements
         } else {
             String result = target.replaceFirst(pattern, replacement);
-            System.out.println("searchReplaceFirst 1.) target | pattern | replacement | result");
-            System.out.println("searchReplaceFirst 2.) " + target + " | " + pattern + " | " + replacement + " | " + result);
+            //System.out.println("searchReplaceFirst 1.) target | pattern | replacement | result");
+            //System.out.println("searchReplaceFirst 2.) " + target + " | " + pattern + " | " + replacement + " | " + result);
             return result; 
         }
     }
@@ -150,12 +150,12 @@ public class Pemdas
     public static String getUpdateString2(String s, String operator)
     {
         String f = s;
-        System.out.println("getUpdateString2 1.) Input is: " + f);
+        //System.out.println("getUpdateString2 1.) Input is: " + f);
         String pattern = "\\s?\\.?\\d+\\.?(\\d+)?\\s?\\" + operator + "\\s?\\.?\\d+\\.?(\\d+)?\\s?";
-        System.out.println("getUpdateString2 2.) Pattern is " + pattern);
+        //System.out.println("getUpdateString2 2.) Pattern is " + pattern);
 
         String occ = searchReturnFirstString(s, pattern);
-        System.out.println("getUpdateString2 3.) the occurance is " + occ);
+        //System.out.println("getUpdateString2 3.) the occurance is " + occ);
         //if we recieve a result
         if(occ != null)
         {   
@@ -176,27 +176,27 @@ public class Pemdas
             {
                    case "^":
                    doubleResult = Math.pow(left, right);
-                   System.out.println("getUpdateString2 .4) " + left + operator + right + "=" + doubleResult);
+                   //System.out.println("getUpdateString2 .4) " + left + operator + right + "=" + doubleResult);
                    break;
                    
                    case "+":
                    doubleResult = left + right;
-                   System.out.println("getUpdateString2 .4) " + left + operator + right + "=" + doubleResult);
+                   //System.out.println("getUpdateString2 .4) " + left + operator + right + "=" + doubleResult);
                    break;
                    
                    case "-":
                    doubleResult = left - right;
-                   System.out.println("getUpdateString2 .4) " + left + operator + right + "=" + doubleResult);
+                   //System.out.println("getUpdateString2 .4) " + left + operator + right + "=" + doubleResult);
                    break;
                    
                    case "*":
                    doubleResult = left * right;
-                   System.out.println("getUpdateString2 .4) " + left + operator + right + "=" + doubleResult);
+                   //System.out.println("getUpdateString2 .4) " + left + operator + right + "=" + doubleResult);
                    break;
                    
                    case "/":
                    doubleResult = left / right;
-                   System.out.println("getUpdateString2 .4) " + left + operator + right + "=" + doubleResult);
+                   //System.out.println("getUpdateString2 .4) " + left + operator + right + "=" + doubleResult);
                    break;
                    
                    default:
@@ -208,7 +208,7 @@ public class Pemdas
             //String result = String.format("%.9f", doubleResult);
             //replace the occurence of occ in s with result
             f = searchReplaceFirst(s, result, pattern);
-            System.out.println("getUpdateString2 5.) iteration completed, f: " + f + "\n");
+            //System.out.println("getUpdateString2 5.) iteration completed, f: " + f + "\n");
             if(!f.equals(s))
             {
                 f = getUpdateString2(f, operator);

package.bluej

@@ -8,22 +8,22 @@ dependency2.type=UsesDependency
 dependency3.from=Calculations
 dependency3.to=Console
 dependency3.type=UsesDependency
-editor.fx.0.height=1080
-editor.fx.0.width=1920
-editor.fx.0.x=-345
-editor.fx.0.y=-1080
-objectbench.height=198
-objectbench.width=595
+editor.fx.0.height=722
+editor.fx.0.width=1280
+editor.fx.0.x=0
+editor.fx.0.y=23
+objectbench.height=322
+objectbench.width=1256
 package.divider.horizontal=0.6
-package.divider.vertical=0.685099846390169
-package.editor.height=439
-package.editor.width=493
-package.editor.x=35
-package.editor.y=23
-package.frame.height=709
-package.frame.width=619
+package.divider.vertical=0.569371727748691
+package.editor.height=428
+package.editor.width=1154
+package.editor.x=0
+package.editor.y=0
+package.frame.height=800
+package.frame.width=1280
 package.numDependencies=3
-package.numTargets=3
+package.numTargets=4
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -37,19 +37,26 @@ target1.name=Calculations
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=100
-target1.x=240
-target1.y=140
+target1.x=310
+target1.y=260
 target2.height=50
 target2.name=Console
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=30
-target2.y=200
+target2.x=190
+target2.y=160
 target3.height=50
-target3.name=MainApplication
+target3.name=Pemdas
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=120
+target3.width=80
 target3.x=70
-target3.y=70
+target3.y=10
+target4.height=120
+target4.name=MainApplication
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=230
+target4.x=320
+target4.y=20