Skip to content

Commit 8736df0

Browse files
MathBunnyMathBunny
authored
Merge pull request #6 from MathBunny/CodeCleanup
Further code cleanup, refactoring
2 parents d9d2c4e + bd7d423 commit 8736df0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+8005
-233
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ It's important to note that:
1818
* Various different trignometric functions with scientific constants
1919
* Utilized Dijkstra's Shunting-Yard algorithm (Reverse Polish Notation) and stacks to parse expressions
2020
* JUnit tests
21-
* Ability to run in a console window
21+
* Ability to run in a console window (no GUI)
2222

2323
##How to Run & Documentation:
2424
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
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package classes;
2+
23
/**
34
* This class verifies the input
45
* @author Horatiu Lazu

‎classes/KeyMapping.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

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

‎classes/NewtonRaphsonApp.java

-18
Original file line numberDiff line numberDiff line change
@@ -232,24 +232,6 @@ else if (x == 3 && y == 4){
232232
}
233233

234234
verifyCommandValidity(false);
235-
236-
/*if (!cmdBefore.equals(command)){
237-
if (command.length() >= 2 && isNumber(command.charAt(command.length()-1) + "") && isNumber(command.charAt(command.length()-2) + ""))
238-
expression = expression.substring(0, expression.length()-1) + command.substring(cmdBefore.length()) + " ";
239-
else
240-
expression = expression + command.substring(cmdBefore.length()) + " ";
241-
if (expression.endsWith("( ")){
242-
if (expression.charAt(expression.length()-4) >= '0' && expression.charAt(expression.length()-4) <= '9' || expression.charAt(expression.length()-4) == 'X')
243-
expression = expression.substring(0, expression.length()-2) + "* ( ";
244-
else
245-
expression = expression.substring(0, expression.length()-2) + " ( "; //extra space .. doesn't matter tho
246-
}
247-
248-
if (expression.length() > 3 && expression.charAt(expression.length()-3) == '^'){
249-
expression = expression.substring(0, expression.length()-3) + " ^ " + expression.charAt(expression.length()-2);
250-
}
251-
}
252-
System.out.println(expression);*/
253235
}
254236

255237
/** This helper method removes the last operation */

‎classes/NewtonRaphsonConsole.class

0 Bytes
Binary file not shown.

‎classes/NewtonRaphsonConsole.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

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

‎classes/NumericalTokenizer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package classes;
2-
import java.util.*;
32

43
/**
54
* This class converts tokenizes and spaces expressions so it can be read by the parser.
65
* @author Horatiu Lazu
7-
* @version 1.0 */
6+
* @version 1.0
7+
*/
88
public class NumericalTokenizer{
99
/** operatorHelper Operations This is the operations reference. */
1010
private Operations operatorHelper = new Operations();

‎classes/Operation.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package classes;
2+
23
/** This class solves for the root of expressions.
34
* @author Horatiu Lazu
4-
* @version 1.0.0.0 */
5+
* @version 1.0
6+
*/
7+
58
public class Operation{
69
/** operation String This is the current operation. */
710
private static String operation = "";

‎classes/Operations.class

0 Bytes
Binary file not shown.

‎classes/Operations.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* @author Horatiu Lazu
66
* @version 1.0
77
*/
8+
89
public class Operations{
910
/** operator HashSet These are binary operators. */
1011
private HashSet<String> operator = new HashSet<String>();

‎classes/PostfixEvaluater.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
/** This class evaluates postfix expressions.
55
* @author Horatiu Lazu
6-
* @version 1.0 */
6+
* @version 1.0
7+
*/
78

89
public class PostfixEvaluater{
910

‎classes/StartValueSelection.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
/** This class shows the root of an expression, and allows the user to modify their estimates.
1010
* @author Horatiu Lazu
11-
* @version 1.0 */
11+
* @version 1.0
12+
*/
1213
@SuppressWarnings("serial")
1314
public class StartValueSelection extends JFrame implements MouseListener{
1415
/** panel JPanel This is the panel that is used for the graphics */

‎classes/Variable.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package classes;
2+
23
/** This class abstracts a variable.
34
* @author Horatiu Lazu
45
* @version 1.0

‎doc/allclasses-frame.html

+18-14
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,32 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_102) on Sat Aug 06 08:45:33 EDT 2016 -->
5+
<!-- Generated by javadoc (1.8.0_102) on Sat Aug 13 12:50:25 EDT 2016 -->
66
<title>All Classes</title>
7-
<meta name="date" content="2016-08-06">
7+
<meta name="date" content="2016-08-13">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>
1111
<body>
1212
<h1 class="bar">All&nbsp;Classes</h1>
1313
<div class="indexContainer">
1414
<ul>
15-
<li><a href="InfixToPostfix.html" title="class in &lt;Unnamed&gt;" target="classFrame">InfixToPostfix</a></li>
16-
<li><a href="InputVerification.html" title="class in &lt;Unnamed&gt;" target="classFrame">InputVerification</a></li>
17-
<li><a href="KeyMapping.html" title="class in &lt;Unnamed&gt;" target="classFrame">KeyMapping</a></li>
18-
<li><a href="NewtonRaphsonApp.html" title="class in &lt;Unnamed&gt;" target="classFrame">NewtonRaphsonApp</a></li>
19-
<li><a href="NumericalTokenizer.html" title="class in &lt;Unnamed&gt;" target="classFrame">NumericalTokenizer</a></li>
20-
<li><a href="Operation.html" title="class in &lt;Unnamed&gt;" target="classFrame">Operation</a></li>
21-
<li><a href="Operations.html" title="class in &lt;Unnamed&gt;" target="classFrame">Operations</a></li>
22-
<li><a href="PostfixEvaluater.html" title="class in &lt;Unnamed&gt;" target="classFrame">PostfixEvaluater</a></li>
23-
<li><a href="ScreenAbout.html" title="class in &lt;Unnamed&gt;" target="classFrame">ScreenAbout</a></li>
24-
<li><a href="Settings.html" title="class in &lt;Unnamed&gt;" target="classFrame">Settings</a></li>
25-
<li><a href="StartValueSelection.html" title="class in &lt;Unnamed&gt;" target="classFrame">StartValueSelection</a></li>
26-
<li><a href="Variable.html" title="class in &lt;Unnamed&gt;" target="classFrame">Variable</a></li>
15+
<li><a href="classes/InfixToPostfix.html" title="class in classes" target="classFrame">InfixToPostfix</a></li>
16+
<li><a href="test/InfixToPostfixTest.html" title="class in test" target="classFrame">InfixToPostfixTest</a></li>
17+
<li><a href="classes/InputVerification.html" title="class in classes" target="classFrame">InputVerification</a></li>
18+
<li><a href="test/InputVerificationTest.html" title="class in test" target="classFrame">InputVerificationTest</a></li>
19+
<li><a href="classes/KeyMapping.html" title="class in classes" target="classFrame">KeyMapping</a></li>
20+
<li><a href="classes/NewtonRaphsonApp.html" title="class in classes" target="classFrame">NewtonRaphsonApp</a></li>
21+
<li><a href="classes/NewtonRaphsonConsole.html" title="class in classes" target="classFrame">NewtonRaphsonConsole</a></li>
22+
<li><a href="classes/NumericalTokenizer.html" title="class in classes" target="classFrame">NumericalTokenizer</a></li>
23+
<li><a href="test/NumericalTokenizerTest.html" title="class in test" target="classFrame">NumericalTokenizerTest</a></li>
24+
<li><a href="classes/Operation.html" title="class in classes" target="classFrame">Operation</a></li>
25+
<li><a href="classes/Operations.html" title="class in classes" target="classFrame">Operations</a></li>
26+
<li><a href="classes/PostfixEvaluater.html" title="class in classes" target="classFrame">PostfixEvaluater</a></li>
27+
<li><a href="classes/ScreenAbout.html" title="class in classes" target="classFrame">ScreenAbout</a></li>
28+
<li><a href="classes/Settings.html" title="class in classes" target="classFrame">Settings</a></li>
29+
<li><a href="classes/StartValueSelection.html" title="class in classes" target="classFrame">StartValueSelection</a></li>
30+
<li><a href="classes/Variable.html" title="class in classes" target="classFrame">Variable</a></li>
2731
</ul>
2832
</div>
2933
</body>

‎doc/allclasses-noframe.html

+18-14
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,32 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_102) on Sat Aug 06 08:45:33 EDT 2016 -->
5+
<!-- Generated by javadoc (1.8.0_102) on Sat Aug 13 12:50:25 EDT 2016 -->
66
<title>All Classes</title>
7-
<meta name="date" content="2016-08-06">
7+
<meta name="date" content="2016-08-13">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>
1111
<body>
1212
<h1 class="bar">All&nbsp;Classes</h1>
1313
<div class="indexContainer">
1414
<ul>
15-
<li><a href="InfixToPostfix.html" title="class in &lt;Unnamed&gt;">InfixToPostfix</a></li>
16-
<li><a href="InputVerification.html" title="class in &lt;Unnamed&gt;">InputVerification</a></li>
17-
<li><a href="KeyMapping.html" title="class in &lt;Unnamed&gt;">KeyMapping</a></li>
18-
<li><a href="NewtonRaphsonApp.html" title="class in &lt;Unnamed&gt;">NewtonRaphsonApp</a></li>
19-
<li><a href="NumericalTokenizer.html" title="class in &lt;Unnamed&gt;">NumericalTokenizer</a></li>
20-
<li><a href="Operation.html" title="class in &lt;Unnamed&gt;">Operation</a></li>
21-
<li><a href="Operations.html" title="class in &lt;Unnamed&gt;">Operations</a></li>
22-
<li><a href="PostfixEvaluater.html" title="class in &lt;Unnamed&gt;">PostfixEvaluater</a></li>
23-
<li><a href="ScreenAbout.html" title="class in &lt;Unnamed&gt;">ScreenAbout</a></li>
24-
<li><a href="Settings.html" title="class in &lt;Unnamed&gt;">Settings</a></li>
25-
<li><a href="StartValueSelection.html" title="class in &lt;Unnamed&gt;">StartValueSelection</a></li>
26-
<li><a href="Variable.html" title="class in &lt;Unnamed&gt;">Variable</a></li>
15+
<li><a href="classes/InfixToPostfix.html" title="class in classes">InfixToPostfix</a></li>
16+
<li><a href="test/InfixToPostfixTest.html" title="class in test">InfixToPostfixTest</a></li>
17+
<li><a href="classes/InputVerification.html" title="class in classes">InputVerification</a></li>
18+
<li><a href="test/InputVerificationTest.html" title="class in test">InputVerificationTest</a></li>
19+
<li><a href="classes/KeyMapping.html" title="class in classes">KeyMapping</a></li>
20+
<li><a href="classes/NewtonRaphsonApp.html" title="class in classes">NewtonRaphsonApp</a></li>
21+
<li><a href="classes/NewtonRaphsonConsole.html" title="class in classes">NewtonRaphsonConsole</a></li>
22+
<li><a href="classes/NumericalTokenizer.html" title="class in classes">NumericalTokenizer</a></li>
23+
<li><a href="test/NumericalTokenizerTest.html" title="class in test">NumericalTokenizerTest</a></li>
24+
<li><a href="classes/Operation.html" title="class in classes">Operation</a></li>
25+
<li><a href="classes/Operations.html" title="class in classes">Operations</a></li>
26+
<li><a href="classes/PostfixEvaluater.html" title="class in classes">PostfixEvaluater</a></li>
27+
<li><a href="classes/ScreenAbout.html" title="class in classes">ScreenAbout</a></li>
28+
<li><a href="classes/Settings.html" title="class in classes">Settings</a></li>
29+
<li><a href="classes/StartValueSelection.html" title="class in classes">StartValueSelection</a></li>
30+
<li><a href="classes/Variable.html" title="class in classes">Variable</a></li>
2731
</ul>
2832
</div>
2933
</body>

0 commit comments

Comments
 (0)