Delete old, unused code.

# Conflicts:
#	src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java

build.gradle

@@ -1,21 +1,13 @@
-plugins {
-    id 'java'
-    id 'application'
-    id 'org.jetbrains.kotlin.jvm' version '1.1.3'
-}
-apply plugin: 'java'
-apply plugin: 'application'
+subprojects {
 
-repositories {
+    apply plugin: 'java'
+
+    repositories {
       mavenCentral()
+    }
+
+    dependencies {
+        compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.3"
+    }
 }
 
-dependencies {
-    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

@@ -0,0 +1,8 @@
+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/Abacus.java

@@ -1,7 +1,6 @@
 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;
@@ -61,10 +60,6 @@ public class Abacus {
         pluginManager.addListener(lexerTokenizer);
     }
 
-    public static void main(String[] args) {
-        AbacusApplication.launch(AbacusApplication.class, args);
-    }
-
     /**
      * Gets the current tree builder.
      *

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

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

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

@@ -1,5 +1,7 @@
 package org.nwapw.abacus.plugin;
 
+import org.nwapw.abacus.function.Documentation;
+import org.nwapw.abacus.function.DocumentationType;
 import org.nwapw.abacus.function.Function;
 import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.number.NumberInterface;
@@ -94,6 +96,15 @@ 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
@@ -130,6 +141,17 @@ 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

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

@@ -1,6 +1,8 @@
 package org.nwapw.abacus.plugin;
 
 import org.nwapw.abacus.Abacus;
+import org.nwapw.abacus.function.Documentation;
+import org.nwapw.abacus.function.DocumentationType;
 import org.nwapw.abacus.function.Function;
 import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.number.NumberInterface;
@@ -34,6 +36,10 @@ 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.
@@ -65,6 +71,7 @@ public class PluginManager {
         registeredFunctions = new HashMap<>();
         registeredOperators = new HashMap<>();
         registeredNumberImplementations = new HashMap<>();
+        registeredDocumentation = new HashSet<>();
         cachedInterfaceImplementations = new HashMap<>();
         cachedPi = new HashMap<>();
         listeners = new HashSet<>();
@@ -97,6 +104,15 @@ 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.
@@ -124,6 +140,27 @@ 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.
      *
@@ -230,6 +267,7 @@ public class PluginManager {
         registeredFunctions.clear();
         registeredOperators.clear();
         registeredNumberImplementations.clear();
+        registeredDocumentation.clear();
         cachedInterfaceImplementations.clear();
         cachedPi.clear();
         listeners.forEach(e -> e.onUnload(this));

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

@@ -1,15 +1,19 @@
 package org.nwapw.abacus.plugin;
 
-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.function.*;
+import org.nwapw.abacus.lexing.pattern.Match;
 import org.nwapw.abacus.number.NaiveNumber;
 import org.nwapw.abacus.number.NumberInterface;
 import org.nwapw.abacus.number.PreciseNumber;
+import org.nwapw.abacus.parsing.Parser;
+import org.nwapw.abacus.parsing.ShuntingYardParser;
+import org.nwapw.abacus.tree.TokenType;
+import org.nwapw.abacus.tree.TreeNode;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.function.BiFunction;
 
 /**
@@ -94,7 +98,7 @@ public class StandardPlugin extends Plugin {
     public static final Operator OP_DIVIDE = new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1, new Function() {
         @Override
         protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 2 && params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[1].getClass())) != 0;
+            return params.length == 2 && params[1].compareTo(fromInt(params[0].getClass(), 0)) != 0;
         }
 
         @Override
@@ -110,7 +114,7 @@ public class StandardPlugin extends Plugin {
         @Override
         protected boolean matchesParams(NumberInterface[] params) {
             return params.length == 1
-                    && params[0].fractionalPart().compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0
+                    && params[0].fractionalPart().compareTo(fromInt(params[0].getClass(), 0)) == 0
                     && params[0].signum() >= 0;
         }
 
@@ -119,10 +123,11 @@ public class StandardPlugin extends Plugin {
             if (params[0].signum() == 0) {
                 return fromInt(params[0].getClass(), 1);
             }
+            NumberInterface one = fromInt(params[0].getClass(), 1);
             NumberInterface factorial = params[0];
             NumberInterface multiplier = params[0];
             //It is necessary to later prevent calls of factorial on anything but non-negative integers.
-            while ((multiplier = multiplier.subtract(NaiveNumber.ONE.promoteTo(multiplier.getClass()))).signum() == 1) {
+            while ((multiplier = multiplier.subtract(one)).signum() == 1) {
                 factorial = factorial.multiply(multiplier);
             }
             return factorial;
@@ -133,6 +138,51 @@ public class StandardPlugin extends Plugin {
                 }*/
         }
     });
+    /**
+     * The permutation operator.
+     */
+    public static final Operator OP_NPR = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0, new Function() {
+        @Override
+        protected boolean matchesParams(NumberInterface[] params) {
+            return params.length == 2 && params[0].fractionalPart().signum() == 0
+                    && params[1].fractionalPart().signum() == 0;
+        }
+
+        @Override
+        protected NumberInterface applyInternal(NumberInterface[] params) {
+            if(params[0].compareTo(params[1]) < 0 ||
+                    params[0].signum() < 0 ||
+                    (params[0].signum() == 0 && params[1].signum() != 0)) return fromInt(params[0].getClass(), 0);
+            NumberInterface total = fromInt(params[0].getClass(), 1);
+            NumberInterface multiplyBy = params[0];
+            NumberInterface remainingMultiplications = params[1];
+            NumberInterface halfway = params[0].divide(fromInt(params[0].getClass(), 2));
+            if(remainingMultiplications.compareTo(halfway) > 0){
+                remainingMultiplications = params[0].subtract(remainingMultiplications);
+            }
+            while(remainingMultiplications.signum() > 0){
+                total = total.multiply(multiplyBy);
+                remainingMultiplications = remainingMultiplications.subtract(fromInt(params[0].getClass(), 1));
+                multiplyBy = multiplyBy.subtract(fromInt(params[0].getClass(), 1));
+            }
+            return total;
+        }
+    });
+    /**
+     * The combination operator.
+     */
+    public static final Operator OP_NCR = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0, new Function() {
+        @Override
+        protected boolean matchesParams(NumberInterface[] params) {
+            return params.length == 2 && params[0].fractionalPart().signum() == 0
+                    && params[1].fractionalPart().signum() == 0;
+        }
+
+        @Override
+        protected NumberInterface applyInternal(NumberInterface[] params) {
+            return OP_NPR.getFunction().apply(params).divide(OP_FACTORIAL.getFunction().apply(params[1]));
+        }
+    });
     /**
      * The absolute value function, abs(-3) = 3
      */
@@ -144,7 +194,7 @@ public class StandardPlugin extends Plugin {
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
-            return params[0].multiply((new NaiveNumber(params[0].signum())).promoteTo(params[0].getClass()));
+            return params[0].multiply(fromInt(params[0].getClass(), params[0].signum()));
         }
     };
     /**
@@ -153,31 +203,32 @@ public class StandardPlugin extends Plugin {
     public static final Function FUNCTION_LN = new Function() {
         @Override
         protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1 && params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) > 0;
+            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(NaiveNumber.ONE.promoteTo(param.getClass()))).compareTo(new NaiveNumber(0.1).promoteTo(param.getClass())) >= 0) {
-                if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() == 1) {
+            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(NaiveNumber.ONE.promoteTo(param.getClass())).signum() != 1) {
+                    if (param.subtract(one).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) {
+                    if (param.subtract(one).signum() != -1) {
                         break;
                         //No infinite loop for you.
                     }
                 }
             }
-            return getLog2(param).multiply((new NaiveNumber(powersOf2)).promoteTo(param.getClass())).add(getLogPartialSum(param));
+            return getLog2(param).multiply(fromInt(param.getClass(), powersOf2)).add(getLogPartialSum(param));
         }
 
         /**
@@ -189,13 +240,13 @@ public class StandardPlugin extends Plugin {
         private NumberInterface getLogPartialSum(NumberInterface x) {
 
             NumberInterface maxError = x.getMaxError();
-            x = x.subtract(NaiveNumber.ONE.promoteTo(x.getClass())); //Terms used are for log(x+1).
+            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(new NaiveNumber(n).promoteTo(x.getClass()));
+                currentTerm = currentNumerator.divide(fromInt(x.getClass(), n));
                 sum = sum.add(currentTerm);
             }
             return sum;
@@ -213,13 +264,14 @@ public class StandardPlugin extends Plugin {
             //In the following, a=1/3^n, b=1/4^n, c = 1/n.
             //a is also an error bound.
             NumberInterface a = fromInt(number.getClass(), 1), b = a, c = a;
-            NumberInterface sum = NaiveNumber.ZERO.promoteTo(number.getClass());
+            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 = NaiveNumber.ONE.promoteTo(number.getClass()).divide((new NaiveNumber(n)).promoteTo(number.getClass()));
+                c = one.divide(fromInt(number.getClass(), n));
                 sum = sum.add(a.add(b).multiply(c));
             }
             return sum;
@@ -239,6 +291,20 @@ public class StandardPlugin extends Plugin {
             return OP_CARET.getFunction().apply(params[0], ((new NaiveNumber(0.5)).promoteTo(params[0].getClass())));
         }
     };
+    /**
+     * Gets a random number smaller or equal to the given number's integer value.
+     */
+    public static final Function FUNCTION_RAND_INT = new Function() {
+        @Override
+        protected boolean matchesParams(NumberInterface[] params) {
+            return params.length == 1;
+        }
+
+        @Override
+        protected NumberInterface applyInternal(NumberInterface[] params) {
+            return fromInt(params[0].getClass(), (int) Math.round(Math.random() * params[0].floor().intValue()));
+        }
+    };
     /**
      * The implementation for double-based naive numbers.
      */
@@ -278,10 +344,10 @@ public class StandardPlugin extends Plugin {
                     .negate();
             for (int i = 0; i < termsNeeded; i++) {
                 M = M
-                        .multiply(new NaiveNumber(12 * i + 2).promoteTo(PreciseNumber.class))
-                        .multiply(new NaiveNumber(12 * i + 6).promoteTo(PreciseNumber.class))
-                        .multiply(new NaiveNumber(12 * i + 10).promoteTo(PreciseNumber.class))
-                        .divide(new NaiveNumber(Math.pow(i + 1, 3)).promoteTo(PreciseNumber.class));
+                        .multiply(new PreciseNumber((12 * i + 2) + ""))
+                        .multiply(new PreciseNumber((12 * i + 6) + ""))
+                        .multiply(new PreciseNumber((12 * i + 10) + ""))
+                        .divide(new PreciseNumber(Math.pow(i + 1, 3) + ""));
                 L = L.add(lSummand);
                 X = X.multiply(xMultiplier);
                 sum = sum.add(M.multiply(L).divide(X));
@@ -309,7 +375,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 = NaiveNumber.ONE.promoteTo(params[0].getClass());
+                NumberInterface sum = fromInt(params[0].getClass(), 1);
                 NumberInterface nextNumerator = params[0];
                 NumberInterface left = params[0].multiply(fromInt(params[0].getClass(), 3).intPow(params[0].ceiling().intValue())), right = maxError;
                 do {
@@ -317,7 +383,7 @@ public class StandardPlugin extends Plugin {
                     n++;
                     nextNumerator = nextNumerator.multiply(params[0]);
                     left = left.multiply(params[0]);
-                    NumberInterface nextN = (new NaiveNumber(n + 1)).promoteTo(params[0].getClass());
+                    NumberInterface nextN = fromInt(params[0].getClass(), n + 1);
                     right = right.multiply(nextN);
                     //System.out.println(left + ", " + right);
                 }
@@ -333,18 +399,20 @@ public class StandardPlugin extends Plugin {
     public static final Operator OP_CARET = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2, new Function() {
         @Override
         protected boolean matchesParams(NumberInterface[] params) {
+            NumberInterface zero = fromInt(params[0].getClass(), 0);
             return params.length == 2
-                    && !(params[0].compareTo(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);
+                    && !(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) {
-            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());
+            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
@@ -419,7 +487,7 @@ public class StandardPlugin extends Plugin {
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
-            return NaiveNumber.ONE.promoteTo(params[0].getClass()).divide(functionCos.apply(params[0]));
+            return fromInt(params[0].getClass(), 1).divide(functionCos.apply(params[0]));
         }
     };
     /**
@@ -433,7 +501,7 @@ public class StandardPlugin extends Plugin {
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
-            return NaiveNumber.ONE.promoteTo(params[0].getClass()).divide(functionSin.apply(params[0]));
+            return fromInt(params[0].getClass(), 1).divide(functionSin.apply(params[0]));
         }
     };
     /**
@@ -451,6 +519,144 @@ 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);
     }
@@ -464,7 +670,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 = NaiveNumber.ZERO.promoteTo(x.getClass());
+        NumberInterface sum = fromInt(x.getClass(), 0);
         for (int i = 0; i <= n; i++) {
             sum = sum.add(nthTermFunction.apply(i, x));
         }
@@ -482,13 +688,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(NaiveNumber.ONE.promoteTo(numberClass));
-            FACTORIAL_LISTS.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
+            FACTORIAL_LISTS.get(numberClass).add(fromInt(numberClass, 1));
+            FACTORIAL_LISTS.get(numberClass).add(fromInt(numberClass, 1));
         }
         ArrayList<NumberInterface> list = FACTORIAL_LISTS.get(numberClass);
         if (n >= list.size()) {
             while (list.size() < n + 16) {
-                list.add(list.get(list.size() - 1).multiply(new NaiveNumber(list.size()).promoteTo(numberClass)));
+                list.add(list.get(list.size() - 1).multiply(fromInt(numberClass, list.size())));
             }
         }
         return list.get(n);
@@ -520,7 +726,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(new NaiveNumber("2").promoteTo(phi.getClass()));
+        NumberInterface twoPi = pi.multiply(fromInt(pi.getClass(), 2));
         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) {
@@ -558,16 +764,77 @@ 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

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

@@ -0,0 +1,26 @@
+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())
+    }
+
+}

fx/build.gradle

@@ -0,0 +1,10 @@
+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/AbacusApplication.java

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

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

@@ -7,6 +7,7 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.fxml.FXML;
+import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.CheckBoxListCell;
 import javafx.scene.text.Text;
@@ -14,6 +15,8 @@ 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,7 +27,10 @@ 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;
 
 
 /**
@@ -97,7 +103,7 @@ public class AbacusController implements PluginListener {
     @FXML
     private TextField computationLimitField;
     @FXML
-    private ListView<String> functionListView;
+    private ListView<Documentation> functionListView;
     @FXML
     private TextField functionListSearchField;
 
@@ -120,11 +126,11 @@ public class AbacusController implements PluginListener {
     /**
      * The list of functions that are registered in the calculator.
      */
-    private ObservableList<String> functionList;
+    private ObservableList<Documentation> functionList;
     /**
      * The filtered list displayed to the user.
      */
-    private FilteredList<String> functionFilter;
+    private FilteredList<Documentation> functionFilter;
 
     /**
      * The abacus instance used for changing the plugin configuration.
@@ -227,12 +233,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.contains(newValue))));
+                functionFilter.setPredicate((newValue.length() == 0) ? ((s) -> true) : ((s) -> s.matches(newValue))));
+        functionListView.setCellFactory(param -> new DocumentationCell());
         historyData = FXCollections.observableArrayList();
         historyTable.setItems(historyData);
         numberImplementationOptions = FXCollections.observableArrayList();
@@ -354,8 +360,10 @@ public class AbacusController implements PluginListener {
             plugin.getEnabledProperty().addListener(e -> changesMade = true);
             enabledPlugins.add(plugin);
         }
-        functionList.addAll(manager.getAllFunctions());
-        functionList.sort(String::compareTo);
+        PluginManager pluginManager = abacus.getPluginManager();
+        functionList.addAll(manager.getAllFunctions().stream().map(name -> pluginManager.documentationFor(name, DocumentationType.FUNCTION))
+                .collect(Collectors.toCollection(ArrayList::new)));
+        functionList.sort(Comparator.comparing(Documentation::getCodeName));
     }
 
     @Override

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

@@ -0,0 +1,59 @@
+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 +1,2 @@
 rootProject.name = 'abacus'
+include 'core', 'fx'

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

@@ -1,106 +0,0 @@
-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

@@ -1,255 +0,0 @@
-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();
-    }
-}