Further code cleanup, refactoring

Author: MathBunny

README.md

@@ -18,7 +18,7 @@ It's important to note that:
 * Various different trignometric functions with scientific constants
 * Utilized Dijkstra's Shunting-Yard algorithm (Reverse Polish Notation) and stacks to parse expressions
 * JUnit tests
-* Ability to run in a console window
+* Ability to run in a console window (no GUI)
 
 ##How to Run & Documentation:
 You can use ANT to build this project, or you can manually compile all the Java files. If you are interested in running this app through a command-line interface, run `NewtonRaphsonConsole.java`, or GUI `NewtonRaphsonApp.java`. Documentation can be found in the `/doc/` folder.

classes/InputVerification.java

@@ -1,4 +1,5 @@
 package classes;
+
 /**
  * This class verifies the input
  * @author Horatiu Lazu

classes/KeyMapping.java

@@ -3,7 +3,9 @@
 
 /** This class stores the key mapping for the keyboard on the calculator.
   * @author Horatiu Lazu
-  * @version 1.0 */
+  * @version 1.0 
+  */
+
 public class KeyMapping{
   /** getCommandAppending HashMap This map converts the coordinates into commands. */
   public HashMap<String, String> getCommandAppending = new HashMap<String, String>();

classes/NewtonRaphsonApp.java

@@ -232,24 +232,6 @@ else if (x == 3 && y == 4){
     }
 
     verifyCommandValidity(false);
-    
-    /*if (!cmdBefore.equals(command)){
-     if (command.length() >= 2 && isNumber(command.charAt(command.length()-1) + "") && isNumber(command.charAt(command.length()-2) + ""))
-     expression = expression.substring(0, expression.length()-1) + command.substring(cmdBefore.length()) + " ";
-     else
-     expression = expression + command.substring(cmdBefore.length()) + " ";
-     if (expression.endsWith("( ")){
-     if (expression.charAt(expression.length()-4) >= '0' && expression.charAt(expression.length()-4) <= '9' || expression.charAt(expression.length()-4) == 'X')
-     expression = expression.substring(0, expression.length()-2) + "* ( ";
-     else
-     expression = expression.substring(0, expression.length()-2) + " ( "; //extra space .. doesn't matter tho
-     }
-     
-     if (expression.length() > 3 && expression.charAt(expression.length()-3) == '^'){
-     expression = expression.substring(0, expression.length()-3) + " ^ " + expression.charAt(expression.length()-2);
-     }
-     }
-     System.out.println(expression);*/
   }
 
   /** This helper method removes the last operation */

classes/NewtonRaphsonConsole.class

@@ -3,7 +3,8 @@
 
 /** This class lets the user find the roots of an equation.
   * @author Horatiu Lazu
-  * @version 1.0 */
+  * @version 1.0 
+  */
 public class NewtonRaphsonConsole{
   /** Main method for the program.
     * @param args String [] These are the arguments. */

classes/NewtonRaphsonConsole.java

@@ -1,10 +1,10 @@
 package classes;
-import java.util.*;
 
 /**
  * This class converts tokenizes and spaces expressions so it can be read by the parser.
  * @author Horatiu Lazu
- * @version 1.0 */
+ * @version 1.0 
+ */
 public class NumericalTokenizer{
   /** operatorHelper Operations This is the operations reference. */
   private Operations operatorHelper = new Operations();

classes/NumericalTokenizer.java

@@ -1,7 +1,10 @@
 package classes;
+
 /** This class solves for the root of expressions.
   * @author Horatiu Lazu
-  * @version 1.0.0.0 */
+  * @version 1.0
+  */
+
 public class Operation{
   /** operation String This is the current operation. */
   private static String operation = "";

classes/Operation.java

@@ -5,6 +5,7 @@
   * @author Horatiu Lazu
   * @version 1.0
   */
+
 public class Operations{
   /** operator HashSet These are binary operators. */
   private HashSet<String> operator = new HashSet<String>();