1
0
mirror of https://github.com/DanilaFe/abacus synced 2026-01-25 16:15:19 +00:00

Compare commits

..

5 Commits

12 changed files with 116 additions and 209 deletions

View File

@@ -53,10 +53,7 @@ public class Abacus {
* from a string.
*/
private TreeBuilder treeBuilder;
private Window window;
public boolean getStop(){
return window.getStop();
}
/**
* Creates a new instance of the Abacus calculator.
*/
@@ -136,7 +133,7 @@ public class Abacus {
* @return the resulting tree, null if the tree builder or the produced tree are null.
*/
public TreeNode parseString(String input) {
return treeBuilder.fromString(input,this);
return treeBuilder.fromString(input);
}
/**
@@ -168,8 +165,4 @@ public class Abacus {
}
return null;
}
public void setWindow(Window window) {
this.window = window;
}
}

View File

@@ -93,6 +93,11 @@ public class NaiveNumber implements NumberInterface {
return this.compareTo(ZERO);
}
@Override
public int ceiling() {
return (int) Math.ceil(value);
}
@Override
public NumberInterface promoteTo(Class<? extends NumberInterface> toClass) {
if (toClass == this.getClass()) return this;

View File

@@ -79,6 +79,12 @@ public interface NumberInterface {
*/
int signum();
/**
* Returns the least integer greater than or equal to the number.
* @return the least integer >= the number, if int can hold the value.
*/
int ceiling();
/**
* Promotes this class to another number class.
*

View File

@@ -1,6 +1,7 @@
package org.nwapw.abacus.number;
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
public class PreciseNumber implements NumberInterface {
@@ -49,7 +50,7 @@ public class PreciseNumber implements NumberInterface {
@Override
public NumberInterface multiply(NumberInterface multiplier) {
return new PreciseNumber(value.multiply(((PreciseNumber) multiplier).value));
return new PreciseNumber(this.value.multiply(((PreciseNumber) multiplier).value));
}
@Override
@@ -94,6 +95,11 @@ public class PreciseNumber implements NumberInterface {
return value.signum();
}
@Override
public int ceiling() {
return (int) Math.ceil(value.doubleValue());
}
@Override
public NumberInterface negate() {
return new PreciseNumber(value.negate());

View File

@@ -1,6 +1,5 @@
package org.nwapw.abacus.parsing;
import org.nwapw.abacus.Abacus;
import org.nwapw.abacus.tree.TreeNode;
import java.util.List;
@@ -19,5 +18,5 @@ public interface Parser<T> {
* @param tokens the tokens to construct a tree from.
* @return the constructed tree, or null on error.
*/
public TreeNode constructTree(List<T> tokens,Abacus trace);
public TreeNode constructTree(List<T> tokens);
}

View File

@@ -34,8 +34,6 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
*/
private Map<String, OperatorType> typeMap;
//private Abacus trace;
/**
* Creates a new Shunting Yard parser with the given Abacus instance.
*
@@ -118,8 +116,7 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
* @param matches the list of tokens from the source string.
* @return the construct tree expression.
*/
public TreeNode constructRecursive(List<Match<TokenType>> matches,Abacus trace) {
//this.trace = trace;
public TreeNode constructRecursive(List<Match<TokenType>> matches) {
if (matches.size() == 0) return null;
Match<TokenType> match = matches.remove(0);
TokenType matchType = match.getType();
@@ -127,22 +124,22 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
String operator = match.getContent();
OperatorType type = typeMap.get(operator);
if (type == OperatorType.BINARY_INFIX) {
TreeNode right = constructRecursive(matches,trace);
TreeNode left = constructRecursive(matches,trace);
TreeNode right = constructRecursive(matches);
TreeNode left = constructRecursive(matches);
if (left == null || right == null) return null;
else return new BinaryInfixNode(operator, left, right,trace);
else return new BinaryInfixNode(operator, left, right);
} else {
TreeNode applyTo = constructRecursive(matches,trace);
TreeNode applyTo = constructRecursive(matches);
if (applyTo == null) return null;
else return new UnaryPrefixNode(operator, applyTo,trace);
else return new UnaryPrefixNode(operator, applyTo);
}
} else if (matchType == TokenType.NUM) {
return new NumberNode(abacus.numberFromString(match.getContent()));
} else if (matchType == TokenType.FUNCTION) {
String functionName = match.getContent();
FunctionNode node = new FunctionNode(functionName,trace);
FunctionNode node = new FunctionNode(functionName);
while (!matches.isEmpty() && matches.get(0).getType() != TokenType.INTERNAL_FUNCTION_END) {
TreeNode argument = constructRecursive(matches,trace);
TreeNode argument = constructRecursive(matches);
if (argument == null) return null;
node.prependChild(argument);
}
@@ -154,10 +151,10 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
}
@Override
public TreeNode constructTree(List<Match<TokenType>> tokens,Abacus trace) {
public TreeNode constructTree(List<Match<TokenType>> tokens) {
tokens = intoPostfix(new ArrayList<>(tokens));
Collections.reverse(tokens);
return constructRecursive(tokens,trace);
return constructRecursive(tokens);
}
@Override

View File

@@ -1,6 +1,5 @@
package org.nwapw.abacus.parsing;
import org.nwapw.abacus.Abacus;
import org.nwapw.abacus.tree.TreeNode;
import java.util.List;
@@ -42,10 +41,10 @@ public class TreeBuilder<T> {
* @param input the string to parse into a tree.
* @return the resulting tree.
*/
public TreeNode fromString(String input,Abacus trace) {
public TreeNode fromString(String input) {
List<T> tokens = tokenizer.tokenizeString(input);
if (tokens == null) return null;
return parser.constructTree(tokens,trace);
return parser.constructTree(tokens);
}
}

View File

@@ -8,6 +8,8 @@ import org.nwapw.abacus.number.NaiveNumber;
import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.number.PreciseNumber;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.function.BiFunction;
/**
@@ -16,6 +18,8 @@ import java.util.function.BiFunction;
*/
public class StandardPlugin extends Plugin {
private static HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> factorialLists = new HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>>();
/**
* The addition operator, +
*/
@@ -152,17 +156,40 @@ public class StandardPlugin extends Plugin {
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
boolean takeReciprocal = params[0].signum() == -1;
params[0] = FUNCTION_ABS.apply(params[0]);
NumberInterface sum = sumSeries(params[0], StandardPlugin::getExpSeriesTerm, getNTermsExp(getMaxError(params[0]), params[0]));
if (takeReciprocal) {
sum = NaiveNumber.ONE.promoteTo(sum.getClass()).divide(sum);
NumberInterface maxError = getMaxError(params[0]);
int n = 0;
if(params[0].signum() <= 0){
NumberInterface currentTerm = NaiveNumber.ONE.promoteTo(params[0].getClass()), sum = currentTerm;
while(FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0){
n++;
currentTerm = currentTerm.multiply(params[0]).divide((new NaiveNumber(n)).promoteTo(params[0].getClass()));
sum = sum.add(currentTerm);
}
return sum;
}
else{
//We need n such that x^(n+1) * 3^ceil(x) <= maxError * (n+1)!.
//right and left refer to lhs and rhs in the above inequality.
NumberInterface sum = NaiveNumber.ONE.promoteTo(params[0].getClass());
NumberInterface nextNumerator = params[0];
NumberInterface left = params[0].multiply((new NaiveNumber(3)).promoteTo(params[0].getClass()).intPow(params[0].ceiling())), right = maxError;
do{
sum = sum.add(nextNumerator.divide(factorial(params[0].getClass(), n+1)));
n++;
nextNumerator = nextNumerator.multiply(params[0]);
left = left.multiply(params[0]);
NumberInterface nextN = (new NaiveNumber(n+1)).promoteTo(params[0].getClass());
right = right.multiply(nextN);
//System.out.println(left + ", " + right);
}
while(left.compareTo(right) > 0);
//System.out.println(n+1);
return sum;
}
return sum;
}
};
/**
* The natural log function, ln(exp(1)) = 1
* The natural log function.
*/
public static final Function FUNCTION_LN = new Function() {
@Override
@@ -239,7 +266,7 @@ public class StandardPlugin extends Plugin {
}
};
/**
* The square root function, sqrt(4) = 2
* The square root function.
*/
public static final Function FUNCTION_SQRT = new Function() {
@Override
@@ -257,39 +284,6 @@ public class StandardPlugin extends Plugin {
super(manager);
}
/**
* Returns the nth term of the Taylor series (centered at 0) of e^x
*
* @param n the term required (n >= 0).
* @param x the real number at which the series is evaluated.
* @return the nth term of the series.
*/
private static NumberInterface getExpSeriesTerm(int n, NumberInterface x) {
return x.intPow(n).divide(OP_FACTORIAL.getFunction().apply((new NaiveNumber(n)).promoteTo(x.getClass())));
}
/**
* Returns the number of terms needed to evaluate the exponential function (at x)
* such that the error is at most maxError.
*
* @param maxError Maximum error permissible (This should probably be positive.)
* @param x where the function is evaluated.
* @return the number of terms needed to evaluate the exponential function.
*/
private static int getNTermsExp(NumberInterface maxError, NumberInterface x) {
//We need n such that |x^(n+1)| <= (n+1)! * maxError
//The variables LHS and RHS refer to the above inequality.
int n = 0;
x = FUNCTION_ABS.apply(x);
NumberInterface LHS = x, RHS = maxError;
while (LHS.compareTo(RHS) > 0) {
n++;
LHS = LHS.multiply(x);
RHS = RHS.multiply(new NaiveNumber(n + 1).promoteTo(RHS.getClass()));
}
return n;
}
/**
* Returns a partial sum of a series whose terms are given by the nthTermFunction, evaluated at x.
*
@@ -339,4 +333,19 @@ public class StandardPlugin extends Plugin {
}
public static NumberInterface factorial(Class<? extends NumberInterface> numberClass, int n){
if(!factorialLists.containsKey(numberClass)){
factorialLists.put(numberClass, new ArrayList<NumberInterface>());
factorialLists.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
factorialLists.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
}
ArrayList<NumberInterface> list = factorialLists.get(numberClass);
if(n >= list.size()){
while(list.size() < n + 16){
list.add(list.get(list.size()-1).multiply(new NaiveNumber(list.size()).promoteTo(numberClass)));
}
}
return list.get(n);
}
}

View File

@@ -1,7 +1,5 @@
package org.nwapw.abacus.tree;
import org.nwapw.abacus.Abacus;
/**
* A tree node that represents an operation being applied to two operands.
*/
@@ -19,7 +17,6 @@ public class BinaryInfixNode extends TreeNode {
* The right node of the operation.
*/
private TreeNode right;
private Abacus trace;
private BinaryInfixNode() {
}
@@ -30,8 +27,8 @@ public class BinaryInfixNode extends TreeNode {
*
* @param operation the operation.
*/
public BinaryInfixNode(String operation,Abacus trace) {
this(operation, null, null,trace);
public BinaryInfixNode(String operation) {
this(operation, null, null);
}
/**
@@ -42,11 +39,10 @@ public class BinaryInfixNode extends TreeNode {
* @param left the left node of the expression.
* @param right the right node of the expression.
*/
public BinaryInfixNode(String operation, TreeNode left, TreeNode right,Abacus trace) {
public BinaryInfixNode(String operation, TreeNode left, TreeNode right) {
this.operation = operation;
this.left = left;
this.right = right;
this.trace = trace;
}
/**
@@ -96,15 +92,10 @@ public class BinaryInfixNode extends TreeNode {
@Override
public <T> T reduce(Reducer<T> reducer) {
if(!trace.getStop()) {
T leftReduce = left.reduce(reducer);
T rightReduce = right.reduce(reducer);
if (leftReduce == null || rightReduce == null) return null;
return reducer.reduceNode(this, leftReduce, rightReduce);
}
return null;
T leftReduce = left.reduce(reducer);
T rightReduce = right.reduce(reducer);
if (leftReduce == null || rightReduce == null) return null;
return reducer.reduceNode(this, leftReduce, rightReduce);
}
@Override

View File

@@ -1,7 +1,5 @@
package org.nwapw.abacus.tree;
import org.nwapw.abacus.Abacus;
import java.util.ArrayList;
import java.util.List;
@@ -18,7 +16,6 @@ public class FunctionNode extends TreeNode {
* The list of arguments to the function.
*/
private List<TreeNode> children;
private Abacus trace;
/**
* Creates a function node with no function.
@@ -31,10 +28,9 @@ public class FunctionNode extends TreeNode {
*
* @param function the function name.
*/
public FunctionNode(String function,Abacus trace) {
public FunctionNode(String function) {
this.function = function;
children = new ArrayList<>();
this.trace = trace;
}
/**

View File

@@ -1,7 +1,5 @@
package org.nwapw.abacus.tree;
import org.nwapw.abacus.Abacus;
public class UnaryPrefixNode extends TreeNode {
/**
@@ -12,15 +10,14 @@ public class UnaryPrefixNode extends TreeNode {
* The tree node to apply the operation to.
*/
private TreeNode applyTo;
private Abacus trace;
/**
* Creates a new node with the given operation and no child.
*
* @param operation the operation for this node.
*/
public UnaryPrefixNode(String operation,Abacus trace) {
this(operation, null,trace);
public UnaryPrefixNode(String operation) {
this(operation, null);
}
/**
@@ -29,20 +26,16 @@ public class UnaryPrefixNode extends TreeNode {
* @param operation the operation for this node.
* @param applyTo the node to apply the function to.
*/
public UnaryPrefixNode(String operation, TreeNode applyTo,Abacus trace) {
public UnaryPrefixNode(String operation, TreeNode applyTo) {
this.operation = operation;
this.applyTo = applyTo;
this.trace = trace;
}
@Override
public <T> T reduce(Reducer<T> reducer) {
if(!trace.getStop()) {
Object reducedChild = applyTo.reduce(reducer);
if (reducedChild == null) return null;
return reducer.reduceNode(this, reducedChild);
}
return null;
Object reducedChild = applyTo.reduce(reducer);
if (reducedChild == null) return null;
return reducer.reduceNode(this, reducedChild);
}
/**

View File

@@ -15,14 +15,13 @@ import java.awt.event.MouseEvent;
* The main UI window for the calculator.
*/
public class Window extends JFrame {
private static final String CALC_STRING = "Calculate";
private static final String SYNTAX_ERR_STRING = "Syntax Error";
private static final String EVAL_ERR_STRING = "Evaluation Error";
private static final String NUMBER_SYSTEM_LABEL = "Number Type:";
private static final String FUNCTION_LABEL = "Functions:";
private static final String STOP_STRING = "Stop";
/**
* Array of Strings to which the "calculate" button's text
* changes. For instance, in the graph tab, the name will
@@ -91,10 +90,7 @@ public class Window extends JFrame {
* The "submit" button.
*/
private JButton inputEnterButton;
/**
* The stop calculations button.
*/
private JButton inputStopButton;
/**
* The side panel for separate configuration.
*/
@@ -117,80 +113,26 @@ public class Window extends JFrame {
* The list of functions available to the user.
*/
private JComboBox<String> functionList;
/**
* Thread used for calculations
*/
private Thread calculateThread;
/**
* Check if currently calculating.
*/
private boolean calculating;
/**
* Checks if thread should stop calculating.
*/
private boolean stopCalculating;
/**
* Test variable to check number of threads running in the calculator.
*/
private int count;
/**
* ActionListener that stops calculations.
*/
private ActionListener stopListener = (event) -> {
//System.out.println(count++); //Shows about how many calculation threads are running with the calculating=false command
//calculating = false; //Ignores result of calculation and allows for the start of a new calculation
stopCalculating = true; //Stops calculation at the next node check
//calculateThread.stop(); //Stops thread no matter what, Unsafe
};
/**
* Node check to get whether nodes should continue calculating.
* @return boolean stop calculations if true.
*/
public boolean getStop(){
return stopCalculating;
}
/**
* ActionListener that runs all calculations.
* Action listener that causes the input to be evaluated.
*/
private ActionListener evaluateListener = (event) -> {
Runnable calculate = new Runnable() {
public void run() {
boolean skip = false;
calculating = true;
TreeNode parsedExpression = null;
parsedExpression = abacus.parseString(inputField.getText());
if (parsedExpression == null) {
lastOutputArea.setText(SYNTAX_ERR_STRING);
skip = true;
}
if(!skip){
NumberInterface numberInterface = abacus.evaluateTree(parsedExpression);
if (numberInterface == null) {
lastOutputArea.setText(EVAL_ERR_STRING);
calculating = false;
stopCalculating = false;
return;
}
if(calculateThread.equals(Thread.currentThread())) {
lastOutput = numberInterface.toString();
historyModel.addEntry(new HistoryTableModel.HistoryEntry(inputField.getText(), parsedExpression, lastOutput));
historyTable.invalidate();
lastOutputArea.setText(lastOutput);
inputField.setText("");
calculating = false;
stopCalculating = false;
}
}
}
};
if(!calculating) {
calculateThread = new Thread(calculate);
calculateThread.setName("a-"+System.currentTimeMillis());
calculateThread.start();
TreeNode parsedExpression = abacus.parseString(inputField.getText());
if (parsedExpression == null) {
lastOutputArea.setText(SYNTAX_ERR_STRING);
return;
}
NumberInterface numberInterface = abacus.evaluateTree(parsedExpression);
if (numberInterface == null) {
lastOutputArea.setText(EVAL_ERR_STRING);
return;
}
lastOutput = numberInterface.toString();
historyModel.addEntry(new HistoryTableModel.HistoryEntry(inputField.getText(), parsedExpression, lastOutput));
historyTable.invalidate();
lastOutputArea.setText(lastOutput);
inputField.setText("");
};
/**
@@ -201,14 +143,6 @@ public class Window extends JFrame {
evaluateListener,
null
};
/**
* Array of listeners that tell the stop button how to behave
* at a given input tab.
*/
private ActionListener[] stopListeners = {
stopListener,
null
};
/**
* Creates a new window with the given manager.
@@ -218,7 +152,6 @@ public class Window extends JFrame {
public Window(Abacus abacus) {
this();
this.abacus = abacus;
abacus.setWindow(this);
}
/**
@@ -227,36 +160,25 @@ public class Window extends JFrame {
private Window() {
super();
//variables related to when calculations occur
stopCalculating = false;
calculating = true;
lastOutput = "";
//default window properties
setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
setSize(320, 480);
//initiates input objects
inputField = new JTextField();
inputEnterButton = new JButton(CALC_STRING);
inputStopButton = new JButton(STOP_STRING);
//adds input objects into Panel
inputPanel = new JPanel();
inputPanel.setLayout(new BorderLayout());
inputPanel.add(inputStopButton, BorderLayout.SOUTH);
inputPanel.add(inputField, BorderLayout.NORTH);
inputPanel.add(inputEnterButton, BorderLayout.CENTER);
inputPanel.add(inputField, BorderLayout.CENTER);
inputPanel.add(inputEnterButton, BorderLayout.SOUTH);
//initiates output objects in calculator tab
historyModel = new HistoryTableModel();
historyTable = new JTable(historyModel);
historyScroll = new JScrollPane(historyTable);
lastOutputArea = new JTextArea(lastOutput);
lastOutputArea.setEditable(false);
//adds output objects into Panel
calculationPanel = new JPanel();
calculationPanel.setLayout(new BorderLayout());
calculationPanel.add(historyScroll, BorderLayout.CENTER);
@@ -286,8 +208,6 @@ public class Window extends JFrame {
settingsPanel.add(numberSystemPanel);
settingsPanel.add(functionSelectPanel);
calculating = false;
pane = new JTabbedPane();
pane.add("Calculator", calculationPanel);
pane.add("Settings", settingsPanel);
@@ -295,23 +215,17 @@ public class Window extends JFrame {
int selectionIndex = pane.getSelectedIndex();
boolean enabled = INPUT_ENABLED[selectionIndex];
ActionListener listener = listeners[selectionIndex];
ActionListener stopUsed = stopListeners[selectionIndex];
inputEnterButton.setText(BUTTON_NAMES[selectionIndex]);
inputField.setEnabled(enabled);
inputEnterButton.setEnabled(enabled);
inputStopButton.setEnabled(enabled);
for (ActionListener removingListener : inputEnterButton.getActionListeners()) {
inputEnterButton.removeActionListener(removingListener);
inputField.removeActionListener(removingListener);
}
for(ActionListener removingListener : inputStopButton.getActionListeners()){
inputStopButton.removeActionListener(removingListener);
}
if (listener != null) {
inputEnterButton.addActionListener(listener);
inputField.addActionListener(listener);
inputStopButton.addActionListener(stopUsed);
}
});
add(pane, BorderLayout.CENTER);
@@ -319,7 +233,6 @@ public class Window extends JFrame {
inputEnterButton.addActionListener(evaluateListener);
inputField.addActionListener(evaluateListener);
inputStopButton.addActionListener(stopListener);
historyTable.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {