done

Calculations.java

@@ -8,9 +8,9 @@ public class Calculations
     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();
-    
+
     public Calculations(){
-   
+
     library.add("multiply");
     library.add("divide");
     library.add("subtract");
@@ -27,7 +27,7 @@ public class Calculations
     library.add("resetM");
     library.add("recallM");
     library.add("displayM");
-        
+
     }
 
     public static String getCommand(String userInput)
@@ -35,7 +35,7 @@ public class Calculations
         boolean foundCommand = false;
         String command = "";
         String result = "";
-        
+
         String[] inputArr = userInput.split(" ");
         for(int i = 0; i < library.size(); i ++)
         {
@@ -47,43 +47,43 @@ public class Calculations
                 break;
             }
         }
-        
+
         switch(command)
         {
             case "multiply":
                 result = Multiply(userInput);
             break;
-            
+
             case "divide":
                 result = Divide(userInput);
             break;
-            
+
             case "add":
                 result = Add(userInput);
             break;
-            
+
             case "subtract":
                 result = Subtract(userInput);
             break;
-            
+
             case "invertS":
                 result = InvertSign(userInput);
             break;
-            
+
             case "invertN":
                 result = InvertNumber(userInput);
-            break;   
-            
+            break;
+
             case "clear":
                  Clear();
             break;
         }
         return result;
     }
-    
+
     public static ArrayList<Double> getNumbers(String userInput){
         ArrayList<Double> results = new ArrayList<Double>();
-        
+
         //takes in a string
         //finds the first occurence of a number
         //store it as a double ( left )
@@ -94,27 +94,27 @@ public class Calculations
         //if the size of the arraylist is 2
             //return the array list
         //else return null'
-        
+
         Pattern pattern = Pattern.compile("\\s?\\-?\\.?\\d+\\.?(\\d+)?\\s?");
         Matcher matcher = pattern.matcher(userInput);
-        
+
         while(matcher.find()){
             String number = matcher.group().trim();
             Double deci = Double.valueOf(number);
 
             results.add(deci);
         }
-        
+
         if(results.size() == 2)
-        { 
+        {
             return results;
         }
         return null;
     }
-    
+
     public static ArrayList<Double> getNumber(String userInput){
         ArrayList<Double> results = new ArrayList<Double>();
-        
+
         //takes in a string
         //finds the first occurence of a number
         //store it as a double ( left )
@@ -125,27 +125,27 @@ public class Calculations
         //if the size of the arraylist is 2
             //return the array list
         //else return null'
-        
+
         Pattern pattern = Pattern.compile("\\s?\\-?\\.?\\d+\\.?(\\d+)?\\s?");
         Matcher matcher = pattern.matcher(userInput);
-        
+
         while(matcher.find()){
             String number = matcher.group().trim();
             Double deci = Double.valueOf(number);
-            
+
             results.add(deci);
-            
+
         }
-        
+
         if(results.size() == 1)
-        { 
+        {
             System.out.println(results.get(0));
             return results;
         }
-        
+
         return null;
     }
-    
+
     public static String Multiply(String userInput)
     {
         String result = "";
@@ -175,9 +175,9 @@ public class Calculations
         } else {
             return invalidArgumentsAmountError;
         }
-        
-        
-    } 
+
+
+    }
 
         public static String Add(String userInput)
     {
@@ -191,9 +191,9 @@ public class Calculations
         } else {
             return invalidArgumentsAmountError;
         }
-        
+
     }
-    
+
     public static String Subtract(String userInput)
     {
         //perform the operation
@@ -209,24 +209,26 @@ public class Calculations
         } else {
             return invalidArgumentsAmountError;
         }
-        
+
     }
- 
+
     public static String InvertSign(String userInput)
     {
+      ArrayList <Double> number1 = getNumber(userInput);
+      return number.get(0) * -1;
         //perform the operation
         //convert to string
         //return string
         return null;
-    }  
-    
+    }
+
     public static String InvertNumber(String userInput)
     {
         //perform the operation
         //convert to string
         //return string
         return null;
-    } 
+    }
 
     public static void Clear()
     {

package.bluej

@@ -1,29 +1,32 @@
 #BlueJ package file
-dependency1.from=MainApplication
-dependency1.to=Calculations
+dependency1.from=Calculations
+dependency1.to=Console
 dependency1.type=UsesDependency
-dependency2.from=MainApplication
-dependency2.to=Console
+dependency2.from=Calculations
+dependency2.to=Pemdas
 dependency2.type=UsesDependency
-dependency3.from=Calculations
-dependency3.to=Console
+dependency3.from=MainApplication
+dependency3.to=Calculations
 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
+dependency4.from=MainApplication
+dependency4.to=Console
+dependency4.type=UsesDependency
+editor.fx.0.height=707
+editor.fx.0.width=800
+editor.fx.0.x=240
+editor.fx.0.y=23
+objectbench.height=196
 objectbench.width=595
 package.divider.horizontal=0.6
-package.divider.vertical=0.685099846390169
-package.editor.height=439
+package.divider.vertical=0.6857585139318886
+package.editor.height=436
 package.editor.width=493
 package.editor.x=35
 package.editor.y=23
-package.frame.height=709
+package.frame.height=704
 package.frame.width=619
-package.numDependencies=3
-package.numTargets=3
+package.numDependencies=4
+package.numTargets=4
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -40,16 +43,23 @@ target1.width=100
 target1.x=240
 target1.y=140
 target2.height=50
-target2.name=Console
+target2.name=Pemdas
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=30
-target2.y=200
+target2.x=70
+target2.y=10
 target3.height=50
-target3.name=MainApplication
+target3.name=Console
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=120
-target3.x=70
-target3.y=70
+target3.width=80
+target3.x=30
+target3.y=200
+target4.height=50
+target4.name=MainApplication
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=120
+target4.x=70
+target4.y=70