mirror of
https://github.com/DanilaFe/abacus
synced 2026-01-27 09:05:19 +00:00
Compare commits
1 Commits
new-tests
...
documentat
| Author | SHA1 | Date | |
|---|---|---|---|
| 3e39087fde |
@@ -6,12 +6,16 @@ import org.nwapw.abacus.number.NumberInterface;
|
|||||||
import org.nwapw.abacus.parsing.LexerTokenizer;
|
import org.nwapw.abacus.parsing.LexerTokenizer;
|
||||||
import org.nwapw.abacus.parsing.ShuntingYardParser;
|
import org.nwapw.abacus.parsing.ShuntingYardParser;
|
||||||
import org.nwapw.abacus.parsing.TreeBuilder;
|
import org.nwapw.abacus.parsing.TreeBuilder;
|
||||||
|
import org.nwapw.abacus.plugin.ClassFinder;
|
||||||
import org.nwapw.abacus.plugin.NumberImplementation;
|
import org.nwapw.abacus.plugin.NumberImplementation;
|
||||||
import org.nwapw.abacus.plugin.PluginManager;
|
import org.nwapw.abacus.plugin.PluginManager;
|
||||||
import org.nwapw.abacus.plugin.StandardPlugin;
|
import org.nwapw.abacus.plugin.StandardPlugin;
|
||||||
import org.nwapw.abacus.tree.NumberReducer;
|
import org.nwapw.abacus.tree.NumberReducer;
|
||||||
import org.nwapw.abacus.tree.TreeNode;
|
import org.nwapw.abacus.tree.TreeNode;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The main calculator class. This is responsible
|
* The main calculator class. This is responsible
|
||||||
* for piecing together all of the components, allowing
|
* for piecing together all of the components, allowing
|
||||||
@@ -23,6 +27,10 @@ public class Abacus {
|
|||||||
* The default number implementation to be used if no other one is available / selected.
|
* The default number implementation to be used if no other one is available / selected.
|
||||||
*/
|
*/
|
||||||
public static final NumberImplementation DEFAULT_IMPLEMENTATION = StandardPlugin.IMPLEMENTATION_NAIVE;
|
public static final NumberImplementation DEFAULT_IMPLEMENTATION = StandardPlugin.IMPLEMENTATION_NAIVE;
|
||||||
|
/**
|
||||||
|
* The file used for saving and loading configuration.
|
||||||
|
*/
|
||||||
|
public static final File CONFIG_FILE = new File("config.toml");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The plugin manager responsible for
|
* The plugin manager responsible for
|
||||||
@@ -47,16 +55,25 @@ public class Abacus {
|
|||||||
/**
|
/**
|
||||||
* Creates a new instance of the Abacus calculator.
|
* Creates a new instance of the Abacus calculator.
|
||||||
*/
|
*/
|
||||||
public Abacus(Configuration configuration) {
|
public Abacus() {
|
||||||
pluginManager = new PluginManager(this);
|
pluginManager = new PluginManager(this);
|
||||||
numberReducer = new NumberReducer(this);
|
numberReducer = new NumberReducer(this);
|
||||||
this.configuration = new Configuration(configuration);
|
configuration = new Configuration(CONFIG_FILE);
|
||||||
|
configuration.saveTo(CONFIG_FILE);
|
||||||
LexerTokenizer lexerTokenizer = new LexerTokenizer();
|
LexerTokenizer lexerTokenizer = new LexerTokenizer();
|
||||||
ShuntingYardParser shuntingYardParser = new ShuntingYardParser(this);
|
ShuntingYardParser shuntingYardParser = new ShuntingYardParser(this);
|
||||||
treeBuilder = new TreeBuilder<>(lexerTokenizer, shuntingYardParser);
|
treeBuilder = new TreeBuilder<>(lexerTokenizer, shuntingYardParser);
|
||||||
|
|
||||||
pluginManager.addListener(shuntingYardParser);
|
|
||||||
pluginManager.addListener(lexerTokenizer);
|
pluginManager.addListener(lexerTokenizer);
|
||||||
|
pluginManager.addListener(shuntingYardParser);
|
||||||
|
pluginManager.addInstantiated(new StandardPlugin(pluginManager));
|
||||||
|
try {
|
||||||
|
ClassFinder.loadJars("plugins")
|
||||||
|
.forEach(plugin -> pluginManager.addClass(plugin));
|
||||||
|
} catch (IOException | ClassNotFoundException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
pluginManager.load();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
|||||||
@@ -39,15 +39,6 @@ public class Configuration {
|
|||||||
*/
|
*/
|
||||||
private Set<String> disabledPlugins = new HashSet<>();
|
private Set<String> disabledPlugins = new HashSet<>();
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new configuration form the given configuration.
|
|
||||||
*
|
|
||||||
* @param copyFrom the configuration to copy.
|
|
||||||
*/
|
|
||||||
public Configuration(Configuration copyFrom){
|
|
||||||
copyFrom(copyFrom);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new configuration with the given values.
|
* Creates a new configuration with the given values.
|
||||||
*
|
*
|
||||||
@@ -94,15 +85,6 @@ public class Configuration {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the value of this configuration as a string.
|
|
||||||
*
|
|
||||||
* @return the string that represents this configuration.
|
|
||||||
*/
|
|
||||||
public String asTomlString(){
|
|
||||||
return TOML_WRITER.write(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the number implementation from this configuration.
|
* Gets the number implementation from this configuration.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ public class Operator {
|
|||||||
* Creates a new operator with the given parameters.
|
* Creates a new operator with the given parameters.
|
||||||
*
|
*
|
||||||
* @param associativity the associativity of the operator.
|
* @param associativity the associativity of the operator.
|
||||||
|
* @param operatorType the type of this operator, like binary infix or unary postfix.
|
||||||
* @param precedence the precedence of the operator.
|
* @param precedence the precedence of the operator.
|
||||||
* @param function the function that the operator calls.
|
* @param function the function that the operator calls.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -12,14 +12,10 @@ import javafx.util.StringConverter;
|
|||||||
import org.nwapw.abacus.Abacus;
|
import org.nwapw.abacus.Abacus;
|
||||||
import org.nwapw.abacus.config.Configuration;
|
import org.nwapw.abacus.config.Configuration;
|
||||||
import org.nwapw.abacus.number.NumberInterface;
|
import org.nwapw.abacus.number.NumberInterface;
|
||||||
import org.nwapw.abacus.plugin.ClassFinder;
|
|
||||||
import org.nwapw.abacus.plugin.PluginListener;
|
import org.nwapw.abacus.plugin.PluginListener;
|
||||||
import org.nwapw.abacus.plugin.PluginManager;
|
import org.nwapw.abacus.plugin.PluginManager;
|
||||||
import org.nwapw.abacus.plugin.StandardPlugin;
|
|
||||||
import org.nwapw.abacus.tree.TreeNode;
|
import org.nwapw.abacus.tree.TreeNode;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
|
||||||
@@ -29,10 +25,6 @@ import java.util.Set;
|
|||||||
*/
|
*/
|
||||||
public class AbacusController implements PluginListener {
|
public class AbacusController implements PluginListener {
|
||||||
|
|
||||||
/**
|
|
||||||
* The file used for saving and loading configuration.
|
|
||||||
*/
|
|
||||||
public static final File CONFIG_FILE = new File("config.toml");
|
|
||||||
/**
|
/**
|
||||||
* The title for the apply alert dialog.
|
* The title for the apply alert dialog.
|
||||||
*/
|
*/
|
||||||
@@ -180,16 +172,9 @@ public class AbacusController implements PluginListener {
|
|||||||
if (oldValue.equals(settingsTab)) alertIfApplyNeeded(true);
|
if (oldValue.equals(settingsTab)) alertIfApplyNeeded(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
abacus = new Abacus(new Configuration(CONFIG_FILE));
|
abacus = new Abacus();
|
||||||
PluginManager abacusPluginManager = abacus.getPluginManager();
|
abacus.getPluginManager().addListener(this);
|
||||||
abacusPluginManager.addListener(this);
|
abacus.getPluginManager().reload();
|
||||||
abacusPluginManager.addInstantiated(new StandardPlugin(abacus.getPluginManager()));
|
|
||||||
try {
|
|
||||||
ClassFinder.loadJars("plugins").forEach(abacusPluginManager::addClass);
|
|
||||||
} catch (IOException | ClassNotFoundException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
abacusPluginManager.reload();
|
|
||||||
|
|
||||||
changesMade = false;
|
changesMade = false;
|
||||||
reloadAlertShown = false;
|
reloadAlertShown = false;
|
||||||
@@ -284,7 +269,7 @@ public class AbacusController implements PluginListener {
|
|||||||
for (ToggleablePlugin pluginEntry : enabledPlugins) {
|
for (ToggleablePlugin pluginEntry : enabledPlugins) {
|
||||||
if (!pluginEntry.isEnabled()) disabledPlugins.add(pluginEntry.getClassName());
|
if (!pluginEntry.isEnabled()) disabledPlugins.add(pluginEntry.getClassName());
|
||||||
}
|
}
|
||||||
configuration.saveTo(CONFIG_FILE);
|
configuration.saveTo(Abacus.CONFIG_FILE);
|
||||||
changesMade = false;
|
changesMade = false;
|
||||||
reloadAlertShown = false;
|
reloadAlertShown = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class ValueNode<T> extends PatternNode<T> {
|
|||||||
/**
|
/**
|
||||||
* Creates a new node that matches the given character.
|
* Creates a new node that matches the given character.
|
||||||
*
|
*
|
||||||
* @param value
|
* @param value the character value of the node.
|
||||||
*/
|
*/
|
||||||
public ValueNode(char value) {
|
public ValueNode(char value) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
|
|||||||
@@ -82,14 +82,14 @@ public interface NumberInterface {
|
|||||||
/**
|
/**
|
||||||
* Returns the least integer greater than or equal to the number.
|
* Returns the least integer greater than or equal to the number.
|
||||||
*
|
*
|
||||||
* @return the least integer >= the number, if int can hold the value.
|
* @return the least integer bigger or equal to the number, if int can hold the value.
|
||||||
*/
|
*/
|
||||||
NumberInterface ceiling();
|
NumberInterface ceiling();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the greatest integer less than or equal to the number.
|
* Return the greatest integer less than or equal to the number.
|
||||||
*
|
*
|
||||||
* @return the greatest int >= the number, if int can hold the value.
|
* @return the greatest integer smaller or equal the number, if int can hold the value.
|
||||||
*/
|
*/
|
||||||
NumberInterface floor();
|
NumberInterface floor();
|
||||||
|
|
||||||
@@ -104,7 +104,7 @@ public interface NumberInterface {
|
|||||||
* Returns the integer representation of this number, discarding any fractional part,
|
* Returns the integer representation of this number, discarding any fractional part,
|
||||||
* if int can hold the value.
|
* if int can hold the value.
|
||||||
*
|
*
|
||||||
* @return
|
* @return the integer value of this number.
|
||||||
*/
|
*/
|
||||||
int intValue();
|
int intValue();
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public abstract class NumberImplementation {
|
|||||||
* Creates a new number implementation with the given data.
|
* Creates a new number implementation with the given data.
|
||||||
*
|
*
|
||||||
* @param implementation the implementation class.
|
* @param implementation the implementation class.
|
||||||
* @param priority the priority, higher -> more likely to be converted into.
|
* @param priority the priority, higher means more likely to be converted into.
|
||||||
*/
|
*/
|
||||||
public NumberImplementation(Class<? extends NumberInterface> implementation, int priority) {
|
public NumberImplementation(Class<? extends NumberInterface> implementation, int priority) {
|
||||||
this.implementation = implementation;
|
this.implementation = implementation;
|
||||||
|
|||||||
@@ -70,6 +70,8 @@ public class PluginManager {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new plugin manager.
|
* Creates a new plugin manager.
|
||||||
|
*
|
||||||
|
* @param abacus the abacus instance.
|
||||||
*/
|
*/
|
||||||
public PluginManager(Abacus abacus) {
|
public PluginManager(Abacus abacus) {
|
||||||
this.abacus = abacus;
|
this.abacus = abacus;
|
||||||
|
|||||||
@@ -1,104 +0,0 @@
|
|||||||
package org.nwapw.abacus.tests;
|
|
||||||
|
|
||||||
import org.junit.Assert;
|
|
||||||
import org.junit.BeforeClass;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.nwapw.abacus.Abacus;
|
|
||||||
import org.nwapw.abacus.config.Configuration;
|
|
||||||
import org.nwapw.abacus.number.NumberInterface;
|
|
||||||
import org.nwapw.abacus.plugin.StandardPlugin;
|
|
||||||
import org.nwapw.abacus.tree.TreeNode;
|
|
||||||
|
|
||||||
public class CalculationTests {
|
|
||||||
|
|
||||||
private static Abacus abacus = new Abacus(new Configuration("precise", new String[]{}));
|
|
||||||
|
|
||||||
@BeforeClass
|
|
||||||
public static void prepareTests(){
|
|
||||||
abacus.getPluginManager().addInstantiated(new StandardPlugin(abacus.getPluginManager()));
|
|
||||||
abacus.getPluginManager().load();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void testOutput(String input, String parseOutput, String output){
|
|
||||||
TreeNode parsedTree = abacus.parseString(input);
|
|
||||||
Assert.assertNotNull(parsedTree);
|
|
||||||
Assert.assertEquals(parsedTree.toString(), parseOutput);
|
|
||||||
NumberInterface result = abacus.evaluateTree(parsedTree);
|
|
||||||
Assert.assertNotNull(result);
|
|
||||||
Assert.assertTrue(result.toString().startsWith(output));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void testEvalError(String input, String parseOutput){
|
|
||||||
TreeNode parsedTree = abacus.parseString(input);
|
|
||||||
Assert.assertNotNull(parsedTree);
|
|
||||||
Assert.assertEquals(parsedTree.toString(), parseOutput);
|
|
||||||
Assert.assertNull(abacus.evaluateTree(parsedTree));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testAddition(){
|
|
||||||
testOutput("9.5+10", "(9.5+10)", "19.5");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testSubtraction(){
|
|
||||||
testOutput("9.5-10", "(9.5-10)", "-0.5");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testMultiplication(){
|
|
||||||
testOutput("9.5*10", "(9.5*10)", "95");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testDivision(){
|
|
||||||
testOutput("9.5/2", "(9.5/2)", "4.75");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testNegation(){
|
|
||||||
testOutput("-9.5", "(9.5)`", "-9.5");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testFactorial(){
|
|
||||||
testOutput("7!", "(7)!", "5040");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testAbs(){
|
|
||||||
testOutput("abs(-1)", "abs((1)`)", "1");
|
|
||||||
testOutput("abs(1)", "abs(1)", "1");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testLn(){
|
|
||||||
testEvalError("ln(-1)", "ln((1)`)");
|
|
||||||
testOutput("ln2", "ln(2)", "0.6931471805599453094172321214581765680755");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testSqrt(){
|
|
||||||
testOutput("sqrt0", "sqrt(0)", "0");
|
|
||||||
testOutput("sqrt4", "sqrt(4)", "2");
|
|
||||||
testOutput("sqrt2", "sqrt(2)", "1.4142135623730950488016887242096980785696");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testExp(){
|
|
||||||
testOutput("exp0", "exp(0)", "1");
|
|
||||||
testOutput("exp1", "exp(1)", "2.718281828459045235360287471352662497757247");
|
|
||||||
testOutput("exp300", "exp(300)", "19424263952412559365842088360176992193662086");
|
|
||||||
testOutput("exp300", "exp(300)", "19424263952412559365842088360176992193662086");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testPow(){
|
|
||||||
testOutput("0^2", "(0^2)", "0");
|
|
||||||
testOutput("2^0", "(2^0)", "1");
|
|
||||||
testOutput("2^1", "(2^1)", "2");
|
|
||||||
testOutput("2^-1", "(2^(1)`)", "0.5");
|
|
||||||
testOutput("2^50", "(2^50)", "112589990684262");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@ import org.junit.Assert;
|
|||||||
import org.junit.BeforeClass;
|
import org.junit.BeforeClass;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.nwapw.abacus.Abacus;
|
import org.nwapw.abacus.Abacus;
|
||||||
import org.nwapw.abacus.config.Configuration;
|
|
||||||
import org.nwapw.abacus.function.Function;
|
import org.nwapw.abacus.function.Function;
|
||||||
import org.nwapw.abacus.function.Operator;
|
import org.nwapw.abacus.function.Operator;
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity;
|
import org.nwapw.abacus.function.OperatorAssociativity;
|
||||||
@@ -19,7 +18,7 @@ import java.util.List;
|
|||||||
|
|
||||||
public class TokenizerTests {
|
public class TokenizerTests {
|
||||||
|
|
||||||
private static Abacus abacus = new Abacus(new Configuration("precise", new String[]{}));
|
private static Abacus abacus = new Abacus();
|
||||||
private static LexerTokenizer lexerTokenizer = new LexerTokenizer();
|
private static LexerTokenizer lexerTokenizer = new LexerTokenizer();
|
||||||
private static Function subtractFunction = new Function() {
|
private static Function subtractFunction = new Function() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user