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/lexing/Lexer.java

@@ -1,8 +1,9 @@
 package org.nwapw.abacus.lexing;
 
+import org.nwapw.abacus.lexing.pattern.EndNode;
+import org.nwapw.abacus.lexing.pattern.Match;
 import org.nwapw.abacus.lexing.pattern.Pattern;
-import org.nwapw.abacus.lexing.pattern.nodes.EndNode;
+import org.nwapw.abacus.lexing.pattern.PatternNode;
-import org.nwapw.abacus.lexing.pattern.nodes.PatternNode;
 
 import java.util.*;
 
@@ -79,10 +80,10 @@ public class Lexer<T> {
 
             index++;
         }
+        matches.sort((a, b) -> compare.compare(a.getType(), b.getType()));
         if (compare != null) {
-            Collections.sort(matches, (a, b) -> compare.compare(a.getType(), b.getType()));
+            matches.sort(Comparator.comparingInt(a -> a.getContent().length()));
         }
-        Collections.sort(matches, (o1, o2) -> o1.getContent().length() - o2.getContent().length());
         return matches.isEmpty() ? null : matches.get(matches.size() - 1);
     }
 
@@ -136,10 +137,7 @@ public class Lexer<T> {
 
         @Override
         public int hashCode() {
-            return Arrays.hashCode(new Object[] {
+            return Objects.hash(name, id);
-                    this.name,
-                    this.id
-            });
         }
 
         @Override

core/src/main/java/org/nwapw/abacus/lexing/pattern/AnyNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern.nodes;
+package org.nwapw.abacus.lexing.pattern;
 
 /**
  * A pattern node that matches any character.

core/src/main/java/org/nwapw/abacus/lexing/pattern/EndNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern.nodes;
+package org.nwapw.abacus.lexing.pattern;
 
 /**
  * A node that represents a successful match.

core/src/main/java/org/nwapw/abacus/lexing/pattern/LinkNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern.nodes;
+package org.nwapw.abacus.lexing.pattern;
 
 import java.util.Collection;
 

core/src/main/java/org/nwapw/abacus/lexing/pattern/Match.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing;
+package org.nwapw.abacus.lexing.pattern;
 
 /**
  * A match that has been generated by the lexer.

core/src/main/java/org/nwapw/abacus/lexing/pattern/Pattern.java

@@ -1,11 +1,10 @@
 package org.nwapw.abacus.lexing.pattern;
 
-import org.nwapw.abacus.lexing.pattern.nodes.*;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Stack;
+import java.util.function.Function;
 
 /**
  * A pattern that can be compiled from a string and used in lexing.
@@ -35,8 +34,8 @@ public class Pattern<T> {
      * A map of regex operator to functions that modify a PatternChain
      * with the appropriate operation.
      */
-    private Map<Character, Transformation<T>> operations =
+    private Map<Character, Function<PatternChain<T>, PatternChain<T>>> operations =
-            new HashMap<Character, Transformation<T>>() {{
+            new HashMap<Character, Function<PatternChain<T>, PatternChain<T>>>() {{
                 put('+', Pattern.this::transformPlus);
                 put('*', Pattern.this::transformStar);
                 put('?', Pattern.this::transformQuestion);
@@ -89,7 +88,7 @@ public class Pattern<T> {
      * @return the modified chain.
      */
     private PatternChain<T> transformPlus(PatternChain<T> chain) {
-        chain.tail.getOutputStates().add(chain.head);
+        chain.tail.outputStates.add(chain.head);
         return chain;
     }
 
@@ -103,10 +102,10 @@ public class Pattern<T> {
     private PatternChain<T> transformStar(PatternChain<T> chain) {
         LinkNode<T> newTail = new LinkNode<>();
         LinkNode<T> newHead = new LinkNode<>();
-        newHead.getOutputStates().add(chain.head);
+        newHead.outputStates.add(chain.head);
-        newHead.getOutputStates().add(newTail);
+        newHead.outputStates.add(newTail);
-        chain.tail.getOutputStates().add(newTail);
+        chain.tail.outputStates.add(newTail);
-        newTail.getOutputStates().add(newHead);
+        newTail.outputStates.add(newHead);
         chain.head = newHead;
         chain.tail = newTail;
         return chain;
@@ -122,9 +121,9 @@ public class Pattern<T> {
     private PatternChain<T> transformQuestion(PatternChain<T> chain) {
         LinkNode<T> newTail = new LinkNode<>();
         LinkNode<T> newHead = new LinkNode<>();
-        newHead.getOutputStates().add(chain.head);
+        newHead.outputStates.add(chain.head);
-        newHead.getOutputStates().add(newTail);
+        newHead.outputStates.add(newTail);
-        chain.tail.getOutputStates().add(newTail);
+        chain.tail.outputStates.add(newTail);
         chain.head = newHead;
         chain.tail = newTail;
         return chain;
@@ -141,8 +140,8 @@ public class Pattern<T> {
         LinkNode<T> tail = new LinkNode<>();
         PatternChain<T> newChain = new PatternChain<>(head, tail);
         for (PatternChain<T> chain : collection) {
-            head.getOutputStates().add(chain.head);
+            head.outputStates.add(chain.head);
-            chain.tail.getOutputStates().add(tail);
+            chain.tail.outputStates.add(tail);
         }
         return newChain;
     }
@@ -206,7 +205,7 @@ public class Pattern<T> {
             if (operations.containsKey(currentChar)) {
                 if (currentChain == null) return null;
 
-                currentChain = operations.get(currentChar).transform(currentChain);
+                currentChain = operations.get(currentChar).apply(currentChain);
                 fullChain.append(currentChain);
                 currentChain = null;
                 index++;

core/src/main/java/org/nwapw/abacus/lexing/pattern/PatternChain.java

@@ -1,7 +1,5 @@
 package org.nwapw.abacus.lexing.pattern;
 
-import org.nwapw.abacus.lexing.pattern.nodes.PatternNode;
-
 /**
  * A chain of nodes that can be treated as a single unit.
  * Used during pattern compilation.
@@ -58,7 +56,7 @@ public class PatternChain<T> {
             this.head = other.head;
             this.tail = other.tail;
         } else {
-            tail.getOutputStates().add(other.head);
+            tail.outputStates.add(other.head);
             tail = other.tail;
         }
     }
@@ -74,7 +72,7 @@ public class PatternChain<T> {
         if (tail == null) {
             head = tail = node;
         } else {
-            tail.getOutputStates().add(node);
+            tail.outputStates.add(node);
             tail = node;
         }
     }

core/src/main/java/org/nwapw/abacus/lexing/pattern/PatternNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern.nodes;
+package org.nwapw.abacus.lexing.pattern;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -65,11 +65,4 @@ public class PatternNode<T> {
         outputStates.forEach(e -> e.addInto(into));
     }
 
-    /**
-     * Gets the output states of this node.
-     * @return the output states.
-     */
-    public Set<PatternNode<T>> getOutputStates() {
-        return outputStates;
-    }
 }

core/src/main/java/org/nwapw/abacus/lexing/pattern/RangeNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern.nodes;
+package org.nwapw.abacus.lexing.pattern;
 
 /**
  * A node that matches a range of characters.

core/src/main/java/org/nwapw/abacus/lexing/pattern/Transformation.java

@@ -1,16 +0,0 @@
-package org.nwapw.abacus.lexing.pattern;
-
-/**
- * An interface that transforms a pattern chain into a different pattern chain.
- * @param <T> the type used to identify the nodes in the pattern chain.
- */
-public interface Transformation<T> {
-
-    /**
-     * Performs the actual transformation.
-     * @param from the original chain.
-     * @return the resulting chain.
-     */
-    PatternChain<T> transform(PatternChain<T> from);
-
-}

core/src/main/java/org/nwapw/abacus/lexing/pattern/ValueNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern.nodes;
+package org.nwapw.abacus.lexing.pattern;
 
 /**
  * A node that matches a single value.

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

@@ -1,6 +1,4 @@
-package org.nwapw.abacus.number.standard;
+package org.nwapw.abacus.number;
-
-import org.nwapw.abacus.number.NumberInterface;
 
 /**
  * An implementation of NumberInterface using a double.

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

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

@@ -1,6 +1,4 @@
-package org.nwapw.abacus.number.standard;
+package org.nwapw.abacus.number;
-
-import org.nwapw.abacus.number.NumberInterface;
 
 import java.math.BigDecimal;
 import java.math.MathContext;

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

@@ -1,12 +1,12 @@
-package org.nwapw.abacus.parsing.standard;
+package org.nwapw.abacus.parsing;
 
 import org.nwapw.abacus.exception.TokenizeException;
 import org.nwapw.abacus.lexing.Lexer;
-import org.nwapw.abacus.lexing.Match;
+import org.nwapw.abacus.lexing.pattern.Match;
 import org.nwapw.abacus.lexing.pattern.Pattern;
-import org.nwapw.abacus.parsing.Tokenizer;
 import org.nwapw.abacus.plugin.PluginListener;
 import org.nwapw.abacus.plugin.PluginManager;
+import org.nwapw.abacus.tree.TokenType;
 
 import java.util.Comparator;
 import java.util.List;
@@ -20,7 +20,7 @@ public class LexerTokenizer implements Tokenizer<Match<TokenType>>, PluginListen
     /**
      * Comparator used to sort the tokens produced by the lexer.
      */
-    protected static final Comparator<TokenType> TOKEN_SORTER = (o1, o2) -> o1.priority - o2.priority;
+    protected static final Comparator<TokenType> TOKEN_SORTER = Comparator.comparingInt(e -> e.priority);
 
     /**
      * The lexer instance used to turn strings into matches.

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.nodes.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

@@ -1,14 +1,13 @@
-package org.nwapw.abacus.parsing.standard;
+package org.nwapw.abacus.parsing;
 
 import org.nwapw.abacus.exception.ParseException;
 import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.function.OperatorAssociativity;
 import org.nwapw.abacus.function.OperatorType;
-import org.nwapw.abacus.lexing.Match;
+import org.nwapw.abacus.lexing.pattern.Match;
-import org.nwapw.abacus.parsing.Parser;
 import org.nwapw.abacus.plugin.PluginListener;
 import org.nwapw.abacus.plugin.PluginManager;
-import org.nwapw.abacus.tree.nodes.*;
+import org.nwapw.abacus.tree.*;
 
 import java.util.*;
 
@@ -125,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();
@@ -163,7 +162,7 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
             matches.remove(0);
             CallNode node;
             if (matchType == TokenType.FUNCTION) {
-                node = new NumberFunctionNode(functionName, children);
+                node = new FunctionNode(functionName, children);
             } else {
                 node = new TreeValueFunctionNode(functionName, children);
             }
@@ -173,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/ClassFinder.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.fx;
+package org.nwapw.abacus.plugin;
 
 import java.io.File;
 import java.io.IOException;

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

@@ -1,10 +1,10 @@
 package org.nwapw.abacus.plugin;
 
 import org.nwapw.abacus.number.NumberInterface;
-import org.nwapw.abacus.number.promotion.PromotionFunction;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
 
 /**
  * A class that holds data about a number implementation.
@@ -14,7 +14,7 @@ public abstract class NumberImplementation {
     /**
      * The list of paths through which this implementation can be promoted.
      */
-    private Map<String, PromotionFunction> promotionPaths;
+    private Map<String, Function<NumberInterface, NumberInterface>> promotionPaths;
     /**
      * The implementation class for this implementation.
      */
@@ -41,7 +41,7 @@ public abstract class NumberImplementation {
      *
      * @return the map of documentation paths.
      */
-    public final Map<String, PromotionFunction> getPromotionPaths() {
+    public final Map<String, Function<NumberInterface, NumberInterface>> getPromotionPaths() {
         return promotionPaths;
     }
 

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

@@ -1,11 +1,6 @@
 package org.nwapw.abacus.plugin;
 
-import org.nwapw.abacus.function.Documentation;
+import org.nwapw.abacus.function.*;
-import org.nwapw.abacus.function.DocumentationType;
-import org.nwapw.abacus.function.interfaces.NumberFunction;
-import org.nwapw.abacus.function.interfaces.NumberOperator;
-import org.nwapw.abacus.function.interfaces.TreeValueFunction;
-import org.nwapw.abacus.function.interfaces.TreeValueOperator;
 import org.nwapw.abacus.number.NumberInterface;
 
 /**

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

@@ -1,12 +1,7 @@
 package org.nwapw.abacus.plugin;
 
 import org.nwapw.abacus.Abacus;
-import org.nwapw.abacus.function.Documentation;
+import org.nwapw.abacus.function.*;
-import org.nwapw.abacus.function.DocumentationType;
-import org.nwapw.abacus.function.interfaces.NumberFunction;
-import org.nwapw.abacus.function.interfaces.NumberOperator;
-import org.nwapw.abacus.function.interfaces.TreeValueFunction;
-import org.nwapw.abacus.function.interfaces.TreeValueOperator;
 import org.nwapw.abacus.number.NumberInterface;
 
 import java.lang.reflect.InvocationTargetException;

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

@@ -1,20 +1,12 @@
-package org.nwapw.abacus.plugin.standard;
+package org.nwapw.abacus.plugin;
 
-import org.jetbrains.annotations.NotNull;
 import org.nwapw.abacus.context.MutableEvaluationContext;
-import org.nwapw.abacus.context.PluginEvaluationContext;
+import org.nwapw.abacus.function.*;
-import org.nwapw.abacus.function.Documentation;
+import org.nwapw.abacus.number.NaiveNumber;
-import org.nwapw.abacus.function.DocumentationType;
-import org.nwapw.abacus.function.interfaces.NumberFunction;
-import org.nwapw.abacus.function.interfaces.NumberOperator;
-import org.nwapw.abacus.function.interfaces.TreeValueOperator;
 import org.nwapw.abacus.number.NumberInterface;
-import org.nwapw.abacus.number.standard.NaiveNumber;
+import org.nwapw.abacus.number.PreciseNumber;
-import org.nwapw.abacus.number.standard.PreciseNumber;
+import org.nwapw.abacus.tree.TreeNode;
-import org.nwapw.abacus.plugin.NumberImplementation;
+import org.nwapw.abacus.tree.VariableNode;
-import org.nwapw.abacus.plugin.Plugin;
-import org.nwapw.abacus.plugin.PluginManager;
-import org.nwapw.abacus.plugin.standard.operator.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,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.
      */
@@ -103,30 +161,107 @@ 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
      */
     public static final NumberFunction FUNCTION_ABS = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             return params[0].multiply(context.getInheritedNumberImplementation().instanceForString(Integer.toString(params[0].signum())));
         }
     };
@@ -135,12 +270,12 @@ public class StandardPlugin extends Plugin {
      */
     public static final NumberFunction FUNCTION_LN = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1 && params[0].compareTo(context.getInheritedNumberImplementation().instanceForString("0")) > 0;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             NumberImplementation implementation = context.getInheritedNumberImplementation();
             NumberInterface param = params[0];
             NumberInterface one = implementation.instanceForString("1");
@@ -168,12 +303,10 @@ public class StandardPlugin extends Plugin {
         /**
          * Returns the partial sum of the Taylor series for logx (around x=1).
          * Automatically determines the number of terms needed based on the precision of x.
-         *
-         * @param context
          * @param x value at which the series is evaluated. 0 < x < 2. (x=2 is convergent but impractical.)
          * @return the partial sum.
          */
-        private NumberInterface getLogPartialSum(PluginEvaluationContext context, NumberInterface x) {
+        private NumberInterface getLogPartialSum(MutableEvaluationContext context, NumberInterface x) {
             NumberImplementation implementation = context.getInheritedNumberImplementation();
             NumberInterface maxError = x.getMaxError();
             x = x.subtract(implementation.instanceForString("1")); //Terms used are for log(x+1).
@@ -218,30 +351,57 @@ public class StandardPlugin extends Plugin {
      */
     public static final NumberFunction FUNCTION_RAND_INT = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             return context.getInheritedNumberImplementation().instanceForString(Long.toString(Math.round(Math.random() * params[0].floor().intValue())));
         }
     };
     /**
      * 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.
      */
     public static final NumberFunction FUNCTION_SQRT = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             return OP_CARET.apply(context, params[0], context.getInheritedNumberImplementation().instanceForString(".5"));
         }
     };
@@ -251,12 +411,12 @@ public class StandardPlugin extends Plugin {
      */
     public static final NumberFunction FUNCTION_EXP = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             NumberImplementation implementation = context.getInheritedNumberImplementation();
             NumberInterface maxError = params[0].getMaxError();
             int n = 0;
@@ -289,12 +449,12 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionSin = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             NumberImplementation implementation = context.getInheritedNumberImplementation();
             NumberInterface pi = piFor(params[0].getClass());
             NumberInterface twoPi = pi.multiply(implementation.instanceForString("2"));
@@ -314,12 +474,12 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionCos = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             return functionSin.apply(context, piFor(params[0].getClass()).divide(context.getInheritedNumberImplementation().instanceForString("2"))
                     .subtract(params[0]));
         }
@@ -329,12 +489,12 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionTan = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             return functionSin.apply(context, params[0]).divide(functionCos.apply(context, params[0]));
         }
     };
@@ -343,12 +503,12 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionSec = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             return context.getInheritedNumberImplementation().instanceForString("1").divide(functionCos.apply(context, params[0]));
         }
     };
@@ -357,12 +517,12 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionCsc = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             return context.getInheritedNumberImplementation().instanceForString("1").divide(functionSin.apply(context, params[0]));
         }
     };
@@ -371,12 +531,12 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionCot = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             return functionCos.apply(context, params[0]).divide(functionSin.apply(context, params[0]));
         }
     };
@@ -386,13 +546,13 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionArcsin = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1
                     && FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) <= 0;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             NumberImplementation implementation = context.getInheritedNumberImplementation();
             if (FUNCTION_ABS.apply(context, params[0]).compareTo(implementation.instanceForString(".8")) >= 0) {
                 NumberInterface[] newParams = {FUNCTION_SQRT.apply(context, implementation.instanceForString("1").subtract(params[0].multiply(params[0])))};
@@ -420,12 +580,12 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionArccos = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1 && FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) <= 0;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             return piFor(params[0].getClass()).divide(context.getInheritedNumberImplementation().instanceForString("2"))
                     .subtract(functionArcsin.apply(context, params));
         }
@@ -436,12 +596,12 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionArccsc = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1 && FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) >= 0;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             NumberInterface[] reciprocalParamArr = {context.getInheritedNumberImplementation().instanceForString("1").divide(params[0])};
             return functionArcsin.apply(context, reciprocalParamArr);
         }
@@ -452,12 +612,12 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionArcsec = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1 && FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) >= 0;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             NumberInterface[] reciprocalParamArr = {context.getInheritedNumberImplementation().instanceForString("1").divide(params[0])};
             return functionArccos.apply(context, reciprocalParamArr);
         }
@@ -468,12 +628,12 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionArctan = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             NumberImplementation implementation = context.getInheritedNumberImplementation();
             if (params[0].signum() == -1) {
                 NumberInterface[] negatedParams = {params[0].negate()};
@@ -510,12 +670,12 @@ public class StandardPlugin extends Plugin {
      */
     public final NumberFunction functionArccot = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 1;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             return piFor(params[0].getClass()).divide(context.getInheritedNumberImplementation().instanceForString("2"))
                     .subtract(functionArctan.apply(context, params));
         }
@@ -554,7 +714,7 @@ public class StandardPlugin extends Plugin {
      * @param x where the series is evaluated.
      * @return the value of the series
      */
-    private static NumberInterface sinTaylor(PluginEvaluationContext context, NumberInterface x) {
+    private static NumberInterface sinTaylor(MutableEvaluationContext context, NumberInterface x) {
         NumberInterface power = x, multiplier = x.multiply(x).negate(), currentTerm, sum = x;
         NumberInterface maxError = x.getMaxError();
         int n = 1;
@@ -573,7 +733,7 @@ public class StandardPlugin extends Plugin {
      * @param phi an angle (in radians).
      * @return theta in [0, 2pi) that differs from phi by a multiple of 2pi.
      */
-    private static NumberInterface getSmallAngle(PluginEvaluationContext context, NumberInterface phi, NumberInterface pi) {
+    private static NumberInterface getSmallAngle(MutableEvaluationContext context, NumberInterface phi, NumberInterface pi) {
         NumberInterface twoPi = pi.multiply(context.getInheritedNumberImplementation().instanceForString("2"));
         NumberInterface theta = FUNCTION_ABS.apply(context, phi).subtract(twoPi
                 .multiply(FUNCTION_ABS.apply(context, phi).divide(twoPi).floor())); //Now theta is in [0, 2pi).
@@ -596,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/java/org/nwapw/abacus/tree/TokenType.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.parsing.standard;
+package org.nwapw.abacus.tree;
 
 /**
  * Enum to represent the type of the token that has been matched

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

@@ -1,15 +1,17 @@
 package org.nwapw.abacus
 
 import org.nwapw.abacus.config.Configuration
-import org.nwapw.abacus.context.EvaluationContext
 import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.number.promotion.PromotionManager
+import org.nwapw.abacus.context.EvaluationContext
+import org.nwapw.abacus.number.PromotionManager
+import org.nwapw.abacus.parsing.LexerTokenizer
+import org.nwapw.abacus.parsing.ShuntingYardParser
 import org.nwapw.abacus.parsing.TreeBuilder
-import org.nwapw.abacus.parsing.standard.LexerTokenizer
-import org.nwapw.abacus.parsing.standard.ShuntingYardParser
 import org.nwapw.abacus.plugin.PluginManager
-import org.nwapw.abacus.plugin.standard.StandardPlugin
+import org.nwapw.abacus.plugin.StandardPlugin
-import org.nwapw.abacus.tree.nodes.TreeNode
+import org.nwapw.abacus.tree.EvaluationResult
+import org.nwapw.abacus.tree.NumberReducer
+import org.nwapw.abacus.tree.TreeNode
 
 /**
  * Core class to handle all mathematics.
@@ -46,7 +48,7 @@ class Abacus(val configuration: Configuration) {
     /**
      * The hidden, mutable implementation of the context.
      */
-    private val mutableContext = MutableEvaluationContext(numberImplementation = StandardPlugin.IMPLEMENTATION_NAIVE, abacus = this)
+    private val mutableContext = MutableEvaluationContext(numberImplementation = StandardPlugin.IMPLEMENTATION_NAIVE)
     /**
      * The base context from which calculations are started.
      */
@@ -63,13 +65,13 @@ class Abacus(val configuration: Configuration) {
      * Reloads the Abacus core.
      */
     fun reload(){
-        with(mutableContext){
+        pluginManager.reload()
+        with(mutableContext) {
+            numberImplementation = pluginManager.numberImplementationFor(configuration.numberImplementation)
+                    ?: StandardPlugin.IMPLEMENTATION_NAIVE
             clearVariables()
             clearDefinitions()
         }
-        pluginManager.reload()
-        mutableContext.numberImplementation = pluginManager.numberImplementationFor(configuration.numberImplementation)
-                ?: StandardPlugin.IMPLEMENTATION_NAIVE
     }
     /**
      * Merges the current context with the provided one, updating
@@ -105,8 +107,9 @@ class Abacus(val configuration: Configuration) {
      * @return the evaluation result.
      */
     fun evaluateTreeWithContext(tree: TreeNode, context: MutableEvaluationContext): EvaluationResult {
-        val evaluationValue = tree.reduce(context)
+        val newReducer = NumberReducer(this, context)
-        return EvaluationResult(evaluationValue, context)
+        val evaluationValue = tree.reduce(newReducer)
+        return EvaluationResult(evaluationValue, newReducer.context)
     }
 
 }

core/src/main/kotlin/org/nwapw/abacus/context/EvaluationContext.kt

@@ -1,10 +1,9 @@
 package org.nwapw.abacus.context
 
-import org.nwapw.abacus.Abacus
 import org.nwapw.abacus.number.NumberInterface
 import org.nwapw.abacus.plugin.NumberImplementation
 import org.nwapw.abacus.tree.Reducer
-import org.nwapw.abacus.tree.nodes.TreeNode
+import org.nwapw.abacus.tree.TreeNode
 
 /**
  * A context for the reduction of a [org.nwapw.abacus.tree.TreeNode] into a number.
@@ -14,11 +13,11 @@ import org.nwapw.abacus.tree.nodes.TreeNode
  *
  * @property parent the parent of this context.
  * @property numberImplementation the implementation for numbers of this context.
- * @property abacus the abacus instance used by this reducer.
+ * @property reducer the reducer used by this context.
  */
-abstract class EvaluationContext(val parent: EvaluationContext? = null,
+open class EvaluationContext(val parent: EvaluationContext? = null,
-                                 open val numberImplementation: NumberImplementation? = null,
+                             open val numberImplementation: NumberImplementation? = null,
-                                 open val abacus: Abacus? = null): Reducer<NumberInterface> {
+                             open val reducer: Reducer<NumberInterface>? = null) {
 
     /**
      * The map of variables in this context.
@@ -48,10 +47,10 @@ abstract class EvaluationContext(val parent: EvaluationContext? = null,
             by ChainSearchDelegate { numberImplementation }
 
     /**
-     * The Abacus instance inherited from this context's parent.
+     * The reducer inherited from this context's parent.
      */
-    val inheritedAbacus: Abacus
+    val inheritedReducer: Reducer<NumberInterface>
-            by ChainSearchDelegate { abacus }
+            by ChainSearchDelegate { reducer }
 
     /**
      * The set of all variables in this context and its parents.

core/src/main/kotlin/org/nwapw/abacus/context/MutableEvaluationContext.kt

@@ -1,26 +1,23 @@
 package org.nwapw.abacus.context
 
-import org.nwapw.abacus.Abacus
-import org.nwapw.abacus.exception.NumberReducerException
-import org.nwapw.abacus.exception.ReductionException
 import org.nwapw.abacus.number.NumberInterface
 import org.nwapw.abacus.plugin.NumberImplementation
-import org.nwapw.abacus.tree.nodes.*
+import org.nwapw.abacus.tree.Reducer
+import org.nwapw.abacus.tree.TreeNode
 
 /**
  * A reduction context that is mutable.
- *
  * @param parent the parent of this context.
  * @param numberImplementation the number implementation used in this context.
- * @param abacus the abacus instance used.
+ * @param reducer the reducer used in this context
  */
 class MutableEvaluationContext(parent: EvaluationContext? = null,
                                numberImplementation: NumberImplementation? = null,
-                               abacus: Abacus? = null) :
+                               reducer: Reducer<NumberInterface>? = null) :
-        PluginEvaluationContext(parent, numberImplementation, abacus) {
+        EvaluationContext(parent, numberImplementation, reducer) {
 
     override var numberImplementation: NumberImplementation? = super.numberImplementation
-    override var abacus: Abacus? = super.abacus
+    override var reducer: Reducer<NumberInterface>? = super.reducer
 
     /**
      * Writes data stored in the [other] context over data stored in this one.
@@ -28,6 +25,7 @@ class MutableEvaluationContext(parent: EvaluationContext? = null,
      */
     fun apply(other: EvaluationContext) {
         if(other.numberImplementation != null) numberImplementation = other.numberImplementation
+        if(other.reducer != null) reducer = other.reducer
         for(name in other.variables) {
             setVariable(name, other.getVariable(name) ?: continue)
         }
@@ -36,56 +34,36 @@ class MutableEvaluationContext(parent: EvaluationContext? = null,
         }
     }
 
-    override fun reduceNode(treeNode: TreeNode, vararg children: Any): NumberInterface {
+    /**
-        val oldNumberImplementation = numberImplementation
+     * Sets a variable to a certain [value].
-        val abacus = inheritedAbacus
+     * @param name the name of the variable.
-        val promotionManager = abacus.promotionManager
+     * @param value the value of the variable.
-        val toReturn = when(treeNode){
+     */
-            is NumberNode -> {
+    fun setVariable(name: String, value: NumberInterface) {
-                inheritedNumberImplementation.instanceForString(treeNode.number)
+        variableMap[name] = value
-            }
+    }
-            is VariableNode -> {
+
-                val variable = getVariable(treeNode.variable)
+    /**
-                if(variable != null) return variable
+     * Set a definition to a certain [value].
-                val definition = getDefinition(treeNode.variable)
+     * @param name the name of the definition.
-                if(definition != null) return definition.reduce(this)
+     * @param value the value of the definition.
-                throw NumberReducerException("variable is not defined.")
+     */
-            }
+    fun setDefinition(name: String, value: TreeNode) {
-            is NumberUnaryNode -> {
+        definitionMap[name] = value
-                val child = children[0] as NumberInterface
+    }
-                numberImplementation = abacus.pluginManager.interfaceImplementationFor(child.javaClass)
+
-                abacus.pluginManager.operatorFor(treeNode.operation)
+    /**
-                        .apply(this, child)
+     * Clears the variables defined in this context.
-            }
+     */
-            is NumberBinaryNode -> {
+    fun clearVariables(){
-                val left = children[0] as NumberInterface
+        variableMap.clear()
-                val right = children[1] as NumberInterface
+    }
-                val promotionResult = promotionManager.promote(left, right)
+
-                numberImplementation = promotionResult.promotedTo
+    /**
-                abacus.pluginManager.operatorFor(treeNode.operation).apply(this, *promotionResult.items)
+     * Clears the definitions defined in this context.
-            }
+     */
-            is NumberFunctionNode -> {
+    fun clearDefinitions(){
-                val promotionResult = promotionManager
+        definitionMap.clear()
-                        .promote(*children.map { it as NumberInterface }.toTypedArray())
-                numberImplementation = promotionResult.promotedTo
-                abacus.pluginManager.functionFor(treeNode.callTo).apply(this, *promotionResult.items)
-            }
-            is TreeValueUnaryNode -> {
-                abacus.pluginManager.treeValueOperatorFor(treeNode.operation)
-                        .apply(this, treeNode.applyTo)
-            }
-            is TreeValueBinaryNode -> {
-                abacus.pluginManager.treeValueOperatorFor(treeNode.operation)
-                        .apply(this, treeNode.left, treeNode.right)
-            }
-            is TreeValueFunctionNode -> {
-                abacus.pluginManager.treeValueFunctionFor(treeNode.callTo)
-                        .apply(this, *treeNode.children.toTypedArray())
-            }
-            else -> throw ReductionException("unrecognized tree node.")
-        }
-        numberImplementation = oldNumberImplementation
-        return toReturn
     }
 
 }

core/src/main/kotlin/org/nwapw/abacus/context/PluginEvaluationContext.kt

@@ -1,58 +0,0 @@
-package org.nwapw.abacus.context
-
-import org.nwapw.abacus.Abacus
-import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.plugin.NumberImplementation
-import org.nwapw.abacus.tree.nodes.TreeNode
-
-/**
- * An evaluation context with limited mutability.
- *
- * An evaluation context that is mutable but in a limited way, that is, not allowing the modifications
- * of variables whose changes might cause issues outside of the function. An example of this would be
- * the modification of the [numberImplementation], which would cause code paths such as the parsing
- * of NumberNodes to produce a different type of number than if the function did not run, whcih is unacceptable.
- *
- * @param parent the parent of this context.
- * @param numberImplementation the number implementation used in this context.
- * @param abacus the abacus instance used.
- */
-abstract class PluginEvaluationContext(parent: EvaluationContext? = null,
-                                       numberImplementation: NumberImplementation? = null,
-                                       abacus: Abacus? = null) :
-        EvaluationContext(parent, numberImplementation, abacus) {
-
-    /**
-     * Sets a variable to a certain [value].
-     * @param name the name of the variable.
-     * @param value the value of the variable.
-     */
-    fun setVariable(name: String, value: NumberInterface) {
-        variableMap[name] = value
-    }
-
-    /**
-     * Set a definition to a certain [value].
-     * @param name the name of the definition.
-     * @param value the value of the definition.
-     */
-    fun setDefinition(name: String, value: TreeNode) {
-        definitionMap[name] = value
-    }
-
-    /**
-     * Clears the variables defined in this context.
-     */
-    fun clearVariables(){
-        variableMap.clear()
-    }
-
-    /**
-     * Clears the definitions defined in this context.
-     */
-    fun clearDefinitions(){
-        definitionMap.clear()
-    }
-
-
-}

core/src/main/kotlin/org/nwapw/abacus/function/NumberFunction.kt

@@ -1,6 +1,6 @@
-package org.nwapw.abacus.function.interfaces
+package org.nwapw.abacus.function
 
-import org.nwapw.abacus.function.Applicable
+import org.nwapw.abacus.function.applicable.Applicable
 import org.nwapw.abacus.number.NumberInterface
 
 /**

core/src/main/kotlin/org/nwapw/abacus/function/NumberOperator.kt

@@ -1,9 +1,6 @@
-package org.nwapw.abacus.function.interfaces
+package org.nwapw.abacus.function
 
-import org.nwapw.abacus.function.Applicable
+import org.nwapw.abacus.function.applicable.Applicable
-import org.nwapw.abacus.function.Operator
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface
 
 /**

core/src/main/kotlin/org/nwapw/abacus/function/TreeValueFunction.kt

@@ -1,8 +1,8 @@
-package org.nwapw.abacus.function.interfaces
+package org.nwapw.abacus.function
 
-import org.nwapw.abacus.function.Applicable
+import org.nwapw.abacus.function.applicable.Applicable
 import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.tree.nodes.TreeNode
+import org.nwapw.abacus.tree.TreeNode
 
 /**
  * A function that operates on trees.

core/src/main/kotlin/org/nwapw/abacus/function/TreeValueOperator.kt

@@ -1,11 +1,8 @@
-package org.nwapw.abacus.function.interfaces
+package org.nwapw.abacus.function
 
-import org.nwapw.abacus.function.Applicable
+import org.nwapw.abacus.function.applicable.Applicable
-import org.nwapw.abacus.function.Operator
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.tree.nodes.TreeNode
+import org.nwapw.abacus.tree.TreeNode
 
 /**
  * An operator that operates on trees.

core/src/main/kotlin/org/nwapw/abacus/function/applicable/Applicable.kt

@@ -1,7 +1,6 @@
-package org.nwapw.abacus.function
+package org.nwapw.abacus.function.applicable
 
 import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.context.PluginEvaluationContext
 import org.nwapw.abacus.exception.DomainException
 
 /**
@@ -19,7 +18,7 @@ interface Applicable<in T : Any, out O : Any> {
      * @param params the parameter array to verify for compatibility.
      * @return whether the array can be used with applyInternal.
      */
-    fun matchesParams(context: PluginEvaluationContext, params: Array<out T>): Boolean
+    fun matchesParams(context: MutableEvaluationContext, params: Array<out T>): Boolean
 
     /**
      * Applies the applicable object to the given parameters,
@@ -27,7 +26,7 @@ interface Applicable<in T : Any, out O : Any> {
      * @param params the parameters to apply to.
      * @return the result of the application.
      */
-    fun applyInternal(context: PluginEvaluationContext, params: Array<out T>): O
+    fun applyInternal(context: MutableEvaluationContext, params: Array<out T>): O
 
     /**
      * If the parameters can be used with this applicable, returns
@@ -36,7 +35,7 @@ interface Applicable<in T : Any, out O : Any> {
      * @param params the parameters to apply to.
      * @return the result of the operation, or null if parameters do not match.
      */
-    fun apply(context: PluginEvaluationContext, vararg params: T): O {
+    fun apply(context: MutableEvaluationContext, vararg params: T): O {
         if (!matchesParams(context, params))
             throw DomainException("parameters do not match function requirements.")
         return applyInternal(context, params)

core/src/main/kotlin/org/nwapw/abacus/number/NumberRange.kt

@@ -1,7 +1,6 @@
-package org.nwapw.abacus.number.range
+package org.nwapw.abacus.number
 
 import org.nwapw.abacus.Abacus
-import org.nwapw.abacus.number.NumberInterface
 
 /**
  * A closed range designed specifically for [NumberInterface]

core/src/main/kotlin/org/nwapw/abacus/number/NumberRangeBuilder.kt

@@ -1,7 +1,6 @@
-package org.nwapw.abacus.number.range
+package org.nwapw.abacus.number
 
 import org.nwapw.abacus.Abacus
-import org.nwapw.abacus.number.NumberInterface
 
 /**
  * A utility class for creating [NumberRange] instances.

core/src/main/kotlin/org/nwapw/abacus/number/NumberUtils.kt

@@ -1,8 +1,7 @@
 @file:JvmName("NumberUtils")
-package org.nwapw.abacus.number.promotion
+package org.nwapw.abacus.number
-
-import org.nwapw.abacus.number.NumberInterface
 
+typealias PromotionFunction = java.util.function.Function<NumberInterface, NumberInterface>
 typealias PromotionPath = List<PromotionFunction>
 typealias NumberClass = Class<NumberInterface>
 
@@ -13,5 +12,5 @@ typealias NumberClass = Class<NumberInterface>
  * @param from the number to start from.
  */
 fun PromotionPath.promote(from: NumberInterface): NumberInterface {
-    return fold(from, { current, function -> function.promote(current) })
+    return fold(from, { current, function -> function.apply(current) })
 }

core/src/main/kotlin/org/nwapw/abacus/number/PromotionManager.kt

@@ -1,11 +1,11 @@
-package org.nwapw.abacus.number.promotion
+package org.nwapw.abacus.number
 
 import org.nwapw.abacus.Abacus
 import org.nwapw.abacus.exception.PromotionException
-import org.nwapw.abacus.number.NumberInterface
 import org.nwapw.abacus.plugin.NumberImplementation
 import org.nwapw.abacus.plugin.PluginListener
 import org.nwapw.abacus.plugin.PluginManager
+import java.util.function.Function
 
 /**
  * A class that handles promotions based on priority and the
@@ -31,11 +31,7 @@ class PromotionManager(val abacus: Abacus) : PluginListener {
         val fromName = abacus.pluginManager.interfaceImplementationNameFor(from.implementation)
         val toName = abacus.pluginManager.interfaceImplementationNameFor(to.implementation)
 
-        if(fromName == toName) return listOf(object : PromotionFunction {
+        if(fromName == toName) return listOf(Function { it })
-            override fun promote(number: NumberInterface): NumberInterface {
-                return number
-            }
-        })
 
         if(from.promotionPaths.containsKey(toName))
             return listOf(from.promotionPaths[toName] ?: return null)
@@ -55,7 +51,7 @@ class PromotionManager(val abacus: Abacus) : PluginListener {
         val implementations = numbers.map { pluginManager.interfaceImplementationFor(it.javaClass) }
         val highestPriority = implementations.sortedBy { it.priority }.last()
         return PromotionResult(items = numbers.map {
-            if (it.javaClass == highestPriority.implementation) it
+            if(it.javaClass == highestPriority.implementation) it
             else computePaths[pluginManager.interfaceImplementationFor(it.javaClass) to highestPriority]
                     ?.promote(it) ?: throw PromotionException()
         }.toTypedArray(), promotedTo = highestPriority)

core/src/main/kotlin/org/nwapw/abacus/number/PromotionResult.kt

@@ -1,6 +1,5 @@
-package org.nwapw.abacus.number.promotion
+package org.nwapw.abacus.number
 
-import org.nwapw.abacus.number.NumberInterface
 import org.nwapw.abacus.plugin.NumberImplementation
 
 /**

core/src/main/kotlin/org/nwapw/abacus/number/promotion/PromotionFunction.kt

@@ -1,20 +0,0 @@
-package org.nwapw.abacus.number.promotion
-
-import org.nwapw.abacus.number.NumberInterface
-
-/**
- * Function that is used to promote a number from one type to another.
- *
- * A promotion function is used in the promotion system as a mean to
- * actually "travel" down the promotion path.
- */
-interface PromotionFunction {
-
-    /**
-     * Promotes the given [number] into another type.
-     * @param number the number to promote from.
-     * @return the new number with the same value.
-     */
-    fun promote(number: NumberInterface): NumberInterface
-
-}

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.nodes.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.PluginEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.interfaces.NumberOperator
-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, 1) {
-
-    override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2
-    override fun applyInternal(context: PluginEvaluationContext, 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.PluginEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.interfaces.NumberOperator
-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, 3) {
-
-    override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2
-                    && !(params[0].signum() == 0 && params[1].signum() == 0)
-                    && !(params[0].signum() == -1 && !params[1].isInteger())
-
-    override fun applyInternal(context: PluginEvaluationContext, 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].isInteger()
-                && 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.PluginEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.interfaces.TreeValueOperator
-import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.tree.nodes.TreeNode
-import org.nwapw.abacus.tree.nodes.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: PluginEvaluationContext, params: Array<out TreeNode>) =
-            params.size == 2 && params[0] is VariableNode
-
-    override fun applyInternal(context: PluginEvaluationContext, params: Array<out TreeNode>): NumberInterface {
-        val assignTo = (params[0] as VariableNode).variable
-        context.setDefinition(assignTo, params[1])
-        return params[1].reduce(context)
-    }
-
-}

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.PluginEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.interfaces.NumberOperator
-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, 2) {
-
-    override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2
-    override fun applyInternal(context: PluginEvaluationContext, 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.PluginEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.interfaces.NumberOperator
-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: PluginEvaluationContext, params: Array<out NumberInterface>) =
-        params.size == 1
-                && params[0].isInteger()
-                && params[0].signum() >= 0
-
-    override fun applyInternal(context: PluginEvaluationContext, 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.PluginEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.interfaces.NumberOperator
-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, 2) {
-
-    override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2
-    override fun applyInternal(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
-            params[0] * params[1]
-
-}

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

@@ -1,26 +0,0 @@
-package org.nwapw.abacus.plugin.standard.operator
-
-import org.nwapw.abacus.context.PluginEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.interfaces.NumberOperator
-import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.plugin.standard.StandardPlugin.OP_FACTORIAL
-import org.nwapw.abacus.plugin.standard.StandardPlugin.OP_NPR
-
-/**
- * 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, 1) {
-
-    override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2 && params[0].isInteger()
-                    && params[1].isInteger()
-
-    override fun applyInternal(context: PluginEvaluationContext, 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.PluginEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.interfaces.NumberOperator
-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, 1) {
-
-    override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 1
-
-    override fun applyInternal(context: PluginEvaluationContext, 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.PluginEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.interfaces.NumberOperator
-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, 1) {
-
-    override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2 && params[0].isInteger()
-                    && params[1].isInteger()
-
-    override fun applyInternal(context: PluginEvaluationContext, 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.PluginEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.interfaces.TreeValueOperator
-import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.tree.nodes.TreeNode
-import org.nwapw.abacus.tree.nodes.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: PluginEvaluationContext, params: Array<out TreeNode>) =
-            params.size == 2 && params[0] is VariableNode
-
-    override fun applyInternal(context: PluginEvaluationContext, params: Array<out TreeNode>): NumberInterface {
-        val assignTo = (params[0] as VariableNode).variable
-        val value = params[1].reduce(context)
-        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.PluginEvaluationContext
-import org.nwapw.abacus.function.OperatorAssociativity
-import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.interfaces.NumberOperator
-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, 1) {
-
-    override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
-            params.size == 2
-    override fun applyInternal(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
-            params[0] - params[1]
-
-}

core/src/main/kotlin/org/nwapw/abacus/tree/BinaryNode.kt

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
 
 /**
  * A tree node that holds a binary operation.

core/src/main/kotlin/org/nwapw/abacus/tree/CallNode.kt

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
 
 /**
  * Represents a more generic function call.

core/src/main/kotlin/org/nwapw/abacus/tree/EvaluationResult.kt

@@ -1,4 +1,4 @@
-package org.nwapw.abacus
+package org.nwapw.abacus.tree
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.number.NumberInterface

core/src/main/kotlin/org/nwapw/abacus/tree/FunctionNode.kt

@@ -1,6 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
-
-import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that holds a function call.
@@ -10,7 +8,7 @@ import org.nwapw.abacus.tree.Reducer
  *
  * @param function the function string.
  */
-class NumberFunctionNode(function: String, children: List<TreeNode>) : CallNode(function, children) {
+class FunctionNode(function: String, children: List<TreeNode>) : CallNode(function, children) {
 
     override fun <T : Any> reduce(reducer: Reducer<T>): T {
         val children = Array<Any>(children.size, { children[it].reduce(reducer) })

core/src/main/kotlin/org/nwapw/abacus/tree/NumberBinaryNode.kt

@@ -1,6 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
-
-import org.nwapw.abacus.tree.Reducer
 
 /**
  * A binary operator node that reduces its children.

core/src/main/kotlin/org/nwapw/abacus/tree/NumberNode.kt

@@ -1,6 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
-
-import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that holds a single number value.

core/src/main/kotlin/org/nwapw/abacus/tree/NumberReducer.kt

@@ -0,0 +1,65 @@
+package org.nwapw.abacus.tree
+
+import org.nwapw.abacus.Abacus
+import org.nwapw.abacus.context.EvaluationContext
+import org.nwapw.abacus.exception.NumberReducerException
+import org.nwapw.abacus.exception.ReductionException
+import org.nwapw.abacus.number.NumberInterface
+
+class NumberReducer(val abacus: Abacus, context: EvaluationContext) : Reducer<NumberInterface> {
+
+    val context = context.mutableSubInstance()
+
+    init {
+        this.context.reducer = this
+    }
+
+    override fun reduceNode(treeNode: TreeNode, vararg children: Any): NumberInterface {
+        val promotionManager = abacus.promotionManager
+        return when(treeNode){
+            is NumberNode -> {
+                context.inheritedNumberImplementation.instanceForString(treeNode.number)
+            }
+            is VariableNode -> {
+                val variable = context.getVariable(treeNode.variable)
+                if(variable != null) return variable
+                val definition = context.getDefinition(treeNode.variable)
+                if(definition != null) return definition.reduce(this)
+                throw NumberReducerException("variable is not defined.")
+            }
+            is NumberUnaryNode -> {
+                val child = children[0] as NumberInterface
+                context.numberImplementation = abacus.pluginManager.interfaceImplementationFor(child.javaClass)
+                abacus.pluginManager.operatorFor(treeNode.operation)
+                        .apply(context, child)
+            }
+            is NumberBinaryNode -> {
+                val left = children[0] as NumberInterface
+                val right = children[1] as NumberInterface
+                val promotionResult = promotionManager.promote(left, right)
+                context.numberImplementation = promotionResult.promotedTo
+                abacus.pluginManager.operatorFor(treeNode.operation).apply(context, *promotionResult.items)
+            }
+            is FunctionNode -> {
+                val promotionResult = promotionManager
+                        .promote(*children.map { it as NumberInterface }.toTypedArray())
+                context.numberImplementation = promotionResult.promotedTo
+                abacus.pluginManager.functionFor(treeNode.callTo).apply(context, *promotionResult.items)
+            }
+            is TreeValueUnaryNode -> {
+                abacus.pluginManager.treeValueOperatorFor(treeNode.operation)
+                        .apply(context, treeNode.applyTo)
+            }
+            is TreeValueBinaryNode -> {
+                abacus.pluginManager.treeValueOperatorFor(treeNode.operation)
+                        .apply(context, treeNode.left, treeNode.right)
+            }
+            is TreeValueFunctionNode -> {
+                abacus.pluginManager.treeValueFunctionFor(treeNode.callTo)
+                        .apply(context, *treeNode.children.toTypedArray())
+            }
+            else -> throw ReductionException("unrecognized tree node.")
+        }
+    }
+
+}

core/src/main/kotlin/org/nwapw/abacus/tree/NumberUnaryNode.kt

@@ -1,6 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
-
-import org.nwapw.abacus.tree.Reducer
 
 /**
  * A unary operator node that reduces its children.

core/src/main/kotlin/org/nwapw/abacus/tree/Reducer.kt

@@ -1,7 +1,5 @@
 package org.nwapw.abacus.tree
 
-import org.nwapw.abacus.tree.nodes.TreeNode
-
 /**
  * Reducer interface that takes a tree and returns a single value.
  *

core/src/main/kotlin/org/nwapw/abacus/tree/TreeNode.kt

@@ -1,6 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
-
-import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node.

core/src/main/kotlin/org/nwapw/abacus/tree/TreeValueBinaryNode.kt

@@ -1,6 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
-
-import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that represents a binary tree value operator.

core/src/main/kotlin/org/nwapw/abacus/tree/TreeValueFunctionNode.kt

@@ -1,6 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
-
-import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that represents a tree value function call.

core/src/main/kotlin/org/nwapw/abacus/tree/TreeValueUnaryNode.kt

@@ -1,6 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
-
-import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that represents a unary tree value operator.

core/src/main/kotlin/org/nwapw/abacus/tree/UnaryNode.kt

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
 
 /**
  * A tree node that holds a unary operation.

core/src/main/kotlin/org/nwapw/abacus/tree/VariableNode.kt

@@ -1,6 +1,4 @@
-package org.nwapw.abacus.tree.nodes
+package org.nwapw.abacus.tree
-
-import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that holds a placeholder variable.

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

@@ -7,8 +7,8 @@ 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.nodes.TreeNode;
+import org.nwapw.abacus.tree.TreeNode;
 
 public class CalculationTests {
 

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

@@ -3,7 +3,7 @@ package org.nwapw.abacus.tests;
 import org.junit.Assert;
 import org.junit.Test;
 import org.nwapw.abacus.lexing.Lexer;
-import org.nwapw.abacus.lexing.Match;
+import org.nwapw.abacus.lexing.pattern.Match;
 
 import java.util.List;
 

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

@@ -5,17 +5,19 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.config.Configuration;
-import org.nwapw.abacus.number.promotion.PromotionFunction;
+import org.nwapw.abacus.number.NaiveNumber;
-import org.nwapw.abacus.number.range.NumberRange;
+import org.nwapw.abacus.number.NumberInterface;
-import org.nwapw.abacus.number.standard.NaiveNumber;
+import org.nwapw.abacus.number.NumberRange;
-import org.nwapw.abacus.number.standard.PreciseNumber;
+import org.nwapw.abacus.number.PreciseNumber;
-import org.nwapw.abacus.plugin.standard.StandardPlugin;
+import org.nwapw.abacus.plugin.StandardPlugin;
+
+import java.util.function.Function;
 
 public class RangeTests {
 
     private static Abacus abacus = new Abacus(new Configuration( "precise", new String[]{}));
-    private static PromotionFunction naivePromotion = i -> new NaiveNumber((i.toString()));
+    private static Function<NumberInterface, NumberInterface> naivePromotion = i -> new NaiveNumber((i.toString()));
-    private static PromotionFunction precisePromotion = i -> new PreciseNumber((i.toString()));
+    private static Function<NumberInterface, NumberInterface> precisePromotion = i -> new PreciseNumber((i.toString()));
 
     @BeforeClass
     public static void prepareTests() {

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

@@ -1,22 +1,17 @@
 package org.nwapw.abacus.tests;
 
-import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.config.Configuration;
 import org.nwapw.abacus.context.MutableEvaluationContext;
-import org.nwapw.abacus.context.PluginEvaluationContext;
+import org.nwapw.abacus.function.*;
-import org.nwapw.abacus.function.OperatorAssociativity;
+import org.nwapw.abacus.lexing.pattern.Match;
-import org.nwapw.abacus.function.OperatorType;
-import org.nwapw.abacus.function.interfaces.NumberFunction;
-import org.nwapw.abacus.function.interfaces.NumberOperator;
-import org.nwapw.abacus.lexing.Match;
 import org.nwapw.abacus.number.NumberInterface;
-import org.nwapw.abacus.parsing.standard.LexerTokenizer;
+import org.nwapw.abacus.parsing.LexerTokenizer;
-import org.nwapw.abacus.parsing.standard.TokenType;
 import org.nwapw.abacus.plugin.Plugin;
+import org.nwapw.abacus.tree.TokenType;
 
 import java.util.List;
 
@@ -26,12 +21,12 @@ public class TokenizerTests {
     private static LexerTokenizer lexerTokenizer = new LexerTokenizer();
     private static NumberFunction subtractFunction = new NumberFunction() {
         @Override
-        public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+        public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
             return params.length == 2;
         }
 
         @Override
-        public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+        public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
             return params[0].subtract(params[1]);
         }
     };
@@ -42,12 +37,12 @@ public class TokenizerTests {
                     0) {
 
                 @Override
-                public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+                public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
                     return true;
                 }
 
-                @Override
+                                @Override
-                public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+                public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
                     return subtractFunction.apply(context, params);
                 }
             });
@@ -55,12 +50,12 @@ public class TokenizerTests {
                     0) {
 
                 @Override
-                public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
+                public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
                     return true;
                 }
 
-                @Override
+                                @Override
-                public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
+                public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
                     return subtractFunction.apply(context, params);
                 }
             });

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/AbacusApplication.java

@@ -26,7 +26,7 @@ public class AbacusApplication extends Application {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/abacus.fxml"));
         Parent parent = loader.load();
         controller = loader.getController();
-        Scene mainScene = new Scene(parent, 420, 520);
+        Scene mainScene = new Scene(parent, 320, 480);
         primaryStage.setScene(mainScene);
         primaryStage.setTitle("Abacus");
         primaryStage.show();

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

@@ -8,7 +8,6 @@ import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.CheckBoxListCell;
 import javafx.scene.text.Text;
-import javafx.stage.FileChooser;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
 import org.nwapw.abacus.Abacus;
@@ -17,19 +16,17 @@ import org.nwapw.abacus.exception.AbacusException;
 import org.nwapw.abacus.function.Documentation;
 import org.nwapw.abacus.function.DocumentationType;
 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.EvaluationResult;
+import org.nwapw.abacus.tree.EvaluationResult;
-import org.nwapw.abacus.tree.nodes.TreeNode;
+import org.nwapw.abacus.tree.TreeNode;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.Scanner;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -73,7 +70,6 @@ public class AbacusController implements PluginListener {
      * Constant string that is displayed if the calculations are interrupted by an exception.
      */
     private static final String ERR_EXCEPTION = "Exception Thrown";
-    private static final String ERR_DEFINITION = "Definition Error";
     @FXML
     private TabPane coreTabPane;
     @FXML
@@ -108,8 +104,6 @@ public class AbacusController implements PluginListener {
     private ListView<Documentation> functionListView;
     @FXML
     private TextField functionListSearchField;
-    @FXML
-    private ListView<String> definitionFilesView;
 
     /**
      * The list of history entries, created by the users.
@@ -135,10 +129,6 @@ public class AbacusController implements PluginListener {
      * The filtered list displayed to the user.
      */
     private FilteredList<Documentation> functionFilter;
-    /**
-     * The list of definition files to be loaded.
-     */
-    private ObservableList<String> definitionFiles;
 
     /**
      * The abacus instance used for changing the plugin configuration.
@@ -262,9 +252,6 @@ public class AbacusController implements PluginListener {
             if (oldValue.equals(settingsTab)) alertIfApplyNeeded(true);
         });
 
-        definitionFiles = FXCollections.observableArrayList();
-        definitionFilesView.setItems(definitionFiles);
-
         abacus = new Abacus(new ExtendedConfiguration(CONFIG_FILE));
         PluginManager abacusPluginManager = abacus.getPluginManager();
         abacusPluginManager.addListener(this);
@@ -318,25 +305,6 @@ public class AbacusController implements PluginListener {
         reloadAlertShown = false;
     }
 
-    private void loadDefinitionFile(String fileName){
-        File definitionFile = new File(fileName);
-        if(!definitionFile.exists()) return;
-        try {
-            FileReader fileReader = new FileReader(definitionFile);
-            Scanner scanner = new Scanner(fileReader);
-            while(scanner.hasNext()){
-                EvaluationResult result = abacus.evaluateTree(abacus.parseString(scanner.nextLine()));
-                abacus.applyToContext(result.getResultingContext());
-            }
-        } catch (AbacusException abacusError) {
-            outputText.setText(ERR_DEFINITION + " (" + abacusError.getMessage() + ")");
-            abacusError.printStackTrace();
-        } catch (RuntimeException runtime) {
-            outputText.setText(ERR_DEFINITION + " (" + ERR_EXCEPTION + ")");
-            runtime.printStackTrace();
-        } catch (FileNotFoundException ignored) {}
-    }
-
     @FXML
     public void performScan() {
         PluginManager abacusPluginManager = abacus.getPluginManager();
@@ -347,62 +315,34 @@ public class AbacusController implements PluginListener {
         } catch (IOException | ClassNotFoundException e) {
             e.printStackTrace();
         }
-        reloadAbacus();
+        abacus.reload();
     }
 
     @FXML
     public void performReload() {
         alertIfApplyNeeded(true);
-        reloadAbacus();
+        abacus.reload();
     }
 
     @FXML
     public void performSave() {
-        ExtendedConfiguration configuration = (ExtendedConfiguration) abacus.getConfiguration();
+        Configuration configuration = abacus.getConfiguration();
         configuration.setNumberImplementation(numberImplementationBox.getSelectionModel().getSelectedItem());
         Set<String> disabledPlugins = configuration.getDisabledPlugins();
         disabledPlugins.clear();
         for (ToggleablePlugin pluginEntry : enabledPlugins) {
             if (!pluginEntry.isEnabled()) disabledPlugins.add(pluginEntry.getClassName());
         }
-        Set<String> abacusDefinitionFiles = configuration.getDefinitionFiles();
-        abacusDefinitionFiles.clear();
-        abacusDefinitionFiles.addAll(definitionFiles);
         if (computationLimitField.getText().matches("\\d*(\\.\\d+)?") && computationLimitField.getText().length() != 0)
-            configuration.setComputationDelay(Double.parseDouble(computationLimitField.getText()));
+            ((ExtendedConfiguration) configuration).setComputationDelay(Double.parseDouble(computationLimitField.getText()));
-        configuration.saveTo(CONFIG_FILE);
+        ((ExtendedConfiguration) configuration).saveTo(CONFIG_FILE);
         changesMade = false;
         reloadAlertShown = false;
     }
 
-    @FXML
-    public void performAddDefinitionFile(){
-        FileChooser fileChooser = new FileChooser();
-        fileChooser.setTitle("Add definition file");
-        File selectedFile = fileChooser.showOpenDialog(null);
-        if(selectedFile == null) return;
-        String absolutePath = selectedFile.getAbsolutePath();
-        if(!definitionFiles.contains(absolutePath)) definitionFiles.add(absolutePath);
-        changesMade = true;
-    }
-
-    @FXML
-    public void performRemoveDefinitionFile(){
-        String selectedItem = definitionFilesView.getSelectionModel().getSelectedItem();
-        if(selectedItem != null) definitionFiles.remove(selectedItem);
-        changesMade = true;
-    }
-
-    private void reloadAbacus(){
-        abacus.reload();
-        for(String file : definitionFiles){
-            loadDefinitionFile(file);
-        }
-    }
-
     @Override
     public void onLoad(PluginManager manager) {
-        ExtendedConfiguration configuration = (ExtendedConfiguration) abacus.getConfiguration();
+        Configuration configuration = abacus.getConfiguration();
         Set<String> disabledPlugins = configuration.getDisabledPlugins();
         numberImplementationOptions.addAll(abacus.getPluginManager().getAllNumberImplementations());
         String actualImplementation = configuration.getNumberImplementation();
@@ -420,15 +360,11 @@ public class AbacusController implements PluginListener {
             if(documentationInstance == null)
                 documentationInstance = new Documentation(name, "", "", "", DocumentationType.FUNCTION);
             return documentationInstance;
-        }).collect(Collectors.toCollection(ArrayList::new)));
+        })
-        functionList.addAll(manager.getAllTreeValueFunctions().stream().map(name -> {
+                .collect(Collectors.toCollection(ArrayList::new)));
-            Documentation documentationInstance = pluginManager.documentationFor(name, DocumentationType.TREE_VALUE_FUNCTION);
+        functionList.addAll(manager.getAllTreeValueFunctions().stream().map(name -> pluginManager.documentationFor(name, DocumentationType.TREE_VALUE_FUNCTION))
-            if(documentationInstance == null)
+                .collect(Collectors.toCollection(ArrayList::new)));
-                documentationInstance = new Documentation(name, "", "", "", DocumentationType.TREE_VALUE_FUNCTION);
-            return documentationInstance;
-        }).collect(Collectors.toCollection(ArrayList::new)));
         functionList.sort(Comparator.comparing(Documentation::getCodeName));
-        definitionFiles.addAll(configuration.getDefinitionFiles());
     }
 
     @Override
@@ -436,7 +372,6 @@ public class AbacusController implements PluginListener {
         functionList.clear();
         enabledPlugins.clear();
         numberImplementationOptions.clear();
-        definitionFiles.clear();
     }
 
 }

fx/src/main/kotlin/org/nwapw/abacus/fx/ExtendedConfiguration.kt

@@ -17,9 +17,8 @@ import java.io.File
  * @param disabledPlugins the list of plugins that should be disabled, same as [Configuration.disabledPlugins]
  */
 class ExtendedConfiguration(var computationDelay: Double = 0.0,
-                            definitionFiles: Array<String> = emptyArray(),
+                     implementation: String = "<default>",
-                            implementation: String = "<default>",
+                     disabledPlugins: Array<String> = emptyArray())
-                            disabledPlugins: Array<String> = emptyArray())
     : Configuration(implementation, disabledPlugins) {
 
     companion object {
@@ -28,7 +27,6 @@ class ExtendedConfiguration(var computationDelay: Double = 0.0,
          */
         val DEFAULT_TOML_STRING = """
             computationDelay=0.0
-            definitionFiles=[]
             implementation="naive"
             disabledPlugins=[]
             """
@@ -42,11 +40,6 @@ class ExtendedConfiguration(var computationDelay: Double = 0.0,
         val DEFAULT_TOML_WRITER = TomlWriter()
     }
 
-    /**
-     * The set of files that definitions should be loaded from.
-     */
-    val definitionFiles: MutableSet<String> = mutableSetOf(*definitionFiles)
-
     /**
      * Constructs a new configuration from a file on disk.
      * @param tomlFile the file from disk to load.
@@ -66,8 +59,6 @@ class ExtendedConfiguration(var computationDelay: Double = 0.0,
         numberImplementation = config.numberImplementation
         disabledPlugins.clear()
         disabledPlugins.addAll(config.disabledPlugins)
-        definitionFiles.clear()
-        definitionFiles.addAll(config.definitionFiles)
     }
 
     /**

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())
+    }
+
+}

fx/src/main/resources/abacus.fxml

@@ -47,33 +47,17 @@
                     </padding>
                     <Label text="Number Implementation" GridPane.columnIndex="0" GridPane.rowIndex="0"/>
                     <ComboBox fx:id="numberImplementationBox" GridPane.columnIndex="1" GridPane.rowIndex="0"/>
-
-                    <Label text="Plugins:" GridPane.columnIndex="0" GridPane.rowIndex="1"/>
                     <ListView fx:id="enabledPluginView"
-                              GridPane.rowIndex="2" GridPane.columnIndex="0"
+                              GridPane.rowIndex="1" GridPane.columnIndex="0"
                               GridPane.columnSpan="2" maxHeight="100"/>
-
+                    <Text GridPane.columnIndex="0" GridPane.rowIndex="2" text="Computation Limit"/>
-                    <Label GridPane.columnIndex="0" GridPane.rowIndex="3" text="Computation Limit"/>
+                    <TextField fx:id="computationLimitField" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-                    <TextField fx:id="computationLimitField" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
+                    <FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="3" hgap="10"
-
-                    <Label text="Definition Files:" GridPane.columnIndex="0" GridPane.rowIndex="4"/>
-                    <ListView fx:id="definitionFilesView"
-                              GridPane.columnIndex="0" GridPane.columnSpan="2"
-                              GridPane.rowIndex="5" maxHeight="100"/>
-                    <FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="6" hgap="10"
                               vgap="10">
-                        <Button text="Add" onAction="#performAddDefinitionFile"/>
+                        <Button text="Save" onAction="#performSave"/>
-                        <Button text="Remove" onAction="#performRemoveDefinitionFile"/>
+                        <Button text="Reload Plugins" onAction="#performReload"/>
-                    </FlowPane>
+                        <Button text="Apply and Reload" onAction="#performSaveAndReload"/>
-
+                        <Button text="Scan Plugins" onAction="#performScan"/>
-                    <Separator GridPane.rowIndex="7"/>
-
-                    <FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="8" hgap="10"
-                              vgap="10">
-                        <Button text="Save Settings" onAction="#performSave"/>
-                        <Button text="Reload Plugins And Definitions" onAction="#performReload"/>
-                        <Button text="Save and Reload" onAction="#performSaveAndReload"/>
-                        <Button text="Reload Plugins From Disk" onAction="#performScan"/>
                     </FlowPane>
                 </GridPane>
             </Tab>