Switch to the new UI.

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

@@ -1,21 +1,21 @@
 package org.nwapw.abacus;
 
 import org.nwapw.abacus.config.ConfigurationObject;
+import org.nwapw.abacus.fx.AbacusApplication;
+import org.nwapw.abacus.number.NaiveNumber;
 import org.nwapw.abacus.number.NumberInterface;
 import org.nwapw.abacus.parsing.LexerTokenizer;
 import org.nwapw.abacus.parsing.ShuntingYardParser;
 import org.nwapw.abacus.parsing.TreeBuilder;
 import org.nwapw.abacus.plugin.ClassFinder;
-import org.nwapw.abacus.plugin.NumberImplementation;
 import org.nwapw.abacus.plugin.PluginManager;
 import org.nwapw.abacus.plugin.StandardPlugin;
 import org.nwapw.abacus.tree.NumberReducer;
 import org.nwapw.abacus.tree.TreeNode;
-import org.nwapw.abacus.window.Window;
 
-import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 
 /**
  * The main calculator class. This is responsible
@@ -24,7 +24,10 @@ import java.io.IOException;
  */
 public class Abacus {
 
-    public static final NumberImplementation DEFAULT_IMPLEMENTATION = StandardPlugin.IMPLEMENTATION_NAIVE;
+    /**
+     * The default implementation to use for the number representation.
+     */
+    public static final Class<? extends NumberInterface> DEFAULT_NUMBER = NaiveNumber.class;
     /**
      * The file used for saving and loading configuration.
      */
@@ -75,13 +78,7 @@ public class Abacus {
     }
 
     public static void main(String[] args) {
-        try {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        } catch (ClassNotFoundException | InstantiationException | UnsupportedLookAndFeelException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-        new Window(new Abacus()).setVisible(true);
+        AbacusApplication.launch(AbacusApplication.class, args);
     }
 
     /**
@@ -150,10 +147,15 @@ public class Abacus {
      * @return the resulting number.
      */
     public NumberInterface numberFromString(String numberString) {
-        NumberImplementation toInstantiate =
-                pluginManager.numberImplementationFor(configuration.getNumberImplementation());
-        if (toInstantiate == null) toInstantiate = DEFAULT_IMPLEMENTATION;
+        Class<? extends NumberInterface> toInstantiate =
+                pluginManager.numberFor(configuration.getNumberImplementation());
+        if (toInstantiate == null) toInstantiate = DEFAULT_NUMBER;
 
-        return toInstantiate.instanceForString(numberString);
+        try {
+            return toInstantiate.getConstructor(String.class).newInstance(numberString);
+        } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
     }
 }

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

@@ -1,6 +1,10 @@
 package org.nwapw.abacus.function;
 
+import org.nwapw.abacus.number.NaiveNumber;
 import org.nwapw.abacus.number.NumberInterface;
+import org.nwapw.abacus.number.PreciseNumber;
+
+import java.util.HashMap;
 
 /**
  * A function that operates on one or more
@@ -8,6 +12,15 @@ import org.nwapw.abacus.number.NumberInterface;
  */
 public abstract class Function {
 
+    /**
+     * A map to correctly promote different number implementations to each other.
+     */
+    private static final HashMap<Class<? extends NumberInterface>, Integer> priorityMap =
+            new HashMap<Class<? extends NumberInterface>, Integer>() {{
+                put(NaiveNumber.class, 0);
+                put(PreciseNumber.class, 1);
+            }};
+
     /**
      * Checks whether the given params will work for the given function.
      *

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

@@ -0,0 +1,20 @@
+package org.nwapw.abacus.fx;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+public class AbacusApplication extends Application {
+
+    @Override
+    public void start(Stage primaryStage) throws Exception {
+        Parent parent = FXMLLoader.load(getClass().getResource("/abacus.fxml"));
+        Scene mainScene = new Scene(parent, 320, 480);
+        primaryStage.setScene(mainScene);
+        primaryStage.setTitle("Abacus");
+        primaryStage.show();
+    }
+
+}

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

@@ -0,0 +1,77 @@
+package org.nwapw.abacus.fx;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.text.Text;
+import javafx.util.Callback;
+import org.nwapw.abacus.Abacus;
+import org.nwapw.abacus.number.NumberInterface;
+import org.nwapw.abacus.tree.TreeNode;
+
+
+public class AbacusController {
+
+    private static final String ERR_SYNTAX = "Syntax Error";
+    private static final String ERR_EVAL = "Evaluation Error";
+
+    @FXML
+    private TableView<HistoryModel> historyTable;
+    @FXML
+    private TableColumn<HistoryModel, String> inputColumn;
+    @FXML
+    private TableColumn<HistoryModel, String> parsedColumn;
+    @FXML
+    private TableColumn<HistoryModel, String> outputColumn;
+    @FXML
+    private Text outputText;
+    @FXML
+    private TextField inputField;
+    @FXML
+    private Button inputButton;
+
+    private ObservableList<HistoryModel> historyData;
+
+    private Abacus abacus;
+
+    @FXML
+    public void initialize(){
+        Callback<TableColumn<HistoryModel, String>, TableCell<HistoryModel, String>> cellFactory =
+                param -> new CopyableCell<>();
+
+        abacus = new Abacus();
+        historyData = FXCollections.observableArrayList();
+        historyTable.setItems(historyData);
+        historyTable.getSelectionModel().setCellSelectionEnabled(true);
+        inputColumn.setCellFactory(cellFactory);
+        inputColumn.setCellValueFactory(cell -> cell.getValue().inputProperty());
+        parsedColumn.setCellFactory(cellFactory);
+        parsedColumn.setCellValueFactory(cell -> cell.getValue().parsedProperty());
+        outputColumn.setCellFactory(cellFactory);
+        outputColumn.setCellValueFactory(cell -> cell.getValue().outputProperty());
+    }
+
+    @FXML
+    private void performCalculation(){
+        inputButton.setDisable(true);
+        TreeNode constructedTree = abacus.parseString(inputField.getText());
+        if(constructedTree == null){
+            outputText.setText(ERR_SYNTAX);
+            inputButton.setDisable(false);
+            return;
+        }
+        NumberInterface evaluatedNumber = abacus.evaluateTree(constructedTree);
+        if(evaluatedNumber == null){
+            outputText.setText(ERR_EVAL);
+            inputButton.setDisable(false);
+            return;
+        }
+        outputText.setText(evaluatedNumber.toString());
+        historyData.add(new HistoryModel(inputField.getText(), constructedTree.toString(), evaluatedNumber.toString()));
+
+        inputButton.setDisable(false);
+        inputField.setText("");
+    }
+
+}

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

@@ -0,0 +1,26 @@
+package org.nwapw.abacus.fx;
+
+import javafx.scene.control.TableCell;
+import javafx.scene.input.MouseEvent;
+
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
+
+public class CopyableCell<S, T> extends TableCell<S, T> {
+
+    public CopyableCell(){
+        addEventFilter(MouseEvent.MOUSE_CLICKED, event -> {
+            if(event.getClickCount() == 2){
+                Toolkit.getDefaultToolkit().getSystemClipboard()
+                        .setContents(new StringSelection(getText()), null);
+            }
+        });
+    }
+
+    @Override
+    protected void updateItem(T item, boolean empty) {
+        super.updateItem(item, empty);
+        setText((empty || item == null) ? null : item.toString());
+        setGraphic(null);
+    }
+}

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

@@ -0,0 +1,42 @@
+package org.nwapw.abacus.fx;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+public class HistoryModel {
+
+    private final StringProperty input;
+    private final StringProperty parsed;
+    private final StringProperty output;
+
+    public HistoryModel(String input, String parsed, String output){
+        this.input = new SimpleStringProperty();
+        this.parsed = new SimpleStringProperty();
+        this.output = new SimpleStringProperty();
+        this.input.setValue(input);
+        this.parsed.setValue(parsed);
+        this.output.setValue(output);
+    }
+
+    public StringProperty inputProperty() {
+        return input;
+    }
+    public String getInput() {
+        return input.get();
+    }
+
+    public StringProperty parsedProperty() {
+        return parsed;
+    }
+    public String getParsed() {
+        return parsed.get();
+    }
+
+    public StringProperty outputProperty() {
+        return output;
+    }
+    public String getOutput() {
+        return output.get();
+    }
+
+}

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

@@ -93,26 +93,6 @@ public class NaiveNumber implements NumberInterface {
         return this.compareTo(ZERO);
     }
 
-    @Override
-    public NumberInterface ceiling() {
-        return new NaiveNumber(Math.ceil(value));
-    }
-
-    @Override
-    public NumberInterface floor() {
-        return new NaiveNumber(Math.floor(value));
-    }
-
-    @Override
-    public NumberInterface fractionalPart() {
-        return new NaiveNumber(value - Math.floor(value));
-    }
-
-    @Override
-    public int intValue() {
-        return (int)value;
-    }
-
     @Override
     public NumberInterface promoteTo(Class<? extends NumberInterface> toClass) {
         if (toClass == this.getClass()) return this;

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

@@ -79,31 +79,6 @@ public interface NumberInterface {
      */
     int signum();
 
-    /**
-     * Returns the least integer greater than or equal to the number.
-     * @return the least integer >= the number, if int can hold the value.
-     */
-    NumberInterface ceiling();
-
-    /**
-     * Return the greatest integer less than or equal to the number.
-     * @return the greatest int >= the number, if int can hold the value.
-     */
-    NumberInterface floor();
-
-    /**
-     * Returns the fractional part of the number.
-     * @return the fractional part of the number.
-     */
-    NumberInterface fractionalPart();
-
-    /**
-     * Returns the integer representation of this number, discarding any fractional part,
-     * if int can hold the value.
-     * @return
-     */
-    int intValue();
-
     /**
      * Promotes this class to another number class.
      *

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

@@ -8,15 +8,15 @@ public class PreciseNumber implements NumberInterface {
     /**
      * The number one.
      */
-    public static final PreciseNumber ONE = new PreciseNumber(BigDecimal.ONE);
+    static final PreciseNumber ONE = new PreciseNumber(BigDecimal.ONE);
     /**
      * The number zero.
      */
-    public static final PreciseNumber ZERO = new PreciseNumber(BigDecimal.ZERO);
+    static final PreciseNumber ZERO = new PreciseNumber(BigDecimal.ZERO);
     /**
      * The number ten.
      */
-    public static final PreciseNumber TEN = new PreciseNumber(BigDecimal.TEN);
+    static final PreciseNumber TEN = new PreciseNumber(BigDecimal.TEN);
 
     /**
      * The value of the PreciseNumber.
@@ -44,12 +44,12 @@ public class PreciseNumber implements NumberInterface {
 
     @Override
     public int getMaxPrecision() {
-        return 65;
+        return 54;
     }
 
     @Override
     public NumberInterface multiply(NumberInterface multiplier) {
-        return new PreciseNumber(this.value.multiply(((PreciseNumber) multiplier).value));
+        return new PreciseNumber(value.multiply(((PreciseNumber) multiplier).value));
     }
 
     @Override
@@ -94,41 +94,6 @@ public class PreciseNumber implements NumberInterface {
         return value.signum();
     }
 
-    @Override
-    public NumberInterface ceiling() {
-        String str = value.toPlainString();
-        int decimalIndex = str.indexOf('.');
-        if(decimalIndex != -1){
-            return this.floor().add(ONE);
-        }
-        return this;
-    }
-
-    @Override
-    public NumberInterface floor() {
-        String str = value.toPlainString();
-        int decimalIndex = str.indexOf('.');
-        if(decimalIndex != -1){
-            return new PreciseNumber(str.substring(0, decimalIndex));
-        }
-        return this;
-    }
-
-    @Override
-    public NumberInterface fractionalPart() {
-        String str = value.toPlainString();
-        int decimalIndex = str.indexOf('.');
-        if(decimalIndex != -1){
-            return new PreciseNumber(str.substring(decimalIndex + 1));
-        }
-        return ZERO;
-    }
-
-    @Override
-    public int intValue() {
-        return value.intValue();
-    }
-
     @Override
     public NumberInterface negate() {
         return new PreciseNumber(value.negate());
@@ -144,7 +109,7 @@ public class PreciseNumber implements NumberInterface {
 
     @Override
     public String toString() {
-        BigDecimal rounded = value.setScale(getMaxPrecision() - 15, RoundingMode.HALF_UP);
+        BigDecimal rounded = value.setScale(getMaxPrecision() - 4, RoundingMode.HALF_UP);
         return rounded.stripTrailingZeros().toPlainString();
     }
 }

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

@@ -1,75 +0,0 @@
-package org.nwapw.abacus.plugin;
-
-import org.nwapw.abacus.number.NumberInterface;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
-/**
- * A class that holds data about a number implementation.
- */
-public abstract class NumberImplementation {
-
-    /**
-     * The list of paths through which this implementation can be promoted.
-     */
-    protected Map<Class<? extends NumberInterface>, Function<NumberInterface, NumberInterface>> promotionPaths;
-    /**
-     * The implementation class for this implementation.
-     */
-    private Class<? extends NumberInterface> implementation;
-    /**
-     * The priority of converting into this number implementation.
-     */
-    private int priority;
-
-    /**
-     * Creates a new number implementation with the given data.
-     * @param implementation the implementation class.
-     * @param priority the priority, higher -> more likely to be converted into.
-     */
-    public NumberImplementation(Class<? extends NumberInterface> implementation, int priority){
-        this.implementation = implementation;
-        this.priority = priority;
-        promotionPaths = new HashMap<>();
-    }
-
-    /**
-     * Gets the list of all promotion paths this implementation can take.
-     * @return the map of documentation paths.
-     */
-    public final Map<Class<? extends NumberInterface>, Function<NumberInterface, NumberInterface>> getPromotionPaths(){
-        return promotionPaths;
-    }
-
-    /**
-     * Gets the implementation class used by this implementation.
-     * @return the implementation class.
-     */
-    public final Class<? extends NumberInterface> getImplementation(){
-        return implementation;
-    }
-
-    /**
-     * Gets the priority of this number implementation.
-     * @return the priority.
-     */
-    public final int getPriority(){
-        return priority;
-    }
-
-    /**
-     * Abstract function to create a new instance from a string.
-     * @param string the string to create a number from.
-     * @return the resulting number.
-     */
-    public abstract NumberInterface instanceForString(String string);
-
-    /**
-     * Get the instance of pi with the given implementation.
-     * @return pi
-     */
-    public abstract NumberInterface instanceForPi();
-
-}

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

@@ -26,9 +26,9 @@ public abstract class Plugin {
      */
     private Map<String, Operator> operators;
     /**
-     * The map of the number implementations this plugin provides.
+     * A hash map of operators mapped to their string names.
      */
-    private Map<String, NumberImplementation> numberImplementations;
+    private Map<String, Class<? extends NumberInterface>> numbers;
     /**
      * The plugin manager in which to search for functions
      * not inside this package,
@@ -51,7 +51,7 @@ public abstract class Plugin {
         this.manager = manager;
         functions = new HashMap<>();
         operators = new HashMap<>();
-        numberImplementations = new HashMap<>();
+        numbers = new HashMap<>();
         enabled = false;
     }
 
@@ -74,12 +74,12 @@ public abstract class Plugin {
     }
 
     /**
-     * Gets the list of number implementations provided by this plugin.
+     * Gets the list of all numbers provided by this plugin.
      *
-     * @return the list of registered number implementations.
+     * @return the list of registered numbers.
      */
-    public final Set<String> providedNumberImplementations(){
-        return numberImplementations.keySet();
+    public final Set<String> providedNumbers() {
+        return numbers.keySet();
     }
 
     /**
@@ -103,13 +103,13 @@ public abstract class Plugin {
     }
 
     /**
-     * Gets the number implementation under the given name.
+     * Gets the class under the given name.
      *
-     * @param name the name of the number implementation to look up.
-     * @return the number implementation associated with that name, or null if the plugin doesn't provide it.
+     * @param numberName the name of the class.
+     * @return the class, or null if the plugin doesn't provide it.
      */
-    public final NumberImplementation getNumberImplementation(String name){
-        return numberImplementations.get(name);
+    public final Class<? extends NumberInterface> getNumber(String numberName) {
+        return numbers.get(numberName);
     }
 
     /**
@@ -158,13 +158,16 @@ public abstract class Plugin {
     }
 
     /**
-     * To be used in load(). Registers a new number implementation with the plugin.
-     * This makes it accessible to the plugin manager.
-     * @param name the name of the implementation.
-     * @param implementation the actual implementation class to register.
+     * To be used in load(). Registers a number class
+     * with the plugin internally, which makes it possible
+     * for the user to select it as an "implementation" for the
+     * number that they would like to use.
+     *
+     * @param name       the name to register it under.
+     * @param toRegister the class to register.
      */
-    protected final void registerNumberImplementation(String name, NumberImplementation implementation){
-        numberImplementations.put(name, implementation);
+    protected final void registerNumber(String name, Class<? extends NumberInterface> toRegister) {
+        numbers.put(name, toRegister);
     }
 
     /**
@@ -191,30 +194,6 @@ public abstract class Plugin {
         return manager.operatorFor(name);
     }
 
-    /**
-     * Searches the PluginManager for the given number implementation
-     * name. This can be used by the plugins internally in order to find
-     * implementations that they do not provide.
-     *
-     * @param name the name for which to search.
-     * @return the resulting number implementation, or null if none was found.
-     */
-    protected final NumberImplementation numberImplementationFor(String name){
-        return manager.numberImplementationFor(name);
-    }
-
-    /**
-     * 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
-     * can provide their own pi values, without losing said precision by
-     * promoting NaiveNumbers.
-     * @param forClass the class to which to find the pi instance.
-     * @return the pi value for the given class.
-     */
-    protected final NumberInterface getPi(Class<? extends NumberInterface> forClass){
-        return manager.piFor(forClass);
-    }
-
     /**
      * Abstract method to be overridden by plugin implementation, in which the plugins
      * are supposed to register the functions they provide and do any other

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

@@ -32,19 +32,10 @@ public class PluginManager {
      */
     private Map<String, Operator> cachedOperators;
     /**
-     * The list of number implementations that have
+     * List of registered number implementations that have
      * been cached, that is, found in a plugin and returned.
      */
-    private Map<String, NumberImplementation> cachedNumberImplementations;
-    /**
-     * The list of number implementations that have been
-     * found by their implementation class.
-     */
-    private Map<Class<? extends NumberInterface>, NumberImplementation> cachedInterfaceImplementations;
-    /**
-     * The pi values for each implementation class that have already been computer.
-     */
-    private Map<Class<? extends NumberInterface>, NumberInterface> cachedPi;
+    private Map<String, Class<? extends NumberInterface>> cachedNumbers;
     /**
      * List of all functions loaded by the plugins.
      */
@@ -54,9 +45,9 @@ public class PluginManager {
      */
     private Set<String> allOperators;
     /**
-     * List of all the number implementations loaded by the plugins.
+     * List of all numbers loaded by the plugins.
      */
-    private Set<String> allNumberImplementations;
+    private Set<String> allNumbers;
     /**
      * The list of plugin listeners attached to this instance.
      */
@@ -70,12 +61,10 @@ public class PluginManager {
         plugins = new HashSet<>();
         cachedFunctions = new HashMap<>();
         cachedOperators = new HashMap<>();
-        cachedNumberImplementations = new HashMap<>();
-        cachedInterfaceImplementations = new HashMap<>();
-        cachedPi = new HashMap<>();
+        cachedNumbers = new HashMap<>();
         allFunctions = new HashSet<>();
         allOperators = new HashSet<>();
-        allNumberImplementations = new HashSet<>();
+        allNumbers = new HashSet<>();
         listeners = new HashSet<>();
     }
 
@@ -91,13 +80,12 @@ public class PluginManager {
      * @param getFunction the function to get the T value under the given name
      * @param name        the name to search for
      * @param <T>         the type of element being search
-     * @param <K>         the type of key that the cache is indexed by.
      * @return the retrieved element, or null if it was not found.
      */
-    private static <T, K> T searchCached(Collection<Plugin> plugins, Map<K, T> cache,
-                                      java.util.function.Function<Plugin, Set<K>> setFunction,
-                                      java.util.function.BiFunction<Plugin, K, T> getFunction,
-                                      K name) {
+    private static <T> T searchCached(Collection<Plugin> plugins, Map<String, T> cache,
+                                      java.util.function.Function<Plugin, Set<String>> setFunction,
+                                      java.util.function.BiFunction<Plugin, String, T> getFunction,
+                                      String name) {
         if (cache.containsKey(name)) return cache.get(name);
 
         T loadedValue = null;
@@ -133,51 +121,13 @@ public class PluginManager {
     }
 
     /**
-     * Gets the number implementation under the given name.
+     * Gets a numer implementation under the given name.
+     *
      * @param name the name of the implementation.
-     * @return the implementation.
+     * @return the implementation class
      */
-    public NumberImplementation numberImplementationFor(String name){
-        return searchCached(plugins, cachedNumberImplementations, Plugin::providedNumberImplementations,
-                Plugin::getNumberImplementation, name);
-    }
-
-    /**
-     * Gets the number implementation for the given implementation class.
-     * @param name the class for which to find the implementation.
-     * @return the implementation.
-     */
-    public NumberImplementation interfaceImplementationFor(Class<? extends NumberInterface> name){
-        if(cachedInterfaceImplementations.containsKey(name)) return cachedInterfaceImplementations.get(name);
-        NumberImplementation toReturn = null;
-        outside:
-        for(Plugin plugin : plugins){
-            for(String implementationName : plugin.providedNumberImplementations()){
-                NumberImplementation implementation = plugin.getNumberImplementation(implementationName);
-                if(implementation.getImplementation().equals(name)) {
-                    toReturn = implementation;
-                    break outside;
-                }
-            }
-        }
-        cachedInterfaceImplementations.put(name, toReturn);
-        return toReturn;
-    }
-
-    /**
-     * Gets the mathematical constant pi for the given implementation class.
-     * @param forClass the class for which to find pi.
-     * @return pi
-     */
-    public NumberInterface piFor(Class<? extends NumberInterface> forClass){
-        if(cachedPi.containsKey(forClass)) return cachedPi.get(forClass);
-        NumberImplementation implementation = interfaceImplementationFor(forClass);
-        NumberInterface generatedPi = null;
-        if(implementation != null){
-            generatedPi = implementation.instanceForPi();
-        }
-        cachedPi.put(forClass, generatedPi);
-        return generatedPi;
+    public Class<? extends NumberInterface> numberFor(String name) {
+        return searchCached(plugins, cachedNumbers, Plugin::providedNumbers, Plugin::getNumber, name);
     }
 
     /**
@@ -214,7 +164,7 @@ public class PluginManager {
         for (Plugin plugin : plugins) {
             allFunctions.addAll(plugin.providedFunctions());
             allOperators.addAll(plugin.providedOperators());
-            allNumberImplementations.addAll(plugin.providedNumberImplementations());
+            allNumbers.addAll(plugin.providedNumbers());
         }
         listeners.forEach(e -> e.onLoad(this));
     }
@@ -226,7 +176,7 @@ public class PluginManager {
         for (Plugin plugin : plugins) plugin.disable();
         allFunctions.clear();
         allOperators.clear();
-        allNumberImplementations.clear();
+        allNumbers.clear();
         listeners.forEach(e -> e.onUnload(this));
     }
 
@@ -257,12 +207,12 @@ public class PluginManager {
     }
 
     /**
-     * Gets all the number implementations loaded by the Plugin Manager.
+     * Gets all the number implementations loaded by the Plugin Manager
      *
-     * @return the set of all implementations that were loaded.
+     * @return the set of all implementations that were loaded
      */
-    public Set<String> getAllNumberImplementations(){
-        return allNumberImplementations;
+    public Set<String> getAllNumbers() {
+        return allNumbers;
     }
 
     /**

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

@@ -8,8 +8,6 @@ import org.nwapw.abacus.number.NaiveNumber;
 import org.nwapw.abacus.number.NumberInterface;
 import org.nwapw.abacus.number.PreciseNumber;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.function.BiFunction;
 
 /**
@@ -18,8 +16,6 @@ import java.util.function.BiFunction;
  */
 public class StandardPlugin extends Plugin {
 
-    private static HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> factorialLists = new HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>>();
-
     /**
      * The addition operator, +
      */
@@ -95,9 +91,7 @@ public class StandardPlugin extends Plugin {
         //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;
+            return params.length == 1;
         }
 
         @Override
@@ -158,40 +152,17 @@ public class StandardPlugin extends Plugin {
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
-            NumberInterface maxError = getMaxError(params[0]);
-            int n = 0;
-            if(params[0].signum() <= 0){
-                NumberInterface currentTerm = NaiveNumber.ONE.promoteTo(params[0].getClass()), sum = currentTerm;
-                while(FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0){
-                    n++;
-                    currentTerm = currentTerm.multiply(params[0]).divide((new NaiveNumber(n)).promoteTo(params[0].getClass()));
-                    sum = sum.add(currentTerm);
-                }
-                return sum;
-            }
-            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 nextNumerator = params[0];
-                NumberInterface left = params[0].multiply((new NaiveNumber(3)).promoteTo(params[0].getClass()).intPow(params[0].ceiling().intValue())), right = maxError;
-                do{
-                    sum = sum.add(nextNumerator.divide(factorial(params[0].getClass(), n+1)));
-                    n++;
-                    nextNumerator = nextNumerator.multiply(params[0]);
-                    left = left.multiply(params[0]);
-                    NumberInterface nextN = (new NaiveNumber(n+1)).promoteTo(params[0].getClass());
-                    right = right.multiply(nextN);
-                    //System.out.println(left + ", " + right);
-                }
-                while(left.compareTo(right) > 0);
-                //System.out.println(n+1);
-                return sum;
+            boolean takeReciprocal = params[0].signum() == -1;
+            params[0] = FUNCTION_ABS.apply(params[0]);
+            NumberInterface sum = sumSeries(params[0], StandardPlugin::getExpSeriesTerm, getNTermsExp(getMaxError(params[0]), params[0]));
+            if (takeReciprocal) {
+                sum = NaiveNumber.ONE.promoteTo(sum.getClass()).divide(sum);
             }
+            return sum;
         }
     };
     /**
-     * The natural log function.
+     * The natural log function, ln(exp(1)) = 1
      */
     public static final Function FUNCTION_LN = new Function() {
         @Override
@@ -232,12 +203,11 @@ public class StandardPlugin extends Plugin {
         private NumberInterface getLogPartialSum(NumberInterface x) {
             NumberInterface maxError = getMaxError(x);
             x = x.subtract(NaiveNumber.ONE.promoteTo(x.getClass())); //Terms used are for log(x+1).
-            NumberInterface currentNumerator = x, currentTerm = x, sum = x;
+            NumberInterface 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 = currentTerm.multiply(x).multiply((new NaiveNumber(n - 1)).promoteTo(x.getClass())).divide((new NaiveNumber(n)).promoteTo(x.getClass())).negate();
                 sum = sum.add(currentTerm);
             }
             return sum;
@@ -268,7 +238,7 @@ public class StandardPlugin extends Plugin {
         }
     };
     /**
-     * The square root function.
+     * The square root function, sqrt(4) = 2
      */
     public static final Function FUNCTION_SQRT = new Function() {
         @Override
@@ -282,149 +252,43 @@ public class StandardPlugin extends Plugin {
         }
     };
 
-    /**
-     * The sine function (the argument is interpreted in radians).
-     */
-    public final Function functionSin = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            NumberInterface pi = getPi(params[0].getClass());
-            NumberInterface twoPi = pi.multiply(new NaiveNumber(2).promoteTo(pi.getClass()));
-            NumberInterface theta = getSmallAngle(params[0], pi);
-            //System.out.println(theta);
-            if(theta.compareTo(pi.multiply(new NaiveNumber(1.5).promoteTo(twoPi.getClass()))) >= 0){
-                theta = theta.subtract(twoPi);
-            }
-            else if(theta.compareTo(pi.divide(new NaiveNumber(2).promoteTo(pi.getClass()))) > 0){
-                theta = pi.subtract(theta);
-            }
-            //System.out.println(theta);
-            return sinTaylor(theta);
-        }
-    };
-
-    public final Function functionCos = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return functionSin.apply(getPi(params[0].getClass()).divide(new NaiveNumber(2).promoteTo(params[0].getClass()))
-                .subtract(params[0]));
-        }
-    };
-
-    public final Function functionTan = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return functionSin.apply(params[0]).divide(functionCos.apply(params[0]));
-        }
-    };
-
-    public final Function functionSec = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return NaiveNumber.ONE.promoteTo(params[0].getClass()).divide(functionCos.apply(params[0]));
-        }
-    };
-
-    public final Function functionCsc = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return NaiveNumber.ONE.promoteTo(params[0].getClass()).divide(functionSin.apply(params[0]));
-        }
-    };
-
-    public final Function functionCot = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return functionCos.apply(params[0]).divide(functionCos.apply(params[0]));
-        }
-    };
-
-    /**
-     * The implementation for double-based naive numbers.
-     */
-    public static final NumberImplementation IMPLEMENTATION_NAIVE = new NumberImplementation(NaiveNumber.class, 0) {
-        @Override
-        public NumberInterface instanceForString(String string) {
-            return new NaiveNumber(string);
-        }
-
-        @Override
-        public NumberInterface instanceForPi() {
-            return new NaiveNumber(Math.PI);
-        }
-    };
-
-    /**
-     * The implementation for the infinite-precision BigDecimal.
-     */
-    public static final NumberImplementation IMPLEMENTATION_PRECISE = new NumberImplementation(PreciseNumber.class, 0) {
-        @Override
-        public NumberInterface instanceForString(String string) {
-            return new PreciseNumber(string);
-        }
-
-        @Override
-        public NumberInterface instanceForPi() {
-            NumberInterface C = FUNCTION_SQRT.apply(new PreciseNumber("10005")).multiply(new PreciseNumber("426880"));
-            NumberInterface M = PreciseNumber.ONE;
-            NumberInterface L = new PreciseNumber("13591409");
-            NumberInterface X = M;
-            NumberInterface sum = L;
-            int termsNeeded = C.getMaxPrecision()/13 + 1;
-
-            NumberInterface lSummand = new PreciseNumber("545140134");
-            NumberInterface xMultiplier = new PreciseNumber("262537412")
-                    .multiply(new PreciseNumber("1000000000"))
-                    .add(new PreciseNumber("640768000"))
-                    .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));
-                L = L.add(lSummand);
-                X = X.multiply(xMultiplier);
-                sum = sum.add(M.multiply(L).divide(X));
-            }
-            return C.divide(sum);
-        }
-    };
-
     public StandardPlugin(PluginManager manager) {
         super(manager);
     }
 
+    /**
+     * Returns the nth term of the Taylor series (centered at 0) of e^x
+     *
+     * @param n the term required (n >= 0).
+     * @param x the real number at which the series is evaluated.
+     * @return the nth term of the series.
+     */
+    private static NumberInterface getExpSeriesTerm(int n, NumberInterface x) {
+        return x.intPow(n).divide(OP_FACTORIAL.getFunction().apply((new NaiveNumber(n)).promoteTo(x.getClass())));
+    }
+
+    /**
+     * Returns the number of terms needed to evaluate the exponential function (at x)
+     * such that the error is at most maxError.
+     *
+     * @param maxError Maximum error permissible (This should probably be positive.)
+     * @param x        where the function is evaluated.
+     * @return the number of terms needed to evaluated the exponential function.
+     */
+    private static int getNTermsExp(NumberInterface maxError, NumberInterface x) {
+        //We need n such that |x^(n+1)| <= (n+1)! * maxError
+        //The variables LHS and RHS refer to the above inequality.
+        int n = 0;
+        x = FUNCTION_ABS.apply(x);
+        NumberInterface LHS = x, RHS = maxError;
+        while (LHS.compareTo(RHS) > 0) {
+            n++;
+            LHS = LHS.multiply(x);
+            RHS = RHS.multiply(new NaiveNumber(n + 1).promoteTo(RHS.getClass()));
+        }
+        return n;
+    }
+
     /**
      * Returns a partial sum of a series whose terms are given by the nthTermFunction, evaluated at x.
      *
@@ -453,8 +317,8 @@ public class StandardPlugin extends Plugin {
 
     @Override
     public void onEnable() {
-        registerNumberImplementation("naive", IMPLEMENTATION_NAIVE);
-        registerNumberImplementation("precise", IMPLEMENTATION_PRECISE);
+        registerNumber("naive", NaiveNumber.class);
+        registerNumber("precise", PreciseNumber.class);
 
         registerOperator("+", OP_ADD);
         registerOperator("-", OP_SUBTRACT);
@@ -467,12 +331,6 @@ public class StandardPlugin extends Plugin {
         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);
     }
 
     @Override
@@ -480,58 +338,4 @@ public class StandardPlugin extends Plugin {
 
     }
 
-    /**
-     * A factorial function that uses memoization for each number class; it efficiently
-     * computes factorials of non-negative integers.
-     * @param numberClass type of number to return.
-     * @param n non-negative integer.
-     * @return a number of numClass with value n factorial.
-     */
-    public static NumberInterface factorial(Class<? extends NumberInterface> numberClass, int n){
-        if(!factorialLists.containsKey(numberClass)){
-            factorialLists.put(numberClass, new ArrayList<NumberInterface>());
-            factorialLists.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
-            factorialLists.get(numberClass).add(NaiveNumber.ONE.promoteTo(numberClass));
-        }
-        ArrayList<NumberInterface> list = factorialLists.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)));
-            }
-        }
-        return list.get(n);
-    }
-
-    /**
-     * Returns the value of the Taylor series for sin (centered at 0) at x.
-     * @param x where the series is evaluated.
-     * @return the value of the series
-     */
-    private static NumberInterface sinTaylor(NumberInterface x){
-        NumberInterface power = x, multiplier = x.multiply(x).negate(), currentTerm = x, sum = x;
-        NumberInterface maxError = getMaxError(x);
-        int n = 1;
-        do{
-            n += 2;
-            power = power.multiply(multiplier);
-            currentTerm = power.divide(factorial(x.getClass(), n));
-            sum = sum.add(currentTerm);
-        } while (FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0);
-        return sum;
-    }
-
-    /**
-     * Returns an equivalent angle in the interval [0, 2pi)
-     * @param phi an angle (in radians).
-     * @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 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){
-            theta = twoPi.subtract(theta);
-        }
-        return theta;
-    }
 }

src/main/resources/abacus.fxml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
+<BorderPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="org.nwapw.abacus.fx.AbacusController">
+    <center>
+        <TabPane>
+            <Tab text="Calculator" closable="false">
+                <BorderPane>
+                    <center>
+                        <TableView fx:id="historyTable">
+                            <columnResizePolicy>
+                                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+                            </columnResizePolicy>
+                            <columns>
+                                <TableColumn fx:id="inputColumn" text="Input" sortable="false"/>
+                                <TableColumn fx:id="parsedColumn" text="Parsed" sortable="false"/>
+                                <TableColumn fx:id="outputColumn" text="Output" sortable="false"/>
+                            </columns>
+                        </TableView>
+                    </center>
+                    <bottom>
+                        <VBox>
+                            <ScrollPane prefHeight="50" vbarPolicy="NEVER">
+                                <padding>
+                                    <Insets top="10" bottom="10" left="10" right="10"/>
+                                </padding>
+                                <Text fx:id="outputText"/>
+                            </ScrollPane>
+                            <TextField fx:id="inputField" onAction="#performCalculation"/>
+                            <Button fx:id="inputButton" text="Calculate" maxWidth="Infinity"
+                                    onAction="#performCalculation"/>
+                        </VBox>
+                    </bottom>
+                </BorderPane>
+            </Tab>
+            <Tab text="Settings" closable="false"/>
+        </TabPane>
+    </center>
+
+</BorderPane>