DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2026-09-27 22:02:34 +00:00
Code Issues Releases Wiki Activity

Switch the basic operators into individual classes.

Browse Source
This commit is contained in:
Danila Fedorin
2017-09-21 13:39:38 -07:00
parent 4fd8f7badf
commit 81d0999c11
5 changed files with 92 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
View File

@@ -5,6 +5,10 @@ import org.nwapw.abacus.function.*;
import org.nwapw.abacus.number.NaiveNumber;
import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.number.PreciseNumber;
import org.nwapw.abacus.plugin.standard.OperatorAdd;
import org.nwapw.abacus.plugin.standard.OperatorDivide;
import org.nwapw.abacus.plugin.standard.OperatorMultiply;
import org.nwapw.abacus.plugin.standard.OperatorSubtract;
import org.nwapw.abacus.tree.TreeNode;
import org.nwapw.abacus.tree.VariableNode;
@@ -53,32 +57,11 @@ public class StandardPlugin extends Plugin {
/**
* The addition operator, +
*/
public static final NumberOperator OP_ADD = new NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
@Override
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
return params.length == 2;
}
@Override
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
return params[0].add(params[1]);
}
};
public static final NumberOperator OP_ADD = new OperatorAdd();
/**
* The subtraction operator, -
*/
public static final NumberOperator OP_SUBTRACT = new NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
@Override
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
return params.length == 2;
}
@Override
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
return params[0].subtract(params[1]);
}
};
public static final NumberOperator OP_SUBTRACT = new OperatorSubtract();
/**
* The negation operator, -
*/
@@ -96,17 +79,7 @@ public class StandardPlugin extends Plugin {
/**
* The multiplication operator, *
*/
public static final NumberOperator OP_MULTIPLY = new NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1) {
@Override
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
return params.length == 2;
}
@Override
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
return params[0].multiply(params[1]);
}
};
public static final NumberOperator OP_MULTIPLY = new OperatorMultiply();
/**
* The implementation for double-based naive numbers.
*/
@@ -161,17 +134,7 @@ public class StandardPlugin extends Plugin {
/**
* The division operator, /
*/
public static final NumberOperator OP_DIVIDE = new NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1) {
@Override
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
return params.length == 2 && params[1].compareTo(context.getInheritedNumberImplementation().instanceForString(Integer.toString(0))) != 0;
}
@Override
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
return params[0].divide(params[1]);
}
};
public static final NumberOperator OP_DIVIDE = new OperatorDivide();
/**
* The factorial operator, !
*/