DanilaFe
/
Abacus
mirror of https://github.com/DanilaFe/abacus
1
0
Fork 0
Code Issues Releases Wiki Activity

Move the StandardPlugin into a "standard" package along with the ops.

This commit is contained in:
Danila Fedorin 2017-09-23 22:16:44 -07:00
parent b4214f5714
commit e05b2ac8d5
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java → core/src/main/java/org/nwapw/abacus/plugin/standard/StandardPlugin.java
View File

@ -1,10 +1,13 @@
package org.nwapw.abacus.plugin; package org.nwapw.abacus.plugin.standard;
import org.nwapw.abacus.context.MutableEvaluationContext; import org.nwapw.abacus.context.MutableEvaluationContext;
import org.nwapw.abacus.function.*; import org.nwapw.abacus.function.*;
import org.nwapw.abacus.number.NaiveNumber; import org.nwapw.abacus.number.NaiveNumber;
import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.number.PreciseNumber; import org.nwapw.abacus.number.PreciseNumber;
import org.nwapw.abacus.plugin.NumberImplementation;
import org.nwapw.abacus.plugin.Plugin;
import org.nwapw.abacus.plugin.PluginManager;
import org.nwapw.abacus.plugin.standard.operator.*; import org.nwapw.abacus.plugin.standard.operator.*;
import java.util.ArrayList; import java.util.ArrayList;

2
core/src/main/kotlin/org/nwapw/abacus/Abacus.kt
View File

@ -8,7 +8,7 @@ import org.nwapw.abacus.parsing.LexerTokenizer
import org.nwapw.abacus.parsing.ShuntingYardParser import org.nwapw.abacus.parsing.ShuntingYardParser
import org.nwapw.abacus.parsing.TreeBuilder import org.nwapw.abacus.parsing.TreeBuilder
import org.nwapw.abacus.plugin.PluginManager import org.nwapw.abacus.plugin.PluginManager
import org.nwapw.abacus.plugin.StandardPlugin import org.nwapw.abacus.plugin.standard.StandardPlugin
import org.nwapw.abacus.tree.EvaluationResult import org.nwapw.abacus.tree.EvaluationResult
import org.nwapw.abacus.tree.NumberReducer import org.nwapw.abacus.tree.NumberReducer
import org.nwapw.abacus.tree.TreeNode import org.nwapw.abacus.tree.TreeNode

2
core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorCaret.kt
View File

@ -5,7 +5,7 @@ import org.nwapw.abacus.function.NumberOperator
import org.nwapw.abacus.function.OperatorAssociativity import org.nwapw.abacus.function.OperatorAssociativity
import org.nwapw.abacus.function.OperatorType import org.nwapw.abacus.function.OperatorType
import org.nwapw.abacus.number.NumberInterface import org.nwapw.abacus.number.NumberInterface
import org.nwapw.abacus.plugin.StandardPlugin.* import org.nwapw.abacus.plugin.standard.StandardPlugin.*
/** /**
* The power operator. * The power operator.

2
core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNcr.kt
View File

@ -5,7 +5,7 @@ import org.nwapw.abacus.function.NumberOperator
import org.nwapw.abacus.function.OperatorAssociativity import org.nwapw.abacus.function.OperatorAssociativity
import org.nwapw.abacus.function.OperatorType import org.nwapw.abacus.function.OperatorType
import org.nwapw.abacus.number.NumberInterface import org.nwapw.abacus.number.NumberInterface
import org.nwapw.abacus.plugin.StandardPlugin.* import org.nwapw.abacus.plugin.standard.StandardPlugin.*
/** /**
* The "N choose R" operator. * The "N choose R" operator.

2
core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java
View File

@ -7,7 +7,7 @@ import org.nwapw.abacus.Abacus;
import org.nwapw.abacus.config.Configuration; import org.nwapw.abacus.config.Configuration;
import org.nwapw.abacus.exception.DomainException; import org.nwapw.abacus.exception.DomainException;
import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.plugin.StandardPlugin; import org.nwapw.abacus.plugin.standard.StandardPlugin;
import org.nwapw.abacus.tree.TreeNode; import org.nwapw.abacus.tree.TreeNode;
public class CalculationTests { public class CalculationTests {

2
core/src/test/java/org/nwapw/abacus/tests/RangeTests.java
View File

@ -9,7 +9,7 @@ import org.nwapw.abacus.number.NaiveNumber;
import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.number.NumberRange; import org.nwapw.abacus.number.NumberRange;
import org.nwapw.abacus.number.PreciseNumber; import org.nwapw.abacus.number.PreciseNumber;
import org.nwapw.abacus.plugin.StandardPlugin; import org.nwapw.abacus.plugin.standard.StandardPlugin;
import java.util.function.Function; import java.util.function.Function;

2
fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java
View File

@ -19,7 +19,7 @@ import org.nwapw.abacus.number.*;
import org.nwapw.abacus.plugin.ClassFinder; import org.nwapw.abacus.plugin.ClassFinder;
import org.nwapw.abacus.plugin.PluginListener; import org.nwapw.abacus.plugin.PluginListener;
import org.nwapw.abacus.plugin.PluginManager; import org.nwapw.abacus.plugin.PluginManager;
import org.nwapw.abacus.plugin.StandardPlugin; import org.nwapw.abacus.plugin.standard.StandardPlugin;
import org.nwapw.abacus.tree.EvaluationResult; import org.nwapw.abacus.tree.EvaluationResult;
import org.nwapw.abacus.tree.TreeNode; import org.nwapw.abacus.tree.TreeNode;