1
0
mirror of https://github.com/DanilaFe/abacus synced 2026-01-26 08:35:20 +00:00

Compare commits

...

15 Commits

Author SHA1 Message Date
3e39087fde Add numerous documentation fixes. 2017-08-05 16:15:30 -07:00
508e98413d Fix caret just multiplying. 2017-08-04 14:54:01 -07:00
d06f611a2e Remove leftover merge conflict marker. 2017-08-04 14:48:08 -07:00
c541eaab97 Format code. 2017-08-04 14:29:24 -07:00
0058ec9c71 Merge branch 'stoppable-new'
# Conflicts:
#	src/main/java/org/nwapw/abacus/fx/AbacusController.java
#	src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
2017-08-04 14:28:22 -07:00
Riley Jones
f8bf60f383 Fix exp function 2017-08-04 13:52:41 -07:00
Riley Jones
4369eba107 Allow all standard functions to end early 2017-08-04 13:45:29 -07:00
385a0c960d Merge the new edge cases. 2017-08-04 13:32:06 -07:00
Arthur Drobot
d7ae1a80f1 Merge branch 'master' of https://github.com/DanilaFe/abacus 2017-08-04 13:30:05 -07:00
Arthur Drobot
e4a45c0ec4 Add handling of edge cases to pow. 2017-08-04 13:29:53 -07:00
22cf99d23d Add missing comment. 2017-08-04 13:21:28 -07:00
39b36f84e0 Format code. 2017-08-04 13:20:57 -07:00
Riley Jones
eff7be0204 StandardPlugin uses null 2017-08-03 23:59:23 -07:00
Riley Jones
9d5f9d901c Plugin fixes 2017-08-03 15:16:26 -07:00
Riley Jones
dad546c5b5 Add stop button 2017-08-03 14:04:09 -07:00
21 changed files with 516 additions and 329 deletions

View File

@@ -23,6 +23,9 @@ import java.io.IOException;
*/ */
public class Abacus { public class Abacus {
/**
* 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. * The file used for saving and loading configuration.

View File

@@ -20,7 +20,7 @@ public class Configuration {
*/ */
private static final String DEFAULT_CONFIG = private static final String DEFAULT_CONFIG =
"numberImplementation = \"naive\"\n" + "numberImplementation = \"naive\"\n" +
"disabledPlugins = []"; "disabledPlugins = []";
/** /**
* The defaults TOML object, parsed from the string. * The defaults TOML object, parsed from the string.
*/ */
@@ -41,28 +41,31 @@ public class Configuration {
/** /**
* Creates a new configuration with the given values. * Creates a new configuration with the given values.
*
* @param numberImplementation the number implementation, like "naive" or "precise" * @param numberImplementation the number implementation, like "naive" or "precise"
* @param disabledPlugins the list of disabled plugins. * @param disabledPlugins the list of disabled plugins.
*/ */
public Configuration(String numberImplementation, String[] disabledPlugins){ public Configuration(String numberImplementation, String[] disabledPlugins) {
this.numberImplementation = numberImplementation; this.numberImplementation = numberImplementation;
this.disabledPlugins.addAll(Arrays.asList(disabledPlugins)); this.disabledPlugins.addAll(Arrays.asList(disabledPlugins));
} }
/** /**
* Loads a configuration from a given file, keeping non-specified fields default. * Loads a configuration from a given file, keeping non-specified fields default.
*
* @param fromFile the file to load from. * @param fromFile the file to load from.
*/ */
public Configuration(File fromFile){ public Configuration(File fromFile) {
if(!fromFile.exists()) return; if (!fromFile.exists()) return;
copyFrom(new Toml(DEFAULT_TOML).read(fromFile).to(Configuration.class)); copyFrom(new Toml(DEFAULT_TOML).read(fromFile).to(Configuration.class));
} }
/** /**
* Copies the values from the given configuration into this one. * Copies the values from the given configuration into this one.
*
* @param otherConfiguration the configuration to copy from. * @param otherConfiguration the configuration to copy from.
*/ */
public void copyFrom(Configuration otherConfiguration){ public void copyFrom(Configuration otherConfiguration) {
this.numberImplementation = otherConfiguration.numberImplementation; this.numberImplementation = otherConfiguration.numberImplementation;
this.disabledPlugins.addAll(otherConfiguration.disabledPlugins); this.disabledPlugins.addAll(otherConfiguration.disabledPlugins);
} }
@@ -70,10 +73,11 @@ public class Configuration {
/** /**
* Saves this configuration to the given file, creating * Saves this configuration to the given file, creating
* any directories that do not exist. * any directories that do not exist.
*
* @param file the file to save to. * @param file the file to save to.
*/ */
public void saveTo(File file){ public void saveTo(File file) {
if(file.getParentFile() != null) file.getParentFile().mkdirs(); if (file.getParentFile() != null) file.getParentFile().mkdirs();
try { try {
TOML_WRITER.write(this, file); TOML_WRITER.write(this, file);
} catch (IOException e) { } catch (IOException e) {
@@ -83,6 +87,7 @@ public class Configuration {
/** /**
* Gets the number implementation from this configuration. * Gets the number implementation from this configuration.
*
* @return the number implementation. * @return the number implementation.
*/ */
public String getNumberImplementation() { public String getNumberImplementation() {
@@ -91,6 +96,7 @@ public class Configuration {
/** /**
* Sets the number implementation for the configuration * Sets the number implementation for the configuration
*
* @param numberImplementation the number implementation. * @param numberImplementation the number implementation.
*/ */
public void setNumberImplementation(String numberImplementation) { public void setNumberImplementation(String numberImplementation) {
@@ -99,6 +105,7 @@ public class Configuration {
/** /**
* Gets the list of disabled plugins. * Gets the list of disabled plugins.
*
* @return the list of disabled plugins. * @return the list of disabled plugins.
*/ */
public Set<String> getDisabledPlugins() { public Set<String> getDisabledPlugins() {

View File

@@ -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.
*/ */

View File

@@ -1,5 +1,6 @@
package org.nwapw.abacus.fx; package org.nwapw.abacus.fx;
import javafx.application.Platform;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;
import javafx.fxml.FXML; import javafx.fxml.FXML;
@@ -36,7 +37,7 @@ public class AbacusController implements PluginListener {
* The text for the dialog that is shown if settings haven't been applied. * The text for the dialog that is shown if settings haven't been applied.
*/ */
private static final String APPLY_MSG_TEXT = "You have made changes to the configuration, however, you haven't pressed \"Apply\". " + private static final String APPLY_MSG_TEXT = "You have made changes to the configuration, however, you haven't pressed \"Apply\". " +
"The changes to the configuration will not be present in the calculator until \"Apply\" is pressed."; "The changes to the configuration will not be present in the calculator until \"Apply\" is pressed.";
/** /**
* Constant string that is displayed if the text could not be lexed or parsed. * Constant string that is displayed if the text could not be lexed or parsed.
*/ */
@@ -45,7 +46,10 @@ public class AbacusController implements PluginListener {
* Constant string that is displayed if the tree could not be reduced. * Constant string that is displayed if the tree could not be reduced.
*/ */
private static final String ERR_EVAL = "Evaluation Error"; private static final String ERR_EVAL = "Evaluation Error";
/**
* Constant string that is displayed if the calculations are stopped before they are done.
*/
private static final String ERR_STOP = "Stopped";
@FXML @FXML
private TabPane coreTabPane; private TabPane coreTabPane;
@FXML @FXML
@@ -83,6 +87,7 @@ public class AbacusController implements PluginListener {
private ObservableList<String> numberImplementationOptions; private ObservableList<String> numberImplementationOptions;
/** /**
* <<<<<<< HEAD
* The list of plugin objects that can be toggled on and off, * The list of plugin objects that can be toggled on and off,
* and, when reloaded, get added to the plugin manager's black list. * and, when reloaded, get added to the plugin manager's black list.
*/ */
@@ -92,6 +97,20 @@ public class AbacusController implements PluginListener {
* The abacus instance used for changing the plugin configuration. * The abacus instance used for changing the plugin configuration.
*/ */
private Abacus abacus; private Abacus abacus;
/**
* Thread used for calculating.
*/
private Thread calcThread;
/**
* Checks whether the calculator is calculating.
*/
private boolean calculating;
/**
* Seconds delayed for timer;
*/
private double delay = 0;
/** /**
* Boolean which represents whether changes were made to the configuration. * Boolean which represents whether changes were made to the configuration.
@@ -110,15 +129,15 @@ public class AbacusController implements PluginListener {
* Alerts the user if the changes they made * Alerts the user if the changes they made
* have not yet been applied. * have not yet been applied.
*/ */
private void alertIfApplyNeeded(boolean ignorePrevious){ private void alertIfApplyNeeded(boolean ignorePrevious) {
if(changesMade && (!reloadAlertShown || ignorePrevious)) { if (changesMade && (!reloadAlertShown || ignorePrevious)) {
reloadAlertShown = true; reloadAlertShown = true;
reloadAlert.showAndWait(); reloadAlert.showAndWait();
} }
} }
@FXML @FXML
public void initialize(){ public void initialize() {
Callback<TableColumn<HistoryModel, String>, TableCell<HistoryModel, String>> cellFactory = Callback<TableColumn<HistoryModel, String>, TableCell<HistoryModel, String>> cellFactory =
param -> new CopyableCell<>(); param -> new CopyableCell<>();
Callback<ListView<ToggleablePlugin>, ListCell<ToggleablePlugin>> pluginCellFactory = Callback<ListView<ToggleablePlugin>, ListCell<ToggleablePlugin>> pluginCellFactory =
@@ -150,7 +169,7 @@ public class AbacusController implements PluginListener {
outputColumn.setCellFactory(cellFactory); outputColumn.setCellFactory(cellFactory);
outputColumn.setCellValueFactory(cell -> cell.getValue().outputProperty()); outputColumn.setCellValueFactory(cell -> cell.getValue().outputProperty());
coreTabPane.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> { coreTabPane.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
if(oldValue.equals(settingsTab)) alertIfApplyNeeded(true); if (oldValue.equals(settingsTab)) alertIfApplyNeeded(true);
}); });
abacus = new Abacus(); abacus = new Abacus();
@@ -167,29 +186,68 @@ public class AbacusController implements PluginListener {
} }
@FXML @FXML
private void performCalculation(){ private void performCalculation() {
inputButton.setDisable(true); Runnable calculator = new Runnable() {
TreeNode constructedTree = abacus.parseString(inputField.getText()); public void run() {
if(constructedTree == null){ if (delay > 0) {
outputText.setText(ERR_SYNTAX); Runnable timer = new Runnable() {
inputButton.setDisable(false); public void run() {
return; long gap = (long) (delay * 1000);
} long startTime = System.currentTimeMillis();
NumberInterface evaluatedNumber = abacus.evaluateTree(constructedTree); while (System.currentTimeMillis() - startTime <= gap) {
if(evaluatedNumber == null){ }
outputText.setText(ERR_EVAL); stopCalculation();
inputButton.setDisable(false); }
return; };
} Thread maxTime = new Thread(timer);
outputText.setText(evaluatedNumber.toString()); maxTime.setName("maxTime");
historyData.add(new HistoryModel(inputField.getText(), constructedTree.toString(), evaluatedNumber.toString())); maxTime.start();
}
calculating = true;
Platform.runLater(() -> inputButton.setDisable(true));
TreeNode constructedTree = abacus.parseString(inputField.getText());
if (constructedTree == null) {
Platform.runLater(() -> outputText.setText(ERR_SYNTAX));
Platform.runLater(() -> inputButton.setDisable(false));
//return;
} else {
NumberInterface evaluatedNumber = abacus.evaluateTree(constructedTree);
if (evaluatedNumber == null) {
if (Thread.currentThread().isInterrupted()) {
Platform.runLater(() -> outputText.setText(ERR_STOP));
Platform.runLater(() -> inputButton.setDisable(false));
} else {
Platform.runLater(() -> outputText.setText(ERR_EVAL));
Platform.runLater(() -> inputButton.setDisable(false));
//return;
}
} else {
Platform.runLater(() -> outputText.setText(evaluatedNumber.toString()));
historyData.add(new HistoryModel(inputField.getText(), constructedTree.toString(), evaluatedNumber.toString()));
inputButton.setDisable(false); Platform.runLater(() -> inputButton.setDisable(false));
inputField.setText(""); Platform.runLater(() -> inputField.setText(""));
}
}
calculating = false;
}
};
if (!calculating) {
calcThread = new Thread(calculator);
calcThread.setName("calcThread");
calcThread.start();
}
} }
@FXML @FXML
private void performSaveAndReload(){ private void stopCalculation() {
calcThread.interrupt();
calculating = false;
//Platform.runLater(() ->inputButton.setDisable(false));
}
@FXML
private void performSaveAndReload() {
performSave(); performSave();
performReload(); performReload();
changesMade = false; changesMade = false;
@@ -197,19 +255,19 @@ public class AbacusController implements PluginListener {
} }
@FXML @FXML
private void performReload(){ private void performReload() {
alertIfApplyNeeded(true); alertIfApplyNeeded(true);
abacus.getPluginManager().reload(); abacus.getPluginManager().reload();
} }
@FXML @FXML
private void performSave(){ private void performSave() {
Configuration configuration = abacus.getConfiguration(); Configuration configuration = abacus.getConfiguration();
configuration.setNumberImplementation(numberImplementationBox.getSelectionModel().getSelectedItem()); configuration.setNumberImplementation(numberImplementationBox.getSelectionModel().getSelectedItem());
Set<String> disabledPlugins = configuration.getDisabledPlugins(); Set<String> disabledPlugins = configuration.getDisabledPlugins();
disabledPlugins.clear(); disabledPlugins.clear();
for(ToggleablePlugin pluginEntry : enabledPlugins){ for (ToggleablePlugin pluginEntry : enabledPlugins) {
if(!pluginEntry.isEnabled()) disabledPlugins.add(pluginEntry.getClassName()); if (!pluginEntry.isEnabled()) disabledPlugins.add(pluginEntry.getClassName());
} }
configuration.saveTo(Abacus.CONFIG_FILE); configuration.saveTo(Abacus.CONFIG_FILE);
changesMade = false; changesMade = false;
@@ -224,7 +282,7 @@ public class AbacusController implements PluginListener {
String actualImplementation = configuration.getNumberImplementation(); String actualImplementation = configuration.getNumberImplementation();
String toSelect = (numberImplementationOptions.contains(actualImplementation)) ? actualImplementation : "<default>"; String toSelect = (numberImplementationOptions.contains(actualImplementation)) ? actualImplementation : "<default>";
numberImplementationBox.getSelectionModel().select(toSelect); numberImplementationBox.getSelectionModel().select(toSelect);
for(Class<?> pluginClass : abacus.getPluginManager().getLoadedPluginClasses()){ for (Class<?> pluginClass : abacus.getPluginManager().getLoadedPluginClasses()) {
String fullName = pluginClass.getName(); String fullName = pluginClass.getName();
ToggleablePlugin plugin = new ToggleablePlugin(!disabledPlugins.contains(fullName), fullName); ToggleablePlugin plugin = new ToggleablePlugin(!disabledPlugins.contains(fullName), fullName);
plugin.enabledProperty().addListener(e -> changesMade = true); plugin.enabledProperty().addListener(e -> changesMade = true);

View File

@@ -9,6 +9,7 @@ import java.awt.datatransfer.StringSelection;
/** /**
* A cell that copies its value to the clipboard * A cell that copies its value to the clipboard
* when double clicked. * when double clicked.
*
* @param <S> The type of the table view generic type. * @param <S> The type of the table view generic type.
* @param <T> The type of the value contained in the cell. * @param <T> The type of the value contained in the cell.
*/ */
@@ -17,9 +18,9 @@ public class CopyableCell<S, T> extends TableCell<S, T> {
/** /**
* Creates a new copyable cell. * Creates a new copyable cell.
*/ */
public CopyableCell(){ public CopyableCell() {
addEventFilter(MouseEvent.MOUSE_CLICKED, event -> { addEventFilter(MouseEvent.MOUSE_CLICKED, event -> {
if(event.getClickCount() == 2){ if (event.getClickCount() == 2) {
Toolkit.getDefaultToolkit().getSystemClipboard() Toolkit.getDefaultToolkit().getSystemClipboard()
.setContents(new StringSelection(getText()), null); .setContents(new StringSelection(getText()), null);
} }

View File

@@ -26,11 +26,12 @@ public class HistoryModel {
/** /**
* Creates a new history model with the given variables. * Creates a new history model with the given variables.
* @param input the user input *
* @param input the user input
* @param parsed the parsed input * @param parsed the parsed input
* @param output the program output. * @param output the program output.
*/ */
public HistoryModel(String input, String parsed, String output){ public HistoryModel(String input, String parsed, String output) {
this.input = new SimpleStringProperty(); this.input = new SimpleStringProperty();
this.parsed = new SimpleStringProperty(); this.parsed = new SimpleStringProperty();
this.output = new SimpleStringProperty(); this.output = new SimpleStringProperty();
@@ -41,13 +42,16 @@ public class HistoryModel {
/** /**
* Gets the input property. * Gets the input property.
*
* @return the input property. * @return the input property.
*/ */
public StringProperty inputProperty() { public StringProperty inputProperty() {
return input; return input;
} }
/** /**
* Gets the input. * Gets the input.
*
* @return the input. * @return the input.
*/ */
public String getInput() { public String getInput() {
@@ -56,13 +60,16 @@ public class HistoryModel {
/** /**
* Gets the parsed input property. * Gets the parsed input property.
*
* @return the parsed input property. * @return the parsed input property.
*/ */
public StringProperty parsedProperty() { public StringProperty parsedProperty() {
return parsed; return parsed;
} }
/** /**
* Gets the parsed input. * Gets the parsed input.
*
* @return the parsed input. * @return the parsed input.
*/ */
public String getParsed() { public String getParsed() {
@@ -71,13 +78,16 @@ public class HistoryModel {
/** /**
* Gets the output property. * Gets the output property.
*
* @return the output property. * @return the output property.
*/ */
public StringProperty outputProperty() { public StringProperty outputProperty() {
return output; return output;
} }
/** /**
* Gets the program output. * Gets the program output.
*
* @return the output. * @return the output.
*/ */
public String getOutput() { public String getOutput() {

View File

@@ -20,10 +20,11 @@ public class ToggleablePlugin {
/** /**
* Creates a new toggleable plugin with the given properties. * Creates a new toggleable plugin with the given properties.
* @param enabled the enabled / disabled state at the beginning. *
* @param enabled the enabled / disabled state at the beginning.
* @param className the name of the class this plugin toggles. * @param className the name of the class this plugin toggles.
*/ */
public ToggleablePlugin(boolean enabled, String className){ public ToggleablePlugin(boolean enabled, String className) {
this.enabled = new SimpleBooleanProperty(); this.enabled = new SimpleBooleanProperty();
this.enabled.setValue(enabled); this.enabled.setValue(enabled);
this.className = className; this.className = className;
@@ -31,6 +32,7 @@ public class ToggleablePlugin {
/** /**
* Gets the enabled property of this plugin. * Gets the enabled property of this plugin.
*
* @return the enabled property. * @return the enabled property.
*/ */
public BooleanProperty enabledProperty() { public BooleanProperty enabledProperty() {
@@ -39,6 +41,7 @@ public class ToggleablePlugin {
/** /**
* Checks if this plugin entry should be enabled. * Checks if this plugin entry should be enabled.
*
* @return whether this plugin will be enabled. * @return whether this plugin will be enabled.
*/ */
public boolean isEnabled() { public boolean isEnabled() {
@@ -47,6 +50,7 @@ public class ToggleablePlugin {
/** /**
* Gets the class name this plugin toggles. * Gets the class name this plugin toggles.
*
* @return the class name that should be disabled. * @return the class name that should be disabled.
*/ */
public String getClassName() { public String getClassName() {

View File

@@ -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;

View File

@@ -26,6 +26,7 @@ public class NaiveNumber implements NumberInterface {
public NaiveNumber(String value) { public NaiveNumber(String value) {
this(Double.parseDouble(value)); this(Double.parseDouble(value));
} }
/** /**
* Creates a new NaiveNumber with the given value. * Creates a new NaiveNumber with the given value.
* *
@@ -110,7 +111,7 @@ public class NaiveNumber implements NumberInterface {
@Override @Override
public int intValue() { public int intValue() {
return (int)value; return (int) value;
} }
@Override @Override

View File

@@ -81,18 +81,21 @@ 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();
/** /**
* Returns the fractional part of the number. * Returns the fractional part of the number.
*
* @return the fractional part of the number. * @return the fractional part of the number.
*/ */
NumberInterface fractionalPart(); NumberInterface fractionalPart();
@@ -100,7 +103,8 @@ 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();

View File

@@ -102,7 +102,7 @@ public class PreciseNumber implements NumberInterface {
public NumberInterface ceiling() { public NumberInterface ceiling() {
String str = value.toPlainString(); String str = value.toPlainString();
int decimalIndex = str.indexOf('.'); int decimalIndex = str.indexOf('.');
if(decimalIndex != -1){ if (decimalIndex != -1) {
return this.floor().add(ONE); return this.floor().add(ONE);
} }
return this; return this;
@@ -112,7 +112,7 @@ public class PreciseNumber implements NumberInterface {
public NumberInterface floor() { public NumberInterface floor() {
String str = value.toPlainString(); String str = value.toPlainString();
int decimalIndex = str.indexOf('.'); int decimalIndex = str.indexOf('.');
if(decimalIndex != -1){ if (decimalIndex != -1) {
return new PreciseNumber(str.substring(0, decimalIndex)); return new PreciseNumber(str.substring(0, decimalIndex));
} }
return this; return this;
@@ -122,7 +122,7 @@ public class PreciseNumber implements NumberInterface {
public NumberInterface fractionalPart() { public NumberInterface fractionalPart() {
String str = value.toPlainString(); String str = value.toPlainString();
int decimalIndex = str.indexOf('.'); int decimalIndex = str.indexOf('.');
if(decimalIndex != -1){ if (decimalIndex != -1) {
return new PreciseNumber(str.substring(decimalIndex + 1)); return new PreciseNumber(str.substring(decimalIndex + 1));
} }
return ZERO; return ZERO;

View File

@@ -77,8 +77,8 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
continue; continue;
} }
if(tokenString.equals("-") && (previousType == null || previousType == TokenType.OP || if (tokenString.equals("-") && (previousType == null || previousType == TokenType.OP ||
previousType == TokenType.OPEN_PARENTH)){ previousType == TokenType.OPEN_PARENTH)) {
from.add(0, new Match<>("`", TokenType.OP)); from.add(0, new Match<>("`", TokenType.OP));
continue; continue;
} }

View File

@@ -26,10 +26,11 @@ 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;
this.priority = priority; this.priority = priority;
promotionPaths = new HashMap<>(); promotionPaths = new HashMap<>();
@@ -37,30 +38,34 @@ public abstract class NumberImplementation {
/** /**
* Gets the list of all promotion paths this implementation can take. * Gets the list of all promotion paths this implementation can take.
*
* @return the map of documentation paths. * @return the map of documentation paths.
*/ */
public final Map<Class<? extends NumberInterface>, Function<NumberInterface, NumberInterface>> getPromotionPaths(){ public final Map<Class<? extends NumberInterface>, Function<NumberInterface, NumberInterface>> getPromotionPaths() {
return promotionPaths; return promotionPaths;
} }
/** /**
* Gets the implementation class used by this implementation. * Gets the implementation class used by this implementation.
*
* @return the implementation class. * @return the implementation class.
*/ */
public final Class<? extends NumberInterface> getImplementation(){ public final Class<? extends NumberInterface> getImplementation() {
return implementation; return implementation;
} }
/** /**
* Gets the priority of this number implementation. * Gets the priority of this number implementation.
*
* @return the priority. * @return the priority.
*/ */
public final int getPriority(){ public final int getPriority() {
return priority; return priority;
} }
/** /**
* Abstract function to create a new instance from a string. * Abstract function to create a new instance from a string.
*
* @param string the string to create a number from. * @param string the string to create a number from.
* @return the resulting number. * @return the resulting number.
*/ */
@@ -68,6 +73,7 @@ public abstract class NumberImplementation {
/** /**
* Get the instance of pi with the given implementation. * Get the instance of pi with the given implementation.
*
* @return pi * @return pi
*/ */
public abstract NumberInterface instanceForPi(); public abstract NumberInterface instanceForPi();

View File

@@ -78,7 +78,7 @@ public abstract class Plugin {
* *
* @return the list of registered number implementations. * @return the list of registered number implementations.
*/ */
public final Set<String> providedNumberImplementations(){ public final Set<String> providedNumberImplementations() {
return numberImplementations.keySet(); return numberImplementations.keySet();
} }
@@ -108,7 +108,7 @@ public abstract class Plugin {
* @param name the name of the number implementation to look up. * @param name the name of the number implementation to look up.
* @return the number implementation associated with that name, or null if the plugin doesn't provide it. * @return the number implementation associated with that name, or null if the plugin doesn't provide it.
*/ */
public final NumberImplementation getNumberImplementation(String name){ public final NumberImplementation getNumberImplementation(String name) {
return numberImplementations.get(name); return numberImplementations.get(name);
} }
@@ -160,10 +160,11 @@ public abstract class Plugin {
/** /**
* To be used in load(). Registers a new number implementation with the plugin. * To be used in load(). Registers a new number implementation with the plugin.
* This makes it accessible to the plugin manager. * This makes it accessible to the plugin manager.
* @param name the name of the implementation. *
* @param name the name of the implementation.
* @param implementation the actual implementation class to register. * @param implementation the actual implementation class to register.
*/ */
protected final void registerNumberImplementation(String name, NumberImplementation implementation){ protected final void registerNumberImplementation(String name, NumberImplementation implementation) {
numberImplementations.put(name, implementation); numberImplementations.put(name, implementation);
} }
@@ -199,7 +200,7 @@ public abstract class Plugin {
* @param name the name for which to search. * @param name the name for which to search.
* @return the resulting number implementation, or null if none was found. * @return the resulting number implementation, or null if none was found.
*/ */
protected final NumberImplementation numberImplementationFor(String name){ protected final NumberImplementation numberImplementationFor(String name) {
return manager.numberImplementationFor(name); return manager.numberImplementationFor(name);
} }
@@ -208,10 +209,11 @@ public abstract class Plugin {
* This is done so that number implementations with various degrees of precision * This is done so that number implementations with various degrees of precision
* can provide their own pi values, without losing said precision by * can provide their own pi values, without losing said precision by
* promoting NaiveNumbers. * promoting NaiveNumbers.
*
* @param forClass the class to which to find the pi instance. * @param forClass the class to which to find the pi instance.
* @return the pi value for the given class. * @return the pi value for the given class.
*/ */
protected final NumberInterface getPi(Class<? extends NumberInterface> forClass){ protected final NumberInterface getPi(Class<? extends NumberInterface> forClass) {
return manager.piFor(forClass); return manager.piFor(forClass);
} }

View File

@@ -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;
@@ -102,9 +104,9 @@ public class PluginManager {
* @return the retrieved element, or null if it was not found. * @return the retrieved element, or null if it was not found.
*/ */
private static <T, K> T searchCached(Collection<Plugin> plugins, Map<K, T> cache, private static <T, K> T searchCached(Collection<Plugin> plugins, Map<K, T> cache,
java.util.function.Function<Plugin, Set<K>> setFunction, java.util.function.Function<Plugin, Set<K>> setFunction,
java.util.function.BiFunction<Plugin, K, T> getFunction, java.util.function.BiFunction<Plugin, K, T> getFunction,
K name) { K name) {
if (cache.containsKey(name)) return cache.get(name); if (cache.containsKey(name)) return cache.get(name);
T loadedValue = null; T loadedValue = null;
@@ -141,27 +143,29 @@ public class PluginManager {
/** /**
* Gets the number implementation under the given name. * Gets the number implementation under the given name.
*
* @param name the name of the implementation. * @param name the name of the implementation.
* @return the implementation. * @return the implementation.
*/ */
public NumberImplementation numberImplementationFor(String name){ public NumberImplementation numberImplementationFor(String name) {
return searchCached(plugins, cachedNumberImplementations, Plugin::providedNumberImplementations, return searchCached(plugins, cachedNumberImplementations, Plugin::providedNumberImplementations,
Plugin::getNumberImplementation, name); Plugin::getNumberImplementation, name);
} }
/** /**
* Gets the number implementation for the given implementation class. * Gets the number implementation for the given implementation class.
*
* @param name the class for which to find the implementation. * @param name the class for which to find the implementation.
* @return the implementation. * @return the implementation.
*/ */
public NumberImplementation interfaceImplementationFor(Class<? extends NumberInterface> name){ public NumberImplementation interfaceImplementationFor(Class<? extends NumberInterface> name) {
if(cachedInterfaceImplementations.containsKey(name)) return cachedInterfaceImplementations.get(name); if (cachedInterfaceImplementations.containsKey(name)) return cachedInterfaceImplementations.get(name);
NumberImplementation toReturn = null; NumberImplementation toReturn = null;
outside: outside:
for(Plugin plugin : plugins){ for (Plugin plugin : plugins) {
for(String implementationName : plugin.providedNumberImplementations()){ for (String implementationName : plugin.providedNumberImplementations()) {
NumberImplementation implementation = plugin.getNumberImplementation(implementationName); NumberImplementation implementation = plugin.getNumberImplementation(implementationName);
if(implementation.getImplementation().equals(name)) { if (implementation.getImplementation().equals(name)) {
toReturn = implementation; toReturn = implementation;
break outside; break outside;
} }
@@ -173,14 +177,15 @@ public class PluginManager {
/** /**
* Gets the mathematical constant pi for the given implementation class. * Gets the mathematical constant pi for the given implementation class.
*
* @param forClass the class for which to find pi. * @param forClass the class for which to find pi.
* @return pi * @return pi
*/ */
public NumberInterface piFor(Class<? extends NumberInterface> forClass){ public NumberInterface piFor(Class<? extends NumberInterface> forClass) {
if(cachedPi.containsKey(forClass)) return cachedPi.get(forClass); if (cachedPi.containsKey(forClass)) return cachedPi.get(forClass);
NumberImplementation implementation = interfaceImplementationFor(forClass); NumberImplementation implementation = interfaceImplementationFor(forClass);
NumberInterface generatedPi = null; NumberInterface generatedPi = null;
if(implementation != null){ if (implementation != null) {
generatedPi = implementation.instanceForPi(); generatedPi = implementation.instanceForPi();
} }
cachedPi.put(forClass, generatedPi); cachedPi.put(forClass, generatedPi);
@@ -219,11 +224,11 @@ public class PluginManager {
public void load() { public void load() {
Set<String> disabledPlugins = abacus.getConfiguration().getDisabledPlugins(); Set<String> disabledPlugins = abacus.getConfiguration().getDisabledPlugins();
for (Plugin plugin : plugins) { for (Plugin plugin : plugins) {
if(disabledPlugins.contains(plugin.getClass().getName())) continue; if (disabledPlugins.contains(plugin.getClass().getName())) continue;
plugin.enable(); plugin.enable();
} }
for (Plugin plugin : plugins) { for (Plugin plugin : plugins) {
if(disabledPlugins.contains(plugin.getClass().getName())) continue; if (disabledPlugins.contains(plugin.getClass().getName())) continue;
allFunctions.addAll(plugin.providedFunctions()); allFunctions.addAll(plugin.providedFunctions());
allOperators.addAll(plugin.providedOperators()); allOperators.addAll(plugin.providedOperators());
allNumberImplementations.addAll(plugin.providedNumberImplementations()); allNumberImplementations.addAll(plugin.providedNumberImplementations());
@@ -238,7 +243,7 @@ public class PluginManager {
listeners.forEach(e -> e.onUnload(this)); listeners.forEach(e -> e.onUnload(this));
Set<String> disabledPlugins = abacus.getConfiguration().getDisabledPlugins(); Set<String> disabledPlugins = abacus.getConfiguration().getDisabledPlugins();
for (Plugin plugin : plugins) { for (Plugin plugin : plugins) {
if(disabledPlugins.contains(plugin.getClass().getName())) continue; if (disabledPlugins.contains(plugin.getClass().getName())) continue;
plugin.disable(); plugin.disable();
} }
cachedFunctions.clear(); cachedFunctions.clear();
@@ -283,7 +288,7 @@ public class PluginManager {
* *
* @return the set of all implementations that were loaded. * @return the set of all implementations that were loaded.
*/ */
public Set<String> getAllNumberImplementations(){ public Set<String> getAllNumberImplementations() {
return allNumberImplementations; return allNumberImplementations;
} }
@@ -308,6 +313,7 @@ public class PluginManager {
/** /**
* Gets a list of all the plugin class files that have been * Gets a list of all the plugin class files that have been
* added to the plugin manager. * added to the plugin manager.
*
* @return the list of all the added plugin classes. * @return the list of all the added plugin classes.
*/ */
public Set<Class<?>> getLoadedPluginClasses() { public Set<Class<?>> getLoadedPluginClasses() {

View File

@@ -18,8 +18,6 @@ import java.util.function.BiFunction;
*/ */
public class StandardPlugin extends Plugin { public class StandardPlugin extends Plugin {
private static final HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> FACTORIAL_LISTS = new HashMap<>();
/** /**
* The addition operator, + * The addition operator, +
*/ */
@@ -31,9 +29,13 @@ public class StandardPlugin extends Plugin {
@Override @Override
protected NumberInterface applyInternal(NumberInterface[] params) { protected NumberInterface applyInternal(NumberInterface[] params) {
if (Thread.currentThread().isInterrupted())
return null;
NumberInterface sum = params[0]; NumberInterface sum = params[0];
for (int i = 1; i < params.length; i++) { for (int i = 1; i < params.length; i++) {
sum = sum.add(params[i]); sum = sum.add(params[i]);
if (Thread.currentThread().isInterrupted())
return null;
} }
return sum; return sum;
} }
@@ -49,7 +51,10 @@ public class StandardPlugin extends Plugin {
@Override @Override
protected NumberInterface applyInternal(NumberInterface[] params) { protected NumberInterface applyInternal(NumberInterface[] params) {
if (Thread.currentThread().isInterrupted())
return null;
return params[0].subtract(params[1]); return params[0].subtract(params[1]);
} }
}); });
/** /**
@@ -63,6 +68,8 @@ public class StandardPlugin extends Plugin {
@Override @Override
protected NumberInterface applyInternal(NumberInterface[] params) { protected NumberInterface applyInternal(NumberInterface[] params) {
if (Thread.currentThread().isInterrupted())
return null;
return params[0].negate(); return params[0].negate();
} }
}); });
@@ -77,9 +84,13 @@ public class StandardPlugin extends Plugin {
@Override @Override
protected NumberInterface applyInternal(NumberInterface[] params) { protected NumberInterface applyInternal(NumberInterface[] params) {
if (Thread.currentThread().isInterrupted())
return null;
NumberInterface product = params[0]; NumberInterface product = params[0];
for (int i = 1; i < params.length; i++) { for (int i = 1; i < params.length; i++) {
product = product.multiply(params[i]); product = product.multiply(params[i]);
if (Thread.currentThread().isInterrupted())
return null;
} }
return product; return product;
} }
@@ -95,6 +106,8 @@ public class StandardPlugin extends Plugin {
@Override @Override
protected NumberInterface applyInternal(NumberInterface[] params) { protected NumberInterface applyInternal(NumberInterface[] params) {
if (Thread.currentThread().isInterrupted())
return null;
return params[0].divide(params[1]); return params[0].divide(params[1]);
} }
}); });
@@ -112,15 +125,19 @@ public class StandardPlugin extends Plugin {
@Override @Override
protected NumberInterface applyInternal(NumberInterface[] params) { protected NumberInterface applyInternal(NumberInterface[] params) {
if (Thread.currentThread().isInterrupted())
return null;
if (params[0].signum() == 0) { if (params[0].signum() == 0) {
return (new NaiveNumber(1)).promoteTo(params[0].getClass()); return (new NaiveNumber(1)).promoteTo(params[0].getClass());
} }
NumberInterface factorial = params[0]; NumberInterface factorial = params[0];
NumberInterface multiplier = params[0]; NumberInterface multiplier = params[0];
//It is necessary to later prevent calls of factorial on anything but non-negative integers. //It is necessary to later prevent calls of factorial on anything but non-negative integers.
while ((multiplier = multiplier.subtract(NaiveNumber.ONE.promoteTo(multiplier.getClass()))).signum() == 1) { while (!Thread.currentThread().isInterrupted() && (multiplier = multiplier.subtract(NaiveNumber.ONE.promoteTo(multiplier.getClass()))) != null && multiplier.signum() == 1) {
factorial = factorial.multiply(multiplier); factorial = factorial.multiply(multiplier);
} }
if (Thread.currentThread().isInterrupted())
return null;
return factorial; return factorial;
/*if(!storedList.containsKey(params[0].getClass())){ /*if(!storedList.containsKey(params[0].getClass())){
storedList.put(params[0].getClass(), new ArrayList<NumberInterface>()); storedList.put(params[0].getClass(), new ArrayList<NumberInterface>());
@@ -129,20 +146,6 @@ public class StandardPlugin extends Plugin {
}*/ }*/
} }
}); });
/**
* The caret / pow operator, ^
*/
public static final Operator OP_CARET = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2, new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 2;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return FUNCTION_EXP.apply(FUNCTION_LN.apply(params[0]).multiply(params[1]));
}
});
/** /**
* The absolute value function, abs(-3) = 3 * The absolute value function, abs(-3) = 3
*/ */
@@ -154,52 +157,11 @@ public class StandardPlugin extends Plugin {
@Override @Override
protected NumberInterface applyInternal(NumberInterface[] params) { protected NumberInterface applyInternal(NumberInterface[] params) {
if (Thread.currentThread().isInterrupted())
return null;
return params[0].multiply((new NaiveNumber(params[0].signum())).promoteTo(params[0].getClass())); return params[0].multiply((new NaiveNumber(params[0].signum())).promoteTo(params[0].getClass()));
} }
}; };
/**
* The exponential function, exp(1) = e^1 = 2.71...
*/
public static final Function FUNCTION_EXP = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
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().intValue())), 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;
}
}
};
/** /**
* The natural log function. * The natural log function.
*/ */
@@ -211,26 +173,32 @@ public class StandardPlugin extends Plugin {
@Override @Override
protected NumberInterface applyInternal(NumberInterface[] params) { protected NumberInterface applyInternal(NumberInterface[] params) {
if (Thread.currentThread().isInterrupted())
return null;
NumberInterface param = params[0]; NumberInterface param = params[0];
int powersOf2 = 0; int powersOf2 = 0;
while (FUNCTION_ABS.apply(param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))).compareTo((new NaiveNumber(0.1)).promoteTo(param.getClass())) >= 0) { NumberInterface check;
if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() == 1) { while (!Thread.currentThread().isInterrupted() && (check = FUNCTION_ABS.apply(param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())))) != null && (check.compareTo((new NaiveNumber(0.1)).promoteTo(param.getClass()))) >= 0) {
if ((check = param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))) != null && check.signum() == 1) {
param = param.divide(new NaiveNumber(2).promoteTo(param.getClass())); param = param.divide(new NaiveNumber(2).promoteTo(param.getClass()));
powersOf2++; powersOf2++;
if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() != 1) { if ((check = param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))) == null || check.signum() != 1) {
break; break;
//No infinite loop for you. //No infinite loop for you.
} }
} else { } else {
param = param.multiply(new NaiveNumber(2).promoteTo(param.getClass())); param = param.multiply(new NaiveNumber(2).promoteTo(param.getClass()));
powersOf2--; powersOf2--;
if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() != -1) { if ((check = param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))) == null || check.signum() != 1) {
break; break;
//No infinite loop for you. //No infinite loop for you.
} }
} }
} }
return getLog2(param).multiply((new NaiveNumber(powersOf2)).promoteTo(param.getClass())).add(getLogPartialSum(param)); NumberInterface check2;
if (!Thread.currentThread().isInterrupted() && (check = getLog2(param)) != null && (check = check.multiply((new NaiveNumber(powersOf2).promoteTo(param.getClass())))) != null && (check2 = getLogPartialSum(param)) != null && (check = check.add(check2)) != null)
return check;
return null;
} }
/** /**
@@ -240,16 +208,23 @@ public class StandardPlugin extends Plugin {
* @return the partial sum. * @return the partial sum.
*/ */
private NumberInterface getLogPartialSum(NumberInterface x) { private NumberInterface getLogPartialSum(NumberInterface x) {
if (Thread.currentThread().isInterrupted())
return null;
NumberInterface maxError = getMaxError(x); NumberInterface maxError = getMaxError(x);
x = x.subtract(NaiveNumber.ONE.promoteTo(x.getClass())); //Terms used are for log(x+1). x = x.subtract(NaiveNumber.ONE.promoteTo(x.getClass())); //Terms used are for log(x+1).
NumberInterface currentNumerator = x, currentTerm = x, sum = x; NumberInterface currentNumerator = x, currentTerm = x, sum = x;
int n = 1; int n = 1;
while (FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0) { NumberInterface check;
while (!Thread.currentThread().isInterrupted() && (check = FUNCTION_ABS.apply(currentTerm)) != null && check.compareTo(maxError) > 0) {
n++; n++;
currentNumerator = currentNumerator.multiply(x).negate(); if ((currentNumerator = currentNumerator.multiply(x)) == null || (currentNumerator = currentNumerator.negate()) == null)
return null;
currentTerm = currentNumerator.divide(new NaiveNumber(n).promoteTo(x.getClass())); currentTerm = currentNumerator.divide(new NaiveNumber(n).promoteTo(x.getClass()));
sum = sum.add(currentTerm); sum = sum.add(currentTerm);
} }
if (Thread.currentThread().isInterrupted())
return null;
return sum; return sum;
} }
@@ -259,6 +234,8 @@ public class StandardPlugin extends Plugin {
* @return the value of log(2) with the appropriate precision. * @return the value of log(2) with the appropriate precision.
*/ */
private NumberInterface getLog2(NumberInterface number) { private NumberInterface getLog2(NumberInterface number) {
if (Thread.currentThread().isInterrupted())
return null;
NumberInterface maxError = getMaxError(number); NumberInterface maxError = getMaxError(number);
//NumberInterface errorBound = (new NaiveNumber(1)).promoteTo(number.getClass()); //NumberInterface errorBound = (new NaiveNumber(1)).promoteTo(number.getClass());
//We'll use the series \sigma_{n >= 1) ((1/3^n + 1/4^n) * 1/n) //We'll use the series \sigma_{n >= 1) ((1/3^n + 1/4^n) * 1/n)
@@ -267,13 +244,17 @@ public class StandardPlugin extends Plugin {
NumberInterface a = (new NaiveNumber(1)).promoteTo(number.getClass()), b = a, c = a; NumberInterface a = (new NaiveNumber(1)).promoteTo(number.getClass()), b = a, c = a;
NumberInterface sum = NaiveNumber.ZERO.promoteTo(number.getClass()); NumberInterface sum = NaiveNumber.ZERO.promoteTo(number.getClass());
int n = 0; int n = 0;
while (a.compareTo(maxError) >= 1) { while (!Thread.currentThread().isInterrupted() && a.compareTo(maxError) >= 1) {
n++; n++;
a = a.divide((new NaiveNumber(3)).promoteTo(number.getClass())); a = a.divide((new NaiveNumber(3)).promoteTo(number.getClass()));
b = b.divide((new NaiveNumber(4)).promoteTo(number.getClass())); b = b.divide((new NaiveNumber(4)).promoteTo(number.getClass()));
c = NaiveNumber.ONE.promoteTo(number.getClass()).divide((new NaiveNumber(n)).promoteTo(number.getClass())); c = NaiveNumber.ONE.promoteTo(number.getClass()).divide((new NaiveNumber(n)).promoteTo(number.getClass()));
sum = sum.add(a.add(b).multiply(c)); NumberInterface check;
if (a == null || (check = a.add(b)) == null || (check = check.multiply(c)) == null || (sum = sum.add(check)) == null)
return null;
} }
if (Thread.currentThread().isInterrupted())
return null;
return sum; return sum;
} }
}; };
@@ -291,109 +272,6 @@ public class StandardPlugin extends Plugin {
return OP_CARET.getFunction().apply(params[0], ((new NaiveNumber(0.5)).promoteTo(params[0].getClass()))); return OP_CARET.getFunction().apply(params[0], ((new NaiveNumber(0.5)).promoteTo(params[0].getClass())));
} }
}; };
/**
* The sine function (the argument is interpreted in radians).
*/
public final Function functionSin = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
NumberInterface pi = getPi(params[0].getClass());
NumberInterface twoPi = pi.multiply(new NaiveNumber(2).promoteTo(pi.getClass()));
NumberInterface theta = getSmallAngle(params[0], pi);
//System.out.println(theta);
if(theta.compareTo(pi.multiply(new NaiveNumber(1.5).promoteTo(twoPi.getClass()))) >= 0){
theta = theta.subtract(twoPi);
}
else if(theta.compareTo(pi.divide(new NaiveNumber(2).promoteTo(pi.getClass()))) > 0){
theta = pi.subtract(theta);
}
//System.out.println(theta);
return sinTaylor(theta);
}
};
/**
* The cosine function (the argument is in radians).
*/
public final Function functionCos = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return functionSin.apply(getPi(params[0].getClass()).divide(new NaiveNumber(2).promoteTo(params[0].getClass()))
.subtract(params[0]));
}
};
/**
* The tangent function (the argument is in radians).
*/
public final Function functionTan = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return functionSin.apply(params[0]).divide(functionCos.apply(params[0]));
}
};
/**
* The secant function (the argument is in radians).
*/
public final Function functionSec = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return NaiveNumber.ONE.promoteTo(params[0].getClass()).divide(functionCos.apply(params[0]));
}
};
/**
* The cosecant function (the argument is in radians).
*/
public final Function functionCsc = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return NaiveNumber.ONE.promoteTo(params[0].getClass()).divide(functionSin.apply(params[0]));
}
};
/**
* The cotangent function (the argument is in radians).
*/
public final Function functionCot = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return functionCos.apply(params[0]).divide(functionCos.apply(params[0]));
}
};
/** /**
* The implementation for double-based naive numbers. * The implementation for double-based naive numbers.
*/ */
@@ -408,7 +286,6 @@ public class StandardPlugin extends Plugin {
return new NaiveNumber(Math.PI); return new NaiveNumber(Math.PI);
} }
}; };
/** /**
* The implementation for the infinite-precision BigDecimal. * The implementation for the infinite-precision BigDecimal.
*/ */
@@ -425,19 +302,19 @@ public class StandardPlugin extends Plugin {
NumberInterface L = new PreciseNumber("13591409"); NumberInterface L = new PreciseNumber("13591409");
NumberInterface X = M; NumberInterface X = M;
NumberInterface sum = L; NumberInterface sum = L;
int termsNeeded = C.getMaxPrecision()/13 + 1; int termsNeeded = C.getMaxPrecision() / 13 + 1;
NumberInterface lSummand = new PreciseNumber("545140134"); NumberInterface lSummand = new PreciseNumber("545140134");
NumberInterface xMultiplier = new PreciseNumber("262537412") NumberInterface xMultiplier = new PreciseNumber("262537412")
.multiply(new PreciseNumber("1000000000")) .multiply(new PreciseNumber("1000000000"))
.add(new PreciseNumber("640768000")) .add(new PreciseNumber("640768000"))
.negate(); .negate();
for(int i = 0; i < termsNeeded; i++){ for (int i = 0; i < termsNeeded; i++) {
M = M M = M
.multiply(new NaiveNumber(12*i+2).promoteTo(PreciseNumber.class)) .multiply(new NaiveNumber(12 * i + 2).promoteTo(PreciseNumber.class))
.multiply(new NaiveNumber(12*i+6).promoteTo(PreciseNumber.class)) .multiply(new NaiveNumber(12 * i + 6).promoteTo(PreciseNumber.class))
.multiply(new NaiveNumber(12*i+10).promoteTo(PreciseNumber.class)) .multiply(new NaiveNumber(12 * i + 10).promoteTo(PreciseNumber.class))
.divide(new NaiveNumber(Math.pow(i+1,3)).promoteTo(PreciseNumber.class)); .divide(new NaiveNumber(Math.pow(i + 1, 3)).promoteTo(PreciseNumber.class));
L = L.add(lSummand); L = L.add(lSummand);
X = X.multiply(xMultiplier); X = X.multiply(xMultiplier);
sum = sum.add(M.multiply(L).divide(X)); sum = sum.add(M.multiply(L).divide(X));
@@ -445,6 +322,168 @@ public class StandardPlugin extends Plugin {
return C.divide(sum); return C.divide(sum);
} }
}; };
private static final HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> FACTORIAL_LISTS = new HashMap<>();
/**
* The exponential function, exp(1) = e^1 = 2.71...
*/
public static final Function FUNCTION_EXP = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
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().intValue())), 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;
}
}
};
/**
* The caret / pow operator, ^
*/
public static final Operator OP_CARET = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2, new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 2
&& !(params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0
&& params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[1].getClass())) == 0);
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
if (Thread.currentThread().isInterrupted()) return null;
else if (params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0)
return NaiveNumber.ZERO.promoteTo(params[0].getClass());
else if (params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0)
return NaiveNumber.ONE.promoteTo(params[1].getClass());
FUNCTION_EXP.apply(FUNCTION_LN.apply(FUNCTION_ABS.apply(params[0])).multiply(params[1]));
NumberInterface check = FUNCTION_LN.apply(FUNCTION_ABS.apply(params[0]));
if(check == null) return null;
return FUNCTION_EXP.apply(check.multiply(params[1]));
}
});
/**
* The sine function (the argument is interpreted in radians).
*/
public final Function functionSin = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
NumberInterface pi = getPi(params[0].getClass());
NumberInterface twoPi = pi.multiply(new NaiveNumber(2).promoteTo(pi.getClass()));
NumberInterface theta = getSmallAngle(params[0], pi);
//System.out.println(theta);
if (theta.compareTo(pi.multiply(new NaiveNumber(1.5).promoteTo(twoPi.getClass()))) >= 0) {
theta = theta.subtract(twoPi);
} else if (theta.compareTo(pi.divide(new NaiveNumber(2).promoteTo(pi.getClass()))) > 0) {
theta = pi.subtract(theta);
}
//System.out.println(theta);
return sinTaylor(theta);
}
};
/**
* The cosine function (the argument is in radians).
*/
public final Function functionCos = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return functionSin.apply(getPi(params[0].getClass()).divide(new NaiveNumber(2).promoteTo(params[0].getClass()))
.subtract(params[0]));
}
};
/**
* The tangent function (the argument is in radians).
*/
public final Function functionTan = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return functionSin.apply(params[0]).divide(functionCos.apply(params[0]));
}
};
/**
* The secant function (the argument is in radians).
*/
public final Function functionSec = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return NaiveNumber.ONE.promoteTo(params[0].getClass()).divide(functionCos.apply(params[0]));
}
};
/**
* The cosecant function (the argument is in radians).
*/
public final Function functionCsc = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return NaiveNumber.ONE.promoteTo(params[0].getClass()).divide(functionSin.apply(params[0]));
}
};
/**
* The cotangent function (the argument is in radians).
*/
public final Function functionCot = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return functionCos.apply(params[0]).divide(functionCos.apply(params[0]));
}
};
public StandardPlugin(PluginManager manager) { public StandardPlugin(PluginManager manager) {
super(manager); super(manager);
@@ -476,6 +515,90 @@ public class StandardPlugin extends Plugin {
return (new NaiveNumber(10)).promoteTo(number.getClass()).intPow(-number.getMaxPrecision()); return (new NaiveNumber(10)).promoteTo(number.getClass()).intPow(-number.getMaxPrecision());
} }
/**
* A factorial function that uses memoization for each number class; it efficiently
* computes factorials of non-negative integers.
*
* @param numberClass type of number to return.
* @param n non-negative integer.
* @return a number of numClass with value n factorial.
*/
public static NumberInterface factorial(Class<? extends NumberInterface> numberClass, int n) {
if (Thread.currentThread().isInterrupted())
return null;
if (!FACTORIAL_LISTS.containsKey(numberClass)) {
FACTORIAL_LISTS.put(numberClass, new ArrayList<>());
FACTORIAL_LISTS.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
FACTORIAL_LISTS.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
}
ArrayList<NumberInterface> list = FACTORIAL_LISTS.get(numberClass);
if (n >= list.size()) {
while (!Thread.currentThread().isInterrupted() && list.size() < n + 16) {
list.add(list.get(list.size() - 1).multiply(new NaiveNumber(list.size()).promoteTo(numberClass)));
}
}
if (Thread.currentThread().isInterrupted())
return null;
return list.get(n);
}
/**
* Returns the value of the Taylor series for sin (centered at 0) at x.
*
* @param x where the series is evaluated.
* @return the value of the series
*/
private static NumberInterface sinTaylor(NumberInterface x) {
NumberInterface power = x, multiplier = x.multiply(x).negate(), currentTerm = x, sum = x;
NumberInterface maxError = getMaxError(x);
int n = 1;
do {
n += 2;
power = power.multiply(multiplier);
currentTerm = power.divide(factorial(x.getClass(), n));
sum = sum.add(currentTerm);
} while (FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0);
return sum;
}
/**
* Returns an equivalent angle in the interval [0, 2pi)
*
* @param phi an angle (in radians).
* @return theta in [0, 2pi) that differs from phi by a multiple of 2pi.
*/
private static NumberInterface getSmallAngle(NumberInterface phi, NumberInterface pi) {
NumberInterface twoPi = pi.multiply(new NaiveNumber("2").promoteTo(phi.getClass()));
NumberInterface theta = FUNCTION_ABS.apply(phi).subtract(twoPi
.multiply(FUNCTION_ABS.apply(phi).divide(twoPi).floor())); //Now theta is in [0, 2pi).
if (phi.signum() < 0) {
theta = twoPi.subtract(theta);
}
return theta;
}
public static NumberInterface intPow(NumberInterface number, Class<? extends NumberInterface> numberClass, NumberInterface exponent) {
if (Thread.currentThread().isInterrupted())
return null;
if (exponent.compareTo((new NaiveNumber(0)).promoteTo(numberClass)) == 0) {
return (new NaiveNumber(1)).promoteTo(numberClass);
}
boolean takeReciprocal = exponent.compareTo((new NaiveNumber(0)).promoteTo(numberClass)) < 0;
exponent = FUNCTION_ABS.apply(exponent);
NumberInterface power = number;
for (NumberInterface currentExponent = (new NaiveNumber(1)).promoteTo(numberClass); currentExponent.compareTo(exponent) < 0; currentExponent = currentExponent.add((new NaiveNumber(1)).promoteTo(numberClass))) {
power = power.multiply(number);
if (Thread.currentThread().isInterrupted())
return null;
}
if (takeReciprocal) {
power = (new NaiveNumber(1)).promoteTo(numberClass).divide(power);
}
if (Thread.currentThread().isInterrupted())
return null;
return power;
}
@Override @Override
public void onEnable() { public void onEnable() {
registerNumberImplementation("naive", IMPLEMENTATION_NAIVE); registerNumberImplementation("naive", IMPLEMENTATION_NAIVE);
@@ -505,59 +628,4 @@ public class StandardPlugin extends Plugin {
public void onDisable() { public void onDisable() {
} }
/**
* A factorial function that uses memoization for each number class; it efficiently
* computes factorials of non-negative integers.
* @param numberClass type of number to return.
* @param n non-negative integer.
* @return a number of numClass with value n factorial.
*/
public static NumberInterface factorial(Class<? extends NumberInterface> numberClass, int n){
if(!FACTORIAL_LISTS.containsKey(numberClass)){
FACTORIAL_LISTS.put(numberClass, new ArrayList<>());
FACTORIAL_LISTS.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
FACTORIAL_LISTS.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
}
ArrayList<NumberInterface> list = FACTORIAL_LISTS.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);
}
/**
* Returns the value of the Taylor series for sin (centered at 0) at x.
* @param x where the series is evaluated.
* @return the value of the series
*/
private static NumberInterface sinTaylor(NumberInterface x){
NumberInterface power = x, multiplier = x.multiply(x).negate(), currentTerm = x, sum = x;
NumberInterface maxError = getMaxError(x);
int n = 1;
do{
n += 2;
power = power.multiply(multiplier);
currentTerm = power.divide(factorial(x.getClass(), n));
sum = sum.add(currentTerm);
} while (FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0);
return sum;
}
/**
* Returns an equivalent angle in the interval [0, 2pi)
* @param phi an angle (in radians).
* @return theta in [0, 2pi) that differs from phi by a multiple of 2pi.
*/
private static NumberInterface getSmallAngle(NumberInterface phi, NumberInterface pi){
NumberInterface twoPi = pi.multiply(new NaiveNumber("2").promoteTo(phi.getClass()));
NumberInterface theta = FUNCTION_ABS.apply(phi).subtract(twoPi
.multiply(FUNCTION_ABS.apply(phi).divide(twoPi).floor())); //Now theta is in [0, 2pi).
if(phi.signum() < 0){
theta = twoPi.subtract(theta);
}
return theta;
}
} }

View File

@@ -92,10 +92,15 @@ public class BinaryNode extends TreeNode {
@Override @Override
public <T> T reduce(Reducer<T> reducer) { public <T> T reduce(Reducer<T> reducer) {
if (Thread.currentThread().isInterrupted())
return null;
T leftReduce = left.reduce(reducer); T leftReduce = left.reduce(reducer);
T rightReduce = right.reduce(reducer); T rightReduce = right.reduce(reducer);
if (leftReduce == null || rightReduce == null) return null; if (leftReduce == null || rightReduce == null) return null;
return reducer.reduceNode(this, leftReduce, rightReduce); T a = reducer.reduceNode(this, leftReduce, rightReduce);
if (Thread.currentThread().isInterrupted())
return null;
return a;
} }
@Override @Override

View File

@@ -62,12 +62,17 @@ public class FunctionNode extends TreeNode {
@Override @Override
public <T> T reduce(Reducer<T> reducer) { public <T> T reduce(Reducer<T> reducer) {
if (Thread.currentThread().isInterrupted())
return null;
Object[] reducedChildren = new Object[children.size()]; Object[] reducedChildren = new Object[children.size()];
for (int i = 0; i < reducedChildren.length; i++) { for (int i = 0; i < reducedChildren.length; i++) {
reducedChildren[i] = children.get(i).reduce(reducer); reducedChildren[i] = children.get(i).reduce(reducer);
if (reducedChildren[i] == null) return null; if (Thread.currentThread().isInterrupted() || reducedChildren[i] == null) return null;
} }
return reducer.reduceNode(this, reducedChildren); T a = reducer.reduceNode(this, reducedChildren);
if (Thread.currentThread().isInterrupted())
return null;
return a;
} }
@Override @Override

View File

@@ -33,9 +33,14 @@ public class UnaryNode extends TreeNode {
@Override @Override
public <T> T reduce(Reducer<T> reducer) { public <T> T reduce(Reducer<T> reducer) {
if (Thread.currentThread().isInterrupted())
return null;
Object reducedChild = applyTo.reduce(reducer); Object reducedChild = applyTo.reduce(reducer);
if (reducedChild == null) return null; if (reducedChild == null) return null;
return reducer.reduceNode(this, reducedChild); T a = reducer.reduceNode(this, reducedChild);
if (Thread.currentThread().isInterrupted())
return null;
return a;
} }
/** /**

View File

@@ -250,6 +250,6 @@ public class Window extends JFrame {
@Override @Override
public void setVisible(boolean b) { public void setVisible(boolean b) {
super.setVisible(b); super.setVisible(b);
if(b) inputField.requestFocusInWindow(); if (b) inputField.requestFocusInWindow();
} }
} }

View File

@@ -2,14 +2,10 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.*?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?> <?import javafx.scene.text.Text?>
<?import javafx.scene.layout.HBox?> <BorderPane xmlns:fx="http://javafx.com/fxml"
<?import javafx.scene.layout.GridPane?> xmlns="http://javafx.com/javafx"
<?import javafx.scene.layout.FlowPane?>
<BorderPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="org.nwapw.abacus.fx.AbacusController"> fx:controller="org.nwapw.abacus.fx.AbacusController">
<center> <center>
<TabPane fx:id="coreTabPane"> <TabPane fx:id="coreTabPane">
@@ -38,19 +34,24 @@
<TextField fx:id="inputField" onAction="#performCalculation"/> <TextField fx:id="inputField" onAction="#performCalculation"/>
<Button fx:id="inputButton" text="Calculate" maxWidth="Infinity" <Button fx:id="inputButton" text="Calculate" maxWidth="Infinity"
onAction="#performCalculation"/> onAction="#performCalculation"/>
<Button fx:id="stopButton" text="Stop" maxWidth="Infinity"
onAction="#stopCalculation"/>
</VBox> </VBox>
</bottom> </bottom>
</BorderPane> </BorderPane>
</Tab> </Tab>
<Tab fx:id="settingsTab" text="Settings" closable="false"> <Tab fx:id="settingsTab" text="Settings" closable="false">
<GridPane hgap="10" vgap="10"> <GridPane hgap="10" vgap="10">
<padding><Insets left="10" right="10" top="10" bottom="10"/></padding> <padding>
<Insets left="10" right="10" top="10" bottom="10"/>
</padding>
<Label text="Number Implementation" GridPane.columnIndex="0" GridPane.rowIndex="0"/> <Label text="Number Implementation" GridPane.columnIndex="0" GridPane.rowIndex="0"/>
<ComboBox fx:id="numberImplementationBox" GridPane.columnIndex="1" GridPane.rowIndex="0"/> <ComboBox fx:id="numberImplementationBox" GridPane.columnIndex="1" GridPane.rowIndex="0"/>
<ListView fx:id="enabledPluginView" <ListView fx:id="enabledPluginView"
GridPane.rowIndex="1" GridPane.columnIndex="0" GridPane.rowIndex="1" GridPane.columnIndex="0"
GridPane.columnSpan="2" maxHeight="100"/> GridPane.columnSpan="2" maxHeight="100"/>
<FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="2" hgap="10" vgap="10"> <FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="2" hgap="10"
vgap="10">
<Button text="Apply" onAction="#performSave"/> <Button text="Apply" onAction="#performSave"/>
<Button text="Reload Plugins" onAction="#performReload"/> <Button text="Reload Plugins" onAction="#performReload"/>
<Button text="Apply and Reload" onAction="#performSaveAndReload"/> <Button text="Apply and Reload" onAction="#performSaveAndReload"/>