Decrease test intensity to prevent travis CI from killing gradle.

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

README.md

@@ -5,10 +5,10 @@ Summer project for NWAPW.
 Created by Arthur Drobot, Danila Fedorin and Riley Jones.
 
 ## Project Description
-Abacus is a calculator built with extensibility and usability in mind. It provides a plugin interface, via Java, as Lua provides too difficult to link up to the Java core. The description of the internals of the project can be found on the wiki page.
+Abacus is a calculator built with extensibility and usability in mind. It provides a plugin interface, via Java, as Lua proves too difficult to link up to the Java core. The description of the internals of the project can be found on the wiki page.
 
 ## Current State
-Abacus is being built for the Northwest Advanced Programming Workshop, a 3 week program in which students work in treams to complete a single project, following principles of agile development. Because of its short timeframe, Abacus is not even close to completed state. Below is a list of the current features and problems.
+Abacus is being built for the Northwest Advanced Programming Workshop, a 3 week program in which students work in teams to complete a single project, following principles of agile development. Because of its short timeframe, Abacus is not even close to completed state. Below is a list of the current features and problems.
 - [x] Basic number class
 - [x] Implementation of basic functions 
 - [x] Implementation of `exp`, `ln`, `sqrt` using the basic functions and Taylor Series

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

@@ -1,21 +1,16 @@
 package org.nwapw.abacus;
 
-import org.nwapw.abacus.config.ConfigurationObject;
+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;
 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;
 
 /**
  * The main calculator class. This is responsible
@@ -24,11 +19,10 @@ import java.io.IOException;
  */
 public class Abacus {
 
-    public static final NumberImplementation DEFAULT_IMPLEMENTATION = StandardPlugin.IMPLEMENTATION_NAIVE;
     /**
-     * The file used for saving and loading configuration.
+     * The default number implementation to be used if no other one is available / selected.
      */
-    public static final File CONFIG_FILE = new File("config.toml");
+    public static final NumberImplementation DEFAULT_IMPLEMENTATION = StandardPlugin.IMPLEMENTATION_NAIVE;
 
     /**
      * The plugin manager responsible for
@@ -43,7 +37,7 @@ public class Abacus {
     /**
      * The configuration loaded from a file.
      */
-    private ConfigurationObject configuration;
+    private Configuration configuration;
     /**
      * The tree builder used to construct a tree
      * from a string.
@@ -53,35 +47,20 @@ public class Abacus {
     /**
      * Creates a new instance of the Abacus calculator.
      */
-    public Abacus() {
-        pluginManager = new PluginManager();
+    public Abacus(Configuration configuration) {
+        pluginManager = new PluginManager(this);
         numberReducer = new NumberReducer(this);
-        configuration = new ConfigurationObject(CONFIG_FILE);
-        configuration.save(CONFIG_FILE);
+        this.configuration = new Configuration(configuration);
         LexerTokenizer lexerTokenizer = new LexerTokenizer();
         ShuntingYardParser shuntingYardParser = new ShuntingYardParser(this);
         treeBuilder = new TreeBuilder<>(lexerTokenizer, shuntingYardParser);
 
-        pluginManager.addListener(lexerTokenizer);
         pluginManager.addListener(shuntingYardParser);
-        pluginManager.addInstantiated(new StandardPlugin(pluginManager));
-        try {
-            ClassFinder.loadJars("plugins")
-                    .forEach(plugin -> pluginManager.addClass(plugin));
-        } catch (IOException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-        pluginManager.load();
+        pluginManager.addListener(lexerTokenizer);
     }
 
     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);
     }
 
     /**
@@ -117,7 +96,7 @@ public class Abacus {
      *
      * @return the configuration object.
      */
-    public ConfigurationObject getConfiguration() {
+    public Configuration getConfiguration() {
         return configuration;
     }
 

src/main/java/org/nwapw/abacus/config/Configuration.java

@@ -1,14 +1,133 @@
 package org.nwapw.abacus.config;
 
+import com.moandjiezana.toml.Toml;
+import com.moandjiezana.toml.TomlWriter;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
- * Serializable class that will be used to load TOML
- * configurations.
+ * The configuration object that stores
+ * options that the user can change.
  */
 public class Configuration {
 
     /**
-     * The type of number this calculator should use.
+     * The defaults TOML string.
      */
-    public String numberType;
+    private static final String DEFAULT_CONFIG =
+            "numberImplementation = \"naive\"\n" +
+                    "disabledPlugins = []";
+    /**
+     * The defaults TOML object, parsed from the string.
+     */
+    private static final Toml DEFAULT_TOML = new Toml().read(DEFAULT_CONFIG);
+    /**
+     * The TOML writer used to write this configuration to a file.
+     */
+    private static final TomlWriter TOML_WRITER = new TomlWriter();
+
+    /**
+     * The implementation of the number that should be used.
+     */
+    private String numberImplementation = "<default>";
+    /**
+     * The list of disabled plugins in this Configuration.
+     */
+    private Set<String> disabledPlugins = new HashSet<>();
+
+    /**
+     * Creates a new configuration form the given configuration.
+     *
+     * @param copyFrom the configuration to copy.
+     */
+    public Configuration(Configuration copyFrom){
+        copyFrom(copyFrom);
+    }
+
+    /**
+     * Creates a new configuration with the given values.
+     *
+     * @param numberImplementation the number implementation, like "naive" or "precise"
+     * @param disabledPlugins      the list of disabled plugins.
+     */
+    public Configuration(String numberImplementation, String[] disabledPlugins) {
+        this.numberImplementation = numberImplementation;
+        this.disabledPlugins.addAll(Arrays.asList(disabledPlugins));
+    }
+
+    /**
+     * Loads a configuration from a given file, keeping non-specified fields default.
+     *
+     * @param fromFile the file to load from.
+     */
+    public Configuration(File fromFile) {
+        if (!fromFile.exists()) return;
+        copyFrom(new Toml(DEFAULT_TOML).read(fromFile).to(Configuration.class));
+    }
+
+    /**
+     * Copies the values from the given configuration into this one.
+     *
+     * @param otherConfiguration the configuration to copy from.
+     */
+    public void copyFrom(Configuration otherConfiguration) {
+        this.numberImplementation = otherConfiguration.numberImplementation;
+        this.disabledPlugins.addAll(otherConfiguration.disabledPlugins);
+    }
+
+    /**
+     * Saves this configuration to the given file, creating
+     * any directories that do not exist.
+     *
+     * @param file the file to save to.
+     */
+    public void saveTo(File file) {
+        if (file.getParentFile() != null) file.getParentFile().mkdirs();
+        try {
+            TOML_WRITER.write(this, file);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Gets the value of this configuration as a string.
+     *
+     * @return the string that represents this configuration.
+     */
+    public String asTomlString(){
+        return TOML_WRITER.write(this);
+    }
+
+    /**
+     * Gets the number implementation from this configuration.
+     *
+     * @return the number implementation.
+     */
+    public String getNumberImplementation() {
+        return numberImplementation;
+    }
+
+    /**
+     * Sets the number implementation for the configuration
+     *
+     * @param numberImplementation the number implementation.
+     */
+    public void setNumberImplementation(String numberImplementation) {
+        this.numberImplementation = numberImplementation;
+    }
+
+    /**
+     * Gets the list of disabled plugins.
+     *
+     * @return the list of disabled plugins.
+     */
+    public Set<String> getDisabledPlugins() {
+        return disabledPlugins;
+    }
 
 }

src/main/java/org/nwapw/abacus/config/ConfigurationObject.java

@@ -1,111 +0,0 @@
-package org.nwapw.abacus.config;
-
-import com.moandjiezana.toml.Toml;
-import com.moandjiezana.toml.TomlWriter;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * A configuration object, which essentially
- * manages saving, loading, and getting values
- * from the configuration. While Configuration is
- * the data model, this is the interface with it.
- */
-public class ConfigurationObject {
-
-    /**
-     * The writer used to store the configuration.
-     */
-    private static final TomlWriter TOML_WRITER = new TomlWriter();
-    /**
-     * The configuration instance being modeled.
-     */
-    private Configuration configuration;
-
-    /**
-     * Creates a new configuration object with the given config.
-     *
-     * @param config the config to use.
-     */
-    public ConfigurationObject(Configuration config) {
-        setup(config);
-    }
-
-    /**
-     * Create a configuration object by attempting to
-     * load a config from the given path, using the
-     * default configuration otherwise.
-     *
-     * @param path the path to attempt to load.
-     */
-    public ConfigurationObject(File path) {
-        Configuration config;
-        if (!path.exists()) {
-            config = getDefaultConfig();
-        } else {
-            Toml parse = new Toml();
-            parse.read(path);
-            config = parse.to(Configuration.class);
-        }
-        setup(config);
-    }
-
-    /**
-     * Creates a new configuration object with the
-     * default configuration.
-     */
-    public ConfigurationObject() {
-        setup(getDefaultConfig());
-    }
-
-    /**
-     * Sets up the ConfigurationObject.
-     * different constructors do different things,
-     * but they all lead here.
-     *
-     * @param configuration the configuration to set up with.
-     */
-    private void setup(Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    /**
-     * Creates a default configuration.
-     *
-     * @return the newly created default configuration.
-     */
-    private Configuration getDefaultConfig() {
-        configuration = new Configuration();
-        configuration.numberType = "naive";
-        return configuration;
-    }
-
-    /**
-     * Returns the implementation the user has requested to
-     * represent their numbers.
-     *
-     * @return the implementation name.
-     */
-    public String getNumberImplementation() {
-        return configuration.numberType;
-    }
-
-    /**
-     * Saves the ConfigurationObject to the given file.
-     *
-     * @param toFile the file to save ot.
-     * @return true if the save succeed, false if otherwise.
-     */
-    public boolean save(File toFile) {
-        if (toFile.getParentFile() != null) toFile.getParentFile().mkdirs();
-        try {
-            TOML_WRITER.write(configuration, toFile);
-            return true;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-}

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

@@ -4,5 +4,5 @@ package org.nwapw.abacus.function;
  * The type of an operator, describing how it should behave.
  */
 public enum OperatorType {
-    BINARY_INFIX, UNARY_POSTFIX
+    BINARY_INFIX, UNARY_POSTFIX, UNARY_PREFIX
 }

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

@@ -0,0 +1,24 @@
+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;
+
+/**
+ * The main application class for JavaFX responsible for loading
+ * and displaying the fxml file.
+ */
+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,313 @@
+package org.nwapw.abacus.fx;
+
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.control.cell.CheckBoxListCell;
+import javafx.scene.text.Text;
+import javafx.util.Callback;
+import javafx.util.StringConverter;
+import org.nwapw.abacus.Abacus;
+import org.nwapw.abacus.config.Configuration;
+import org.nwapw.abacus.number.NumberInterface;
+import org.nwapw.abacus.plugin.ClassFinder;
+import org.nwapw.abacus.plugin.PluginListener;
+import org.nwapw.abacus.plugin.PluginManager;
+import org.nwapw.abacus.plugin.StandardPlugin;
+import org.nwapw.abacus.tree.TreeNode;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Set;
+
+
+/**
+ * The controller for the abacus FX UI, responsible
+ * for all the user interaction.
+ */
+public class AbacusController implements PluginListener {
+
+    /**
+     * The file used for saving and loading configuration.
+     */
+    public static final File CONFIG_FILE = new File("config.toml");
+    /**
+     * The title for the apply alert dialog.
+     */
+    private static final String APPLY_MSG_TITLE = "\"Apply\" Needed";
+    /**
+     * The text for the header of the apply alert dialog.
+     */
+    private static final String APPLY_MSG_HEADER = "The settings have not been applied.";
+    /**
+     * The text for the dialog that is shown if settings haven't been applied.
+     */
+    private static final String APPLY_MSG_TEXT = "You have made changes to the configuration, however, you haven't pressed \"Apply\". " +
+            "The changes to the configuration will not be present in the calculator until \"Apply\" is pressed.";
+    /**
+     * Constant string that is displayed if the text could not be lexed or parsed.
+     */
+    private static final String ERR_SYNTAX = "Syntax Error";
+    /**
+     * Constant string that is displayed if the tree could not be reduced.
+     */
+    private static final String ERR_EVAL = "Evaluation Error";
+    /**
+     * Constant string that is displayed if the calculations are stopped before they are done.
+     */
+    private static final String ERR_STOP = "Stopped";
+    @FXML
+    private TabPane coreTabPane;
+    @FXML
+    private Tab calculateTab;
+    @FXML
+    private Tab settingsTab;
+    @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;
+    @FXML
+    private ComboBox<String> numberImplementationBox;
+    @FXML
+    private ListView<ToggleablePlugin> enabledPluginView;
+
+    /**
+     * The list of history entries, created by the users.
+     */
+    private ObservableList<HistoryModel> historyData;
+
+    /**
+     * The abacus instance used for calculations and all
+     * other main processing code.
+     */
+    private ObservableList<String> numberImplementationOptions;
+
+    /**
+     * <<<<<<< HEAD
+     * The list of plugin objects that can be toggled on and off,
+     * and, when reloaded, get added to the plugin manager's black list.
+     */
+    private ObservableList<ToggleablePlugin> enabledPlugins;
+
+    /**
+     * The abacus instance used for changing the plugin configuration.
+     */
+    private Abacus abacus;
+    /**
+     * Thread used for calculating.
+     */
+    private Thread calcThread;
+
+    /**
+     * Checks whether the calculator is calculating.
+     */
+    private boolean calculating;
+
+    /**
+     * Seconds delayed for timer;
+     */
+    private double delay = 0;
+
+    /**
+     * Boolean which represents whether changes were made to the configuration.
+     */
+    private boolean changesMade;
+    /**
+     * Whether an alert about changes to the configuration was already shown.
+     */
+    private boolean reloadAlertShown;
+    /**
+     * The alert shown when a press to "apply" is needed.
+     */
+    private Alert reloadAlert;
+
+    /**
+     * Alerts the user if the changes they made
+     * have not yet been applied.
+     */
+    private void alertIfApplyNeeded(boolean ignorePrevious) {
+        if (changesMade && (!reloadAlertShown || ignorePrevious)) {
+            reloadAlertShown = true;
+            reloadAlert.showAndWait();
+        }
+    }
+
+    @FXML
+    public void initialize() {
+        Callback<TableColumn<HistoryModel, String>, TableCell<HistoryModel, String>> cellFactory =
+                param -> new CopyableCell<>();
+        Callback<ListView<ToggleablePlugin>, ListCell<ToggleablePlugin>> pluginCellFactory =
+                param -> new CheckBoxListCell<>(ToggleablePlugin::enabledProperty, new StringConverter<ToggleablePlugin>() {
+                    @Override
+                    public String toString(ToggleablePlugin object) {
+                        return object.getClassName().substring(object.getClassName().lastIndexOf('.') + 1);
+                    }
+
+                    @Override
+                    public ToggleablePlugin fromString(String string) {
+                        return new ToggleablePlugin(true, string);
+                    }
+                });
+
+        historyData = FXCollections.observableArrayList();
+        historyTable.setItems(historyData);
+        numberImplementationOptions = FXCollections.observableArrayList();
+        numberImplementationBox.setItems(numberImplementationOptions);
+        numberImplementationBox.getSelectionModel().selectedIndexProperty().addListener(e -> changesMade = true);
+        historyTable.getSelectionModel().setCellSelectionEnabled(true);
+        enabledPlugins = FXCollections.observableArrayList();
+        enabledPluginView.setItems(enabledPlugins);
+        enabledPluginView.setCellFactory(pluginCellFactory);
+        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());
+        coreTabPane.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            if (oldValue.equals(settingsTab)) alertIfApplyNeeded(true);
+        });
+
+        abacus = new Abacus(new Configuration(CONFIG_FILE));
+        PluginManager abacusPluginManager = abacus.getPluginManager();
+        abacusPluginManager.addListener(this);
+        abacusPluginManager.addInstantiated(new StandardPlugin(abacus.getPluginManager()));
+        try {
+            ClassFinder.loadJars("plugins").forEach(abacusPluginManager::addClass);
+        } catch (IOException | ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        abacusPluginManager.reload();
+
+        changesMade = false;
+        reloadAlertShown = false;
+
+        reloadAlert = new Alert(Alert.AlertType.WARNING);
+        reloadAlert.setTitle(APPLY_MSG_TITLE);
+        reloadAlert.setHeaderText(APPLY_MSG_HEADER);
+        reloadAlert.setContentText(APPLY_MSG_TEXT);
+    }
+
+    @FXML
+    private void performCalculation() {
+        Runnable calculator = new Runnable() {
+            public void run() {
+                if (delay > 0) {
+                    Runnable timer = new Runnable() {
+                        public void run() {
+                            long gap = (long) (delay * 1000);
+                            long startTime = System.currentTimeMillis();
+                            while (System.currentTimeMillis() - startTime <= gap) {
+                            }
+                            stopCalculation();
+                        }
+                    };
+                    Thread maxTime = new Thread(timer);
+                    maxTime.setName("maxTime");
+                    maxTime.start();
+                }
+                calculating = true;
+                Platform.runLater(() -> inputButton.setDisable(true));
+                TreeNode constructedTree = abacus.parseString(inputField.getText());
+                if (constructedTree == null) {
+                    Platform.runLater(() -> outputText.setText(ERR_SYNTAX));
+                    Platform.runLater(() -> inputButton.setDisable(false));
+                    //return;
+                } else {
+                    NumberInterface evaluatedNumber = abacus.evaluateTree(constructedTree);
+                    if (evaluatedNumber == null) {
+                        if (Thread.currentThread().isInterrupted()) {
+                            Platform.runLater(() -> outputText.setText(ERR_STOP));
+                            Platform.runLater(() -> inputButton.setDisable(false));
+                        } else {
+                            Platform.runLater(() -> outputText.setText(ERR_EVAL));
+                            Platform.runLater(() -> inputButton.setDisable(false));
+                            //return;
+                        }
+                    } else {
+                        Platform.runLater(() -> outputText.setText(evaluatedNumber.toString()));
+                        historyData.add(new HistoryModel(inputField.getText(), constructedTree.toString(), evaluatedNumber.toString()));
+
+                        Platform.runLater(() -> inputButton.setDisable(false));
+                        Platform.runLater(() -> inputField.setText(""));
+                    }
+                }
+                calculating = false;
+            }
+        };
+        if (!calculating) {
+            calcThread = new Thread(calculator);
+            calcThread.setName("calcThread");
+            calcThread.start();
+        }
+    }
+
+    @FXML
+    private void stopCalculation() {
+        calcThread.interrupt();
+        calculating = false;
+        //Platform.runLater(() ->inputButton.setDisable(false));
+    }
+
+    @FXML
+    private void performSaveAndReload() {
+        performSave();
+        performReload();
+        changesMade = false;
+        reloadAlertShown = false;
+    }
+
+    @FXML
+    private void performReload() {
+        alertIfApplyNeeded(true);
+        abacus.getPluginManager().reload();
+    }
+
+    @FXML
+    private void performSave() {
+        Configuration configuration = abacus.getConfiguration();
+        configuration.setNumberImplementation(numberImplementationBox.getSelectionModel().getSelectedItem());
+        Set<String> disabledPlugins = configuration.getDisabledPlugins();
+        disabledPlugins.clear();
+        for (ToggleablePlugin pluginEntry : enabledPlugins) {
+            if (!pluginEntry.isEnabled()) disabledPlugins.add(pluginEntry.getClassName());
+        }
+        configuration.saveTo(CONFIG_FILE);
+        changesMade = false;
+        reloadAlertShown = false;
+    }
+
+    @Override
+    public void onLoad(PluginManager manager) {
+        Configuration configuration = abacus.getConfiguration();
+        Set<String> disabledPlugins = configuration.getDisabledPlugins();
+        numberImplementationOptions.addAll(abacus.getPluginManager().getAllNumberImplementations());
+        String actualImplementation = configuration.getNumberImplementation();
+        String toSelect = (numberImplementationOptions.contains(actualImplementation)) ? actualImplementation : "<default>";
+        numberImplementationBox.getSelectionModel().select(toSelect);
+        for (Class<?> pluginClass : abacus.getPluginManager().getLoadedPluginClasses()) {
+            String fullName = pluginClass.getName();
+            ToggleablePlugin plugin = new ToggleablePlugin(!disabledPlugins.contains(fullName), fullName);
+            plugin.enabledProperty().addListener(e -> changesMade = true);
+            enabledPlugins.add(plugin);
+        }
+    }
+
+    @Override
+    public void onUnload(PluginManager manager) {
+        enabledPlugins.clear();
+        numberImplementationOptions.clear();
+    }
+}

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

@@ -0,0 +1,36 @@
+package org.nwapw.abacus.fx;
+
+import javafx.scene.control.TableCell;
+import javafx.scene.input.MouseEvent;
+
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
+
+/**
+ * A cell that copies its value to the clipboard
+ * when double clicked.
+ *
+ * @param <S> The type of the table view generic type.
+ * @param <T> The type of the value contained in the cell.
+ */
+public class CopyableCell<S, T> extends TableCell<S, T> {
+
+    /**
+     * Creates a new copyable cell.
+     */
+    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,97 @@
+package org.nwapw.abacus.fx;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+/**
+ * The data model used for storing history entries.
+ */
+public class HistoryModel {
+
+    /**
+     * The property used for displaying the column
+     * for the user input.
+     */
+    private final StringProperty input;
+    /**
+     * The property used for displaying the column
+     * that contains the parsed input.
+     */
+    private final StringProperty parsed;
+    /**
+     * The property used for displaying the column
+     * that contains the program output.
+     */
+    private final StringProperty output;
+
+    /**
+     * Creates a new history model with the given variables.
+     *
+     * @param input  the user input
+     * @param parsed the parsed input
+     * @param output the program 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);
+    }
+
+    /**
+     * Gets the input property.
+     *
+     * @return the input property.
+     */
+    public StringProperty inputProperty() {
+        return input;
+    }
+
+    /**
+     * Gets the input.
+     *
+     * @return the input.
+     */
+    public String getInput() {
+        return input.get();
+    }
+
+    /**
+     * Gets the parsed input property.
+     *
+     * @return the parsed input property.
+     */
+    public StringProperty parsedProperty() {
+        return parsed;
+    }
+
+    /**
+     * Gets the parsed input.
+     *
+     * @return the parsed input.
+     */
+    public String getParsed() {
+        return parsed.get();
+    }
+
+    /**
+     * Gets the output property.
+     *
+     * @return the output property.
+     */
+    public StringProperty outputProperty() {
+        return output;
+    }
+
+    /**
+     * Gets the program output.
+     *
+     * @return the output.
+     */
+    public String getOutput() {
+        return output.get();
+    }
+
+}

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

@@ -0,0 +1,60 @@
+package org.nwapw.abacus.fx;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+
+/**
+ * Class that represents an entry in the plugin check box list.
+ * The changes from this property are written to the config on application.
+ */
+public class ToggleablePlugin {
+
+    /**
+     * The property that determines whether the plugin will be enabled.
+     */
+    private final BooleanProperty enabled;
+    /**
+     * The name of the class this entry toggles.
+     */
+    private final String className;
+
+    /**
+     * Creates a new toggleable plugin with the given properties.
+     *
+     * @param enabled   the enabled / disabled state at the beginning.
+     * @param className the name of the class this plugin toggles.
+     */
+    public ToggleablePlugin(boolean enabled, String className) {
+        this.enabled = new SimpleBooleanProperty();
+        this.enabled.setValue(enabled);
+        this.className = className;
+    }
+
+    /**
+     * Gets the enabled property of this plugin.
+     *
+     * @return the enabled property.
+     */
+    public BooleanProperty enabledProperty() {
+        return enabled;
+    }
+
+    /**
+     * Checks if this plugin entry should be enabled.
+     *
+     * @return whether this plugin will be enabled.
+     */
+    public boolean isEnabled() {
+        return enabled.get();
+    }
+
+    /**
+     * Gets the class name this plugin toggles.
+     *
+     * @return the class name that should be disabled.
+     */
+    public String getClassName() {
+        return className;
+    }
+
+}

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

@@ -26,6 +26,7 @@ public class NaiveNumber implements NumberInterface {
     public NaiveNumber(String value) {
         this(Double.parseDouble(value));
     }
+
     /**
      * Creates a new NaiveNumber with the given value.
      *
@@ -110,7 +111,7 @@ public class NaiveNumber implements NumberInterface {
 
     @Override
     public int intValue() {
-        return (int)value;
+        return (int) value;
     }
 
     @Override

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

@@ -81,18 +81,21 @@ public interface NumberInterface {
 
     /**
      * 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();
@@ -100,6 +103,7 @@ public interface NumberInterface {
     /**
      * Returns the integer representation of this number, discarding any fractional part,
      * if int can hold the value.
+     *
      * @return
      */
     int intValue();

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

@@ -3,6 +3,10 @@ package org.nwapw.abacus.number;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
+/**
+ * A number that uses a BigDecimal to store its value,
+ * leading to infinite possible precision.
+ */
 public class PreciseNumber implements NumberInterface {
 
     /**
@@ -98,7 +102,7 @@ public class PreciseNumber implements NumberInterface {
     public NumberInterface ceiling() {
         String str = value.toPlainString();
         int decimalIndex = str.indexOf('.');
-        if(decimalIndex != -1){
+        if (decimalIndex != -1) {
             return this.floor().add(ONE);
         }
         return this;
@@ -108,7 +112,7 @@ public class PreciseNumber implements NumberInterface {
     public NumberInterface floor() {
         String str = value.toPlainString();
         int decimalIndex = str.indexOf('.');
-        if(decimalIndex != -1){
+        if (decimalIndex != -1) {
             return new PreciseNumber(str.substring(0, decimalIndex));
         }
         return this;
@@ -118,7 +122,7 @@ public class PreciseNumber implements NumberInterface {
     public NumberInterface fractionalPart() {
         String str = value.toPlainString();
         int decimalIndex = str.indexOf('.');
-        if(decimalIndex != -1){
+        if (decimalIndex != -1) {
             return new PreciseNumber(str.substring(decimalIndex + 1));
         }
         return ZERO;

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

@@ -55,9 +55,12 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
     public List<Match<TokenType>> intoPostfix(List<Match<TokenType>> from) {
         ArrayList<Match<TokenType>> output = new ArrayList<>();
         Stack<Match<TokenType>> tokenStack = new Stack<>();
+        TokenType previousType;
+        TokenType matchType = null;
         while (!from.isEmpty()) {
             Match<TokenType> match = from.remove(0);
-            TokenType matchType = match.getType();
+            previousType = matchType;
+            matchType = match.getType();
             if (matchType == TokenType.NUM) {
                 output.add(match);
             } else if (matchType == TokenType.FUNCTION) {
@@ -74,13 +77,19 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
                     continue;
                 }
 
-                while (!tokenStack.empty()) {
+                if (tokenString.equals("-") && (previousType == null || previousType == TokenType.OP ||
+                        previousType == TokenType.OPEN_PARENTH)) {
+                    from.add(0, new Match<>("`", TokenType.OP));
+                    continue;
+                }
+
+                while (!tokenStack.empty() && type == OperatorType.BINARY_INFIX) {
                     Match<TokenType> otherMatch = tokenStack.peek();
                     TokenType otherMatchType = otherMatch.getType();
                     if (!(otherMatchType == TokenType.OP || otherMatchType == TokenType.FUNCTION)) break;
 
                     if (otherMatchType == TokenType.OP) {
-                        int otherPrecedence = precedenceMap.get(match.getContent());
+                        int otherPrecedence = precedenceMap.get(otherMatch.getContent());
                         if (otherPrecedence < precedence ||
                                 (associativity == OperatorAssociativity.RIGHT && otherPrecedence == precedence)) {
                             break;
@@ -103,8 +112,8 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
         }
         while (!tokenStack.empty()) {
             Match<TokenType> match = tokenStack.peek();
-            TokenType matchType = match.getType();
-            if (!(matchType == TokenType.OP || matchType == TokenType.FUNCTION)) return null;
+            TokenType newMatchType = match.getType();
+            if (!(newMatchType == TokenType.OP || newMatchType == TokenType.FUNCTION)) return null;
             output.add(tokenStack.pop());
         }
         return output;
@@ -127,11 +136,11 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
                 TreeNode right = constructRecursive(matches);
                 TreeNode left = constructRecursive(matches);
                 if (left == null || right == null) return null;
-                else return new BinaryInfixNode(operator, left, right);
+                else return new BinaryNode(operator, left, right);
             } else {
                 TreeNode applyTo = constructRecursive(matches);
                 if (applyTo == null) return null;
-                else return new UnaryPrefixNode(operator, applyTo);
+                else return new UnaryNode(operator, applyTo);
             }
         } else if (matchType == TokenType.NUM) {
             return new NumberNode(abacus.numberFromString(match.getContent()));

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

@@ -26,10 +26,11 @@ public abstract class NumberImplementation {
 
     /**
      * 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.
+     * @param priority       the priority, higher -> more likely to be converted into.
      */
-    public NumberImplementation(Class<? extends NumberInterface> implementation, int priority){
+    public NumberImplementation(Class<? extends NumberInterface> implementation, int priority) {
         this.implementation = implementation;
         this.priority = priority;
         promotionPaths = new HashMap<>();
@@ -37,30 +38,34 @@ public abstract class NumberImplementation {
 
     /**
      * 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(){
+    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(){
+    public final Class<? extends NumberInterface> getImplementation() {
         return implementation;
     }
 
     /**
      * Gets the priority of this number implementation.
+     *
      * @return the priority.
      */
-    public final int getPriority(){
+    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.
      */
@@ -68,6 +73,7 @@ public abstract class NumberImplementation {
 
     /**
      * Get the instance of pi with the given implementation.
+     *
      * @return pi
      */
     public abstract NumberInterface instanceForPi();

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

@@ -78,7 +78,7 @@ public abstract class Plugin {
      *
      * @return the list of registered number implementations.
      */
-    public final Set<String> providedNumberImplementations(){
+    public final Set<String> providedNumberImplementations() {
         return numberImplementations.keySet();
     }
 
@@ -108,7 +108,7 @@ public abstract class Plugin {
      * @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.
      */
-    public final NumberImplementation getNumberImplementation(String name){
+    public final NumberImplementation getNumberImplementation(String name) {
         return numberImplementations.get(name);
     }
 
@@ -160,10 +160,11 @@ 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 name           the name of the implementation.
      * @param implementation the actual implementation class to register.
      */
-    protected final void registerNumberImplementation(String name, NumberImplementation implementation){
+    protected final void registerNumberImplementation(String name, NumberImplementation implementation) {
         numberImplementations.put(name, implementation);
     }
 
@@ -199,7 +200,7 @@ public abstract class Plugin {
      * @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){
+    protected final NumberImplementation numberImplementationFor(String name) {
         return manager.numberImplementationFor(name);
     }
 
@@ -208,10 +209,11 @@ public abstract class Plugin {
      * 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){
+    protected final NumberInterface getPi(Class<? extends NumberInterface> forClass) {
         return manager.piFor(forClass);
     }
 

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

@@ -1,5 +1,6 @@
 package org.nwapw.abacus.plugin;
 
+import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.function.Function;
 import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.number.NumberInterface;
@@ -61,11 +62,17 @@ public class PluginManager {
      * The list of plugin listeners attached to this instance.
      */
     private Set<PluginListener> listeners;
+    /**
+     * The abacus instance used to access other
+     * components of the application.
+     */
+    private Abacus abacus;
 
     /**
      * Creates a new plugin manager.
      */
-    public PluginManager() {
+    public PluginManager(Abacus abacus) {
+        this.abacus = abacus;
         loadedPluginClasses = new HashSet<>();
         plugins = new HashSet<>();
         cachedFunctions = new HashMap<>();
@@ -95,9 +102,9 @@ public class PluginManager {
      * @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) {
+                                         java.util.function.Function<Plugin, Set<K>> setFunction,
+                                         java.util.function.BiFunction<Plugin, K, T> getFunction,
+                                         K name) {
         if (cache.containsKey(name)) return cache.get(name);
 
         T loadedValue = null;
@@ -134,27 +141,29 @@ public class PluginManager {
 
     /**
      * Gets the number implementation under the given name.
+     *
      * @param name the name of the implementation.
      * @return the implementation.
      */
-    public NumberImplementation numberImplementationFor(String name){
+    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);
+    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()){
+        for (Plugin plugin : plugins) {
+            for (String implementationName : plugin.providedNumberImplementations()) {
                 NumberImplementation implementation = plugin.getNumberImplementation(implementationName);
-                if(implementation.getImplementation().equals(name)) {
+                if (implementation.getImplementation().equals(name)) {
                     toReturn = implementation;
                     break outside;
                 }
@@ -166,14 +175,15 @@ public class PluginManager {
 
     /**
      * 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);
+    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){
+        if (implementation != null) {
             generatedPi = implementation.instanceForPi();
         }
         cachedPi.put(forClass, generatedPi);
@@ -210,8 +220,13 @@ public class PluginManager {
      * Loads all the plugins in the PluginManager.
      */
     public void load() {
-        for (Plugin plugin : plugins) plugin.enable();
+        Set<String> disabledPlugins = abacus.getConfiguration().getDisabledPlugins();
         for (Plugin plugin : plugins) {
+            if (disabledPlugins.contains(plugin.getClass().getName())) continue;
+            plugin.enable();
+        }
+        for (Plugin plugin : plugins) {
+            if (disabledPlugins.contains(plugin.getClass().getName())) continue;
             allFunctions.addAll(plugin.providedFunctions());
             allOperators.addAll(plugin.providedOperators());
             allNumberImplementations.addAll(plugin.providedNumberImplementations());
@@ -223,7 +238,17 @@ public class PluginManager {
      * Unloads all the plugins in the PluginManager.
      */
     public void unload() {
-        for (Plugin plugin : plugins) plugin.disable();
+        listeners.forEach(e -> e.onUnload(this));
+        Set<String> disabledPlugins = abacus.getConfiguration().getDisabledPlugins();
+        for (Plugin plugin : plugins) {
+            if (disabledPlugins.contains(plugin.getClass().getName())) continue;
+            plugin.disable();
+        }
+        cachedFunctions.clear();
+        cachedOperators.clear();
+        cachedNumberImplementations.clear();
+        cachedInterfaceImplementations.clear();
+        cachedPi.clear();
         allFunctions.clear();
         allOperators.clear();
         allNumberImplementations.clear();
@@ -235,7 +260,7 @@ public class PluginManager {
      */
     public void reload() {
         unload();
-        reload();
+        load();
     }
 
     /**
@@ -261,7 +286,7 @@ public class PluginManager {
      *
      * @return the set of all implementations that were loaded.
      */
-    public Set<String> getAllNumberImplementations(){
+    public Set<String> getAllNumberImplementations() {
         return allNumberImplementations;
     }
 
@@ -283,4 +308,13 @@ public class PluginManager {
         listeners.remove(listener);
     }
 
+    /**
+     * Gets a list of all the plugin class files that have been
+     * added to the plugin manager.
+     *
+     * @return the list of all the added plugin classes.
+     */
+    public Set<Class<?>> getLoadedPluginClasses() {
+        return loadedPluginClasses;
+    }
 }

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

@@ -18,8 +18,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, +
      */
@@ -31,9 +29,13 @@ public class StandardPlugin extends Plugin {
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
+            if (Thread.currentThread().isInterrupted())
+                return null;
             NumberInterface sum = params[0];
             for (int i = 1; i < params.length; i++) {
                 sum = sum.add(params[i]);
+                if (Thread.currentThread().isInterrupted())
+                    return null;
             }
             return sum;
         }
@@ -49,7 +51,26 @@ public class StandardPlugin extends Plugin {
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
+            if (Thread.currentThread().isInterrupted())
+                return null;
             return params[0].subtract(params[1]);
+
+        }
+    });
+    /**
+     * The negation operator, -
+     */
+    public static final Operator OP_NEGATE = new Operator(OperatorAssociativity.LEFT, OperatorType.UNARY_PREFIX, 0, new Function() {
+        @Override
+        protected boolean matchesParams(NumberInterface[] params) {
+            return params.length == 1;
+        }
+
+        @Override
+        protected NumberInterface applyInternal(NumberInterface[] params) {
+            if (Thread.currentThread().isInterrupted())
+                return null;
+            return params[0].negate();
         }
     });
     /**
@@ -63,9 +84,13 @@ public class StandardPlugin extends Plugin {
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
+            if (Thread.currentThread().isInterrupted())
+                return null;
             NumberInterface product = params[0];
             for (int i = 1; i < params.length; i++) {
                 product = product.multiply(params[i]);
+                if (Thread.currentThread().isInterrupted())
+                    return null;
             }
             return product;
         }
@@ -76,16 +101,14 @@ 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 >= 1;
+            return params.length == 2 && params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[1].getClass())) != 0;
         }
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
-            NumberInterface product = params[0];
-            for (int i = 1; i < params.length; i++) {
-                product = product.multiply(params[i]);
-            }
-            return product;
+            if (Thread.currentThread().isInterrupted())
+                return null;
+            return params[0].divide(params[1]);
         }
     });
     /**
@@ -95,20 +118,26 @@ 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;
+            return params.length == 1
+                    && params[0].fractionalPart().compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0
+                    && params[0].signum() >= 0;
         }
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
+            if (Thread.currentThread().isInterrupted())
+                return null;
             if (params[0].signum() == 0) {
                 return (new NaiveNumber(1)).promoteTo(params[0].getClass());
             }
             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 (!Thread.currentThread().isInterrupted() && (multiplier = multiplier.subtract(NaiveNumber.ONE.promoteTo(multiplier.getClass()))) != null && multiplier.signum() == 1) {
                 factorial = factorial.multiply(multiplier);
             }
+            if (Thread.currentThread().isInterrupted())
+                return null;
             return factorial;
                 /*if(!storedList.containsKey(params[0].getClass())){
                     storedList.put(params[0].getClass(), new ArrayList<NumberInterface>());
@@ -117,20 +146,6 @@ public class StandardPlugin extends Plugin {
                 }*/
         }
     });
-    /**
-     * The caret / pow operator, ^
-     */
-    public static final Operator OP_CARET = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2, new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 2;
-        }
-
-        @Override
-        protected NumberInterface applyInternal(NumberInterface[] params) {
-            return FUNCTION_EXP.apply(FUNCTION_LN.apply(params[0]).multiply(params[1]));
-        }
-    });
     /**
      * The absolute value function, abs(-3) = 3
      */
@@ -142,83 +157,48 @@ public class StandardPlugin extends Plugin {
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
+            if (Thread.currentThread().isInterrupted())
+                return null;
             return params[0].multiply((new NaiveNumber(params[0].signum())).promoteTo(params[0].getClass()));
         }
     };
-    /**
-     * The exponential function, exp(1) = e^1 = 2.71...
-     */
-    public static final Function FUNCTION_EXP = new Function() {
-        @Override
-        protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
-        }
-
-        @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;
-            }
-        }
-    };
     /**
      * The natural log function.
      */
     public static final Function FUNCTION_LN = new Function() {
         @Override
         protected boolean matchesParams(NumberInterface[] params) {
-            return params.length == 1;
+            return params.length == 1 && params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) > 0;
         }
 
         @Override
         protected NumberInterface applyInternal(NumberInterface[] params) {
+            if (Thread.currentThread().isInterrupted())
+                return null;
             NumberInterface param = params[0];
             int powersOf2 = 0;
-            while (FUNCTION_ABS.apply(param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))).compareTo((new NaiveNumber(0.1)).promoteTo(param.getClass())) >= 0) {
-                if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() == 1) {
+            NumberInterface check;
+            while (!Thread.currentThread().isInterrupted() && (check = FUNCTION_ABS.apply(param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())))) != null && (check.compareTo((new NaiveNumber(0.1)).promoteTo(param.getClass()))) >= 0) {
+                if ((check = param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))) != null && check.signum() == 1) {
                     param = param.divide(new NaiveNumber(2).promoteTo(param.getClass()));
                     powersOf2++;
-                    if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() != 1) {
+                    if ((check = param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))) == null || check.signum() != 1) {
                         break;
                         //No infinite loop for you.
                     }
                 } else {
                     param = param.multiply(new NaiveNumber(2).promoteTo(param.getClass()));
                     powersOf2--;
-                    if (param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() != 1) {
+                    if ((check = param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))) == null || check.signum() != 1) {
                         break;
                         //No infinite loop for you.
                     }
                 }
             }
-            return getLog2(param).multiply((new NaiveNumber(powersOf2)).promoteTo(param.getClass())).add(getLogPartialSum(param));
+            NumberInterface check2;
+            if (!Thread.currentThread().isInterrupted() && (check = getLog2(param)) != null && (check = check.multiply((new NaiveNumber(powersOf2).promoteTo(param.getClass())))) != null && (check2 = getLogPartialSum(param)) != null && (check = check.add(check2)) != null)
+                return check;
+            return null;
         }
 
         /**
@@ -228,16 +208,23 @@ public class StandardPlugin extends Plugin {
          * @return the partial sum.
          */
         private NumberInterface getLogPartialSum(NumberInterface x) {
+
+            if (Thread.currentThread().isInterrupted())
+                return null;
             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;
             int n = 1;
-            while (FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0) {
+            NumberInterface check;
+            while (!Thread.currentThread().isInterrupted() && (check = FUNCTION_ABS.apply(currentTerm)) != null && check.compareTo(maxError) > 0) {
                 n++;
-                currentNumerator = currentNumerator.multiply(x).negate();
+                if ((currentNumerator = currentNumerator.multiply(x)) == null || (currentNumerator = currentNumerator.negate()) == null)
+                    return null;
                 currentTerm = currentNumerator.divide(new NaiveNumber(n).promoteTo(x.getClass()));
                 sum = sum.add(currentTerm);
             }
+            if (Thread.currentThread().isInterrupted())
+                return null;
             return sum;
         }
 
@@ -247,6 +234,8 @@ public class StandardPlugin extends Plugin {
          * @return the value of log(2) with the appropriate precision.
          */
         private NumberInterface getLog2(NumberInterface number) {
+            if (Thread.currentThread().isInterrupted())
+                return null;
             NumberInterface maxError = getMaxError(number);
             //NumberInterface errorBound = (new NaiveNumber(1)).promoteTo(number.getClass());
             //We'll use the series \sigma_{n >= 1) ((1/3^n + 1/4^n) * 1/n)
@@ -255,13 +244,17 @@ public class StandardPlugin extends Plugin {
             NumberInterface a = (new NaiveNumber(1)).promoteTo(number.getClass()), b = a, c = a;
             NumberInterface sum = NaiveNumber.ZERO.promoteTo(number.getClass());
             int n = 0;
-            while (a.compareTo(maxError) >= 1) {
+            while (!Thread.currentThread().isInterrupted() && a.compareTo(maxError) >= 1) {
                 n++;
                 a = a.divide((new NaiveNumber(3)).promoteTo(number.getClass()));
                 b = b.divide((new NaiveNumber(4)).promoteTo(number.getClass()));
                 c = NaiveNumber.ONE.promoteTo(number.getClass()).divide((new NaiveNumber(n)).promoteTo(number.getClass()));
-                sum = sum.add(a.add(b).multiply(c));
+                NumberInterface check;
+                if (a == null || (check = a.add(b)) == null || (check = check.multiply(c)) == null || (sum = sum.add(check)) == null)
+                    return null;
             }
+            if (Thread.currentThread().isInterrupted())
+                return null;
             return sum;
         }
     };
@@ -279,33 +272,6 @@ public class StandardPlugin extends Plugin {
             return OP_CARET.getFunction().apply(params[0], ((new NaiveNumber(0.5)).promoteTo(params[0].getClass())));
         }
     };
-
-    /**
-     * 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);
-        }
-    };
-
     /**
      * The implementation for double-based naive numbers.
      */
@@ -320,7 +286,6 @@ public class StandardPlugin extends Plugin {
             return new NaiveNumber(Math.PI);
         }
     };
-
     /**
      * The implementation for the infinite-precision BigDecimal.
      */
@@ -337,19 +302,19 @@ public class StandardPlugin extends Plugin {
             NumberInterface L = new PreciseNumber("13591409");
             NumberInterface X = M;
             NumberInterface sum = L;
-            int termsNeeded = C.getMaxPrecision()/13 + 1;
+            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++){
+            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 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));
@@ -357,6 +322,168 @@ public class StandardPlugin extends Plugin {
             return C.divide(sum);
         }
     };
+    private static final HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> FACTORIAL_LISTS = new HashMap<>();
+    /**
+     * The exponential function, exp(1) = e^1 = 2.71...
+     */
+    public static final Function FUNCTION_EXP = new Function() {
+        @Override
+        protected boolean matchesParams(NumberInterface[] params) {
+            return params.length == 1;
+        }
+
+        @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;
+            }
+        }
+    };
+    /**
+     * The caret / pow operator, ^
+     */
+    public static final Operator OP_CARET = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2, new Function() {
+        @Override
+        protected boolean matchesParams(NumberInterface[] params) {
+            return params.length == 2
+                    && !(params[0].compareTo(NaiveNumber.ZERO.promoteTo(params[0].getClass())) == 0
+                    && params[1].compareTo(NaiveNumber.ZERO.promoteTo(params[1].getClass())) == 0);
+        }
+
+        @Override
+        protected NumberInterface applyInternal(NumberInterface[] params) {
+            if (Thread.currentThread().isInterrupted()) return null;
+            else 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());
+            FUNCTION_EXP.apply(FUNCTION_LN.apply(FUNCTION_ABS.apply(params[0])).multiply(params[1]));
+            NumberInterface check = FUNCTION_LN.apply(FUNCTION_ABS.apply(params[0]));
+            if(check == null) return null;
+            return FUNCTION_EXP.apply(check.multiply(params[1]));
+        }
+    });
+    /**
+     * 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);
+        }
+    };
+    /**
+     * The cosine function (the argument is in radians).
+     */
+    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]));
+        }
+    };
+    /**
+     * The tangent function (the argument is in radians).
+     */
+    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]));
+        }
+    };
+    /**
+     * The secant function (the argument is in radians).
+     */
+    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]));
+        }
+    };
+    /**
+     * The cosecant function (the argument is in radians).
+     */
+    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]));
+        }
+    };
+    /**
+     * The cotangent function (the argument is in radians).
+     */
+    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]));
+        }
+    };
 
     public StandardPlugin(PluginManager manager) {
         super(manager);
@@ -388,62 +515,44 @@ public class StandardPlugin extends Plugin {
         return (new NaiveNumber(10)).promoteTo(number.getClass()).intPow(-number.getMaxPrecision());
     }
 
-    @Override
-    public void onEnable() {
-        registerNumberImplementation("naive", IMPLEMENTATION_NAIVE);
-        registerNumberImplementation("precise", IMPLEMENTATION_PRECISE);
-
-        registerOperator("+", OP_ADD);
-        registerOperator("-", OP_SUBTRACT);
-        registerOperator("*", OP_MULTIPLY);
-        registerOperator("/", OP_DIVIDE);
-        registerOperator("^", OP_CARET);
-        registerOperator("!", OP_FACTORIAL);
-
-        registerFunction("abs", FUNCTION_ABS);
-        registerFunction("exp", FUNCTION_EXP);
-        registerFunction("ln", FUNCTION_LN);
-        registerFunction("sqrt", FUNCTION_SQRT);
-        registerFunction("sin", functionSin);
-    }
-
-    @Override
-    public void onDisable() {
-
-    }
-
     /**
      * 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.
+     * @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));
+    public static NumberInterface factorial(Class<? extends NumberInterface> numberClass, int n) {
+        if (Thread.currentThread().isInterrupted())
+            return null;
+        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));
         }
-        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)));
+        ArrayList<NumberInterface> list = FACTORIAL_LISTS.get(numberClass);
+        if (n >= list.size()) {
+            while (!Thread.currentThread().isInterrupted() && list.size() < n + 16) {
+                list.add(list.get(list.size() - 1).multiply(new NaiveNumber(list.size()).promoteTo(numberClass)));
             }
         }
+        if (Thread.currentThread().isInterrupted())
+            return null;
         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){
+    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{
+        do {
             n += 2;
             power = power.multiply(multiplier);
             currentTerm = power.divide(factorial(x.getClass(), n));
@@ -454,16 +563,69 @@ public class StandardPlugin extends Plugin {
 
     /**
      * 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){
+    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){
+                .multiply(FUNCTION_ABS.apply(phi).divide(twoPi).floor())); //Now theta is in [0, 2pi).
+        if (phi.signum() < 0) {
             theta = twoPi.subtract(theta);
         }
         return theta;
     }
+
+    public static NumberInterface intPow(NumberInterface number, Class<? extends NumberInterface> numberClass, NumberInterface exponent) {
+        if (Thread.currentThread().isInterrupted())
+            return null;
+        if (exponent.compareTo((new NaiveNumber(0)).promoteTo(numberClass)) == 0) {
+            return (new NaiveNumber(1)).promoteTo(numberClass);
+        }
+        boolean takeReciprocal = exponent.compareTo((new NaiveNumber(0)).promoteTo(numberClass)) < 0;
+        exponent = FUNCTION_ABS.apply(exponent);
+        NumberInterface power = number;
+        for (NumberInterface currentExponent = (new NaiveNumber(1)).promoteTo(numberClass); currentExponent.compareTo(exponent) < 0; currentExponent = currentExponent.add((new NaiveNumber(1)).promoteTo(numberClass))) {
+            power = power.multiply(number);
+            if (Thread.currentThread().isInterrupted())
+                return null;
+        }
+        if (takeReciprocal) {
+            power = (new NaiveNumber(1)).promoteTo(numberClass).divide(power);
+        }
+        if (Thread.currentThread().isInterrupted())
+            return null;
+        return power;
+    }
+
+    @Override
+    public void onEnable() {
+        registerNumberImplementation("naive", IMPLEMENTATION_NAIVE);
+        registerNumberImplementation("precise", IMPLEMENTATION_PRECISE);
+
+        registerOperator("+", OP_ADD);
+        registerOperator("-", OP_SUBTRACT);
+        registerOperator("`", OP_NEGATE);
+        registerOperator("*", OP_MULTIPLY);
+        registerOperator("/", OP_DIVIDE);
+        registerOperator("^", OP_CARET);
+        registerOperator("!", OP_FACTORIAL);
+
+        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);
+    }
+
+    @Override
+    public void onDisable() {
+
+    }
 }

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

@@ -3,7 +3,7 @@ package org.nwapw.abacus.tree;
 /**
  * A tree node that represents an operation being applied to two operands.
  */
-public class BinaryInfixNode extends TreeNode {
+public class BinaryNode extends TreeNode {
 
     /**
      * The operation being applied.
@@ -18,7 +18,7 @@ public class BinaryInfixNode extends TreeNode {
      */
     private TreeNode right;
 
-    private BinaryInfixNode() {
+    private BinaryNode() {
     }
 
     /**
@@ -27,7 +27,7 @@ public class BinaryInfixNode extends TreeNode {
      *
      * @param operation the operation.
      */
-    public BinaryInfixNode(String operation) {
+    public BinaryNode(String operation) {
         this(operation, null, null);
     }
 
@@ -39,7 +39,7 @@ public class BinaryInfixNode extends TreeNode {
      * @param left      the left node of the expression.
      * @param right     the right node of the expression.
      */
-    public BinaryInfixNode(String operation, TreeNode left, TreeNode right) {
+    public BinaryNode(String operation, TreeNode left, TreeNode right) {
         this.operation = operation;
         this.left = left;
         this.right = right;
@@ -92,10 +92,15 @@ public class BinaryInfixNode extends TreeNode {
 
     @Override
     public <T> T reduce(Reducer<T> reducer) {
+        if (Thread.currentThread().isInterrupted())
+            return null;
         T leftReduce = left.reduce(reducer);
         T rightReduce = right.reduce(reducer);
         if (leftReduce == null || rightReduce == null) return null;
-        return reducer.reduceNode(this, leftReduce, rightReduce);
+        T a = reducer.reduceNode(this, leftReduce, rightReduce);
+        if (Thread.currentThread().isInterrupted())
+            return null;
+        return a;
     }
 
     @Override

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

@@ -62,12 +62,17 @@ public class FunctionNode extends TreeNode {
 
     @Override
     public <T> T reduce(Reducer<T> reducer) {
+        if (Thread.currentThread().isInterrupted())
+            return null;
         Object[] reducedChildren = new Object[children.size()];
         for (int i = 0; i < reducedChildren.length; i++) {
             reducedChildren[i] = children.get(i).reduce(reducer);
-            if (reducedChildren[i] == null) return null;
+            if (Thread.currentThread().isInterrupted() || reducedChildren[i] == null) return null;
         }
-        return reducer.reduceNode(this, reducedChildren);
+        T a = reducer.reduceNode(this, reducedChildren);
+        if (Thread.currentThread().isInterrupted())
+            return null;
+        return a;
     }
 
     @Override

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

@@ -28,15 +28,15 @@ public class NumberReducer implements Reducer<NumberInterface> {
     public NumberInterface reduceNode(TreeNode node, Object... children) {
         if (node instanceof NumberNode) {
             return ((NumberNode) node).getNumber();
-        } else if (node instanceof BinaryInfixNode) {
+        } else if (node instanceof BinaryNode) {
             NumberInterface left = (NumberInterface) children[0];
             NumberInterface right = (NumberInterface) children[1];
-            Function function = abacus.getPluginManager().operatorFor(((BinaryInfixNode) node).getOperation()).getFunction();
+            Function function = abacus.getPluginManager().operatorFor(((BinaryNode) node).getOperation()).getFunction();
             if (function == null) return null;
             return function.apply(left, right);
-        } else if (node instanceof UnaryPrefixNode) {
+        } else if (node instanceof UnaryNode) {
             NumberInterface child = (NumberInterface) children[0];
-            Function functionn = abacus.getPluginManager().operatorFor(((UnaryPrefixNode) node).getOperation()).getFunction();
+            Function functionn = abacus.getPluginManager().operatorFor(((UnaryNode) node).getOperation()).getFunction();
             if (functionn == null) return null;
             return functionn.apply(child);
         } else if (node instanceof FunctionNode) {

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

@@ -1,6 +1,6 @@
 package org.nwapw.abacus.tree;
 
-public class UnaryPrefixNode extends TreeNode {
+public class UnaryNode extends TreeNode {
 
     /**
      * The operation this node will apply.
@@ -16,7 +16,7 @@ public class UnaryPrefixNode extends TreeNode {
      *
      * @param operation the operation for this node.
      */
-    public UnaryPrefixNode(String operation) {
+    public UnaryNode(String operation) {
         this(operation, null);
     }
 
@@ -26,16 +26,21 @@ public class UnaryPrefixNode extends TreeNode {
      * @param operation the operation for this node.
      * @param applyTo   the node to apply the function to.
      */
-    public UnaryPrefixNode(String operation, TreeNode applyTo) {
+    public UnaryNode(String operation, TreeNode applyTo) {
         this.operation = operation;
         this.applyTo = applyTo;
     }
 
     @Override
     public <T> T reduce(Reducer<T> reducer) {
+        if (Thread.currentThread().isInterrupted())
+            return null;
         Object reducedChild = applyTo.reduce(reducer);
         if (reducedChild == null) return null;
-        return reducer.reduceNode(this, reducedChild);
+        T a = reducer.reduceNode(this, reducedChild);
+        if (Thread.currentThread().isInterrupted())
+            return null;
+        return a;
     }
 
     /**

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

@@ -250,6 +250,6 @@ public class Window extends JFrame {
     @Override
     public void setVisible(boolean b) {
         super.setVisible(b);
-        if(b) inputField.requestFocusInWindow();
+        if (b) inputField.requestFocusInWindow();
     }
 }

src/main/resources/abacus.fxml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Text?>
+<BorderPane xmlns:fx="http://javafx.com/fxml"
+            xmlns="http://javafx.com/javafx"
+            fx:controller="org.nwapw.abacus.fx.AbacusController">
+    <center>
+        <TabPane fx:id="coreTabPane">
+            <Tab fx:id="calculateTab" 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"/>
+                            <Button fx:id="stopButton" text="Stop" maxWidth="Infinity"
+                                    onAction="#stopCalculation"/>
+                        </VBox>
+                    </bottom>
+                </BorderPane>
+            </Tab>
+            <Tab fx:id="settingsTab" text="Settings" closable="false">
+                <GridPane hgap="10" vgap="10">
+                    <padding>
+                        <Insets left="10" right="10" top="10" bottom="10"/>
+                    </padding>
+                    <Label text="Number Implementation" GridPane.columnIndex="0" GridPane.rowIndex="0"/>
+                    <ComboBox fx:id="numberImplementationBox" GridPane.columnIndex="1" GridPane.rowIndex="0"/>
+                    <ListView fx:id="enabledPluginView"
+                              GridPane.rowIndex="1" GridPane.columnIndex="0"
+                              GridPane.columnSpan="2" maxHeight="100"/>
+                    <FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="2" hgap="10"
+                              vgap="10">
+                        <Button text="Apply" onAction="#performSave"/>
+                        <Button text="Reload Plugins" onAction="#performReload"/>
+                        <Button text="Apply and Reload" onAction="#performSaveAndReload"/>
+                    </FlowPane>
+                </GridPane>
+            </Tab>
+        </TabPane>
+    </center>
+
+</BorderPane>

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

@@ -0,0 +1,104 @@
+package org.nwapw.abacus.tests;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.nwapw.abacus.Abacus;
+import org.nwapw.abacus.config.Configuration;
+import org.nwapw.abacus.number.NumberInterface;
+import org.nwapw.abacus.plugin.StandardPlugin;
+import org.nwapw.abacus.tree.TreeNode;
+
+public class CalculationTests {
+
+    private static Abacus abacus = new Abacus(new Configuration("precise", new String[]{}));
+
+    @BeforeClass
+    public static void prepareTests(){
+        abacus.getPluginManager().addInstantiated(new StandardPlugin(abacus.getPluginManager()));
+        abacus.getPluginManager().load();
+    }
+
+    private void testOutput(String input, String parseOutput, String output){
+        TreeNode parsedTree = abacus.parseString(input);
+        Assert.assertNotNull(parsedTree);
+        Assert.assertEquals(parsedTree.toString(), parseOutput);
+        NumberInterface result = abacus.evaluateTree(parsedTree);
+        Assert.assertNotNull(result);
+        Assert.assertTrue(result.toString().startsWith(output));
+    }
+
+    private void testEvalError(String input, String parseOutput){
+        TreeNode parsedTree = abacus.parseString(input);
+        Assert.assertNotNull(parsedTree);
+        Assert.assertEquals(parsedTree.toString(), parseOutput);
+        Assert.assertNull(abacus.evaluateTree(parsedTree));
+    }
+
+    @Test
+    public void testAddition(){
+        testOutput("9.5+10", "(9.5+10)", "19.5");
+    }
+
+    @Test
+    public void testSubtraction(){
+        testOutput("9.5-10", "(9.5-10)", "-0.5");
+    }
+
+    @Test
+    public void testMultiplication(){
+        testOutput("9.5*10", "(9.5*10)", "95");
+    }
+
+    @Test
+    public void testDivision(){
+        testOutput("9.5/2", "(9.5/2)", "4.75");
+    }
+
+    @Test
+    public void testNegation(){
+        testOutput("-9.5", "(9.5)`", "-9.5");
+    }
+
+    @Test
+    public void testFactorial(){
+        testOutput("7!", "(7)!", "5040");
+    }
+
+    @Test
+    public void testAbs(){
+        testOutput("abs(-1)", "abs((1)`)", "1");
+        testOutput("abs(1)", "abs(1)", "1");
+    }
+
+    @Test
+    public void testLn(){
+        testEvalError("ln(-1)", "ln((1)`)");
+        testOutput("ln2", "ln(2)", "0.6931471805599453094172321214581765680755");
+    }
+
+    @Test
+    public void testSqrt(){
+        testOutput("sqrt0", "sqrt(0)", "0");
+        testOutput("sqrt4", "sqrt(4)", "2");
+        testOutput("sqrt2", "sqrt(2)", "1.4142135623730950488016887242096980785696");
+    }
+
+    @Test
+    public void testExp(){
+        testOutput("exp0", "exp(0)", "1");
+        testOutput("exp1", "exp(1)", "2.718281828459045235360287471352662497757247");
+        testOutput("exp300", "exp(300)", "19424263952412559365842088360176992193662086");
+        testOutput("exp300", "exp(300)", "19424263952412559365842088360176992193662086");
+    }
+
+    @Test
+    public void testPow(){
+        testOutput("0^2", "(0^2)", "0");
+        testOutput("2^0", "(2^0)", "1");
+        testOutput("2^1", "(2^1)", "2");
+        testOutput("2^-1", "(2^(1)`)", "0.5");
+        testOutput("2^50", "(2^50)", "112589990684262");
+    }
+
+}

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

@@ -4,6 +4,7 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.nwapw.abacus.Abacus;
+import org.nwapw.abacus.config.Configuration;
 import org.nwapw.abacus.function.Function;
 import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.function.OperatorAssociativity;
@@ -18,7 +19,7 @@ import java.util.List;
 
 public class TokenizerTests {
 
-    private static Abacus abacus = new Abacus();
+    private static Abacus abacus = new Abacus(new Configuration("precise", new String[]{}));
     private static LexerTokenizer lexerTokenizer = new LexerTokenizer();
     private static Function subtractFunction = new Function() {
         @Override