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'
 
 repositories {
   mavenCentral()
 }
 
 dependencies {
-        compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.3"
+    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/Applicable.java

@@ -1,38 +0,0 @@
-package org.nwapw.abacus.function;
-
-/**
- * A class that represents something that can be applied to one or more
- * arguments of the same type, and returns a single value from that application.
- * @param <T> the type of the parameters passed to this applicable.
- * @param <O> the return type of the applicable.
- */
-public abstract class Applicable<T, O> {
-
-    /**
-     * Checks if the given applicable can be used with the given parameters.
-     * @param params the parameter array to verify for compatibility.
-     * @return whether the array can be used with applyInternal.
-     */
-    protected abstract boolean matchesParams(T[] params);
-
-    /**
-     * Applies the applicable object to the given parameters,
-     * without checking for compatibility.
-     * @param params the parameters to apply to.
-     * @return the result of the application.
-     */
-    protected abstract O applyInternal(T[] params);
-
-    /**
-     * If the parameters can be used with this applicable, returns
-     * the result of the application of the applicable to the parameters.
-     * Otherwise, returns null.
-     * @param params the parameters to apply to.
-     * @return the result of the operation, or null if parameters do not match.
-     */
-    public O apply(T... params){
-        if(!matchesParams(params)) return null;
-        return applyInternal(params);
-    }
-
-}

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

@@ -1,11 +0,0 @@
-package org.nwapw.abacus.function;
-
-/**
- * Enum that holds the type of documentation that has been
- * registered with Abacus.
- */
-public enum DocumentationType {
-
-    FUNCTION, TREE_VALUE_FUNCTION
-
-}

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

@@ -1,11 +0,0 @@
-package org.nwapw.abacus.function;
-
-import org.nwapw.abacus.number.NumberInterface;
-
-/**
- * A function that operates on one or more
- * inputs and returns a single number.
- */
-public abstract class Function extends Applicable<NumberInterface, NumberInterface> {
-
-}

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

@@ -1,43 +0,0 @@
-package org.nwapw.abacus.function;
-
-import org.nwapw.abacus.number.NumberInterface;
-import org.nwapw.abacus.tree.Reducer;
-import org.nwapw.abacus.tree.TreeNode;
-
-/**
- * A function that operates on parse tree nodes instead of on already simplified numbers.
- * Despite this, it returns a number, not a tree.
- */
-public abstract class TreeValueFunction extends Applicable<TreeNode, NumberInterface> {
-
-    @Override
-    protected NumberInterface applyInternal(TreeNode[] params) {
-        return null;
-    }
-
-    @Override
-    public NumberInterface apply(TreeNode... params) {
-        return null;
-    }
-
-    /**
-     * Applies the tree value functions to the given tree nodes,
-     * using the given reducer.
-     * @param reducer the reducer to use.
-     * @param params the parameters to apply to.
-     * @return the result of the application.
-     */
-    public abstract NumberInterface applyWithReducerInternal(Reducer<NumberInterface> reducer, TreeNode[] params);
-
-    /**
-     * Checks if the given parameters and reducer can be used
-     * with this function, and if so, calls the function on them.
-     * @param reducer the reducer to use.
-     * @param params the parameters to apply to.
-     * @return the result of the application, or null if the parameters are incompatible.
-     */
-    public NumberInterface applyWithReducer(Reducer<NumberInterface> reducer, TreeNode... params) {
-        if(!matchesParams(params) || reducer == null) return null;
-        return applyWithReducerInternal(reducer, params);
-    }
-}

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/CallNode.kt

@@ -1,29 +0,0 @@
-package org.nwapw.abacus.tree
-
-/**
- * Represents a more generic function call.
- *
- * This class does not specify how it should be reduced, allowing other classes
- * to extend this functionality.
- *
- * @param callTo the name of the things being called.
- */
-abstract class CallNode(val callTo: String) : TreeNode() {
-
-    /**
-     * The list of children this node has.
-     */
-    val children: MutableList<TreeNode> = mutableListOf()
-
-    override fun toString(): String {
-        val buffer = StringBuffer()
-        buffer.append(callTo)
-        buffer.append("(")
-        for(i in 0 until children.size){
-            buffer.append(children[i].toString())
-            buffer.append(if(i != children.size - 1) ", " else ")")
-        }
-        return buffer.toString()
-    }
-
-}

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

@@ -1,18 +0,0 @@
-package org.nwapw.abacus.tree
-
-/**
- * A tree node that holds a function call.
- *
- * The function call node can hold any number of children, and passes the to the appropriate reducer,
- * but that is its sole purpose.
- *
- * @param function the function string.
- */
-class FunctionNode(function: String) : CallNode(function) {
-
-    override fun <T : Any> reduce(reducer: Reducer<T>): T? {
-        val children = Array<Any>(children.size, { children[it].reduce(reducer) ?: return null; })
-        return reducer.reduceNode(this, *children)
-    }
-
-}

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?
-
-}

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

@@ -1,16 +0,0 @@
-package org.nwapw.abacus.tree
-
-/**
- * A tree node that represents a tree value function call.
- *
- * This is in many ways similar to a simple FunctionNode, and the distinction
- * is mostly to help the reducer. Besides that, this class also does not
- * even attempt to reduce its children.
- */
-class TreeValueFunctionNode(name: String) : CallNode(name) {
-
-    override fun <T : Any> reduce(reducer: Reducer<T>): T? {
-        return reducer.reduceNode(this)
-    }
-
-}

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

@@ -1,21 +0,0 @@
-package org.nwapw.abacus.tree
-
-/**
- * A tree node that holds a placeholder variable.
- *
- * This node holds a variable string, and acts similarly to a number,
- * with the key difference of not actually holding a value at runtime.
- *
- * @param variable the actual variable name that this node represents.
- */
-class VariableNode(val variable: String) : TreeNode() {
-
-    override fun <T : Any> reduce(reducer: Reducer<T>): T? {
-        return reducer.reduceNode(this)
-    }
-
-    override fun toString(): String {
-        return variable
-    }
-
-}

docs/404.html

@@ -1,7 +0,0 @@
----
-layout: base 
----
-<h1>404</h1>
-
-<p><strong>Page not found :(</strong></p>
-<p>The requested page could not be found.</p>

docs/Gemfile

@@ -1,27 +0,0 @@
-source "https://rubygems.org"
-
-# Hello! This is where you manage which Jekyll version is used to run.
-# When you want to use a different version, change it below, save the
-# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
-#
-#     bundle exec jekyll serve
-#
-# This will help ensure the proper Jekyll version is running.
-# Happy Jekylling!
-gem "jekyll", "3.5.2"
-
-# This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima", "~> 2.0"
-
-# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-# uncomment the line below. To upgrade, run `bundle update github-pages`.
-# gem "github-pages", group: :jekyll_plugins
-
-# If you have any plugins, put them here!
-group :jekyll_plugins do
-   gem "jekyll-feed", "~> 0.6"
-end
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-

docs/Gemfile.lock

@@ -1,58 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    colorator (1.1.0)
-    ffi (1.9.18)
-    forwardable-extended (2.6.0)
-    jekyll (3.5.2)
-      addressable (~> 2.4)
-      colorator (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
-      liquid (~> 4.0)
-      mercenary (~> 0.3.3)
-      pathutil (~> 0.9)
-      rouge (~> 1.7)
-      safe_yaml (~> 1.0)
-    jekyll-feed (0.9.2)
-      jekyll (~> 3.3)
-    jekyll-sass-converter (1.5.0)
-      sass (~> 3.4)
-    jekyll-watch (1.5.0)
-      listen (~> 3.0, < 3.1)
-    kramdown (1.14.0)
-    liquid (4.0.0)
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    mercenary (0.3.6)
-    minima (2.1.1)
-      jekyll (~> 3.3)
-    pathutil (0.14.0)
-      forwardable-extended (~> 2.6)
-    public_suffix (2.0.5)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rouge (1.11.1)
-    safe_yaml (1.0.4)
-    sass (3.5.1)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  jekyll (= 3.5.2)
-  jekyll-feed (~> 0.6)
-  minima (~> 2.0)
-  tzinfo-data
-
-BUNDLED WITH
-   1.15.3

docs/_config.yml

@@ -1,43 +0,0 @@
-# Welcome to Jekyll!
-#
-# This config file is meant for settings that affect your whole blog, values
-# which you are expected to set up once and rarely edit after that. If you find
-# yourself editing this file very often, consider using Jekyll's data files
-# feature for the data you need to update frequently.
-#
-# For technical reasons, this file is *NOT* reloaded automatically when you use
-# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
-
-# Site settings
-# These are used to personalize your new site. If you look in the HTML files,
-# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
-# You can create any custom variable you would like, and they will be accessible
-# in the templates via {{ site.myvariable }}.
-title: Abacus
-email: danila.fedorin@gmail.com
-description: > # this means to ignore newlines until "baseurl:"
-  This is the home page of Abacus,
-  a calculator developed during
-  the summer of 2017 as a tool
-  for the more tech-savvy users.
-baseurl: "/abacus" # the subpath of your site, e.g. /blog
-url: "htts://danilafe.github.io" # the base hostname & protocol for your site, e.g. http://example.com
-github_username: DanilaFe 
-include: ['_pages']
-
-# Build settings
-markdown: kramdown
-plugins:
-  - jekyll-feed
-
-# Exclude from processing.
-# The following items will not be processed, by default. Create a custom list
-# to override the default setting.
-# exclude:
-#   - Gemfile
-#   - Gemfile.lock
-#   - node_modules
-#   - vendor/bundle/
-#   - vendor/cache/
-#   - vendor/gems/
-#   - vendor/ruby/

docs/_includes/head.html

@@ -1,17 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-
-  <title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
-  <meta name="description" content="{{ page.excerpt | default: site.description | strip_html | normalize_whitespace | truncate: 160 | escape }}">
-
-  <link rel="stylesheet" href="{{ "assets/css/main.css" | relative_url }}">
-  <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
-  <link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ "/feed.xml" | relative_url }}">
-  
-  {% if jekyll.environment == 'production' and site.google_analytics %}
-  {% include google-analytics.html %}
-  {% endif %}
-</head>
-

docs/_includes/header.html

@@ -1,10 +0,0 @@
-<nav>
-  <div class="center">
-    <a href="{{ "/" | relative_url }}" class="primary-link">{{ site.title }}</a>
-    {% for page in site.pages %}
-    {% if page.in_header %}
-    <a href="{{ page.url | relative_url }}">{{ page.title }}</a>
-    {% endif %}
-    {% endfor %}
-  </div>
-</nav>

docs/_layouts/base.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-  {% include head.html %}
-
-  <body>
-    {% include header.html %}
-
-    <div class="content center">
-      {{ content }}
-    </div>
-
-    {% include footer.html %}
-  </body>
-
-
-</html>

docs/_layouts/home.html

@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-  {% include head.html %}
-  <style>
-  body {
-    margin-top: 100px;
-    color: white;
-    text-align: center;
-  }
-  h1, h2, h3, h4, h5, h6 {
-    font-family: "Source Code Pro"
-  }
-
-  img {
-    margin: auto;
-    width: 100%;
-    max-width: 432px;
-  }
-
-  div#buttons {
-    margin-top: 40px;
-    margin-bottom: 40px;
-  }
-
-  a {
-    background-color: white;
-    color: #06e8a4;
-  }
-
-  a:hover {
-    background-color: #06e8a4;
-    color: white;
-  }
-  </style>
-  <body>
-  <h1>Abacus</h1>
-  <h2>The programmer's calculator</h2>
-  <div id="buttons">
-    <a class="button inverted" href="{{ "/download" | relative_url }}">Download</a>
-    <a class="button inverted" href="{{ "/about" | relative_url }}">About</a>
-    <a class="button inverted" href="https://github.com/DanilaFe/abacus">Contribute</a>
-    <a class="button inverted" href="https://github.com/DanilaFe/abacus/wiki">Wiki</a>
-  </div>
-  <img src="http://i.imgur.com/Min70QY.png" title="source: imgur.com" />
-  </body>
-</html>

docs/_layouts/page.html

@@ -1,5 +0,0 @@
----
-layout: base
----
-<h1>{{ page.title }}</h1>
-{{ content }}

docs/_pages/about.md

@@ -1,27 +0,0 @@
----
-in_header: true
-layout: page
-title: About
-permalink: /about/
----
-
-## So... what IS Abacus?
-It's a calculator. Obviously. But what makes it better than
-what already exists? There's a few things. Abacus is:
-* Programmable, and not in TI Basic.
-* Precise. With the "precise" option, Abacus can keep up to 50 significant figures.
-* Capable. Ever wonder what 2<sup>700</sup> is? How about 8!!? Abacus can tell you!
-* Offline. While Wolfram Alpha can do powerful math, it needs internet connection!
-* Built for the desktop. Why use buttons on the screen when there's buttons on the keyboard?
-* Open source. Don't like something? Help is always welcome!
-
-## Why was Abacus made?
-The initial project was proposed for the [Northwest Advanced Programming Workshop](http://nwapw.org/about/).
-You can read the project proposal on the main GitHub page, although the idea has
-changed quite a bit, mostly in shifting from "fast" to "precise".
-
-## What is Abacus made with?
-Java and Kotlin. Java provides a good layer of abstraction and a great standard
-library, while Kotlin allows for the reduction of boilerplate code and null
-safety. Using JVM-based languages also allows Abacus to expose its entire
-API to plugins, and load them at runtime.

docs/_pages/download.md

@@ -1,34 +0,0 @@
----
-in_header: true
-layout: page
-title: Download
-permalink: /download/
----
-
-Currently, we do not provide standalone executables due to our unfamiliarity with
-including 3rd-party software. Abacus uses a number of open source libraries,
-and we do not want to breach the license terms for any of them. As soon as
-as we figure out the correct way to distribute Abacus, we will make a
-standalone distribution available. In the meantime, please use the below
-steps to run Abacus from source.
-
-## Getting the Code
-Abacus is an open source project, and is distributed under the MIT license.
-If you would like to download the source code, simply clone it from
-[GitHub](https://github.com/DanilaFe/abacus).
-Alternatively, if you don't want the bleeding edge version, check out the
-[releases](https://github.com/DanilaFe/abacus/releases).
-
-## Running from Source
-Once you have unpacked the source code, you can simply run it from
-the command line via the shell command:
-```
-./gradlew run
-```
-If you're on Windows, the command is similar:
-```
-gradlew run
-```
-This should download a distribution of Gradle, a build system that is
-used to compile Abacus. After some time, the Abacus window should appear.
-From there, you can use it normally.

docs/assets/css/main.scss

@@ -1,119 +0,0 @@
----
----
-@import url('https://fonts.googleapis.com/css?family=Source+Code+Pro|Open+Sans|Raleway');
-
-$background-color: #19d69e;
-$code-color: #efefef;
-$accent-color: #00AFE8;
-$clear-color: white;
-$title-font: "Open Sans";
-$text-font: Helvetica;
-$code-font: "Source Code Pro";
-$max-width: 850px;
-
-a {
-  text-decoration: none;
-  color: $background-color;
-
-  &.button {
-    display: inline-block;
-    background-color: $background-color;
-    color: $clear-color;
-    padding: 10px;
-    text-decoration: none;
-    border-radius: 2px;
-
-    margin: 10px;
-    transition: background-color .25s;
-
-    &:hover {
-      background-color: $clear-color;
-      color: $background-color;
-    }
-
-    &.inverted {
-      background-color: $clear-color;
-      color: $background-color;
-
-      &:hover {
-        background-color: $background-color;
-        color: $clear-color;
-      }
-    }
-  }
-}
-
-h1, h2, h3, h4, h5, h6 {
-  font: {
-    family: $title-font;
-  }
-}
-
-h1 {
-  font-size: 50px;
-}
-
-nav {
-  box-sizing: border-box;
-  background-color: $clear-color;
-  width: 100%;
-  padding: 20px;
-
-  a {
-    text-decoration: none;
-    color: $background-color;
-    font-size: 20px;
-    margin-right: 10px;
-
-    &.primary-link {
-      font-size: 30px;
-      margin-right: 20px;
-    }
-
-    &:hover {
-      color: $accent-color;
-    }
-
-    transition: color .25s;
-  }
-}
-
-body {
-  background-color: $background-color;
-  font: {
-    family: $text-font;
-  }
-  margin: 0px;
-}
-
-.center {
-  box-sizing: border-box;
-  width: 100%;
-  max-width: $max-width;
-
-  @media (min-width: $max-width) {
-    margin: {
-      left: auto;
-      right: auto;
-    }
-  }
-}
-
-.content {
-  margin-top: 20px;
-  padding: 30px;
-  background-color: $clear-color;
-}
-
-code {
-  background-color: $code-color;
-  display: inline-block;
-  padding: 5px;
-  font-family: $code-font;
-
-  pre & {
-    padding: 10px;
-    display: block;
-    width: 100%;
-  }
-}

docs/index.md

@@ -1,6 +0,0 @@
----
-# You don't need to edit this file, it's empty on purpose.
-# Edit theme's home layout instead if you wanna make some changes
-# See: https://jekyllrb.com/docs/themes/#overriding-theme-defaults
-layout: home
----

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;
@@ -53,13 +54,17 @@ public class Abacus {
         numberReducer = new NumberReducer(this);
         this.configuration = new Configuration(configuration);
         LexerTokenizer lexerTokenizer = new LexerTokenizer();
-        ShuntingYardParser shuntingYardParser = new ShuntingYardParser();
+        ShuntingYardParser shuntingYardParser = new ShuntingYardParser(this);
         treeBuilder = new TreeBuilder<>(lexerTokenizer, shuntingYardParser);
 
         pluginManager.addListener(shuntingYardParser);
         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/function/Function.java

@@ -0,0 +1,39 @@
+package org.nwapw.abacus.function;
+
+import org.nwapw.abacus.number.NumberInterface;
+
+/**
+ * A function that operates on one or more
+ * inputs and returns a single number.
+ */
+public abstract class Function {
+
+    /**
+     * Checks whether the given params will work for the given function.
+     *
+     * @param params the given params
+     * @return true if the params can be used with this function.
+     */
+    protected abstract boolean matchesParams(NumberInterface[] params);
+
+    /**
+     * Internal apply implementation, which already receives appropriately promoted
+     * parameters that have bee run through matchesParams
+     *
+     * @param params the promoted parameters.
+     * @return the return value of the function.
+     */
+    protected abstract NumberInterface applyInternal(NumberInterface[] params);
+
+    /**
+     * Function to check, promote arguments and run the function.
+     *
+     * @param params the raw input parameters.
+     * @return the return value of the function, or null if an error occurred.
+     */
+    public NumberInterface apply(NumberInterface... params) {
+        if (!matchesParams(params)) return null;
+        return applyInternal(params);
+    }
+
+}

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

@@ -17,10 +17,6 @@ public class AbacusApplication extends Application {
      */
     private AbacusController controller;
 
-    public static void main(String[] args) {
-        launch(args);
-    }
-
     @Override
     public void start(Stage primaryStage) throws Exception {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/abacus.fxml"));
@@ -37,5 +33,4 @@ public class AbacusApplication extends Application {
         super.stop();
         controller.performStop();
     }
-
 }

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

@@ -1,6 +1,8 @@
 package org.nwapw.abacus.fx;
 
 import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
@@ -12,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;
@@ -24,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;
 
 
 /**
@@ -100,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;
 
@@ -123,16 +120,40 @@ 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.
      */
     private Abacus abacus;
+
+    /**
+     * Boolean which represents whether changes were made to the configuration.
+     */
+    private boolean changesMade;
+    /**
+     * Whether an alert about changes to the configuration was already shown.
+     */
+    private boolean reloadAlertShown;
+    /**
+     * The alert shown when a press to "apply" is needed.
+     */
+    private Alert reloadAlert;
+    /**
+     * The runnable that takes care of killing computations that take too long.
+     */
+    private final Runnable TIMER_RUNNABLE = () -> {
+        try {
+            Configuration abacusConfig = abacus.getConfiguration();
+            if(abacusConfig.getComputationDelay() == 0) return;
+            Thread.sleep((long) (abacusConfig.getComputationDelay() * 1000));
+            performStop();
+        } catch (InterruptedException e) { }
+    };
     /**
      * The runnable used to perform the calculation.
      */
@@ -170,18 +191,6 @@ public class AbacusController implements PluginListener {
             });
         }
     };
-    /**
-     * Boolean which represents whether changes were made to the configuration.
-     */
-    private boolean changesMade;
-    /**
-     * Whether an alert about changes to the configuration was already shown.
-     */
-    private boolean reloadAlertShown;
-    /**
-     * The alert shown when a press to "apply" is needed.
-     */
-    private Alert reloadAlert;
     /**
      * The thread that is waiting to pause the calculation.
      */
@@ -190,18 +199,6 @@ public class AbacusController implements PluginListener {
      * The thread in which the computation runs.
      */
     private Thread calculationThread;
-    /**
-     * The runnable that takes care of killing computations that take too long.
-     */
-    private final Runnable TIMER_RUNNABLE = () -> {
-        try {
-            Configuration abacusConfig = abacus.getConfiguration();
-            if (abacusConfig.getComputationDelay() == 0) return;
-            Thread.sleep((long) (abacusConfig.getComputationDelay() * 1000));
-            performStop();
-        } catch (InterruptedException e) {
-        }
-    };
 
     /**
      * Alerts the user if the changes they made
@@ -230,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();
@@ -258,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) -> {
@@ -308,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);
@@ -357,12 +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.addAll(manager.getAllTreeValueFunctions().stream().map(name -> pluginManager.documentationFor(name, DocumentationType.TREE_VALUE_FUNCTION))
-                .collect(Collectors.toCollection(ArrayList::new)));
-        functionList.sort(Comparator.comparing(Documentation::getCodeName));
     }
 
     @Override

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

@@ -13,7 +13,6 @@ public abstract class NumberInterface {
         if(Thread.currentThread().isInterrupted())
             throw new ComputationInterruptedException();
     }
-
     /**
      * The maximum precision to which this number operates.
      *
@@ -220,7 +219,6 @@ public abstract class NumberInterface {
      * Returns the fractional part of the number, specifically x - floor(x).
      * Also, checks if the thread has been interrupted,
      * and if so, throws an exception.
-     *
      * @return the fractional part of the number.
      */
     public final NumberInterface fractionalPart(){
@@ -242,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);
 
     /**
@@ -253,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);
@@ -262,7 +258,6 @@ public abstract class NumberInterface {
     /**
      * Returns the smallest error this instance can tolerate depending
      * on its precision and value.
-     *
      * @return the smallest error that should be permitted in calculations.
      */
     public abstract NumberInterface getMaxError();

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/parsing/LexerTokenizer.java

@@ -34,7 +34,6 @@ public class LexerTokenizer implements Tokenizer<Match<TokenType>>, PluginListen
             register(" ", TokenType.WHITESPACE);
             register(",", TokenType.COMMA);
             register("[0-9]*(\\.[0-9]+)?", TokenType.NUM);
-            register("[a-zA-Z]+", TokenType.VARIABLE);
             register("\\(", TokenType.OPEN_PARENTH);
             register("\\)", TokenType.CLOSE_PARENTH);
         }};
@@ -53,9 +52,6 @@ public class LexerTokenizer implements Tokenizer<Match<TokenType>>, PluginListen
         for (String function : manager.getAllFunctions()) {
             lexer.register(Pattern.sanitize(function), TokenType.FUNCTION);
         }
-        for (String function : manager.getAllTreeValueFunctions()){
-            lexer.register(Pattern.sanitize(function), TokenType.TREE_VALUE_FUNCTION);
-        }
     }
 
     @Override
@@ -66,9 +62,6 @@ public class LexerTokenizer implements Tokenizer<Match<TokenType>>, PluginListen
         for (String function : manager.getAllFunctions()) {
             lexer.unregister(Pattern.sanitize(function), TokenType.FUNCTION);
         }
-        for (String function : manager.getAllTreeValueFunctions()){
-            lexer.unregister(Pattern.sanitize(function), TokenType.TREE_VALUE_FUNCTION);
-        }
     }
 
 }

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

@@ -1,5 +1,6 @@
 package org.nwapw.abacus.parsing;
 
+import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.function.OperatorAssociativity;
 import org.nwapw.abacus.function.OperatorType;
@@ -16,6 +17,10 @@ import java.util.*;
  */
 public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListener {
 
+    /**
+     * The Abacus instance used to create number instances.
+     */
+    private Abacus abacus;
     /**
      * Map of operator precedences, loaded from the plugin operators.
      */
@@ -30,9 +35,12 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
     private Map<String, OperatorType> typeMap;
 
     /**
-     * Creates a new Shunting Yard parser.
+     * Creates a new Shunting Yard parser with the given Abacus instance.
+     *
+     * @param abacus the abacus instance.
      */
-    public ShuntingYardParser() {
+    public ShuntingYardParser(Abacus abacus) {
+        this.abacus = abacus;
         precedenceMap = new HashMap<>();
         associativityMap = new HashMap<>();
         typeMap = new HashMap<>();
@@ -53,9 +61,9 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
             Match<TokenType> match = from.remove(0);
             previousType = matchType;
             matchType = match.getType();
-            if (matchType == TokenType.NUM || matchType == TokenType.VARIABLE) {
+            if (matchType == TokenType.NUM) {
                 output.add(match);
-            } else if (matchType == TokenType.FUNCTION || matchType == TokenType.TREE_VALUE_FUNCTION) {
+            } else if (matchType == TokenType.FUNCTION) {
                 output.add(new Match<>("", TokenType.INTERNAL_FUNCTION_END));
                 tokenStack.push(match);
             } else if (matchType == TokenType.OP) {
@@ -78,8 +86,7 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
                 while (!tokenStack.empty() && type == OperatorType.BINARY_INFIX) {
                     Match<TokenType> otherMatch = tokenStack.peek();
                     TokenType otherMatchType = otherMatch.getType();
-                    if (!(otherMatchType == TokenType.OP || otherMatchType == TokenType.FUNCTION ||
+                    if (!(otherMatchType == TokenType.OP || otherMatchType == TokenType.FUNCTION)) break;
-                        otherMatchType == TokenType.TREE_VALUE_FUNCTION)) break;
 
                     if (otherMatchType == TokenType.OP) {
                         int otherPrecedence = precedenceMap.get(otherMatch.getContent());
@@ -106,8 +113,7 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
         while (!tokenStack.empty()) {
             Match<TokenType> match = tokenStack.peek();
             TokenType newMatchType = match.getType();
-            if (!(newMatchType == TokenType.OP || newMatchType == TokenType.FUNCTION ||
+            if (!(newMatchType == TokenType.OP || newMatchType == TokenType.FUNCTION)) return null;
-                    newMatchType == TokenType.TREE_VALUE_FUNCTION)) return null;
             output.add(tokenStack.pop());
         }
         return output;
@@ -137,21 +143,14 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
                 else return new UnaryNode(operator, applyTo);
             }
         } else if (matchType == TokenType.NUM) {
-            return new NumberNode(match.getContent());
+            return new NumberNode(abacus.numberFromString(match.getContent()));
-        } else if (matchType == TokenType.VARIABLE) {
+        } else if (matchType == TokenType.FUNCTION) {
-            return new VariableNode(match.getContent());
-        } else if (matchType == TokenType.FUNCTION || matchType == TokenType.TREE_VALUE_FUNCTION) {
             String functionName = match.getContent();
-            CallNode node;
+            FunctionNode node = new FunctionNode(functionName);
-            if(matchType == TokenType.FUNCTION){
-                node = new FunctionNode(functionName);
-            } else {
-                node = new TreeValueFunctionNode(functionName);
-            }
             while (!matches.isEmpty() && matches.get(0).getType() != TokenType.INTERNAL_FUNCTION_END) {
                 TreeNode argument = constructRecursive(matches);
                 if (argument == null) return null;
-                node.getChildren().add(0, argument);
+                node.prependChild(argument);
             }
             if (matches.isEmpty()) return null;
             matches.remove(0);

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,8 +1,13 @@
 package org.nwapw.abacus.plugin;
 
-import org.nwapw.abacus.function.*;
+import org.nwapw.abacus.function.Function;
+import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.number.NumberInterface;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * A plugin class that can be externally implemented and loaded via the
  * plugin manager. Plugins provide functionality to the calculator
@@ -66,17 +71,6 @@ public abstract class Plugin {
         manager.registerFunction(name, toRegister);
     }
 
-    /**
-     * To be used in load(). Registers a tree value function abstract class
-     * with the plugin internally, which makes it accessible to the plugin manager.
-     *
-     * @param name the name to register by.
-     * @param toRegister the tree value function implementation.
-     */
-    protected final void registerTreeValueFunction(String name, TreeValueFunction toRegister) {
-        manager.registerTreeValueFunction(name, toRegister);
-    }
-
     /**
      * To be used in load(). Registers an operator abstract class
      * with the plugin internally, which makes it accessible to
@@ -100,16 +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
@@ -122,18 +106,6 @@ public abstract class Plugin {
         return manager.functionFor(name);
     }
 
-    /**
-     * Searches the PluginManager for the given function name.
-     * This can be used by the plugins internally in order to call functions
-     * they do not provide.
-     *
-     * @param name the name for which to search.
-     * @return the resulting tree value function, or null if none was found for that name.
-     */
-    protected final TreeValueFunction treeValueFunctionFor(String name){
-        return manager.treeValueFunctionFor(name);
-    }
-
     /**
      * Searches the PluginManager for the given operator name.
      * This can be used by the plugins internally in order to call
@@ -158,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,14 +1,12 @@
 package org.nwapw.abacus.plugin;
 
 import org.nwapw.abacus.Abacus;
-import org.nwapw.abacus.function.*;
+import org.nwapw.abacus.function.Function;
+import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.number.NumberInterface;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
+import java.util.*;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * A class that controls instances of plugins, allowing for them
@@ -28,10 +26,6 @@ public class PluginManager {
      * The map of functions registered by the plugins.
      */
     private Map<String, Function> registeredFunctions;
-    /**
-     * The map of tree value functions regstered by the plugins.
-     */
-    private Map<String, TreeValueFunction> registeredTreeValueFunctions;
     /**
      * The map of operators registered by the plugins
      */
@@ -40,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.
@@ -73,10 +63,8 @@ public class PluginManager {
         loadedPluginClasses = new HashSet<>();
         plugins = new HashSet<>();
         registeredFunctions = new HashMap<>();
-        registeredTreeValueFunctions = new HashMap<>();
         registeredOperators = new HashMap<>();
         registeredNumberImplementations = new HashMap<>();
-        registeredDocumentation = new HashSet<>();
         cachedInterfaceImplementations = new HashMap<>();
         cachedPi = new HashMap<>();
         listeners = new HashSet<>();
@@ -84,7 +72,6 @@ public class PluginManager {
 
     /**
      * Registers a function under the given name.
-     *
      * @param name the name of the function.
      * @param function the function to register.
      */
@@ -92,19 +79,8 @@ public class PluginManager {
         registeredFunctions.put(name, function);
     }
 
-    /**
-     * Registers a tree value function under the given name.
-     *
-     * @param name the name of the function.
-     * @param function the function to register.
-     */
-    public void registerTreeValueFunction(String name, TreeValueFunction function) {
-        registeredTreeValueFunctions.put(name, function);
-    }
-
     /**
      * Registers an operator under the given name.
-     *
      * @param name the name of the operator.
      * @param operator the operator to register.
      */
@@ -114,7 +90,6 @@ public class PluginManager {
 
     /**
      * Registers a number implementation under the given name.
-     *
      * @param name the name of the number implementation.
      * @param implementation the number implementation to register.
      */
@@ -122,19 +97,8 @@ 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.
      * @return the function, or null if it was not found.
      */
@@ -142,19 +106,8 @@ public class PluginManager {
         return registeredFunctions.get(name);
     }
 
-    /**
-     * Gets the tree value function registered under the given name.
-     *
-     * @param name the name of the function.
-     * @return the function, or null if it was not found.
-     */
-    public TreeValueFunction treeValueFunctionFor(String name){
-        return registeredTreeValueFunctions.get(name);
-    }
-
     /**
      * Gets the operator registered under the given name.
-     *
      * @param name the name of the operator.
      * @return the operator, or null if it was not found.
      */
@@ -164,7 +117,6 @@ public class PluginManager {
 
     /**
      * Gets the number implementation registered under the given name.
-     *
      * @param name the name of the number implementation.
      * @return the number implementation, or null if it was not found.
      */
@@ -172,28 +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.
      *
@@ -257,25 +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.
      */
@@ -301,7 +212,6 @@ public class PluginManager {
         registeredFunctions.clear();
         registeredOperators.clear();
         registeredNumberImplementations.clear();
-        registeredDocumentation.clear();
         cachedInterfaceImplementations.clear();
         cachedPi.clear();
         listeners.forEach(e -> e.onUnload(this));
@@ -324,15 +234,6 @@ public class PluginManager {
         return registeredFunctions.keySet();
     }
 
-    /**
-     * Gets all the tree vlaue functions loaded by the PluginManager.
-     *
-     * @return the set of all the tree value functions that were loaded.
-     */
-    public Set<String> getAllTreeValueFunctions() {
-        return registeredTreeValueFunctions.keySet();
-    }
-
     /**
      * Gets all the operators loaded by the Plugin Manager.
      *

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

@@ -1,6 +1,9 @@
 package org.nwapw.abacus.plugin;
 
-import org.nwapw.abacus.function.*;
+import org.nwapw.abacus.function.Function;
+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;
@@ -15,6 +18,11 @@ import java.util.function.BiFunction;
  */
 public class StandardPlugin extends Plugin {
 
+    /**
+     * Stores objects of NumberInterface with integer values for reuse.
+     */
+    private final static HashMap<Class<? extends NumberInterface>, HashMap<Integer, NumberInterface>> integerValues = new HashMap<>();
+
     /**
      * The addition operator, +
      */
@@ -81,20 +89,156 @@ public class StandardPlugin extends Plugin {
         }
     });
     /**
-     * The combination operator.
+     * The division operator, /
      */
-    public static final Operator OP_NCR = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0, new Function() {
+    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[0].fractionalPart().signum() == 0
+            return params.length == 2 && params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[1].getClass())) != 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]));
+            return params[0].divide(params[1]);
         }
     });
+    /**
+     * The factorial operator, !
+     */
+    public static final Operator OP_FACTORIAL = new Operator(OperatorAssociativity.RIGHT, OperatorType.UNARY_POSTFIX, 0, new Function() {
+        //private HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> storedList = new HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>>();
+        @Override
+        protected boolean matchesParams(NumberInterface[] params) {
+            return params.length == 1
+                    && params[0].fractionalPart().compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0
+                    && params[0].signum() >= 0;
+        }
+
+        @Override
+        protected NumberInterface applyInternal(NumberInterface[] params) {
+            if (params[0].signum() == 0) {
+                return 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(NaiveNumber.ONE.promoteTo(multiplier.getClass()))).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 absolute value function, abs(-3) = 3
+     */
+    public static final Function FUNCTION_ABS = new Function() {
+        @Override
+        protected boolean matchesParams(NumberInterface[] params) {
+            return params.length == 1;
+        }
+
+        @Override
+        protected NumberInterface applyInternal(NumberInterface[] params) {
+            return params[0].multiply((new NaiveNumber(params[0].signum())).promoteTo(params[0].getClass()));
+        }
+    };
+    /**
+     * The natural log function.
+     */
+    public static final Function FUNCTION_LN = new Function() {
+        @Override
+        protected boolean matchesParams(NumberInterface[] params) {
+            return params.length == 1 && params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) > 0;
+        }
+
+        @Override
+        protected NumberInterface applyInternal(NumberInterface[] params) {
+            NumberInterface param = params[0];
+            int powersOf2 = 0;
+            while (FUNCTION_ABS.apply(param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))).compareTo(new NaiveNumber(0.1).promoteTo(param.getClass())) >= 0) {
+                if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() == 1) {
+                    param = param.divide(fromInt(param.getClass(), 2));
+                    powersOf2++;
+                    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(NaiveNumber.ONE.promoteTo(param.getClass())).signum() != -1) {
+                        break;
+                        //No infinite loop for you.
+                    }
+                }
+            }
+            return getLog2(param).multiply((new NaiveNumber(powersOf2)).promoteTo(param.getClass())).add(getLogPartialSum(param));
+        }
+
+        /**
+         * 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 x value at which the series is evaluated. 0 < x < 2. (x=2 is convergent but impractical.)
+         * @return the partial sum.
+         */
+        private NumberInterface getLogPartialSum(NumberInterface x) {
+
+            NumberInterface maxError = x.getMaxError();
+            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(new NaiveNumber(n).promoteTo(x.getClass()));
+                sum = sum.add(currentTerm);
+            }
+            return sum;
+        }
+
+        /**
+         * Returns natural log of 2 to the required precision of the class of number.
+         * @param number a number of the same type as the return type. (Used for precision.)
+         * @return the value of log(2) with the appropriate precision.
+         */
+        private NumberInterface getLog2(NumberInterface number) {
+            NumberInterface maxError = number.getMaxError();
+            //NumberInterface errorBound = fromInt(number.getClass(), 1);
+            //We'll use the series \sigma_{n >= 1) ((1/3^n + 1/4^n) * 1/n)
+            //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 = NaiveNumber.ZERO.promoteTo(number.getClass());
+            int n = 0;
+            while (a.compareTo(maxError) >= 1) {
+                n++;
+                a = a.divide(fromInt(number.getClass(), 3));
+                b = b.divide(fromInt(number.getClass(), 4));
+                c = NaiveNumber.ONE.promoteTo(number.getClass()).divide((new NaiveNumber(n)).promoteTo(number.getClass()));
+                sum = sum.add(a.add(b).multiply(c));
+            }
+            return sum;
+        }
+    };
+    /**
+     * The square root function.
+     */
+    public static final Function FUNCTION_SQRT = new Function() {
+        @Override
+        protected boolean matchesParams(NumberInterface[] params) {
+            return params.length == 1;
+        }
+
+        @Override
+        protected NumberInterface applyInternal(NumberInterface[] params) {
+            return OP_CARET.getFunction().apply(params[0], ((new NaiveNumber(0.5)).promoteTo(params[0].getClass())));
+        }
+    };
     /**
      * The implementation for double-based naive numbers.
      */
@@ -134,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));
@@ -145,238 +289,6 @@ public class StandardPlugin extends Plugin {
             return C.divide(sum);
         }
     };
-    /**
-     * Stores objects of NumberInterface with integer values for reuse.
-     */
-    private final static HashMap<Class<? extends NumberInterface>, HashMap<Integer, NumberInterface>> integerValues = new HashMap<>();
-    /**
-     * The division operator, /
-     */
-    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;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return params[0].divide(params[1]);
-        }
-    });
-    /**
-     * The factorial operator, !
-     */
-    public static final Operator OP_FACTORIAL = new Operator(OperatorAssociativity.RIGHT, OperatorType.UNARY_POSTFIX, 0, new Function() {
-        //private HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> storedList = new HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>>();
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1
-                    && params[0].fractionalPart().compareTo(fromInt(params[0].getClass(), 0)) == 0
-                    && params[0].signum() >= 0;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            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) {
-                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 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 absolute value function, abs(-3) = 3
-     */
-    public static final Function FUNCTION_ABS = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return params[0].multiply(fromInt(params[0].getClass(), params[0].signum()));
-        }
-    };
-    /**
-     * The natural log function.
-     */
-    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;
-        }
-
-        @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) {
-                if (param.subtract(one).signum() == 1) {
-                    param = param.divide(fromInt(param.getClass(), 2));
-                    powersOf2++;
-                    if (param.subtract(one).signum() != 1) {
-                        break;
-                        //No infinite loop for you.
-                    }
-                } else {
-                    param = param.multiply(fromInt(param.getClass(), 2));
-                    powersOf2--;
-                    if (param.subtract(one).signum() != -1) {
-                        break;
-                        //No infinite loop for you.
-                    }
-                }
-            }
-            return getLog2(param).multiply(fromInt(param.getClass(), powersOf2)).add(getLogPartialSum(param));
-        }
-
-        /**
-         * 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 x value at which the series is evaluated. 0 < x < 2. (x=2 is convergent but impractical.)
-         * @return the partial sum.
-         */
-        private NumberInterface getLogPartialSum(NumberInterface x) {
-
-            NumberInterface maxError = x.getMaxError();
-            x = x.subtract(fromInt(x.getClass(), 1)); //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));
-                sum = sum.add(currentTerm);
-            }
-            return sum;
-        }
-
-        /**
-         * Returns natural log of 2 to the required precision of the class of number.
-         * @param number a number of the same type as the return type. (Used for precision.)
-         * @return the value of log(2) with the appropriate precision.
-         */
-        private NumberInterface getLog2(NumberInterface number) {
-            NumberInterface maxError = number.getMaxError();
-            //NumberInterface errorBound = fromInt(number.getClass(), 1);
-            //We'll use the series \sigma_{n >= 1) ((1/3^n + 1/4^n) * 1/n)
-            //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 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));
-                sum = sum.add(a.add(b).multiply(c));
-            }
-            return sum;
-        }
-    };
-    /**
-     * 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 caret / pow operator, ^
-     */
-    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[1].compareTo(zero) == 0)
-                    && !(params[0].signum() == -1 && params[1].fractionalPart().compareTo(zero) != 0);
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            NumberInterface zero = fromInt(params[0].getClass(), 0);
-            if (params[0].compareTo(zero) == 0)
-                return zero;
-            else if (params[1].compareTo(zero) == 0)
-                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
-                    && FUNCTION_ABS.apply(params[1]).compareTo(fromInt(params[1].getClass(), 1)) >= 0) {
-                NumberInterface[] newParams = {params[0], params[1].fractionalPart()};
-                return params[0].intPow(params[1].floor().intValue()).multiply(applyInternal(newParams));
-            }
-            return FUNCTION_EXP.apply(FUNCTION_LN.apply(FUNCTION_ABS.apply(params[0])).multiply(params[1]));
-        }
-    });
-    /**
-     * The square root function.
-     */
-    public static final Function FUNCTION_SQRT = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return OP_CARET.getFunction().apply(params[0], ((new NaiveNumber(0.5)).promoteTo(params[0].getClass())));
-        }
-    };
     private static final HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> FACTORIAL_LISTS = new HashMap<>();
     /**
      * The exponential function, exp(1) = e^1 = 2.71...
@@ -397,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 {
@@ -405,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);
                 }
@@ -415,6 +327,34 @@ public class StandardPlugin extends Plugin {
             }
         }
     };
+    /**
+     * The caret / pow operator, ^
+     */
+    public static final Operator OP_CARET = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2, new Function() {
+        @Override
+        protected boolean matchesParams(NumberInterface[] params) {
+            return params.length == 2
+                    && !(params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0
+                    && params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[1].getClass())) == 0)
+                    && !(params[0].signum() == -1 && params[1].fractionalPart().compareTo(NaiveNumber.ZERO.promoteTo(params[1].getClass())) != 0);
+        }
+
+        @Override
+        protected NumberInterface applyInternal(NumberInterface[] params) {
+            if (params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0)
+                return NaiveNumber.ZERO.promoteTo(params[0].getClass());
+            else if (params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0)
+                return NaiveNumber.ONE.promoteTo(params[1].getClass());
+            //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
+                    && FUNCTION_ABS.apply(params[1]).compareTo(fromInt(params[1].getClass(), 1)) >= 0){
+                NumberInterface[] newParams = {params[0], params[1].fractionalPart()};
+                return params[0].intPow(params[1].floor().intValue()).multiply(applyInternal(newParams));
+            }
+            return FUNCTION_EXP.apply(FUNCTION_LN.apply(FUNCTION_ABS.apply(params[0])).multiply(params[1]));
+        }
+    });
     /**
      * The sine function (the argument is interpreted in radians).
      */
@@ -479,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]));
         }
     };
     /**
@@ -493,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]));
         }
     };
     /**
@@ -511,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);
     }
@@ -662,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));
         }
@@ -680,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);
@@ -718,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) {
@@ -729,7 +531,6 @@ public class StandardPlugin extends Plugin {
 
     /**
      * Returns a number of class numType with value n.
-     *
      * @param numType class of number to return.
      * @param n value of returned number.
      * @return numClass instance with value n.
@@ -757,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/NumberReducer.java

@@ -2,7 +2,6 @@ package org.nwapw.abacus.tree;
 
 import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.function.Function;
-import org.nwapw.abacus.function.TreeValueFunction;
 import org.nwapw.abacus.number.NumberInterface;
 
 /**
@@ -28,9 +27,7 @@ public class NumberReducer implements Reducer<NumberInterface> {
     @Override
     public NumberInterface reduceNode(TreeNode node, Object... children) {
         if (node instanceof NumberNode) {
-            return abacus.numberFromString(((NumberNode) node).getNumber());
+            return ((NumberNode) node).getNumber();
-        } else if(node instanceof VariableNode) {
-            return abacus.numberFromString("0");
         } else if (node instanceof BinaryNode) {
             NumberInterface left = (NumberInterface) children[0];
             NumberInterface right = (NumberInterface) children[1];
@@ -47,19 +44,9 @@ public class NumberReducer implements Reducer<NumberInterface> {
             for (int i = 0; i < convertedChildren.length; i++) {
                 convertedChildren[i] = (NumberInterface) children[i];
             }
-            Function function = abacus.getPluginManager().functionFor(((FunctionNode) node).getCallTo());
+            Function function = abacus.getPluginManager().functionFor(((FunctionNode) node).getFunction());
             if (function == null) return null;
             return function.apply(convertedChildren);
-        } else if (node instanceof TreeValueFunctionNode){
-            CallNode callNode = (CallNode) node;
-            TreeNode[] realChildren = new TreeNode[callNode.getChildren().size()];
-            for(int i = 0; i < realChildren.length; i++){
-                realChildren[i] = callNode.getChildren().get(i);
-            }
-            TreeValueFunction function =
-                    abacus.getPluginManager().treeValueFunctionFor(callNode.getCallTo());
-            if(function == null) return null;
-            return function.applyWithReducer(this, realChildren);
         }
         return null;
     }

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/tree/TokenType.java

@@ -7,7 +7,7 @@ package org.nwapw.abacus.tree;
 public enum TokenType {
 
     INTERNAL_FUNCTION_END(-1),
-    ANY(0), WHITESPACE(1), COMMA(2), OP(3), NUM(4), VARIABLE(5), FUNCTION(6), TREE_VALUE_FUNCTION(6), OPEN_PARENTH(7), CLOSE_PARENTH(8);
+    ANY(0), WHITESPACE(1), COMMA(2), OP(3), NUM(4), FUNCTION(5), OPEN_PARENTH(6), CLOSE_PARENTH(7);
 
     /**
      * The priority by which this token gets sorted.

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/BinaryNode.kt

@@ -11,7 +11,7 @@ package org.nwapw.abacus.tree
  * @param left the left node.
  * @param right the right node.
  */
-class BinaryNode(val operation: String, val left: TreeNode? = null, val right: TreeNode?) : TreeNode() {
+data class BinaryNode(val operation: String, val left: TreeNode? = null, val right: TreeNode?) : TreeNode() {
 
     override fun <T : Any> reduce(reducer: Reducer<T>): T? {
         val leftReduce = left?.reduce(reducer) ?: return null

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

@@ -0,0 +1,52 @@
+package org.nwapw.abacus.tree
+
+/**
+ * A tree node that holds a function call.
+ *
+ * The function call node can hold any number of children, and passes the to the appropriate reducer,
+ * but that is its sole purpose.
+ *
+ * @param function the function string.
+ */
+data class FunctionNode(val function: String) : TreeNode() {
+
+    /**
+     * List of function parameters added to this node.
+     */
+    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; })
+        return reducer.reduceNode(this, *children)
+    }
+
+    override fun toString(): String {
+        val buffer = StringBuffer()
+        buffer.append(function)
+        buffer.append('(')
+        for (i in 0 until children.size) {
+            buffer.append(children[i].toString())
+            buffer.append(if (i == children.size - 1) ")" else ",")
+        }
+        return buffer.toString()
+    }
+
+    /**
+     * Appends a child to this node's list of children.
+     *
+     * @node the node to append.
+     */
+    fun appendChild(node: TreeNode){
+        children.add(node)
+    }
+
+    /**
+     * Prepends a child to this node's list of children.
+     *
+     * @node the node to prepend.
+     */
+    fun prependChild(node: TreeNode){
+        children.add(0, node)
+    }
+
+}

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

@@ -10,14 +10,14 @@ import org.nwapw.abacus.number.NumberInterface
  *
  * @number the number value of this node.
  */
-class NumberNode(val number: String) : TreeNode() {
+data class NumberNode(val number: NumberInterface) : TreeNode() {
 
     override fun <T : Any> reduce(reducer: Reducer<T>): T? {
         return reducer.reduceNode(this)
     }
 
     override fun toString(): String {
-        return number
+        return number.toString()
     }
 
 }

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

@@ -9,7 +9,7 @@ package org.nwapw.abacus.tree
  * @param operation the operation applied to the given node.
  * @param applyTo the node to which the operation will be applied.
  */
-class UnaryNode(val operation: String, val applyTo: TreeNode? = null) : TreeNode() {
+data class UnaryNode(val operation: String, val applyTo: TreeNode? = null) : TreeNode() {
 
     override fun <T : Any> reduce(reducer: Reducer<T>): T? {
         val reducedChild = applyTo?.reduce(reducer) ?: return null

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>

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

@@ -101,7 +101,7 @@ public class CalculationTests {
         testOutput("2^50", "(2^50)", "112589990684262");
         testOutput("7^(-sqrt2*17)", "(7^((sqrt(2)*17))`)", "4.81354609155297814551845300063563");
         testEvalError("0^0", "(0^0)");
-        testEvalError("(-13)^.9999", "((13)`^.9999)");
+        testEvalError("(-13)^.9999", "((13)`^0.9999)");
     }
 
 }