mirror of
https://github.com/DanilaFe/abacus
synced 2024-12-22 23:40:08 -08:00
Merge branch 'stoppable-alternate'
This commit is contained in:
commit
e8f82f9eff
|
@ -11,6 +11,7 @@ import javafx.util.Callback;
|
||||||
import javafx.util.StringConverter;
|
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.ComputationInterruptedException;
|
||||||
import org.nwapw.abacus.number.NumberInterface;
|
import org.nwapw.abacus.number.NumberInterface;
|
||||||
import org.nwapw.abacus.plugin.ClassFinder;
|
import org.nwapw.abacus.plugin.ClassFinder;
|
||||||
import org.nwapw.abacus.plugin.PluginListener;
|
import org.nwapw.abacus.plugin.PluginListener;
|
||||||
|
@ -58,6 +59,10 @@ public class AbacusController implements PluginListener {
|
||||||
* Constant string that is displayed if the calculations are stopped before they are done.
|
* Constant string that is displayed if the calculations are stopped before they are done.
|
||||||
*/
|
*/
|
||||||
private static final String ERR_STOP = "Stopped";
|
private static final String ERR_STOP = "Stopped";
|
||||||
|
/**
|
||||||
|
* Constant string that is displayed if the calculations are interrupted by an exception.
|
||||||
|
*/
|
||||||
|
private static final String ERR_EXCEPTION = "Exception Thrown";
|
||||||
@FXML
|
@FXML
|
||||||
private TabPane coreTabPane;
|
private TabPane coreTabPane;
|
||||||
@FXML
|
@FXML
|
||||||
|
@ -79,6 +84,8 @@ public class AbacusController implements PluginListener {
|
||||||
@FXML
|
@FXML
|
||||||
private Button inputButton;
|
private Button inputButton;
|
||||||
@FXML
|
@FXML
|
||||||
|
private Button stopButton;
|
||||||
|
@FXML
|
||||||
private ComboBox<String> numberImplementationBox;
|
private ComboBox<String> numberImplementationBox;
|
||||||
@FXML
|
@FXML
|
||||||
private ListView<ToggleablePlugin> enabledPluginView;
|
private ListView<ToggleablePlugin> enabledPluginView;
|
||||||
|
@ -95,7 +102,6 @@ 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.
|
||||||
*/
|
*/
|
||||||
|
@ -105,20 +111,6 @@ 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.
|
||||||
|
@ -132,6 +124,47 @@ public class AbacusController implements PluginListener {
|
||||||
* The alert shown when a press to "apply" is needed.
|
* The alert shown when a press to "apply" is needed.
|
||||||
*/
|
*/
|
||||||
private Alert reloadAlert;
|
private Alert reloadAlert;
|
||||||
|
/**
|
||||||
|
* The runnable used to perform the calculation.
|
||||||
|
*/
|
||||||
|
private final Runnable CALCULATION_RUNNABLE = new Runnable() {
|
||||||
|
|
||||||
|
private String attemptCalculation(){
|
||||||
|
try {
|
||||||
|
TreeNode constructedTree = abacus.parseString(inputField.getText());
|
||||||
|
if (constructedTree == null) {
|
||||||
|
return ERR_SYNTAX;
|
||||||
|
}
|
||||||
|
NumberInterface evaluatedNumber = abacus.evaluateTree(constructedTree);
|
||||||
|
if (evaluatedNumber == null) {
|
||||||
|
return ERR_EVAL;
|
||||||
|
}
|
||||||
|
String resultingString = evaluatedNumber.toString();
|
||||||
|
historyData.add(new HistoryModel(inputField.getText(), constructedTree.toString(), resultingString));
|
||||||
|
return resultingString;
|
||||||
|
} catch (ComputationInterruptedException exception) {
|
||||||
|
return ERR_STOP;
|
||||||
|
} catch (RuntimeException exception){
|
||||||
|
exception.printStackTrace();
|
||||||
|
return ERR_EXCEPTION;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
String calculation = attemptCalculation();
|
||||||
|
Platform.runLater(() -> {
|
||||||
|
outputText.setText(calculation);
|
||||||
|
inputField.setText("");
|
||||||
|
inputButton.setDisable(false);
|
||||||
|
stopButton.setDisable(true);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
/**
|
||||||
|
* The thread in which the computation runs.
|
||||||
|
*/
|
||||||
|
private Thread calculationThread;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Alerts the user if the changes they made
|
* Alerts the user if the changes they made
|
||||||
|
@ -202,63 +235,16 @@ public class AbacusController implements PluginListener {
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void performCalculation() {
|
private void performCalculation() {
|
||||||
Runnable calculator = new Runnable() {
|
inputButton.setDisable(true);
|
||||||
public void run() {
|
stopButton.setDisable(false);
|
||||||
if (delay > 0) {
|
calculationThread = new Thread(CALCULATION_RUNNABLE);
|
||||||
Runnable timer = new Runnable() {
|
calculationThread.start();
|
||||||
public void run() {
|
|
||||||
long gap = (long) (delay * 1000);
|
|
||||||
long startTime = System.currentTimeMillis();
|
|
||||||
while (System.currentTimeMillis() - startTime <= gap) {
|
|
||||||
}
|
|
||||||
stopCalculation();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
Thread maxTime = new Thread(timer);
|
|
||||||
maxTime.setName("maxTime");
|
|
||||||
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()));
|
|
||||||
|
|
||||||
Platform.runLater(() -> inputButton.setDisable(false));
|
|
||||||
Platform.runLater(() -> inputField.setText(""));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
calculating = false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
if (!calculating) {
|
|
||||||
calcThread = new Thread(calculator);
|
|
||||||
calcThread.setName("calcThread");
|
|
||||||
calcThread.start();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void stopCalculation() {
|
private void performStop(){
|
||||||
calcThread.interrupt();
|
if(calculationThread != null)
|
||||||
calculating = false;
|
calculationThread.interrupt();
|
||||||
//Platform.runLater(() ->inputButton.setDisable(false));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
package org.nwapw.abacus.number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Exception thrown when the computation is interrupted by
|
||||||
|
* the user.
|
||||||
|
*/
|
||||||
|
public class ComputationInterruptedException extends RuntimeException {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new exception of this type.
|
||||||
|
*/
|
||||||
|
public ComputationInterruptedException(){
|
||||||
|
super("Computation interrupted by user.");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -3,7 +3,7 @@ package org.nwapw.abacus.number;
|
||||||
/**
|
/**
|
||||||
* An implementation of NumberInterface using a double.
|
* An implementation of NumberInterface using a double.
|
||||||
*/
|
*/
|
||||||
public class NaiveNumber implements NumberInterface {
|
public class NaiveNumber extends NumberInterface {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The number zero.
|
* The number zero.
|
||||||
|
@ -42,32 +42,32 @@ public class NaiveNumber implements NumberInterface {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface multiply(NumberInterface multiplier) {
|
public NumberInterface multiplyInternal(NumberInterface multiplier) {
|
||||||
return new NaiveNumber(value * ((NaiveNumber) multiplier).value);
|
return new NaiveNumber(value * ((NaiveNumber) multiplier).value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface divide(NumberInterface divisor) {
|
public NumberInterface divideInternal(NumberInterface divisor) {
|
||||||
return new NaiveNumber(value / ((NaiveNumber) divisor).value);
|
return new NaiveNumber(value / ((NaiveNumber) divisor).value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface add(NumberInterface summand) {
|
public NumberInterface addInternal(NumberInterface summand) {
|
||||||
return new NaiveNumber(value + ((NaiveNumber) summand).value);
|
return new NaiveNumber(value + ((NaiveNumber) summand).value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface subtract(NumberInterface subtrahend) {
|
public NumberInterface subtractInternal(NumberInterface subtrahend) {
|
||||||
return new NaiveNumber(value - ((NaiveNumber) subtrahend).value);
|
return new NaiveNumber(value - ((NaiveNumber) subtrahend).value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface negate() {
|
public NumberInterface negateInternal() {
|
||||||
return new NaiveNumber(-value);
|
return new NaiveNumber(-value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface intPow(int exponent) {
|
public NumberInterface intPowInternal(int exponent) {
|
||||||
if (exponent == 0) {
|
if (exponent == 0) {
|
||||||
return NaiveNumber.ONE;
|
return NaiveNumber.ONE;
|
||||||
}
|
}
|
||||||
|
@ -95,17 +95,17 @@ public class NaiveNumber implements NumberInterface {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface ceiling() {
|
public NumberInterface ceilingInternal() {
|
||||||
return new NaiveNumber(Math.ceil(value));
|
return new NaiveNumber(Math.ceil(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface floor() {
|
public NumberInterface floorInternal() {
|
||||||
return new NaiveNumber(Math.floor(value));
|
return new NaiveNumber(Math.floor(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface fractionalPart() {
|
public NumberInterface fractionalPartInternal() {
|
||||||
return new NaiveNumber(value - Math.floor(value));
|
return new NaiveNumber(value - Math.floor(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@ public class NaiveNumber implements NumberInterface {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface promoteTo(Class<? extends NumberInterface> toClass) {
|
public NumberInterface promoteToInternal(Class<? extends NumberInterface> toClass) {
|
||||||
if (toClass == this.getClass()) return this;
|
if (toClass == this.getClass()) return this;
|
||||||
else if (toClass == PreciseNumber.class) {
|
else if (toClass == PreciseNumber.class) {
|
||||||
return new PreciseNumber(Double.toString(value));
|
return new PreciseNumber(Double.toString(value));
|
||||||
|
|
|
@ -3,14 +3,22 @@ package org.nwapw.abacus.number;
|
||||||
/**
|
/**
|
||||||
* An interface used to represent a number.
|
* An interface used to represent a number.
|
||||||
*/
|
*/
|
||||||
public interface NumberInterface {
|
public abstract class NumberInterface {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the thread was interrupted and
|
||||||
|
* throw an exception to end the computation.
|
||||||
|
*/
|
||||||
|
private static void checkInterrupted(){
|
||||||
|
if(Thread.currentThread().isInterrupted())
|
||||||
|
throw new ComputationInterruptedException();
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* The maximum precision to which this number operates.
|
* The maximum precision to which this number operates.
|
||||||
*
|
*
|
||||||
* @return the precision.
|
* @return the precision.
|
||||||
*/
|
*/
|
||||||
int getMaxPrecision();
|
public abstract int getMaxPrecision();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Multiplies this number by another, returning
|
* Multiplies this number by another, returning
|
||||||
|
@ -19,7 +27,21 @@ public interface NumberInterface {
|
||||||
* @param multiplier the multiplier
|
* @param multiplier the multiplier
|
||||||
* @return the result of the multiplication.
|
* @return the result of the multiplication.
|
||||||
*/
|
*/
|
||||||
NumberInterface multiply(NumberInterface multiplier);
|
protected abstract NumberInterface multiplyInternal(NumberInterface multiplier);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Multiplies this number by another, returning
|
||||||
|
* a new number instance. Also, checks if the
|
||||||
|
* thread has been interrupted, and if so, throws
|
||||||
|
* an exception.
|
||||||
|
*
|
||||||
|
* @param multiplier the multiplier
|
||||||
|
* @return the result of the multiplication.
|
||||||
|
*/
|
||||||
|
public final NumberInterface multiply(NumberInterface multiplier){
|
||||||
|
checkInterrupted();
|
||||||
|
return multiplyInternal(multiplier);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Divides this number by another, returning
|
* Divides this number by another, returning
|
||||||
|
@ -28,7 +50,21 @@ public interface NumberInterface {
|
||||||
* @param divisor the divisor
|
* @param divisor the divisor
|
||||||
* @return the result of the division.
|
* @return the result of the division.
|
||||||
*/
|
*/
|
||||||
NumberInterface divide(NumberInterface divisor);
|
protected abstract NumberInterface divideInternal(NumberInterface divisor);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Divides this number by another, returning
|
||||||
|
* a new number instance. Also, checks if the
|
||||||
|
* thread has been interrupted, and if so, throws
|
||||||
|
* an exception.
|
||||||
|
*
|
||||||
|
* @param divisor the divisor
|
||||||
|
* @return the result of the division.
|
||||||
|
*/
|
||||||
|
public final NumberInterface divide(NumberInterface divisor){
|
||||||
|
checkInterrupted();
|
||||||
|
return divideInternal(divisor);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds this number to another, returning
|
* Adds this number to another, returning
|
||||||
|
@ -37,7 +73,21 @@ public interface NumberInterface {
|
||||||
* @param summand the summand
|
* @param summand the summand
|
||||||
* @return the result of the summation.
|
* @return the result of the summation.
|
||||||
*/
|
*/
|
||||||
NumberInterface add(NumberInterface summand);
|
protected abstract NumberInterface addInternal(NumberInterface summand);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds this number to another, returning
|
||||||
|
* a new number instance. Also, checks if the
|
||||||
|
* thread has been interrupted, and if so, throws
|
||||||
|
* an exception.
|
||||||
|
*
|
||||||
|
* @param summand the summand
|
||||||
|
* @return the result of the summation.
|
||||||
|
*/
|
||||||
|
public final NumberInterface add(NumberInterface summand){
|
||||||
|
checkInterrupted();
|
||||||
|
return addInternal(summand);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Subtracts another number from this number,
|
* Subtracts another number from this number,
|
||||||
|
@ -46,7 +96,21 @@ public interface NumberInterface {
|
||||||
* @param subtrahend the subtrahend.
|
* @param subtrahend the subtrahend.
|
||||||
* @return the result of the subtraction.
|
* @return the result of the subtraction.
|
||||||
*/
|
*/
|
||||||
NumberInterface subtract(NumberInterface subtrahend);
|
protected abstract NumberInterface subtractInternal(NumberInterface subtrahend);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Subtracts another number from this number,
|
||||||
|
* a new number instance. Also, checks if the
|
||||||
|
* thread has been interrupted, and if so, throws
|
||||||
|
* an exception.
|
||||||
|
*
|
||||||
|
* @param subtrahend the subtrahend.
|
||||||
|
* @return the result of the subtraction.
|
||||||
|
*/
|
||||||
|
public final NumberInterface subtract(NumberInterface subtrahend){
|
||||||
|
checkInterrupted();
|
||||||
|
return subtractInternal(subtrahend);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a new instance of this number with
|
* Returns a new instance of this number with
|
||||||
|
@ -54,7 +118,21 @@ public interface NumberInterface {
|
||||||
*
|
*
|
||||||
* @return the new instance.
|
* @return the new instance.
|
||||||
*/
|
*/
|
||||||
NumberInterface negate();
|
protected abstract NumberInterface negateInternal();
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a new instance of this number with
|
||||||
|
* the sign flipped. Also, checks if the
|
||||||
|
* thread has been interrupted, and if so, throws
|
||||||
|
* an exception.
|
||||||
|
*
|
||||||
|
* @return the new instance.
|
||||||
|
*/
|
||||||
|
public final NumberInterface negate(){
|
||||||
|
checkInterrupted();
|
||||||
|
return negateInternal();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Raises this number to an integer power.
|
* Raises this number to an integer power.
|
||||||
|
@ -62,7 +140,20 @@ public interface NumberInterface {
|
||||||
* @param exponent the exponent to which to take the number.
|
* @param exponent the exponent to which to take the number.
|
||||||
* @return the resulting value.
|
* @return the resulting value.
|
||||||
*/
|
*/
|
||||||
NumberInterface intPow(int exponent);
|
protected abstract NumberInterface intPowInternal(int exponent);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Raises this number to an integer power. Also, checks if the
|
||||||
|
* thread has been interrupted, and if so, throws
|
||||||
|
* an exception.
|
||||||
|
*
|
||||||
|
* @param exponent the exponent to which to take the number.
|
||||||
|
* @return the resulting value.
|
||||||
|
*/
|
||||||
|
public final NumberInterface intPow(int exponent){
|
||||||
|
checkInterrupted();
|
||||||
|
return intPowInternal(exponent);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compares this number to another.
|
* Compares this number to another.
|
||||||
|
@ -70,35 +161,70 @@ public interface NumberInterface {
|
||||||
* @param number the number to compare to.
|
* @param number the number to compare to.
|
||||||
* @return same as Integer.compare();
|
* @return same as Integer.compare();
|
||||||
*/
|
*/
|
||||||
int compareTo(NumberInterface number);
|
public abstract int compareTo(NumberInterface number);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Same as Math.signum().
|
* Same as Math.signum().
|
||||||
*
|
*
|
||||||
* @return 1 if this number is positive, -1 if this number is negative, 0 if this number is 0.
|
* @return 1 if this number is positive, -1 if this number is negative, 0 if this number is 0.
|
||||||
*/
|
*/
|
||||||
int signum();
|
public abstract int signum();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.
|
||||||
|
*/
|
||||||
|
protected abstract NumberInterface ceilingInternal();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the least integer greater than or equal to the number.
|
||||||
|
* Also, checks if the thread has been interrupted, and if so, throws
|
||||||
|
* an exception.
|
||||||
|
*
|
||||||
* @return the least integer bigger or equal to 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();
|
public final NumberInterface ceiling(){
|
||||||
|
checkInterrupted();
|
||||||
|
return ceilingInternal();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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 integer smaller or equal 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();
|
protected abstract NumberInterface floorInternal();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the greatest integer less than or equal to the number.
|
||||||
|
* Also, checks if the thread has been interrupted, and if so, throws
|
||||||
|
* an exception.
|
||||||
|
*
|
||||||
|
* @return the greatest int >= the number, if int can hold the value.
|
||||||
|
*/
|
||||||
|
public final NumberInterface floor(){
|
||||||
|
checkInterrupted();
|
||||||
|
return floorInternal();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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();
|
protected abstract NumberInterface fractionalPartInternal();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the fractional part of the number.
|
||||||
|
* Also, checks if the thread has been interrupted,
|
||||||
|
* and if so, throws an exception.
|
||||||
|
* @return the fractional part of the number.
|
||||||
|
*/
|
||||||
|
public final NumberInterface fractionalPart(){
|
||||||
|
checkInterrupted();
|
||||||
|
return fractionalPartInternal();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the integer representation of this number, discarding any fractional part,
|
* Returns the integer representation of this number, discarding any fractional part,
|
||||||
|
@ -106,7 +232,7 @@ public interface NumberInterface {
|
||||||
*
|
*
|
||||||
* @return the integer value of this number.
|
* @return the integer value of this number.
|
||||||
*/
|
*/
|
||||||
int intValue();
|
public abstract int intValue();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Promotes this class to another number class.
|
* Promotes this class to another number class.
|
||||||
|
@ -114,6 +240,19 @@ public interface NumberInterface {
|
||||||
* @param toClass the class to promote to.
|
* @param toClass the class to promote to.
|
||||||
* @return the resulting new instance.
|
* @return the resulting new instance.
|
||||||
*/
|
*/
|
||||||
NumberInterface promoteTo(Class<? extends NumberInterface> toClass);
|
protected abstract NumberInterface promoteToInternal(Class<? extends NumberInterface> toClass);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Promotes this class to another number class. Also, checks if the
|
||||||
|
* thread has been interrupted, and if so, throws
|
||||||
|
* an exception.
|
||||||
|
*
|
||||||
|
* @param toClass the class to promote to.
|
||||||
|
* @return the resulting new instance.
|
||||||
|
*/
|
||||||
|
public final NumberInterface promoteTo(Class<? extends NumberInterface> toClass) {
|
||||||
|
checkInterrupted();
|
||||||
|
return promoteToInternal(toClass);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ import java.math.RoundingMode;
|
||||||
* A number that uses a BigDecimal to store its value,
|
* A number that uses a BigDecimal to store its value,
|
||||||
* leading to infinite possible precision.
|
* leading to infinite possible precision.
|
||||||
*/
|
*/
|
||||||
public class PreciseNumber implements NumberInterface {
|
public class PreciseNumber extends NumberInterface {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The number one.
|
* The number one.
|
||||||
|
@ -52,27 +52,27 @@ public class PreciseNumber implements NumberInterface {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface multiply(NumberInterface multiplier) {
|
public NumberInterface multiplyInternal(NumberInterface multiplier) {
|
||||||
return new PreciseNumber(this.value.multiply(((PreciseNumber) multiplier).value));
|
return new PreciseNumber(this.value.multiply(((PreciseNumber) multiplier).value));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface divide(NumberInterface divisor) {
|
public NumberInterface divideInternal(NumberInterface divisor) {
|
||||||
return new PreciseNumber(value.divide(((PreciseNumber) divisor).value, this.getMaxPrecision(), RoundingMode.HALF_UP));
|
return new PreciseNumber(value.divide(((PreciseNumber) divisor).value, this.getMaxPrecision(), RoundingMode.HALF_UP));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface add(NumberInterface summand) {
|
public NumberInterface addInternal(NumberInterface summand) {
|
||||||
return new PreciseNumber(value.add(((PreciseNumber) summand).value));
|
return new PreciseNumber(value.add(((PreciseNumber) summand).value));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface subtract(NumberInterface subtrahend) {
|
public NumberInterface subtractInternal(NumberInterface subtrahend) {
|
||||||
return new PreciseNumber(value.subtract(((PreciseNumber) subtrahend).value));
|
return new PreciseNumber(value.subtract(((PreciseNumber) subtrahend).value));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface intPow(int exponent) {
|
public NumberInterface intPowInternal(int exponent) {
|
||||||
if (exponent == 0) {
|
if (exponent == 0) {
|
||||||
return PreciseNumber.ONE;
|
return PreciseNumber.ONE;
|
||||||
}
|
}
|
||||||
|
@ -99,7 +99,7 @@ public class PreciseNumber implements NumberInterface {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface ceiling() {
|
public NumberInterface ceilingInternal() {
|
||||||
String str = value.toPlainString();
|
String str = value.toPlainString();
|
||||||
int decimalIndex = str.indexOf('.');
|
int decimalIndex = str.indexOf('.');
|
||||||
if (decimalIndex != -1) {
|
if (decimalIndex != -1) {
|
||||||
|
@ -109,7 +109,7 @@ public class PreciseNumber implements NumberInterface {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface floor() {
|
public NumberInterface floorInternal() {
|
||||||
String str = value.toPlainString();
|
String str = value.toPlainString();
|
||||||
int decimalIndex = str.indexOf('.');
|
int decimalIndex = str.indexOf('.');
|
||||||
if (decimalIndex != -1) {
|
if (decimalIndex != -1) {
|
||||||
|
@ -119,7 +119,7 @@ public class PreciseNumber implements NumberInterface {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface fractionalPart() {
|
public NumberInterface fractionalPartInternal() {
|
||||||
String str = value.toPlainString();
|
String str = value.toPlainString();
|
||||||
int decimalIndex = str.indexOf('.');
|
int decimalIndex = str.indexOf('.');
|
||||||
if (decimalIndex != -1) {
|
if (decimalIndex != -1) {
|
||||||
|
@ -134,12 +134,12 @@ public class PreciseNumber implements NumberInterface {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface negate() {
|
public NumberInterface negateInternal() {
|
||||||
return new PreciseNumber(value.negate());
|
return new PreciseNumber(value.negate());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface promoteTo(Class<? extends NumberInterface> toClass) {
|
public NumberInterface promoteToInternal(Class<? extends NumberInterface> toClass) {
|
||||||
if (toClass == this.getClass()) {
|
if (toClass == this.getClass()) {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -162,8 +162,10 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
|
||||||
@Override
|
@Override
|
||||||
public TreeNode constructTree(List<Match<TokenType>> tokens) {
|
public TreeNode constructTree(List<Match<TokenType>> tokens) {
|
||||||
tokens = intoPostfix(new ArrayList<>(tokens));
|
tokens = intoPostfix(new ArrayList<>(tokens));
|
||||||
|
if(tokens == null) return null;
|
||||||
Collections.reverse(tokens);
|
Collections.reverse(tokens);
|
||||||
return constructRecursive(tokens);
|
TreeNode constructedTree = constructRecursive(tokens);
|
||||||
|
return tokens.size() == 0 ? constructedTree : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -29,13 +29,9 @@ 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;
|
||||||
}
|
}
|
||||||
|
@ -51,8 +47,6 @@ 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]);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -68,8 +62,6 @@ 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();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -84,13 +76,9 @@ 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;
|
||||||
}
|
}
|
||||||
|
@ -106,8 +94,6 @@ 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]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -125,19 +111,15 @@ 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 (!Thread.currentThread().isInterrupted() && (multiplier = multiplier.subtract(NaiveNumber.ONE.promoteTo(multiplier.getClass()))) != null && multiplier.signum() == 1) {
|
while ((multiplier = multiplier.subtract(NaiveNumber.ONE.promoteTo(multiplier.getClass()))).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>());
|
||||||
|
@ -157,8 +139,6 @@ 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()));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -173,32 +153,26 @@ 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;
|
||||||
NumberInterface check;
|
while (FUNCTION_ABS.apply(param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))).compareTo(new NaiveNumber(0.1).promoteTo(param.getClass())) >= 0) {
|
||||||
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 (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() == 1) {
|
||||||
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 ((check = param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))) == null || check.signum() != 1) {
|
if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).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 ((check = param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))) == null || check.signum() != 1) {
|
if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() != -1) {
|
||||||
break;
|
break;
|
||||||
//No infinite loop for you.
|
//No infinite loop for you.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
NumberInterface check2;
|
return getLog2(param).multiply((new NaiveNumber(powersOf2)).promoteTo(param.getClass())).add(getLogPartialSum(param));
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -209,22 +183,16 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
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;
|
||||||
NumberInterface check;
|
while (FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0) {
|
||||||
while (!Thread.currentThread().isInterrupted() && (check = FUNCTION_ABS.apply(currentTerm)) != null && check.compareTo(maxError) > 0) {
|
|
||||||
n++;
|
n++;
|
||||||
if ((currentNumerator = currentNumerator.multiply(x)) == null || (currentNumerator = currentNumerator.negate()) == null)
|
currentNumerator = currentNumerator.multiply(x).negate();
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -234,8 +202,6 @@ 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)
|
||||||
|
@ -244,17 +210,13 @@ 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 (!Thread.currentThread().isInterrupted() && a.compareTo(maxError) >= 1) {
|
while (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()));
|
||||||
NumberInterface check;
|
sum = sum.add(a.add(b).multiply(c));
|
||||||
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;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -378,15 +340,11 @@ 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].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0)
|
||||||
else if (params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0)
|
|
||||||
return NaiveNumber.ZERO.promoteTo(params[0].getClass());
|
return NaiveNumber.ZERO.promoteTo(params[0].getClass());
|
||||||
else if (params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0)
|
else if (params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0)
|
||||||
return NaiveNumber.ONE.promoteTo(params[1].getClass());
|
return NaiveNumber.ONE.promoteTo(params[1].getClass());
|
||||||
FUNCTION_EXP.apply(FUNCTION_LN.apply(FUNCTION_ABS.apply(params[0])).multiply(params[1]));
|
return 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]));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
/**
|
/**
|
||||||
|
@ -524,8 +482,6 @@ public class StandardPlugin extends Plugin {
|
||||||
* @return a number of numClass with value n factorial.
|
* @return a number of numClass with value n factorial.
|
||||||
*/
|
*/
|
||||||
public static NumberInterface factorial(Class<? extends NumberInterface> numberClass, int n) {
|
public static NumberInterface factorial(Class<? extends NumberInterface> numberClass, int n) {
|
||||||
if (Thread.currentThread().isInterrupted())
|
|
||||||
return null;
|
|
||||||
if (!FACTORIAL_LISTS.containsKey(numberClass)) {
|
if (!FACTORIAL_LISTS.containsKey(numberClass)) {
|
||||||
FACTORIAL_LISTS.put(numberClass, new ArrayList<>());
|
FACTORIAL_LISTS.put(numberClass, new ArrayList<>());
|
||||||
FACTORIAL_LISTS.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
|
FACTORIAL_LISTS.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
|
||||||
|
@ -533,12 +489,10 @@ public class StandardPlugin extends Plugin {
|
||||||
}
|
}
|
||||||
ArrayList<NumberInterface> list = FACTORIAL_LISTS.get(numberClass);
|
ArrayList<NumberInterface> list = FACTORIAL_LISTS.get(numberClass);
|
||||||
if (n >= list.size()) {
|
if (n >= list.size()) {
|
||||||
while (!Thread.currentThread().isInterrupted() && list.size() < n + 16) {
|
while (list.size() < n + 16) {
|
||||||
list.add(list.get(list.size() - 1).multiply(new NaiveNumber(list.size()).promoteTo(numberClass)));
|
list.add(list.get(list.size() - 1).multiply(new NaiveNumber(list.size()).promoteTo(numberClass)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (Thread.currentThread().isInterrupted())
|
|
||||||
return null;
|
|
||||||
return list.get(n);
|
return list.get(n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -578,8 +532,6 @@ public class StandardPlugin extends Plugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static NumberInterface intPow(NumberInterface number, Class<? extends NumberInterface> numberClass, NumberInterface exponent) {
|
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) {
|
if (exponent.compareTo((new NaiveNumber(0)).promoteTo(numberClass)) == 0) {
|
||||||
return (new NaiveNumber(1)).promoteTo(numberClass);
|
return (new NaiveNumber(1)).promoteTo(numberClass);
|
||||||
}
|
}
|
||||||
|
@ -588,14 +540,10 @@ public class StandardPlugin extends Plugin {
|
||||||
NumberInterface power = number;
|
NumberInterface power = number;
|
||||||
for (NumberInterface currentExponent = (new NaiveNumber(1)).promoteTo(numberClass); currentExponent.compareTo(exponent) < 0; currentExponent = currentExponent.add((new NaiveNumber(1)).promoteTo(numberClass))) {
|
for (NumberInterface currentExponent = (new NaiveNumber(1)).promoteTo(numberClass); currentExponent.compareTo(exponent) < 0; currentExponent = currentExponent.add((new NaiveNumber(1)).promoteTo(numberClass))) {
|
||||||
power = power.multiply(number);
|
power = power.multiply(number);
|
||||||
if (Thread.currentThread().isInterrupted())
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
if (takeReciprocal) {
|
if (takeReciprocal) {
|
||||||
power = (new NaiveNumber(1)).promoteTo(numberClass).divide(power);
|
power = (new NaiveNumber(1)).promoteTo(numberClass).divide(power);
|
||||||
}
|
}
|
||||||
if (Thread.currentThread().isInterrupted())
|
|
||||||
return null;
|
|
||||||
return power;
|
return power;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,15 +92,10 @@ 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;
|
||||||
T a = reducer.reduceNode(this, leftReduce, rightReduce);
|
return reducer.reduceNode(this, leftReduce, rightReduce);
|
||||||
if (Thread.currentThread().isInterrupted())
|
|
||||||
return null;
|
|
||||||
return a;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -62,17 +62,12 @@ 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 (Thread.currentThread().isInterrupted() || reducedChildren[i] == null) return null;
|
if (reducedChildren[i] == null) return null;
|
||||||
}
|
}
|
||||||
T a = reducer.reduceNode(this, reducedChildren);
|
return reducer.reduceNode(this, reducedChildren);
|
||||||
if (Thread.currentThread().isInterrupted())
|
|
||||||
return null;
|
|
||||||
return a;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -33,14 +33,9 @@ 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;
|
||||||
T a = reducer.reduceNode(this, reducedChild);
|
return reducer.reduceNode(this, reducedChild);
|
||||||
if (Thread.currentThread().isInterrupted())
|
|
||||||
return null;
|
|
||||||
return a;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
<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"
|
<Button fx:id="stopButton" text="Stop" maxWidth="Infinity"
|
||||||
onAction="#stopCalculation"/>
|
onAction="#performStop" disable="true"/>
|
||||||
</VBox>
|
</VBox>
|
||||||
</bottom>
|
</bottom>
|
||||||
</BorderPane>
|
</BorderPane>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user