Start implementing the canvas to draw graphs.

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.1.3'
+    ext.kotlin_version = '1.1.4-3'
     ext.dokka_version = '0.9.15'
 
     repositories {
@@ -19,7 +19,7 @@ subprojects {
     apply plugin: 'org.jetbrains.dokka'
 
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {

core/src/main/java/org/nwapw/abacus/number/NumberInterface.java

@@ -1,268 +1,253 @@
-package org.nwapw.abacus.number
+package org.nwapw.abacus.number;
-
+
-import org.nwapw.abacus.exception.ComputationInterruptedException
+import org.nwapw.abacus.exception.ComputationInterruptedException;
-
+
-abstract class NumberInterface: Comparable<NumberInterface> {
+/**
-
+ * An interface used to represent a number.
-    /**
+ */
-     * Check if the thread was interrupted and
+public abstract class NumberInterface implements Comparable<NumberInterface> {
-     * throw an exception to end the computation.
+
-     */
+    /**
-    private fun checkInterrupted(){
+     * Check if the thread was interrupted and
-        if(Thread.currentThread().isInterrupted)
+     * throw an exception to end the computation.
-            throw ComputationInterruptedException()
+     */
-    }
+    private static void checkInterrupted() {
-
+        if (Thread.currentThread().isInterrupted())
-    /**
+            throw new ComputationInterruptedException();
-     * Returns the integer representation of this number, discarding any fractional part,
+    }
-     * if int can hold the value.
+
-     *
+    /**
-     * @return the integer value of this number.
+     * The maximum precision to which this number operates.
-     */
+     *
-    abstract fun intValue(): Int
+     * @return the precision.
-    /**
+     */
-     * Same as Math.signum().
+    public abstract int getMaxPrecision();
-     *
+
-     * @return 1 if this number is positive, -1 if this number is negative, 0 if this number is 0.
+    /**
-     */
+     * Multiplies this number by another, returning
-    abstract fun signum(): Int
+     * a new number instance.
-
+     *
-    /**
+     * @param multiplier the multiplier
-     * The maximum precision to which this number operates.
+     * @return the result of the multiplication.
-     */
+     */
-    abstract val maxPrecision: Int
+    protected abstract NumberInterface multiplyInternal(NumberInterface multiplier);
-    /**
+
-     * Returns the smallest error this instance can tolerate depending
+    /**
-     * on its precision and value.
+     * Multiplies this number by another, returning
-     */
+     * a new number instance. Also, checks if the
-    abstract val maxError: NumberInterface
+     * thread has been interrupted, and if so, throws
-
+     * an exception.
-    /**
+     *
-     * Adds this number to another, returning
+     * @param multiplier the multiplier
-     * a new number instance.
+     * @return the result of the multiplication.
-     *
+     */
-     * @param summand the summand
+    public final NumberInterface multiply(NumberInterface multiplier) {
-     * @return the result of the summation.
+        checkInterrupted();
-     */
+        return multiplyInternal(multiplier);
-    abstract fun addInternal(summand: NumberInterface): NumberInterface
+    }
-    /**
+
-     * Subtracts another number from this number,
+    /**
-     * a new number instance.
+     * Divides this number by another, returning
-     *
+     * a new number instance.
-     * @param subtrahend the subtrahend.
+     *
-     * @return the result of the subtraction.
+     * @param divisor the divisor
-     */
+     * @return the result of the division.
-    abstract fun subtractInternal(subtrahend: NumberInterface): NumberInterface
+     */
-    /**
+    protected abstract NumberInterface divideInternal(NumberInterface divisor);
-     * Multiplies this number by another, returning
+
-     * a new number instance.
+    /**
-     *
+     * Divides this number by another, returning
-     * @param multiplier the multiplier
+     * a new number instance. Also, checks if the
-     * @return the result of the multiplication.
+     * thread has been interrupted, and if so, throws
-     */
+     * an exception.
-    abstract fun multiplyInternal(multiplier: NumberInterface): NumberInterface
+     *
-    /**
+     * @param divisor the divisor
-     * Divides this number by another, returning
+     * @return the result of the division.
-     * a new number instance.
+     */
-     *
+    public final NumberInterface divide(NumberInterface divisor) {
-     * @param divisor the divisor
+        checkInterrupted();
-     * @return the result of the division.
+        return divideInternal(divisor);
-     */
+    }
-    abstract fun divideInternal(divisor: NumberInterface): NumberInterface
+
-    /**
+    /**
-     * Returns a new instance of this number with
+     * Adds this number to another, returning
-     * the sign flipped.
+     * a new number instance.
-     *
+     *
-     * @return the new instance.
+     * @param summand the summand
-     */
+     * @return the result of the summation.
-    abstract fun negateInternal(): NumberInterface
+     */
-    /**
+    protected abstract NumberInterface addInternal(NumberInterface summand);
-     * Raises this number to an integer power.
+
-     *
+    /**
-     * @param exponent the exponent to which to take the number.
+     * Adds this number to another, returning
-     * @return the resulting value.
+     * a new number instance. Also, checks if the
-     */
+     * thread has been interrupted, and if so, throws
-    abstract fun intPowInternal(pow: Int): NumberInterface
+     * an exception.
-    /**
+     *
-     * Returns the least integer greater than or equal to the number.
+     * @param summand the summand
-     *
+     * @return the result of the summation.
-     * @return the least integer greater or equal to the number, if int can hold the value.
+     */
-     */
+    public final NumberInterface add(NumberInterface summand) {
-    abstract fun ceilingInternal(): NumberInterface
+        checkInterrupted();
-    /**
+        return addInternal(summand);
-     * Return the greatest integer less than or equal to the number.
+    }
-     *
+
-     * @return the greatest integer smaller or equal the number.
+    /**
-     */
+     * Subtracts another number from this number,
-    abstract fun floorInternal(): NumberInterface
+     * a new number instance.
-    /**
+     *
-     * Returns the fractional part of the number.
+     * @param subtrahend the subtrahend.
-     *
+     * @return the result of the subtraction.
-     * @return the fractional part of the number.
+     */
-     */
+    protected abstract NumberInterface subtractInternal(NumberInterface subtrahend);
-    abstract fun fractionalPartInternal(): NumberInterface
+
-
+    /**
-    /**
+     * Subtracts another number from this number,
-     * Adds this number to another, returning
+     * a new number instance. Also, checks if the
-     * a new number instance. Also, checks if the
+     * thread has been interrupted, and if so, throws
-     * thread has been interrupted, and if so, throws
+     * an exception.
-     * an exception.
+     *
-     *
+     * @param subtrahend the subtrahend.
-     * @param summand the summand
+     * @return the result of the subtraction.
-     * @return the result of the summation.
+     */
-     */
+    public final NumberInterface subtract(NumberInterface subtrahend) {
-    fun add(summand: NumberInterface): NumberInterface {
+        checkInterrupted();
-        checkInterrupted()
+        return subtractInternal(subtrahend);
-        return addInternal(summand)
+    }
-    }
+
-
+    /**
-    /**
+     * Returns a new instance of this number with
-     * Subtracts another number from this number,
+     * the sign flipped.
-     * a new number instance. Also, checks if the
+     *
-     * thread has been interrupted, and if so, throws
+     * @return the new instance.
-     * an exception.
+     */
-     *
+    protected abstract NumberInterface negateInternal();
-     * @param subtrahend the subtrahend.
+
-     * @return the result of the subtraction.
+
-     */
+    /**
-    fun subtract(subtrahend: NumberInterface): NumberInterface {
+     * Returns a new instance of this number with
-        checkInterrupted()
+     * the sign flipped. Also, checks if the
-        return subtractInternal(subtrahend)
+     * thread has been interrupted, and if so, throws
-    }
+     * an exception.
-
+     *
-    /**
+     * @return the new instance.
-     * Multiplies this number by another, returning
+     */
-     * a new number instance. Also, checks if the
+    public final NumberInterface negate() {
-     * thread has been interrupted, and if so, throws
+        checkInterrupted();
-     * an exception.
+        return negateInternal();
-     *
+    }
-     * @param multiplier the multiplier
+
-     * @return the result of the multiplication.
+    /**
-     */
+     * Raises this number to an integer power.
-    fun multiply(multiplier: NumberInterface): NumberInterface {
+     *
-        checkInterrupted()
+     * @param exponent the exponent to which to take the number.
-        return multiplyInternal(multiplier)
+     * @return the resulting value.
-    }
+     */
-
+    protected abstract NumberInterface intPowInternal(int exponent);
-    /**
+
-     * Divides this number by another, returning
+    /**
-     * a new number instance. Also, checks if the
+     * Raises this number to an integer power. Also, checks if the
-     * thread has been interrupted, and if so, throws
+     * thread has been interrupted, and if so, throws
-     * an exception.
+     * an exception.
-     *
+     *
-     * @param divisor the divisor
+     * @param exponent the exponent to which to take the number.
-     * @return the result of the division.
+     * @return the resulting value.
-     */
+     */
-    fun divide(divisor: NumberInterface): NumberInterface {
+    public final NumberInterface intPow(int exponent) {
-        checkInterrupted()
+        checkInterrupted();
-        return divideInternal(divisor)
+        return intPowInternal(exponent);
-    }
+    }
-
+
-    /**
+    /**
-     * Returns a new instance of this number with
+     * Same as Math.signum().
-     * the sign flipped. Also, checks if the
+     *
-     * thread has been interrupted, and if so, throws
+     * @return 1 if this number is positive, -1 if this number is negative, 0 if this number is 0.
-     * an exception.
+     */
-     *
+    public abstract int signum();
-     * @return the new instance.
+
-     */
+    /**
-    fun negate(): NumberInterface {
+     * Returns the least integer greater than or equal to the number.
-        checkInterrupted()
+     *
-        return negateInternal()
+     * @return the least integer greater or equal to the number, if int can hold the value.
-    }
+     */
-
+    protected abstract NumberInterface ceilingInternal();
-    /**
+
-     * Raises this number to an integer power. Also, checks if the
+    /**
-     * thread has been interrupted, and if so, throws
+     * Returns the least integer greater than or equal to the number.
-     * an exception.
+     * 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.
+     * @return the least integer bigger or equal to the number.
-     */
+     */
-    fun intPow(exponent: Int): NumberInterface {
+    public final NumberInterface ceiling() {
-        checkInterrupted()
+        checkInterrupted();
-        return intPowInternal(exponent)
+        return ceilingInternal();
-    }
+    }
-
+
-    /**
+    /**
-     * Returns the least integer greater than or equal to the number.
+     * 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 integer smaller or equal the number.
-     *
+     */
-     * @return the least integer bigger or equal to the number.
+    protected abstract NumberInterface floorInternal();
-     */
+
-    fun ceiling(): NumberInterface {
+    /**
-        checkInterrupted()
+     * Return the greatest integer less than or equal to the number.
-        return ceilingInternal()
+     * Also, checks if the thread has been interrupted, and if so, throws
-    }
+     * an exception.
-
+     *
-    /**
+     * @return the greatest int smaller than or equal to the number.
-     * Return the greatest integer less than or equal to the number.
+     */
-     * Also, checks if the thread has been interrupted, and if so, throws
+    public final NumberInterface floor() {
-     * an exception.
+        checkInterrupted();
-     *
+        return floorInternal();
-     * @return the greatest int smaller than or equal to the number.
+    }
-     */
+
-    fun floor(): NumberInterface {
+    /**
-        checkInterrupted()
+     * Returns the fractional part of the number.
-        return floorInternal()
+     *
-    }
+     * @return the fractional part of the number.
-
+     */
-    /**
+    protected abstract NumberInterface fractionalPartInternal();
-     * Returns the fractional part of the number, specifically x - floor(x).
+
-     * Also, checks if the thread has been interrupted,
+    /**
-     * and if so, throws an exception.
+     * Returns the fractional part of the number, specifically x - floor(x).
-     *
+     * Also, checks if the thread has been interrupted,
-     * @return the fractional part of the number.
+     * and if so, throws an exception.
-     */
+     *
-    fun fractionalPart(): NumberInterface {
+     * @return the fractional part of the number.
-        checkInterrupted()
+     */
-        return fractionalPartInternal()
+    public final NumberInterface fractionalPart() {
-    }
+        checkInterrupted();
-
+        return fractionalPartInternal();
-    /**
+    }
-     * Returns a NumberRangeBuilder object, which is used to create a range.
+
-     * The reason that this returns a builder and not an actual range is that
+    /**
-     * the NumberRange needs to promote values passed to it, which
+     * Returns the integer representation of this number, discarding any fractional part,
-     * requires an abacus instance.
+     * if int can hold the value.
-     * @param other the value at the bottom of the range.
+     *
-     * @return the resulting range builder.
+     * @return the integer value of this number.
-     */
+     */
-    operator fun rangeTo(other: NumberInterface) = NumberRangeBuilder(this, other)
+    public abstract int intValue();
-
+
-    /**
+    /**
-     * Plus operator overloaded to allow "nice" looking math.
+     * Returns the smallest error this instance can tolerate depending
-     * @param other the value to add to this number.
+     * on its precision and value.
-     * @return the result of the addition.
+     *
-     */
+     * @return the smallest error that should be permitted in calculations.
-    operator fun plus(other: NumberInterface) = add(other)
+     */
-    /**
+    public abstract NumberInterface getMaxError();
-     * Minus operator overloaded to allow "nice" looking math.
+
-     * @param other the value to subtract to this number.
+    /**
-     * @return the result of the subtraction.
+     * Returns a NumberRangeBuilder object, which is used to create a range.
-     */
+     * The reason that this returns a builder and not an actual range is that
-    operator fun minus(other: NumberInterface) = subtract(other)
+     * the NumberRange needs to promote values passed to it, which
-    /**
+     * requires an abacus instance.
-     * Times operator overloaded to allow "nice" looking math.
+     * @param other the value at the bottom of the range.
-     * @param other the value to multiply this number by.
+     * @return the resulting range builder.
-     * @return the result of the multiplication.
+     */
-     */
+    public NumberRangeBuilder rangeTo(NumberInterface other){
-    operator fun times(other: NumberInterface) = multiply(other)
+        return new NumberRangeBuilder(this, other);
-    /**
+    }
-     * Divide operator overloaded to allow "nice" looking math.
+
-     * @param other the value to divide this number by.
+}
-     * @return the result of the division.
-     */
-    operator fun div(other: NumberInterface) = divide(other)
-    /**
-     * The plus operator.
-     * @return this number.
-     */
-    operator fun unaryPlus() = this
-    /**
-     * The minus operator.
-     * @return the negative of this number.
-     */
-    operator fun unaryMinus() = negate()
-
-}

core/src/main/java/org/nwapw/abacus/parsing/Parser.java

@@ -1,17 +1,16 @@
-package org.nwapw.abacus.parsing
+package org.nwapw.abacus.parsing;
 
-import org.nwapw.abacus.tree.TreeNode
+import org.nwapw.abacus.tree.TreeNode;
+
+import java.util.List;
 
 /**
- * Converter from tokens into a parse tree.
+ * An itnerface that provides the ability to convert a list of tokens
- *
- * An interface that provides the ability to convert a list of tokens
  * into a parse tree.
  *
  * @param <T> the type of tokens accepted by this parser.
  */
-
+public interface Parser<T> {
-interface Parser<in T> {
 
     /**
      * Constructs a tree out of the given tokens.
@@ -19,6 +18,5 @@ interface Parser<in T> {
      * @param tokens the tokens to construct a tree from.
      * @return the constructed tree, or null on error.
      */
-    fun constructTree(tokens: List<T>): TreeNode
+    public TreeNode constructTree(List<T> tokens);
-
+}
-}

core/src/main/java/org/nwapw/abacus/parsing/ShuntingYardParser.java

@@ -124,7 +124,7 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
      * @param matches the list of tokens from the source string.
      * @return the construct tree expression.
      */
-    public TreeNode constructRecursive(List<? extends Match<TokenType>> matches) {
+    public TreeNode constructRecursive(List<Match<TokenType>> matches) {
         if (matches.size() == 0) throw new ParseException("no tokens left in input");
         Match<TokenType> match = matches.remove(0);
         TokenType matchType = match.getType();
@@ -172,7 +172,7 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
     }
 
     @Override
-    public TreeNode constructTree(List<? extends Match<TokenType>> tokens) {
+    public TreeNode constructTree(List<Match<TokenType>> tokens) {
         if (tokens.isEmpty()) throw new ParseException("no input tokens");
         tokens = intoPostfix(new ArrayList<>(tokens));
         Collections.reverse(tokens);

core/src/main/java/org/nwapw/abacus/parsing/Tokenizer.java

@@ -0,0 +1,20 @@
+package org.nwapw.abacus.parsing;
+
+import java.util.List;
+
+/**
+ * Interface that provides the ability to convert a string into a list of tokens.
+ *
+ * @param <T> the type of the tokens produced.
+ */
+public interface Tokenizer<T> {
+
+    /**
+     * Converts a string into tokens.
+     *
+     * @param string the string to convert.
+     * @return the list of tokens, or null on error.
+     */
+    public List<T> tokenizeString(String string);
+
+}

core/src/main/java/org/nwapw/abacus/parsing/TreeBuilder.java

@@ -0,0 +1,48 @@
+package org.nwapw.abacus.parsing;
+
+import org.nwapw.abacus.tree.TreeNode;
+
+import java.util.List;
+
+/**
+ * TreeBuilder class used to piece together a Tokenizer and
+ * Parser of the same kind. This is used to essentially avoid
+ * working with any parameters at all, and the generics
+ * in this class are used only to ensure the tokenizer and parser
+ * are of the same type.
+ *
+ * @param <T> the type of tokens created by the tokenizer and used by the parser.
+ */
+public class TreeBuilder<T> {
+
+    /**
+     * The tokenizer used to convert a string into tokens.
+     */
+    private Tokenizer<T> tokenizer;
+    /**
+     * The parser used to parse a list of tokens into a tree.
+     */
+    private Parser<T> parser;
+
+    /**
+     * Create a new Tree Builder with the given tokenizer and parser
+     *
+     * @param tokenizer the tokenizer to turn strings into tokens
+     * @param parser    the parser to turn tokens into a tree
+     */
+    public TreeBuilder(Tokenizer<T> tokenizer, Parser<T> parser) {
+        this.tokenizer = tokenizer;
+        this.parser = parser;
+    }
+
+    /**
+     * Parse the given string into a tree.
+     *
+     * @param input the string to parse into a tree.
+     * @return the resulting tree.
+     */
+    public TreeNode fromString(String input) {
+        return parser.constructTree(tokenizer.tokenizeString(input));
+    }
+
+}

core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java

@@ -1,14 +1,12 @@
-package org.nwapw.abacus.plugin.standard;
+package org.nwapw.abacus.plugin;
 
 import org.nwapw.abacus.context.MutableEvaluationContext;
 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.NumberImplementation;
+import org.nwapw.abacus.tree.TreeNode;
-import org.nwapw.abacus.plugin.Plugin;
+import org.nwapw.abacus.tree.VariableNode;
-import org.nwapw.abacus.plugin.PluginManager;
-import org.nwapw.abacus.plugin.standard.operator.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,27 +20,93 @@ public class StandardPlugin extends Plugin {
     /**
      * The set operator.
      */
-    public static final TreeValueOperator OP_SET = new OperatorSet();
+    public final TreeValueOperator opSet = new TreeValueOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
+        @Override
+        public boolean matchesParams(MutableEvaluationContext context, TreeNode[] params) {
+            return params.length == 2 && params[0] instanceof VariableNode;
+        }
+
+        @Override
+        public NumberInterface applyInternal(MutableEvaluationContext context, TreeNode[] params) {
+            String assignTo = ((VariableNode) params[0]).getVariable();
+            NumberInterface value = params[1].reduce(context.getInheritedReducer());
+            context.setVariable(assignTo, value);
+            return value;
+        }
+    };
     /**
      * The define operator.
      */
-    public final TreeValueOperator OP_DEFINE = new OperatorDefine();
+    public final TreeValueOperator opDefine = new TreeValueOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
+        @Override
+        public boolean matchesParams(MutableEvaluationContext context, TreeNode[] params) {
+            return params.length == 2 && params[0] instanceof VariableNode;
+        }
+
+        @Override
+        public NumberInterface applyInternal(MutableEvaluationContext context, TreeNode[] params) {
+            String assignTo = ((VariableNode) params[0]).getVariable();
+            context.setDefinition(assignTo, params[1]);
+            return params[1].reduce(context.getInheritedReducer());
+        }
+    };
     /**
      * The addition operator, +
      */
-    public static final NumberOperator OP_ADD = new OperatorAdd();
+    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]);
+        }
+    };
     /**
      * The subtraction operator, -
      */
-    public static final NumberOperator OP_SUBTRACT = new OperatorSubtract();
+    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]);
+
+        }
+    };
     /**
      * The negation operator, -
      */
-    public static final NumberOperator OP_NEGATE = new OperatorNegate();
+    public static final NumberOperator OP_NEGATE = new NumberOperator(OperatorAssociativity.LEFT, OperatorType.UNARY_PREFIX, 0) {
+        @Override
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
+            return params.length == 1;
+        }
+
+        @Override
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
+            return params[0].negate();
+        }
+    };
     /**
      * The multiplication operator, *
      */
-    public static final NumberOperator OP_MULTIPLY = new OperatorMultiply();
+    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]);
+        }
+    };
     /**
      * The implementation for double-based naive numbers.
      */
@@ -97,19 +161,96 @@ public class StandardPlugin extends Plugin {
     /**
      * The division operator, /
      */
-    public static final NumberOperator OP_DIVIDE = new OperatorDivide();
+    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]);
+        }
+    };
     /**
      * The factorial operator, !
      */
-    public static final NumberOperator OP_FACTORIAL = new OperatorFactorial();
+    public static final NumberOperator OP_FACTORIAL = new NumberOperator(OperatorAssociativity.RIGHT, OperatorType.UNARY_POSTFIX, 0) {
+        //private HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> storedList = new HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>>();
+        @Override
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
+            return params.length == 1
+                    && params[0].fractionalPart().compareTo(context.getInheritedNumberImplementation().instanceForString("0")) == 0
+                    && params[0].signum() >= 0;
+        }
+
+        @Override
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
+            NumberImplementation implementation = context.getInheritedNumberImplementation();
+            if (params[0].signum() == 0) {
+                return implementation.instanceForString("1");
+            }
+            NumberInterface one = implementation.instanceForString("1");
+            NumberInterface factorial = params[0];
+            NumberInterface multiplier = params[0];
+            //It is necessary to later prevent calls of factorial on anything but non-negative integers.
+            while ((multiplier = multiplier.subtract(one)).signum() == 1) {
+                factorial = factorial.multiply(multiplier);
+            }
+            return factorial;
+                /*if(!storedList.containsKey(params[0].getClass())){
+                    storedList.put(params[0].getClass(), new ArrayList<NumberInterface>());
+                    storedList.get(params[0].getClass()).add(NaiveNumber.ONE.promoteTo(params[0].getClass()));
+                    storedList.get(params[0].getClass()).add(NaiveNumber.ONE.promoteTo(params[0].getClass()));
+                }*/
+        }
+    };
     /**
      * The permutation operator.
      */
-    public static final NumberOperator OP_NPR = new OperatorNpr();
+    public static final NumberOperator OP_NPR = new NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0) {
+        @Override
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
+            return params.length == 2 && params[0].fractionalPart().signum() == 0
+                    && params[1].fractionalPart().signum() == 0;
+        }
+
+        @Override
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
+            NumberImplementation implementation = context.getInheritedNumberImplementation();
+            if (params[0].compareTo(params[1]) < 0 ||
+                    params[0].signum() < 0 ||
+                    (params[0].signum() == 0 && params[1].signum() != 0)) return implementation.instanceForString("0");
+            NumberInterface total = implementation.instanceForString("1");
+            NumberInterface multiplyBy = params[0];
+            NumberInterface remainingMultiplications = params[1];
+            NumberInterface halfway = params[0].divide(implementation.instanceForString("2"));
+            if (remainingMultiplications.compareTo(halfway) > 0) {
+                remainingMultiplications = params[0].subtract(remainingMultiplications);
+            }
+            while (remainingMultiplications.signum() > 0) {
+                total = total.multiply(multiplyBy);
+                remainingMultiplications = remainingMultiplications.subtract(implementation.instanceForString("1"));
+                multiplyBy = multiplyBy.subtract(implementation.instanceForString("1"));
+            }
+            return total;
+        }
+    };
     /**
      * The combination operator.
      */
-    public static final NumberOperator OP_NCR = new OperatorNcr();
+    public static final NumberOperator OP_NCR = new NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0) {
+        @Override
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
+            return params.length == 2 && params[0].fractionalPart().signum() == 0
+                    && params[1].fractionalPart().signum() == 0;
+        }
+
+        @Override
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
+            return OP_NPR.apply(context, params).divide(OP_FACTORIAL.apply(context, params[1]));
+        }
+    };
     /**
      * The absolute value function, abs(-3) = 3
      */
@@ -222,7 +363,34 @@ public class StandardPlugin extends Plugin {
     /**
      * The caret / pow operator, ^
      */
-    public static final NumberOperator OP_CARET = new OperatorCaret();
+    public static final NumberOperator OP_CARET = new NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2) {
+        @Override
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
+            NumberInterface zero = context.getInheritedNumberImplementation().instanceForString("0");
+            return params.length == 2
+                    && !(params[0].compareTo(zero) == 0
+                    && params[1].compareTo(zero) == 0)
+                    && !(params[0].signum() == -1 && params[1].fractionalPart().compareTo(zero) != 0);
+        }
+
+        @Override
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
+            NumberImplementation implementation = context.getInheritedNumberImplementation();
+            NumberInterface zero = implementation.instanceForString("0");
+            if (params[0].compareTo(zero) == 0)
+                return zero;
+            else if (params[1].compareTo(zero) == 0)
+                return implementation.instanceForString("1");
+            //Detect integer bases:
+            if (params[0].fractionalPart().compareTo(implementation.instanceForString("0")) == 0
+                    && FUNCTION_ABS.apply(context, params[1]).compareTo(implementation.instanceForString(Integer.toString(Integer.MAX_VALUE))) < 0
+                    && FUNCTION_ABS.apply(context, params[1]).compareTo(implementation.instanceForString("1")) >= 0) {
+                NumberInterface[] newParams = {params[0], params[1].fractionalPart()};
+                return params[0].intPow(params[1].floor().intValue()).multiply(applyInternal(context, newParams));
+            }
+            return FUNCTION_EXP.apply(context, FUNCTION_LN.apply(context, FUNCTION_ABS.apply(context, params[0])).multiply(params[1]));
+        }
+    };
     /**
      * The square root function.
      */
@@ -588,8 +756,8 @@ public class StandardPlugin extends Plugin {
         registerOperator("^", OP_CARET);
         registerOperator("!", OP_FACTORIAL);
 
-        registerTreeValueOperator("=", OP_SET);
+        registerTreeValueOperator("=", opSet);
-        registerTreeValueOperator(":=", OP_DEFINE);
+        registerTreeValueOperator(":=", opDefine);
 
         registerOperator("nPr", OP_NPR);
         registerOperator("nCr", OP_NCR);

core/src/main/kotlin/org/nwapw/abacus/Abacus.kt

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

core/src/main/kotlin/org/nwapw/abacus/parsing/Tokenizer.kt

@@ -1,21 +0,0 @@
-package org.nwapw.abacus.parsing
-
-/**
- * Converter from string to tokens.
- *
- * Interface that converts a string into a list
- * of tokens of a certain type.
- *
- * @param <T> the type of the tokens produced.
- */
-interface Tokenizer<out T> {
-
-    /**
-     * Converts a string into tokens.
-     *
-     * @param string the string to convert.
-     * @return the list of tokens, or null on error.
-     */
-    fun tokenizeString(string: String):  List<T>
-
-}

core/src/main/kotlin/org/nwapw/abacus/parsing/TreeBuilder.kt

@@ -1,26 +0,0 @@
-package org.nwapw.abacus.parsing
-
-import org.nwapw.abacus.tree.TreeNode
-
-/**
- * Class to combine a [Tokenizer] and a [Parser]
- *
- * TreeBuilder class used to piece together a Tokenizer and
- * Parser of the same kind. This is used to essentially avoid
- * working with any parameters at all, and the generics
- * in this class are used only to ensure the tokenizer and parser
- * are of the same type.
- *
- * @param <T> the type of tokens created by the tokenizer and used by the parser.
- */
-class TreeBuilder<T>(private val tokenizer: Tokenizer<T>, private val parser: Parser<T>) {
-
-    /**
-     * Parses the given [string] into a tree.
-     *
-     * @param string the string to parse into a tree.
-     * @return the resulting tree.
-     */
-    fun fromString(string: String): TreeNode = parser.constructTree(tokenizer.tokenizeString(string))
-
-}

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorAdd.kt

@@ -1,21 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.number.NumberInterface
-
-/**
- * The addition operator.
- *
- * This is a standard operator that simply performs addition.
- */
-class OperatorAdd: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
-
-    override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2
-    override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params[0] + params[1]
-
-}

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

@@ -1,38 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.plugin.standard.StandardPlugin.*
-
-/**
- * The power operator.
- *
- * This is a standard operator that brings one number to the power of the other.
- */
-class OperatorCaret: NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2) {
-
-    override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2
-                    && !(params[0].signum() == 0 && params[1].signum() == 0)
-                    && !(params[0].signum() == -1 && params[1].fractionalPart().signum() != 0)
-
-    override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>): NumberInterface {
-        val implementation = context.inheritedNumberImplementation
-        if (params[0].signum() == 0)
-            return implementation.instanceForString("0")
-        else if (params[1].signum() == 0)
-            return implementation.instanceForString("1")
-        //Detect integer bases:
-        if (params[0].fractionalPart().signum() == 0
-                && FUNCTION_ABS.apply(context, params[1]) < implementation.instanceForString(Integer.toString(Integer.MAX_VALUE))
-                && FUNCTION_ABS.apply(context, params[1]) >= implementation.instanceForString("1")) {
-            val newParams = arrayOf(params[0], params[1].fractionalPart())
-            return params[0].intPow(params[1].floor().intValue()) * applyInternal(context, newParams)
-        }
-        return FUNCTION_EXP.apply(context, FUNCTION_LN.apply(context, FUNCTION_ABS.apply(context, params[0])) * params[1])
-    }
-
-}

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorDefine.kt

@@ -1,28 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.TreeValueOperator
-import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.tree.TreeNode
-import org.nwapw.abacus.tree.VariableNode
-
-/**
- * The definition operator.
- *
- * This is a standard operator that creates a definition - something that doesn't capture variable values
- * when it's created, but rather the variables themselves, and changes when the variables it uses change.
- */
-class OperatorDefine: TreeValueOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
-
-    override fun matchesParams(context: MutableEvaluationContext, params: Array<out TreeNode>) =
-            params.size == 2 && params[0] is VariableNode
-
-    override fun applyInternal(context: MutableEvaluationContext, params: Array<out TreeNode>): NumberInterface {
-        val assignTo = (params[0] as VariableNode).variable
-        context.setDefinition(assignTo, params[1])
-        return params[1].reduce(context.inheritedReducer)
-    }
-
-}

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorDivide.kt

@@ -1,21 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.number.NumberInterface
-
-/**
- * The division operator.
- *
- * This is a standard operator that simply performs division.
- */
-class OperatorDivide: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1) {
-
-    override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2
-    override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params[0] / params[1]
-
-}

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorFactorial.kt

@@ -1,37 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.number.NumberInterface
-
-/**
- * The factorial operator.
- *
- * This is a standard operator that simply evaluates the factorial of a number.
- */
-class OperatorFactorial: NumberOperator(OperatorAssociativity.LEFT, OperatorType.UNARY_POSTFIX, 0) {
-
-    override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-        params.size == 1
-                && params[0].fractionalPart().signum() == 0
-                && params[0].signum() >= 0
-
-    override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>): NumberInterface {
-        val implementation = context.inheritedNumberImplementation
-        val one = implementation.instanceForString("1")
-        if (params[0].signum() == 0) {
-            return one
-        }
-        var factorial = params[0]
-        var multiplier = params[0] - one
-        //It is necessary to later prevent calls of factorial on anything but non-negative integers.
-        while (multiplier.signum() == 1) {
-            factorial *= multiplier
-            multiplier -= one
-        }
-        return factorial
-    }
-
-}

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorMultiply.kt

@@ -1,21 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.number.NumberInterface
-
-/**
- * The multiplication operator.
- *
- * This is a standard operator that simply performs multiplication.
- */
-class OperatorMultiply: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1) {
-
-    override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2
-    override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params[0] * params[1]
-
-}

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

@@ -1,25 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.plugin.standard.StandardPlugin.*
-
-/**
- * The "N choose R" operator.
- *
- * This is a standard operator that returns the number of possible combinations, regardless of order,
- * of a certain size can be taken out of a pool of a bigger size.
- */
-class OperatorNcr: NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0) {
-
-    override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2 && params[0].fractionalPart().signum() == 0
-                    && params[1].fractionalPart().signum() == 0
-
-    override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            OP_NPR.apply(context, *params) / OP_FACTORIAL.apply(context, params[1])
-
-}

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNegate.kt

@@ -1,22 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.number.NumberInterface
-
-/**
- * The negation operator.
- *
- * This is a standard operator that negates a number.
- */
-class OperatorNegate: NumberOperator(OperatorAssociativity.LEFT, OperatorType.UNARY_PREFIX, 0) {
-
-    override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 1
-
-    override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            -params[0]
-
-}

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNpr.kt

@@ -1,42 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.number.NumberInterface
-
-/**
- * The "N pick R" operator.
- *
- * his is a standard operator that returns the number of possible combinations
- * of a certain size can be taken out of a pool of a bigger size.
- */
-class OperatorNpr: NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0) {
-
-    override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2 && params[0].fractionalPart().signum() == 0
-                    && params[1].fractionalPart().signum() == 0
-
-    override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>): NumberInterface {
-        val implementation = context.inheritedNumberImplementation
-        if (params[0] < params[1] ||
-                params[0].signum() < 0 ||
-                params[0].signum() == 0 && params[1].signum() != 0)
-            return implementation.instanceForString("0")
-        var total = implementation.instanceForString("1")
-        var multiplyBy = params[0]
-        var remainingMultiplications = params[1]
-        val halfway = params[0] / implementation.instanceForString("2")
-        if (remainingMultiplications > halfway) {
-            remainingMultiplications = params[0] - remainingMultiplications
-        }
-        while (remainingMultiplications.signum() > 0) {
-            total *= multiplyBy
-            remainingMultiplications -= implementation.instanceForString("1")
-            multiplyBy -= implementation.instanceForString("1")
-        }
-        return total
-    }
-
-}

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorSet.kt

@@ -1,28 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.TreeValueOperator
-import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.tree.TreeNode
-import org.nwapw.abacus.tree.VariableNode
-
-/**
- * The set operator.
- *
- * This is a standard operator that assigns a value to a variable name.
- */
-class OperatorSet: TreeValueOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
-
-    override fun matchesParams(context: MutableEvaluationContext, params: Array<out TreeNode>) =
-            params.size == 2 && params[0] is VariableNode
-
-    override fun applyInternal(context: MutableEvaluationContext, params: Array<out TreeNode>): NumberInterface {
-        val assignTo = (params[0] as VariableNode).variable
-        val value = params[1].reduce(context.inheritedReducer)
-        context.setVariable(assignTo, value)
-        return value
-    }
-
-}

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorSubtract.kt

@@ -1,21 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.number.NumberInterface
-
-/**
- * The subtraction operator.
- *
- * This is a standard operator that performs subtraction.
- */
-class OperatorSubtract: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
-
-    override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2
-    override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
-            params[0] - params[1]
-
-}

core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java

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

core/src/test/java/org/nwapw/abacus/tests/RangeTests.java

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

fx/build.gradle

@@ -2,7 +2,14 @@ apply plugin: 'application'
 
 dependencies {
     compile 'com.moandjiezana.toml:toml4j:0.7.1'
+    compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.18'
     compile project(':core')
 }
 
+kotlin {
+    experimental {
+        coroutines "enable"
+    }
+}
+
 mainClassName = 'org.nwapw.abacus.fx.AbacusApplication'

fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java

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

fx/src/main/kotlin/org/nwapw/abacus/fx/graphing/Graph.kt

@@ -0,0 +1,121 @@
+package org.nwapw.abacus.fx.graphing
+
+import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.async
+import kotlinx.coroutines.experimental.runBlocking
+import org.nwapw.abacus.Abacus
+import org.nwapw.abacus.config.Configuration
+import org.nwapw.abacus.context.EvaluationContext
+import org.nwapw.abacus.context.MutableEvaluationContext
+import org.nwapw.abacus.number.NaiveNumber
+import org.nwapw.abacus.number.NumberInterface
+import org.nwapw.abacus.number.NumberRange
+import org.nwapw.abacus.plugin.StandardPlugin
+import org.nwapw.abacus.tree.TreeNode
+
+/**
+ * A class that holds information about a graph.
+ *
+ * Graph that uses an instance of [Abacus] to generate graphs of an
+ * [expression]. Continuous graphing on large expressions is expensive,
+ * and therefore the method of graphing is discrete. The graph class
+ * uses the [pointExpression] to generate inputs until an input is outside
+ * the function's domain. In both the expressions, the [inputVariable] and
+ * [pointInputVariable] are used, respectively, in order to either pass in
+ * the x-coordinate or the number of the input value being generated.
+ *
+ * @property abacus the abacus instance to use to evaluate expressions.
+ * @property domain the domain used in computation.
+ * @property range the range used for displaying the output.
+ * @property inputVariable the variable which is substituted for the input x-coordinate.
+ * @property pointInputVariable the variable which is substituted for the number of the input point being generated.
+ */
+class Graph(val abacus: Abacus,
+            var domain: NumberRange, var range: NumberRange,
+            var inputVariable: String = "x", var pointInputVariable: String = "n") {
+
+    /**
+     * Property used for storing the parsed version of the [expression]
+     */
+    private var expressionTree: TreeNode? = null
+    /**
+     * Property used for storing the parsed version of the [pointExpression]
+     */
+    private var pointExpressionTree: TreeNode? = null
+
+    /**
+     * The expression being graphed.
+     */
+    var expression: String? = null
+        set(value) {
+            field = value
+            expressionTree = abacus.parseString(value ?: return)
+        }
+    /**
+     * The expression being used to generate points.
+     */
+    var pointExpression: String? = null
+        set(value) {
+            field = value
+            pointExpressionTree = abacus.parseString(value ?: return)
+        }
+
+    /**
+     * Evaluates a parsed expression [tree] with the given input [values] of indeterminate type.
+     * This is is an asynchronous operation using coroutines, and for every input
+     * value a new sub-context is created. The [contextModifier] function is executed
+     * on each new sub-context, and is expected to use the input value to modify the context
+     * state so that the evaluation of the expression produces a correct result.
+     *
+     * @param T the type of input values.
+     * @param tree the tree to evaluate.
+     * @param values the values to plug into the expression.
+     * @param contextModifier the function that plugs values into the context.
+     * @return the list of outputs.
+     */
+    fun <T> evaluateWith(tree: TreeNode, values: List<T>,
+                         contextModifier: MutableEvaluationContext.(T) -> Unit) = runBlocking {
+        values.map {
+            val context = abacus.context.mutableSubInstance()
+            context.contextModifier(it)
+            async(CommonPool) { abacus.evaluateTreeWithContext(tree, context) }
+        }.map { it.await() }
+    }
+
+    /**
+     * Extension function that calls [evaluateWith] with the current list.
+     * @param T the type of the values in the list.
+     * @param tree the tree node to evaluate.
+     * @param contextModifier the function that plugs values into the context.
+     * @return the list of outputs.
+     */
+    fun <T> List<T>.evaluateWith(tree: TreeNode,
+                                 contextModifier: MutableEvaluationContext.(T) -> Unit ) =
+            evaluateWith(tree, this, contextModifier)
+
+    /**
+     * Uses the [pointExpression] and [pointInputVariable] to generate
+     * a set of points as inputs for the actual expression. These points are generated
+     * as long as they are within the [domain].
+     * @return the list of generated input values.
+     */
+    fun generateInputs(): List<NumberInterface> =
+            generateSequence(1) {
+                it + 1
+            }.map {
+                val context = abacus.context.mutableSubInstance()
+                context.setVariable(pointInputVariable,
+                        context.inheritedNumberImplementation!!.instanceForString(it.toString()))
+                abacus.evaluateTreeWithContext(pointExpressionTree!!, context).value
+            }.takeWhile { it in domain }.toList()
+
+    /**
+     * Uses the [expression] and [inputVariable] to generate
+     * a set of outputs from the given set of [inputs].
+     * @return the list of generated points.
+     */
+    fun generateOutputs(inputs: List<NumberInterface>): List<Pair<NumberInterface, NumberInterface>> =
+            inputs.evaluateWith(expressionTree!!) {
+                setVariable(inputVariable, it)
+            }.mapIndexed { index, (value) -> inputs[index] to value }
+}

fx/src/main/kotlin/org/nwapw/abacus/fx/graphing/GraphCanvas.kt

@@ -0,0 +1,39 @@
+package org.nwapw.abacus.fx.graphing
+
+import javafx.beans.value.ChangeListener
+import javafx.scene.canvas.Canvas
+
+/**
+ * A canvas that renders a graph.
+ *
+ * The GraphCanvas uses the provided [Graph] instance in order to draw the outputs on itself.
+ * @param graph the graph used to render.
+ */
+class GraphCanvas(graph: Graph): Canvas() {
+
+    /**
+     * The graph that is currently being used to generate inputs / outputs.
+     * The redraw is triggered if this graph is reset.
+     */
+    var graph: Graph = graph
+        set(value) {
+            field = value
+            redraw()
+        }
+
+    init {
+        val redrawListener = ChangeListener<Number> { _, _, _ -> redraw() }
+        widthProperty().addListener(redrawListener)
+        heightProperty().addListener(redrawListener)
+        redraw()
+    }
+
+    /**
+     * Redraws the graph onto the canvas.
+     */
+    fun redraw() {
+        val graphicsContext = graphicsContext2D
+        val outputs = graph.generateOutputs(graph.generateInputs())
+    }
+
+}