Write a RationalNumber class.

build.gradle

@@ -1,13 +1,22 @@
-subprojects {
+plugins {
+    id 'java'
+    id 'application'
+    id 'org.jetbrains.kotlin.jvm' version '1.1.3'
+}
+apply plugin: 'java'
+apply plugin: 'application'
 
-    apply plugin: 'java'
+repositories {
-
+  mavenCentral()
-    repositories {
-      mavenCentral()
-    }
-
-    dependencies {
-        compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.3"
-    }
 }
 
+dependencies {
+    compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
+    compile 'com.moandjiezana.toml:toml4j:0.7.1'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8"
+    testCompile 'junit:junit:4.12'
+}
+
+// Define the main class for the application
+mainClassName = 'org.nwapw.abacus.Abacus'
+

core/build.gradle

@@ -1,8 +0,0 @@
-plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.1.3'
-}
-
-dependencies {
-    compile 'com.moandjiezana.toml:toml4j:0.7.1'
-    testCompile 'junit:junit:4.12'
-}

core/src/main/java/org/nwapw/abacus/function/DocumentationType.java

@@ -1,7 +0,0 @@
-package org.nwapw.abacus.function;
-
-public enum DocumentationType {
-
-    FUNCTION
-
-}

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

@@ -1,26 +0,0 @@
-package org.nwapw.abacus.function
-
-/**
- * A data class used for storing information about a function.
- *
- * The Documentation class holds the information necessary to display the information
- * about a function to the user.
- *
- * @param codeName the name of the function as it occurs in code.
- * @param name the name of the function in English.
- * @param description the short description of this function.
- * @param longDescription the full description of this function.
- * @param type the things this documentation maps to.
- */
-data class Documentation(val codeName: String, val name: String,
-                         val description: String, val longDescription: String,
-                         val type: DocumentationType) {
-
-    fun matches(other: String): Boolean {
-        return codeName.toLowerCase().contains(other.toLowerCase()) ||
-                name.toLowerCase().contains(other.toLowerCase()) ||
-                description.toLowerCase().contains(other.toLowerCase()) ||
-                longDescription.toLowerCase().contains(other.toLowerCase())
-    }
-
-}

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

@@ -1,19 +0,0 @@
-package org.nwapw.abacus.tree
-
-/**
- * Reducer interface that takes a tree and returns a single value.
- *
- * The reducer walks the tree, visiting the children first, converting them into
- * a value, and then attempts to reduce the parent. Eventually, the single final value is returned.
- */
-interface Reducer <out T> {
-
-    /**
-     * Reduces the given tree node, given its already reduced children.
-     *
-     * @param treeNode the tree node to reduce.
-     * @param children the list of children, of type T.
-     */
-    fun reduceNode(treeNode: TreeNode, vararg children: Any) : T?
-
-}

fx/build.gradle

@@ -1,10 +0,0 @@
-plugins {
-  id 'org.jetbrains.kotlin.jvm' version '1.1.3'
-}
-apply plugin: 'application'
-
-dependencies {
-  compile project(':core')
-}
-
-mainClassName = 'org.nwapw.abacus.fx.AbacusApplication'

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

@@ -1,59 +0,0 @@
-package org.nwapw.abacus.fx;
-
-import javafx.scene.control.Label;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.TitledPane;
-import javafx.scene.layout.VBox;
-import org.nwapw.abacus.function.Documentation;
-
-public class DocumentationCell extends ListCell<Documentation> {
-
-    private Label codeNameLabel;
-    private Label nameLabel;
-    private Label description;
-    private Label longDescription;
-    private TitledPane titledPane;
-
-    public DocumentationCell(){
-        VBox vbox = new VBox();
-        vbox.setSpacing(10);
-        titledPane = new TitledPane();
-        codeNameLabel = new Label();
-        nameLabel = new Label();
-        description = new Label();
-        longDescription = new Label();
-        codeNameLabel.setWrapText(true);
-        nameLabel.setWrapText(true);
-        description.setWrapText(true);
-        longDescription.setWrapText(true);
-        vbox.getChildren().add(codeNameLabel);
-        vbox.getChildren().add(nameLabel);
-        vbox.getChildren().add(description);
-        vbox.getChildren().add(longDescription);
-        titledPane.textProperty().bindBidirectional(codeNameLabel.textProperty());
-        titledPane.setContent(vbox);
-        titledPane.setExpanded(false);
-        titledPane.prefWidthProperty().bind(widthProperty().subtract(32));
-
-        visibleProperty().addListener((a, b, c) -> titledPane.setExpanded(false));
-    }
-
-    @Override
-    protected void updateItem(Documentation item, boolean empty) {
-        super.updateItem(item, empty);
-        if(empty){
-            codeNameLabel.setText("");
-            nameLabel.setText("");
-            description.setText("");
-            longDescription.setText("");
-            setGraphic(null);
-        } else {
-            codeNameLabel.setText(item.getCodeName());
-            nameLabel.setText(item.getName());
-            description.setText(item.getDescription());
-            longDescription.setText(item.getLongDescription());
-            setGraphic(titledPane);
-        }
-        titledPane.setExpanded(false);
-    }
-}

settings.gradle

@@ -1,2 +1 @@
 rootProject.name = 'abacus'
-include 'core', 'fx'

src/main/java/org/nwapw/abacus/Abacus.java

@@ -1,6 +1,7 @@
 package org.nwapw.abacus;
 
 import org.nwapw.abacus.config.Configuration;
+import org.nwapw.abacus.fx.AbacusApplication;
 import org.nwapw.abacus.number.NumberInterface;
 import org.nwapw.abacus.parsing.LexerTokenizer;
 import org.nwapw.abacus.parsing.ShuntingYardParser;
@@ -60,6 +61,10 @@ public class Abacus {
         pluginManager.addListener(lexerTokenizer);
     }
 
+    public static void main(String[] args) {
+        AbacusApplication.launch(AbacusApplication.class, args);
+    }
+
     /**
      * Gets the current tree builder.
      *

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

@@ -33,9 +33,4 @@ public class AbacusApplication extends Application {
         super.stop();
         controller.performStop();
     }
-
-    public static void main(String[] args){
-        launch(args);
-    }
-
 }

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

@@ -7,7 +7,6 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.fxml.FXML;
-import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.CheckBoxListCell;
 import javafx.scene.text.Text;
@@ -15,8 +14,6 @@ import javafx.util.Callback;
 import javafx.util.StringConverter;
 import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.config.Configuration;
-import org.nwapw.abacus.function.Documentation;
-import org.nwapw.abacus.function.DocumentationType;
 import org.nwapw.abacus.number.ComputationInterruptedException;
 import org.nwapw.abacus.number.NumberInterface;
 import org.nwapw.abacus.plugin.ClassFinder;
@@ -27,10 +24,7 @@ import org.nwapw.abacus.tree.TreeNode;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 
 /**
@@ -103,7 +97,7 @@ public class AbacusController implements PluginListener {
     @FXML
     private TextField computationLimitField;
     @FXML
-    private ListView<Documentation> functionListView;
+    private ListView<String> functionListView;
     @FXML
     private TextField functionListSearchField;
 
@@ -126,11 +120,11 @@ public class AbacusController implements PluginListener {
     /**
      * The list of functions that are registered in the calculator.
      */
-    private ObservableList<Documentation> functionList;
+    private ObservableList<String> functionList;
     /**
      * The filtered list displayed to the user.
      */
-    private FilteredList<Documentation> functionFilter;
+    private FilteredList<String> functionFilter;
 
     /**
      * The abacus instance used for changing the plugin configuration.
@@ -233,12 +227,12 @@ public class AbacusController implements PluginListener {
                         return new ToggleablePlugin(string, true);
                     }
                 });
+
         functionList = FXCollections.observableArrayList();
         functionFilter = new FilteredList<>(functionList, (s) -> true);
         functionListView.setItems(functionFilter);
         functionListSearchField.textProperty().addListener((observable, oldValue, newValue) ->
-                functionFilter.setPredicate((newValue.length() == 0) ? ((s) -> true) : ((s) -> s.matches(newValue))));
+                functionFilter.setPredicate((newValue.length() == 0) ? ((s) -> true) : ((s) -> s.contains(newValue))));
-        functionListView.setCellFactory(param -> new DocumentationCell());
         historyData = FXCollections.observableArrayList();
         historyTable.setItems(historyData);
         numberImplementationOptions = FXCollections.observableArrayList();
@@ -261,7 +255,13 @@ public class AbacusController implements PluginListener {
         abacus = new Abacus(new Configuration(CONFIG_FILE));
         PluginManager abacusPluginManager = abacus.getPluginManager();
         abacusPluginManager.addListener(this);
-        performScan();
+        abacusPluginManager.addInstantiated(new StandardPlugin(abacus.getPluginManager()));
+        try {
+            ClassFinder.loadJars("plugins").forEach(abacusPluginManager::addClass);
+        } catch (IOException | ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        abacusPluginManager.reload();
 
         computationLimitField.setText(Double.toString(abacus.getConfiguration().getComputationDelay()));
         computationLimitField.textProperty().addListener((observable, oldValue, newValue) -> {
@@ -311,19 +311,6 @@ public class AbacusController implements PluginListener {
         reloadAlertShown = false;
     }
 
-    @FXML
-    public void performScan(){
-        PluginManager abacusPluginManager = abacus.getPluginManager();
-        abacusPluginManager.removeAll();
-        abacusPluginManager.addInstantiated(new StandardPlugin(abacus.getPluginManager()));
-        try {
-            ClassFinder.loadJars("plugins").forEach(abacusPluginManager::addClass);
-        } catch (IOException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-        abacusPluginManager.reload();
-    }
-
     @FXML
     public void performReload() {
         alertIfApplyNeeded(true);
@@ -360,10 +347,8 @@ public class AbacusController implements PluginListener {
             plugin.getEnabledProperty().addListener(e -> changesMade = true);
             enabledPlugins.add(plugin);
         }
-        PluginManager pluginManager = abacus.getPluginManager();
+        functionList.addAll(manager.getAllFunctions());
-        functionList.addAll(manager.getAllFunctions().stream().map(name -> pluginManager.documentationFor(name, DocumentationType.FUNCTION))
+        functionList.sort(String::compareTo);
-                .collect(Collectors.toCollection(ArrayList::new)));
-        functionList.sort(Comparator.comparing(Documentation::getCodeName));
     }
 
     @Override

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

@@ -240,7 +240,6 @@ public abstract class NumberInterface {
      * @param toClass the class to promote to.
      * @return the resulting new instance.
      */
-    @Deprecated
     protected abstract NumberInterface promoteToInternal(Class<? extends NumberInterface> toClass);
 
     /**
@@ -251,7 +250,6 @@ public abstract class NumberInterface {
      * @param toClass the class to promote to.
      * @return the resulting new instance.
      */
-    @Deprecated
     public final NumberInterface promoteTo(Class<? extends NumberInterface> toClass) {
         checkInterrupted();
         return promoteToInternal(toClass);

src/main/java/org/nwapw/abacus/number/PreciseNumber.java

@@ -1,6 +1,7 @@
 package org.nwapw.abacus.number;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.math.MathContext;
 
 /**
@@ -61,6 +62,15 @@ public class PreciseNumber extends NumberInterface {
         this.value = value;
     }
 
+    /**
+     * Constructs a precise number from the given BigInteger.
+     *
+     * @param value a BigInteger object representing the value of the number.
+     */
+    public PreciseNumber(BigInteger value) {
+        this.value = new BigDecimal(value);
+    }
+
     @Override
     public int getMaxPrecision() {
         return internalContext.getPrecision();

src/main/java/org/nwapw/abacus/number/RationalNumber.java

@@ -0,0 +1,115 @@
+package org.nwapw.abacus.number;
+
+import org.apache.commons.math3.fraction.BigFraction;
+import org.apache.commons.math3.fraction.Fraction;
+
+import java.math.BigInteger;
+
+public class RationalNumber extends NumberInterface{
+
+    static final RationalNumber ONE = new RationalNumber(BigFraction.ONE);
+
+    /**
+     * The value of the number.
+     */
+    private BigFraction value;
+
+    /**
+     * Constructs a new instance with the given value.
+     * @param value
+     */
+    public RationalNumber(BigFraction value){
+        this.value = value;
+    }
+
+    @Override
+    public int getMaxPrecision() {
+        return 0;
+    }
+
+    @Override
+    protected NumberInterface multiplyInternal(NumberInterface multiplier) {
+        return new RationalNumber(value.multiply(((RationalNumber)multiplier).value));
+    }
+
+    @Override
+    protected NumberInterface divideInternal(NumberInterface divisor) {
+        return new RationalNumber(value.divide(((RationalNumber)divisor).value));
+    }
+
+    @Override
+    protected NumberInterface addInternal(NumberInterface summand) {
+        return new RationalNumber(value.add(((RationalNumber)summand).value));
+    }
+
+    @Override
+    protected NumberInterface subtractInternal(NumberInterface subtrahend) {
+        return new RationalNumber(value.subtract(((RationalNumber)subtrahend).value));
+    }
+
+    @Override
+    protected NumberInterface negateInternal() {
+        return new RationalNumber(value.negate());
+    }
+
+    @Override
+    protected NumberInterface intPowInternal(int exponent) {
+        return new RationalNumber(value.pow(exponent));
+    }
+
+    @Override
+    public int compareTo(NumberInterface number) {
+        return value.compareTo(((RationalNumber)number).value);
+    }
+
+    @Override
+    public int signum() {
+        return value.getNumerator().signum();
+    }
+
+    @Override
+    protected NumberInterface ceilingInternal() {
+        if(value.getNumeratorAsInt() != 1){
+            return floorInternal().add(ONE);
+        }
+        return this;
+    }
+
+    @Override
+    protected NumberInterface floorInternal() {
+        BigInteger floor = value.bigDecimalValue().toBigInteger();
+        if(value.compareTo(BigFraction.ZERO) < 0 && value.getDenominatorAsInt() != 1){
+            floor = floor.subtract(BigInteger.ONE);
+        }
+        return new RationalNumber(new BigFraction(floor));
+    }
+
+    @Override
+    protected NumberInterface fractionalPartInternal() {
+        return this.subtractInternal(floorInternal());
+    }
+
+    @Override
+    public int intValue() {
+        return 0;
+    }
+
+    @Override
+    protected NumberInterface promoteToInternal(Class<? extends NumberInterface> toClass) {
+        return null;
+    }
+
+    @Override
+    public NumberInterface getMaxError() {
+        return toPreciseNumber().getMaxError();
+    }
+
+    @Override
+    public String toString(){
+        return toPreciseNumber().toString();
+    }
+
+    PreciseNumber toPreciseNumber(){
+        return (PreciseNumber) new PreciseNumber(value.getNumerator()).divideInternal(new PreciseNumber(value.getDenominator()));
+    }
+}

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

@@ -14,7 +14,7 @@ public abstract class NumberImplementation {
     /**
      * The list of paths through which this implementation can be promoted.
      */
-    private Map<Class<? extends NumberInterface>, Function<NumberInterface, NumberInterface>> promotionPaths;
+    protected Map<Class<? extends NumberInterface>, Function<NumberInterface, NumberInterface>> promotionPaths;
     /**
      * The implementation class for this implementation.
      */

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

@@ -1,7 +1,5 @@
 package org.nwapw.abacus.plugin;
 
-import org.nwapw.abacus.function.Documentation;
-import org.nwapw.abacus.function.DocumentationType;
 import org.nwapw.abacus.function.Function;
 import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.number.NumberInterface;
@@ -96,15 +94,6 @@ public abstract class Plugin {
         manager.registerNumberImplementation(name, implementation);
     }
 
-    /**
-     * To be used in load(). Registers a documentation instance
-     * used to explain some element of the plugin to the user.
-     * @param documentation the documentation instance.
-     */
-    protected final void registerDocumentation(Documentation documentation){
-        manager.registerDocumentation(documentation);
-    }
-
     /**
      * Searches the PluginManager for the given function name.
      * This can be used by the plugins internally in order to call functions
@@ -141,17 +130,6 @@ public abstract class Plugin {
         return manager.numberImplementationFor(name);
     }
 
-    /**
-     * Searches the PluginManager for the given documentation name and type.
-     *
-     * @param name the name for which to search.
-     * @param type the type of documentation to search for.
-     * @return the found documentation, or null if none was found.
-     */
-    protected final Documentation documentationFor(String name, DocumentationType type){
-        return manager.documentationFor(name, type);
-    }
-
     /**
      * Searches the plugin manager for a Pi value for the given number implementation.
      * This is done so that number implementations with various degrees of precision

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

@@ -1,8 +1,6 @@
 package org.nwapw.abacus.plugin;
 
 import org.nwapw.abacus.Abacus;
-import org.nwapw.abacus.function.Documentation;
-import org.nwapw.abacus.function.DocumentationType;
 import org.nwapw.abacus.function.Function;
 import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.number.NumberInterface;
@@ -36,10 +34,6 @@ public class PluginManager {
      * The map of number implementations registered by the plugins.
      */
     private Map<String, NumberImplementation> registeredNumberImplementations;
-    /**
-     * The map of documentation for functions registered by the plugins.
-     */
-    private Set<Documentation> registeredDocumentation;
     /**
      * The list of number implementations that have been
      * found by their implementation class.
@@ -71,7 +65,6 @@ public class PluginManager {
         registeredFunctions = new HashMap<>();
         registeredOperators = new HashMap<>();
         registeredNumberImplementations = new HashMap<>();
-        registeredDocumentation = new HashSet<>();
         cachedInterfaceImplementations = new HashMap<>();
         cachedPi = new HashMap<>();
         listeners = new HashSet<>();
@@ -104,15 +97,6 @@ public class PluginManager {
         registeredNumberImplementations.put(name, implementation);
     }
 
-    /**
-     * Registers the given documentation with the plugin manager,
-     * making it accessible to the plugin manager etc.
-     * @param documentation the documentation to register.
-     */
-    public void registerDocumentation(Documentation documentation){
-        registeredDocumentation.add(documentation);
-    }
-
     /**
      * Gets the function registered under the given name.
      * @param name the name of the function.
@@ -140,27 +124,6 @@ public class PluginManager {
         return registeredNumberImplementations.get(name);
     }
 
-    /**
-     * Gets the documentation for the given entity of the given type.
-     * @param name the name of the entity to search for.
-     * @param type the type that this entity is, to filter out similarly named documentation.
-     * @return the documentation object.
-     */
-    public Documentation documentationFor(String name, DocumentationType type){
-        Documentation toReturn = null;
-        for(Documentation entry : registeredDocumentation){
-            if(entry.getCodeName().equals(name) && entry.getType() == type) {
-                toReturn = entry;
-                break;
-            }
-        }
-        if(toReturn == null){
-            toReturn = new Documentation(name, "", "", "", type);
-            registerDocumentation(toReturn);
-        }
-        return toReturn;
-    }
-
     /**
      * Gets the number implementation for the given implementation class.
      *
@@ -224,24 +187,6 @@ public class PluginManager {
         }
     }
 
-    /**
-     * Removes the plugin with the given class from the manager.
-     * @param toRemove the plugin to remove.
-     */
-    public void removeClass(Class<? extends Plugin> toRemove){
-        if(!loadedPluginClasses.contains(toRemove)) return;
-        plugins.removeIf(plugin -> plugin.getClass() == toRemove);
-        loadedPluginClasses.remove(toRemove);
-    }
-
-    /**
-     * Removes all plugins from this plugin manager.
-     */
-    public void removeAll(){
-        loadedPluginClasses.clear();
-        plugins.clear();
-    }
-
     /**
      * Loads all the plugins in the PluginManager.
      */
@@ -267,7 +212,6 @@ public class PluginManager {
         registeredFunctions.clear();
         registeredOperators.clear();
         registeredNumberImplementations.clear();
-        registeredDocumentation.clear();
         cachedInterfaceImplementations.clear();
         cachedPi.clear();
         listeners.forEach(e -> e.onUnload(this));

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

@@ -1,19 +1,15 @@
 package org.nwapw.abacus.plugin;
 
-import org.nwapw.abacus.function.*;
+import org.nwapw.abacus.function.Function;
-import org.nwapw.abacus.lexing.pattern.Match;
+import org.nwapw.abacus.function.Operator;
+import org.nwapw.abacus.function.OperatorAssociativity;
+import org.nwapw.abacus.function.OperatorType;
 import org.nwapw.abacus.number.NaiveNumber;
 import org.nwapw.abacus.number.NumberInterface;
 import org.nwapw.abacus.number.PreciseNumber;
-import org.nwapw.abacus.parsing.Parser;
-import org.nwapw.abacus.parsing.ShuntingYardParser;
-import org.nwapw.abacus.tree.TokenType;
-import org.nwapw.abacus.tree.TreeNode;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.function.BiFunction;
 
 /**
@@ -98,7 +94,7 @@ public class StandardPlugin extends Plugin {
     public static final Operator OP_DIVIDE = new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1, new Function() {
         @Override
         protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 2 && params[1].compareTo(fromInt(params[0].getClass(), 0)) != 0;
+            return params.length == 2 && params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[1].getClass())) != 0;
         }
 
         @Override
@@ -114,7 +110,7 @@ public class StandardPlugin extends Plugin {
         @Override
         protected boolean matchesParams(NumberInterface[] params) {
             return params.length == 1
-                    && params[0].fractionalPart().compareTo(fromInt(params[0].getClass(), 0)) == 0
+                    && params[0].fractionalPart().compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0
                     && params[0].signum() >= 0;
         }
 
@@ -123,11 +119,10 @@ public class StandardPlugin extends Plugin {
             if (params[0].signum() == 0) {
                 return fromInt(params[0].getClass(), 1);
             }
-            NumberInterface one = fromInt(params[0].getClass(), 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) {
+            while ((multiplier = multiplier.subtract(NaiveNumber.ONE.promoteTo(multiplier.getClass()))).signum() == 1) {
                 factorial = factorial.multiply(multiplier);
             }
             return factorial;
@@ -138,51 +133,6 @@ public class StandardPlugin extends Plugin {
                 }*/
         }
     });
-    /**
-     * The permutation operator.
-     */
-    public static final Operator OP_NPR = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0, new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 2 && params[0].fractionalPart().signum() == 0
-                    && params[1].fractionalPart().signum() == 0;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            if(params[0].compareTo(params[1]) < 0 ||
-                    params[0].signum() < 0 ||
-                    (params[0].signum() == 0 && params[1].signum() != 0)) return fromInt(params[0].getClass(), 0);
-            NumberInterface total = fromInt(params[0].getClass(), 1);
-            NumberInterface multiplyBy = params[0];
-            NumberInterface remainingMultiplications = params[1];
-            NumberInterface halfway = params[0].divide(fromInt(params[0].getClass(), 2));
-            if(remainingMultiplications.compareTo(halfway) > 0){
-                remainingMultiplications = params[0].subtract(remainingMultiplications);
-            }
-            while(remainingMultiplications.signum() > 0){
-                total = total.multiply(multiplyBy);
-                remainingMultiplications = remainingMultiplications.subtract(fromInt(params[0].getClass(), 1));
-                multiplyBy = multiplyBy.subtract(fromInt(params[0].getClass(), 1));
-            }
-            return total;
-        }
-    });
-    /**
-     * The combination operator.
-     */
-    public static final Operator OP_NCR = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0, new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 2 && params[0].fractionalPart().signum() == 0
-                    && params[1].fractionalPart().signum() == 0;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return OP_NPR.getFunction().apply(params).divide(OP_FACTORIAL.getFunction().apply(params[1]));
-        }
-    });
     /**
      * The absolute value function, abs(-3) = 3
      */
@@ -194,7 +144,7 @@ public class StandardPlugin extends Plugin {
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
-            return params[0].multiply(fromInt(params[0].getClass(), params[0].signum()));
+            return params[0].multiply((new NaiveNumber(params[0].signum())).promoteTo(params[0].getClass()));
         }
     };
     /**
@@ -203,32 +153,31 @@ public class StandardPlugin extends Plugin {
     public static final Function FUNCTION_LN = new Function() {
         @Override
         protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1 && params[0].compareTo(fromInt(params[0].getClass(), 0)) > 0;
+            return params.length == 1 && params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) > 0;
         }
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
             NumberInterface param = params[0];
-            NumberInterface one = fromInt(param.getClass(), 1);
             int powersOf2 = 0;
-            while (FUNCTION_ABS.apply(param.subtract(one)).compareTo(new NaiveNumber(0.1).promoteTo(param.getClass())) >= 0) {
+            while (FUNCTION_ABS.apply(param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))).compareTo(new NaiveNumber(0.1).promoteTo(param.getClass())) >= 0) {
-                if (param.subtract(one).signum() == 1) {
+                if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() == 1) {
                     param = param.divide(fromInt(param.getClass(), 2));
                     powersOf2++;
-                    if (param.subtract(one).signum() != 1) {
+                    if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() != 1) {
                         break;
                         //No infinite loop for you.
                     }
                 } else {
                     param = param.multiply(fromInt(param.getClass(), 2));
                     powersOf2--;
-                    if (param.subtract(one).signum() != -1) {
+                    if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() != -1) {
                         break;
                         //No infinite loop for you.
                     }
                 }
             }
-            return getLog2(param).multiply(fromInt(param.getClass(), powersOf2)).add(getLogPartialSum(param));
+            return getLog2(param).multiply((new NaiveNumber(powersOf2)).promoteTo(param.getClass())).add(getLogPartialSum(param));
         }
 
         /**
@@ -240,13 +189,13 @@ public class StandardPlugin extends Plugin {
         private NumberInterface getLogPartialSum(NumberInterface x) {
 
             NumberInterface maxError = x.getMaxError();
-            x = x.subtract(fromInt(x.getClass(), 1)); //Terms used are for log(x+1).
+            x = x.subtract(NaiveNumber.ONE.promoteTo(x.getClass())); //Terms used are for log(x+1).
             NumberInterface currentNumerator = x, currentTerm = x, sum = x;
             int n = 1;
             while (FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0) {
                 n++;
                 currentNumerator = currentNumerator.multiply(x).negate();
-                currentTerm = currentNumerator.divide(fromInt(x.getClass(), n));
+                currentTerm = currentNumerator.divide(new NaiveNumber(n).promoteTo(x.getClass()));
                 sum = sum.add(currentTerm);
             }
             return sum;
@@ -264,14 +213,13 @@ public class StandardPlugin extends Plugin {
             //In the following, a=1/3^n, b=1/4^n, c = 1/n.
             //a is also an error bound.
             NumberInterface a = fromInt(number.getClass(), 1), b = a, c = a;
-            NumberInterface sum = fromInt(number.getClass(), 0);
+            NumberInterface sum = NaiveNumber.ZERO.promoteTo(number.getClass());
-            NumberInterface one = fromInt(number.getClass(), 1);
             int n = 0;
             while (a.compareTo(maxError) >= 1) {
                 n++;
                 a = a.divide(fromInt(number.getClass(), 3));
                 b = b.divide(fromInt(number.getClass(), 4));
-                c = one.divide(fromInt(number.getClass(), n));
+                c = NaiveNumber.ONE.promoteTo(number.getClass()).divide((new NaiveNumber(n)).promoteTo(number.getClass()));
                 sum = sum.add(a.add(b).multiply(c));
             }
             return sum;
@@ -291,20 +239,6 @@ public class StandardPlugin extends Plugin {
             return OP_CARET.getFunction().apply(params[0], ((new NaiveNumber(0.5)).promoteTo(params[0].getClass())));
         }
     };
-    /**
-     * Gets a random number smaller or equal to the given number's integer value.
-     */
-    public static final Function FUNCTION_RAND_INT = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return fromInt(params[0].getClass(), (int) Math.round(Math.random() * params[0].floor().intValue()));
-        }
-    };
     /**
      * The implementation for double-based naive numbers.
      */
@@ -344,10 +278,10 @@ public class StandardPlugin extends Plugin {
                     .negate();
             for (int i = 0; i < termsNeeded; i++) {
                 M = M
-                        .multiply(new PreciseNumber((12 * i + 2) + ""))
+                        .multiply(new NaiveNumber(12 * i + 2).promoteTo(PreciseNumber.class))
-                        .multiply(new PreciseNumber((12 * i + 6) + ""))
+                        .multiply(new NaiveNumber(12 * i + 6).promoteTo(PreciseNumber.class))
-                        .multiply(new PreciseNumber((12 * i + 10) + ""))
+                        .multiply(new NaiveNumber(12 * i + 10).promoteTo(PreciseNumber.class))
-                        .divide(new PreciseNumber(Math.pow(i + 1, 3) + ""));
+                        .divide(new NaiveNumber(Math.pow(i + 1, 3)).promoteTo(PreciseNumber.class));
                 L = L.add(lSummand);
                 X = X.multiply(xMultiplier);
                 sum = sum.add(M.multiply(L).divide(X));
@@ -375,7 +309,7 @@ public class StandardPlugin extends Plugin {
             } else {
                 //We need n such that x^(n+1) * 3^ceil(x) <= maxError * (n+1)!.
                 //right and left refer to lhs and rhs in the above inequality.
-                NumberInterface sum = fromInt(params[0].getClass(), 1);
+                NumberInterface sum = NaiveNumber.ONE.promoteTo(params[0].getClass());
                 NumberInterface nextNumerator = params[0];
                 NumberInterface left = params[0].multiply(fromInt(params[0].getClass(), 3).intPow(params[0].ceiling().intValue())), right = maxError;
                 do {
@@ -383,7 +317,7 @@ public class StandardPlugin extends Plugin {
                     n++;
                     nextNumerator = nextNumerator.multiply(params[0]);
                     left = left.multiply(params[0]);
-                    NumberInterface nextN = fromInt(params[0].getClass(), n + 1);
+                    NumberInterface nextN = (new NaiveNumber(n + 1)).promoteTo(params[0].getClass());
                     right = right.multiply(nextN);
                     //System.out.println(left + ", " + right);
                 }
@@ -399,20 +333,18 @@ public class StandardPlugin extends Plugin {
     public static final Operator OP_CARET = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2, new Function() {
         @Override
         protected boolean matchesParams(NumberInterface[] params) {
-            NumberInterface zero = fromInt(params[0].getClass(), 0);
             return params.length == 2
-                    && !(params[0].compareTo(zero) == 0
+                    && !(params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0
-                    && params[1].compareTo(zero) == 0)
+                    && params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[1].getClass())) == 0)
-                    && !(params[0].signum() == -1 && params[1].fractionalPart().compareTo(zero) != 0);
+                    && !(params[0].signum() == -1 && params[1].fractionalPart().compareTo(NaiveNumber.ZERO.promoteTo(params[1].getClass())) != 0);
         }
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
-            NumberInterface zero = fromInt(params[0].getClass(), 0);
+            if (params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0)
-            if (params[0].compareTo(zero) == 0)
+                return NaiveNumber.ZERO.promoteTo(params[0].getClass());
-                return zero;
+            else if (params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0)
-            else if (params[1].compareTo(zero) == 0)
+                return NaiveNumber.ONE.promoteTo(params[1].getClass());
-                return fromInt(params[0].getClass(), 1);
             //Detect integer bases:
             if(params[0].fractionalPart().compareTo(fromInt(params[0].getClass(), 0)) == 0
                     && FUNCTION_ABS.apply(params[1]).compareTo(fromInt(params[0].getClass(), Integer.MAX_VALUE)) < 0
@@ -487,7 +419,7 @@ public class StandardPlugin extends Plugin {
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
-            return fromInt(params[0].getClass(), 1).divide(functionCos.apply(params[0]));
+            return NaiveNumber.ONE.promoteTo(params[0].getClass()).divide(functionCos.apply(params[0]));
         }
     };
     /**
@@ -501,7 +433,7 @@ public class StandardPlugin extends Plugin {
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
-            return fromInt(params[0].getClass(), 1).divide(functionSin.apply(params[0]));
+            return NaiveNumber.ONE.promoteTo(params[0].getClass()).divide(functionSin.apply(params[0]));
         }
     };
     /**
@@ -519,144 +451,6 @@ public class StandardPlugin extends Plugin {
         }
     };
 
-    /**
-     * The arcsine function (return type in radians).
-     */
-    public final Function functionArcsin = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1
-                    && FUNCTION_ABS.apply(params[0]).compareTo(fromInt(params[0].getClass(), 1)) <= 0;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            if(FUNCTION_ABS.apply(params[0]).compareTo(new NaiveNumber(0.8).promoteTo(params[0].getClass())) >= 0){
-                NumberInterface[] newParams = {FUNCTION_SQRT.apply(fromInt(params[0].getClass(), 1).subtract(params[0].multiply(params[0])))};
-                return piFor(params[0].getClass()).divide(fromInt(params[0].getClass(), 2))
-                        .subtract(applyInternal(newParams)).multiply(fromInt(params[0].getClass(), params[0].signum()));
-            }
-            NumberInterface currentTerm = params[0], sum = currentTerm,
-                    multiplier = currentTerm.multiply(currentTerm), summandBound = sum.getMaxError().multiply(fromInt(sum.getClass(), 1).subtract(multiplier)),
-                    power = currentTerm, coefficient = fromInt(params[0].getClass(), 1);
-            int exponent = 1;
-            while(FUNCTION_ABS.apply(currentTerm).compareTo(summandBound) > 0){
-                exponent += 2;
-                power = power.multiply(multiplier);
-                coefficient = coefficient.multiply(fromInt(params[0].getClass(), exponent-2))
-                        .divide(fromInt(params[0].getClass(), exponent - 1));
-                currentTerm = power.multiply(coefficient).divide(fromInt(power.getClass(), exponent));
-                sum = sum.add(currentTerm);
-            }
-            return sum;
-        }
-    };
-
-    /**
-     * The arccosine function.
-     */
-    public final Function functionArccos = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1 && FUNCTION_ABS.apply(params[0]).compareTo(fromInt(params[0].getClass(), 1)) <= 0;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return piFor(params[0].getClass()).divide(fromInt(params[0].getClass(), 2))
-                    .subtract(functionArcsin.apply(params));
-        }
-    };
-
-    /**
-     * The arccosecant function.
-     */
-    public final Function functionArccsc = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1 && FUNCTION_ABS.apply(params[0]).compareTo(fromInt(params[0].getClass(), 1)) >= 0;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            NumberInterface[] reciprocalParamArr = {fromInt(params[0].getClass(), 1).divide(params[0])};
-            return functionArcsin.apply(reciprocalParamArr);
-        }
-    };
-
-    /**
-     * The arcsecant function.
-     */
-    public final Function functionArcsec = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1 && FUNCTION_ABS.apply(params[0]).compareTo(fromInt(params[0].getClass(), 1)) >= 0;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            NumberInterface[] reciprocalParamArr = {fromInt(params[0].getClass(), 1).divide(params[0])};
-            return functionArccos.apply(reciprocalParamArr);
-        }
-    };
-
-    /**
-     * The arctangent function.
-     */
-    public final Function functionArctan = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            if(params[0].signum() == -1){
-                NumberInterface[] negatedParams = {params[0].negate()};
-                return applyInternal(negatedParams).negate();
-            }
-            if(params[0].compareTo(fromInt(params[0].getClass(), 1)) > 0){
-                NumberInterface[] reciprocalParams = {fromInt(params[0].getClass(), 1).divide(params[0])};
-                return piFor(params[0].getClass()).divide(fromInt(params[0].getClass(), 2))
-                        .subtract(applyInternal(reciprocalParams));
-            }
-            if(params[0].compareTo(fromInt(params[0].getClass(), 1)) == 0){
-                return piFor(params[0].getClass()).divide(fromInt(params[0].getClass(), 4));
-            }
-            if(params[0].compareTo(new NaiveNumber(0.9).promoteTo(params[0].getClass())) >= 0){
-                NumberInterface[] newParams = {params[0].multiply(fromInt(params[0].getClass(),2 ))
-                .divide(fromInt(params[0].getClass(), 1).subtract(params[0].multiply(params[0])))};
-                return applyInternal(newParams).divide(fromInt(params[0].getClass(), 2));
-            }
-            NumberInterface currentPower = params[0], currentTerm = currentPower, sum = currentTerm,
-                    maxError = params[0].getMaxError(), multiplier = currentPower.multiply(currentPower).negate();
-            int n = 1;
-            while(FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0){
-                n += 2;
-                currentPower = currentPower.multiply(multiplier);
-                currentTerm = currentPower.divide(fromInt(currentPower.getClass(), n));
-                sum = sum.add(currentTerm);
-            }
-            return sum;
-        }
-    };
-
-    /**
-     * The arccotangent function. Range: (0, pi).
-     */
-    public final Function functionArccot = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return piFor(params[0].getClass()).divide(fromInt(params[0].getClass(), 2))
-                    .subtract(functionArctan.apply(params));
-        }
-    };
-
     public StandardPlugin(PluginManager manager) {
         super(manager);
     }
@@ -670,7 +464,7 @@ public class StandardPlugin extends Plugin {
      * @return the value of the partial sum that has the same class as x.
      */
     private static NumberInterface sumSeries(NumberInterface x, BiFunction<Integer, NumberInterface, NumberInterface> nthTermFunction, int n) {
-        NumberInterface sum = fromInt(x.getClass(), 0);
+        NumberInterface sum = NaiveNumber.ZERO.promoteTo(x.getClass());
         for (int i = 0; i <= n; i++) {
             sum = sum.add(nthTermFunction.apply(i, x));
         }
@@ -688,13 +482,13 @@ public class StandardPlugin extends Plugin {
     public static NumberInterface factorial(Class<? extends NumberInterface> numberClass, int n) {
         if (!FACTORIAL_LISTS.containsKey(numberClass)) {
             FACTORIAL_LISTS.put(numberClass, new ArrayList<>());
-            FACTORIAL_LISTS.get(numberClass).add(fromInt(numberClass, 1));
+            FACTORIAL_LISTS.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
-            FACTORIAL_LISTS.get(numberClass).add(fromInt(numberClass, 1));
+            FACTORIAL_LISTS.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
         }
         ArrayList<NumberInterface> list = FACTORIAL_LISTS.get(numberClass);
         if (n >= list.size()) {
             while (list.size() < n + 16) {
-                list.add(list.get(list.size() - 1).multiply(fromInt(numberClass, list.size())));
+                list.add(list.get(list.size() - 1).multiply(new NaiveNumber(list.size()).promoteTo(numberClass)));
             }
         }
         return list.get(n);
@@ -726,7 +520,7 @@ public class StandardPlugin extends Plugin {
      * @return theta in [0, 2pi) that differs from phi by a multiple of 2pi.
      */
     private static NumberInterface getSmallAngle(NumberInterface phi, NumberInterface pi) {
-        NumberInterface twoPi = pi.multiply(fromInt(pi.getClass(), 2));
+        NumberInterface twoPi = pi.multiply(new NaiveNumber("2").promoteTo(phi.getClass()));
         NumberInterface theta = FUNCTION_ABS.apply(phi).subtract(twoPi
                 .multiply(FUNCTION_ABS.apply(phi).divide(twoPi).floor())); //Now theta is in [0, 2pi).
         if (phi.signum() < 0) {
@@ -764,77 +558,16 @@ public class StandardPlugin extends Plugin {
         registerOperator("^", OP_CARET);
         registerOperator("!", OP_FACTORIAL);
 
-        registerOperator("nPr", OP_NPR);
-        registerOperator("nCr", OP_NCR);
-
         registerFunction("abs", FUNCTION_ABS);
         registerFunction("exp", FUNCTION_EXP);
         registerFunction("ln", FUNCTION_LN);
         registerFunction("sqrt", FUNCTION_SQRT);
-
         registerFunction("sin", functionSin);
         registerFunction("cos", functionCos);
         registerFunction("tan", functionTan);
         registerFunction("sec", functionSec);
         registerFunction("csc", functionCsc);
         registerFunction("cot", functionCot);
-
-        registerFunction("arcsin", functionArcsin);
-        registerFunction("arccos", functionArccos);
-        registerFunction("arctan", functionArctan);
-        registerFunction("arcsec", functionArcsec);
-        registerFunction("arccsc", functionArccsc);
-        registerFunction("arccot", functionArccot);
-
-        registerFunction("random_int", FUNCTION_RAND_INT);
-
-        registerDocumentation(new Documentation("abs", "Absolute Value", "Finds the distance " +
-                "from zero of a number.", "Given a number, this function finds the distance form " +
-                "zero of a number, effectively turning negative numbers into positive ones.\n\n" +
-                "Example: abs(-2) -> 2", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("exp", "Exponentiate", "Brings e to the given power.",
-                "This function evaluates e to the power of the given value, and is the inverse " +
-                        "of the natural logarithm.\n\n" +
-                        "Example: exp(1) -> 2.718...", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("ln", "Natural Logarithm", "Gets the natural " +
-                "logarithm of the given value.", "The natural logarithm of a number is " +
-                "the power that e has to be brought to to be equal to the number.\n\n" +
-                "Example: ln(2.718) -> 1", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("sqrt", "Square Root", "Finds the square root " +
-                "of the number.", "A square root a of a number is defined as the non-negative a such that a times a is equal " +
-                "to that number.\n\n" +
-                "Example: sqrt(4) -> 2", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("sin", "Sine", "Computes the sine of the given angle, " +
-                "in radians.", "Example: sin(pi/6) -> 0.5", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("cos", "Cosine", "Computes the cosine of the given angle, " +
-                "in radians.", "Example: cos(pi/6) -> 0.866... (the exact result is sqrt(3)/2)", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("tan", "Tangent", "Computes the tangent of the given angle, " +
-                "in radians.", "Example: tan(pi/6) -> 0.577... (the exact result is 1/sqrt(3))", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("sec", "Secant", "Computes the secant of the given angle, " +
-                "in radians.", "Example: sec(pi/6) -> 1.154... (the exact result is 2/sqrt(3))", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("csc", "Cosecant", "Computes the cosecant of the given angle, " +
-                "in radians.", "Example: csc(pi/6) -> 2", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("cot", "Cotangent", "Computes the cotangent of the given angle, " +
-                "in radians.", "Example: cot(pi/6) -> 1.732... (the exact result is sqrt(3))", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("random_int", "Random Integer", "Generates a random integer [0, n].",
-                "Generates a pseudorandom number using the standard JVM random mechanism, keeping it less than or " +
-                        "equal to the given number.\n\n" +
-                        "Example: random_int(5) -> 4\n" +
-                        "random_int(5) -> 3\n" +
-                        "random_int(5) -> 3\n", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("arcsin", "Arcsine", "Computes the arcsine of x. (The result is in radians.)",
-                "Example: arcsin(0.5) -> 0.523... (the exact result is pi/6)", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("arccos", "Arccosine", "Computes the arccosine of x. (The result is in radians.)",
-                "Example: arccos(0.5) -> 1.047... (the exact result is pi/3)", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("arctan", "Arctangent", "Computes the arctangent of x. (The result is in radians.)",
-                "Example: arctan(1) -> 0.785... (the exact result is pi/4)", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("arcsec", "Arcsecant", "Computes the arcsecant of x. (The result is in radians.)",
-                "Example: arcsec(2) -> 1.047... (the exact result is pi/3)", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("arccsc", "Arccosecant", "Computes the arcscosecant of x. (The result is in radians.)",
-                "Example: arccsc(2) -> 0.523... (the exact result is pi/6)", DocumentationType.FUNCTION));
-        registerDocumentation(new Documentation("arccot", "Arccotangent", "Computes the arccotangent of x. (The result is in radians," +
-                " in the range (0, pi).)",
-                "Example: arccot(0) -> 1.570... (the exact result is pi/2)", DocumentationType.FUNCTION));
     }
 
     @Override

src/main/java/org/nwapw/abacus/tree/Reducer.java

@@ -0,0 +1,19 @@
+package org.nwapw.abacus.tree;
+
+/**
+ * Interface used to reduce a tree into a single value.
+ *
+ * @param <T> the value to reduce into.
+ */
+public interface Reducer<T> {
+
+    /**
+     * Reduces the given tree into a single value of type T.
+     *
+     * @param node     the node being passed in to be reduced.
+     * @param children the already-reduced children of this node.
+     * @return the resulting value from the reduce.
+     */
+    public T reduceNode(TreeNode node, Object... children);
+
+}

src/main/java/org/nwapw/abacus/window/HistoryTableModel.java

@@ -0,0 +1,106 @@
+package org.nwapw.abacus.window;
+
+import org.nwapw.abacus.tree.TreeNode;
+
+import javax.swing.table.AbstractTableModel;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A table model to store data about the history of inputs
+ * in the calculator.
+ */
+public class HistoryTableModel extends AbstractTableModel {
+
+    /**
+     * Static array used to get the column names.
+     */
+    public static final String[] COLUMN_NAMES = {
+            "Input",
+            "Parsed Input",
+            "Output"
+    };
+
+    /**
+     * Static array used to get the class of each column.
+     */
+    public static final Class[] CLASS_TYPES = {
+            String.class,
+            TreeNode.class,
+            String.class
+    };
+    /**
+     * The list of entries.
+     */
+    List<HistoryEntry> entries;
+
+    /**
+     * Creates a new empty history table model
+     */
+    public HistoryTableModel() {
+        entries = new ArrayList<>();
+    }
+
+    /**
+     * Adds an entry to the model.
+     *
+     * @param entry the entry to add.
+     */
+    public void addEntry(HistoryEntry entry) {
+        entries.add(entry);
+    }
+
+    @Override
+    public int getRowCount() {
+        return entries.size();
+    }
+
+    @Override
+    public int getColumnCount() {
+        return 3;
+    }
+
+    @Override
+    public String getColumnName(int columnIndex) {
+        return COLUMN_NAMES[columnIndex];
+    }
+
+    @Override
+    public Class<?> getColumnClass(int columnIndex) {
+        return CLASS_TYPES[columnIndex];
+    }
+
+    @Override
+    public boolean isCellEditable(int rowIndex, int columnIndex) {
+        return false;
+    }
+
+    @Override
+    public Object getValueAt(int rowIndex, int columnIndex) {
+        return entries.get(rowIndex).nthValue(columnIndex);
+    }
+
+    /**
+     * Class used specifically to hold data about
+     * the previous entries into the calculator.
+     */
+    public static class HistoryEntry {
+        public String input;
+        public TreeNode parsedInput;
+        public String output;
+
+        public HistoryEntry(String input, TreeNode parsedInput, String output) {
+            this.input = input;
+            this.parsedInput = parsedInput;
+            this.output = output;
+        }
+
+        Object nthValue(int n) {
+            if (n == 0) return input;
+            if (n == 1) return parsedInput;
+            if (n == 2) return output;
+            return null;
+        }
+    }
+
+}

src/main/java/org/nwapw/abacus/window/Window.java

@@ -0,0 +1,255 @@
+package org.nwapw.abacus.window;
+
+import org.nwapw.abacus.Abacus;
+import org.nwapw.abacus.number.NumberInterface;
+import org.nwapw.abacus.tree.TreeNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+/**
+ * The main UI window for the calculator.
+ */
+public class Window extends JFrame {
+
+    private static final String CALC_STRING = "Calculate";
+    private static final String SYNTAX_ERR_STRING = "Syntax Error";
+    private static final String EVAL_ERR_STRING = "Evaluation Error";
+    private static final String NUMBER_SYSTEM_LABEL = "Number Type:";
+    private static final String FUNCTION_LABEL = "Functions:";
+
+    /**
+     * Array of Strings to which the "calculate" button's text
+     * changes. For instance, in the graph tab, the name will
+     * be "Graph" and not "Calculate".
+     */
+    private static final String[] BUTTON_NAMES = {
+            CALC_STRING,
+            CALC_STRING
+    };
+
+    /**
+     * Array of booleans that determine whether the input
+     * field and the input button are enabled at a particular
+     * index.
+     */
+    private static boolean[] INPUT_ENABLED = {
+            true,
+            false
+    };
+
+    /**
+     * The instance of the Abacus class, used
+     * for interaction with plugins and configuration.
+     */
+    private Abacus abacus;
+    /**
+     * The last output by the calculator.
+     */
+    private String lastOutput;
+
+    /**
+     * The tabbed pane that separates calculator contexts.
+     */
+    private JTabbedPane pane;
+
+    /**
+     * The panel where the output occurs.
+     */
+    private JPanel calculationPanel;
+    /**
+     * The text area reserved for the last output.
+     */
+    private JTextArea lastOutputArea;
+    /**
+     * The table used for storing history results.
+     */
+    private JTable historyTable;
+    /**
+     * The table model used for managing history.
+     */
+    private HistoryTableModel historyModel;
+    /**
+     * The scroll pane for the history area.
+     */
+    private JScrollPane historyScroll;
+
+    /**
+     * The panel where the input occurs.
+     */
+    private JPanel inputPanel;
+    /**
+     * The input text field.
+     */
+    private JTextField inputField;
+    /**
+     * The "submit" button.
+     */
+    private JButton inputEnterButton;
+
+    /**
+     * The side panel for separate configuration.
+     */
+    private JPanel settingsPanel;
+    /**
+     * Panel for elements relating to number
+     * system selection.
+     */
+    private JPanel numberSystemPanel;
+    /**
+     * The possible list of number systems.
+     */
+    private JComboBox<String> numberSystemList;
+    /**
+     * The panel for elements relating to
+     * function selection.
+     */
+    private JPanel functionSelectPanel;
+    /**
+     * The list of functions available to the user.
+     */
+    private JComboBox<String> functionList;
+
+    /**
+     * Action listener that causes the input to be evaluated.
+     */
+    private ActionListener evaluateListener = (event) -> {
+        TreeNode parsedExpression = abacus.parseString(inputField.getText());
+        if (parsedExpression == null) {
+            lastOutputArea.setText(SYNTAX_ERR_STRING);
+            return;
+        }
+        NumberInterface numberInterface = abacus.evaluateTree(parsedExpression);
+        if (numberInterface == null) {
+            lastOutputArea.setText(EVAL_ERR_STRING);
+            return;
+        }
+        lastOutput = numberInterface.toString();
+        historyModel.addEntry(new HistoryTableModel.HistoryEntry(inputField.getText(), parsedExpression, lastOutput));
+        historyTable.invalidate();
+        lastOutputArea.setText(lastOutput);
+        inputField.setText("");
+    };
+
+    /**
+     * Array of listeners that tell the input button how to behave
+     * at a given input tab.
+     */
+    private ActionListener[] listeners = {
+            evaluateListener,
+            null
+    };
+
+    /**
+     * Creates a new window with the given manager.
+     *
+     * @param abacus the calculator instance to interact with other components.
+     */
+    public Window(Abacus abacus) {
+        this();
+        this.abacus = abacus;
+    }
+
+    /**
+     * Creates a new window.
+     */
+    private Window() {
+        super();
+
+        lastOutput = "";
+
+        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        setSize(320, 480);
+
+        inputField = new JTextField();
+        inputEnterButton = new JButton(CALC_STRING);
+
+        inputPanel = new JPanel();
+        inputPanel.setLayout(new BorderLayout());
+        inputPanel.add(inputField, BorderLayout.CENTER);
+        inputPanel.add(inputEnterButton, BorderLayout.SOUTH);
+
+        historyModel = new HistoryTableModel();
+        historyTable = new JTable(historyModel);
+        historyScroll = new JScrollPane(historyTable);
+        lastOutputArea = new JTextArea(lastOutput);
+        lastOutputArea.setEditable(false);
+
+        calculationPanel = new JPanel();
+        calculationPanel.setLayout(new BorderLayout());
+        calculationPanel.add(historyScroll, BorderLayout.CENTER);
+        calculationPanel.add(lastOutputArea, BorderLayout.SOUTH);
+
+        numberSystemList = new JComboBox<>();
+
+        numberSystemPanel = new JPanel();
+        numberSystemPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
+        numberSystemPanel.setLayout(new FlowLayout());
+        numberSystemPanel.add(new JLabel(NUMBER_SYSTEM_LABEL));
+        numberSystemPanel.add(numberSystemList);
+        numberSystemPanel.setMaximumSize(numberSystemPanel.getPreferredSize());
+
+        functionList = new JComboBox<>();
+
+        functionSelectPanel = new JPanel();
+        functionSelectPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
+        functionSelectPanel.setLayout(new FlowLayout());
+        functionSelectPanel.add(new JLabel(FUNCTION_LABEL));
+        functionSelectPanel.add(functionList);
+        functionSelectPanel.setMaximumSize(functionSelectPanel.getPreferredSize());
+
+        settingsPanel = new JPanel();
+        settingsPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
+        settingsPanel.setLayout(new BoxLayout(settingsPanel, BoxLayout.PAGE_AXIS));
+        settingsPanel.add(numberSystemPanel);
+        settingsPanel.add(functionSelectPanel);
+
+        pane = new JTabbedPane();
+        pane.add("Calculator", calculationPanel);
+        pane.add("Settings", settingsPanel);
+        pane.addChangeListener(e -> {
+            int selectionIndex = pane.getSelectedIndex();
+            boolean enabled = INPUT_ENABLED[selectionIndex];
+            ActionListener listener = listeners[selectionIndex];
+            inputEnterButton.setText(BUTTON_NAMES[selectionIndex]);
+            inputField.setEnabled(enabled);
+            inputEnterButton.setEnabled(enabled);
+
+            for (ActionListener removingListener : inputEnterButton.getActionListeners()) {
+                inputEnterButton.removeActionListener(removingListener);
+                inputField.removeActionListener(removingListener);
+            }
+            if (listener != null) {
+                inputEnterButton.addActionListener(listener);
+                inputField.addActionListener(listener);
+            }
+        });
+        add(pane, BorderLayout.CENTER);
+        add(inputPanel, BorderLayout.SOUTH);
+
+        inputEnterButton.addActionListener(evaluateListener);
+        inputField.addActionListener(evaluateListener);
+        historyTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                Point clickPoint = e.getPoint();
+                if (e.getClickCount() == 2) {
+                    int row = historyTable.rowAtPoint(clickPoint);
+                    int column = historyTable.columnAtPoint(clickPoint);
+                    String toCopy = historyTable.getValueAt(row, column).toString();
+                    Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(toCopy), null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void setVisible(boolean b) {
+        super.setVisible(b);
+        if (b) inputField.requestFocusInWindow();
+    }
+}

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

@@ -16,7 +16,7 @@ data class FunctionNode(val function: String) : TreeNode() {
     val children: MutableList<TreeNode> = mutableListOf()
 
     override fun <T : Any> reduce(reducer: Reducer<T>): T? {
-        val children = Array<Any>(children.size, { children[it].reduce(reducer) ?: return null; })
+        val children = Array<Any?>(children.size, { children[it].reduce(reducer) ?: return null; })
         return reducer.reduceNode(this, *children)
     }
 

src/main/resources/abacus.fxml

@@ -57,7 +57,6 @@
                         <Button text="Apply" onAction="#performSave"/>
                         <Button text="Reload Plugins" onAction="#performReload"/>
                         <Button text="Apply and Reload" onAction="#performSaveAndReload"/>
-                        <Button text="Scan Plugins" onAction="#performScan"/>
                     </FlowPane>
                 </GridPane>
             </Tab>