1
0
mirror of https://github.com/DanilaFe/abacus synced 2026-01-25 08:05:19 +00:00

Compare commits

...

189 Commits

Author SHA1 Message Date
1c448048f2 Fix typos created in removing the promoteTo calls. 2017-08-09 19:23:44 -07:00
fd21014c39 Phase out as many promoteTo calls as possible. 2017-08-09 19:04:32 -07:00
021e569491 Make the C in nCr capital. 2017-08-09 17:15:12 -07:00
e6f5af3727 Add optimization to NPR. 2017-08-09 12:47:22 -07:00
4e042bd0eb Implement two combinatorics operators. 2017-08-09 12:34:02 -07:00
d6f4838f05 Add a random function. 2017-08-09 11:51:12 -07:00
61475a24d9 Fix the weird scroll bars. 2017-08-09 11:22:01 -07:00
c498a5b643 Merge branch 'function-doc' 2017-08-09 11:10:00 -07:00
5e3daaed43 Rescan the plugins folder. 2017-08-09 11:02:21 -07:00
b99ad5a09a Add plugin removal from the plugin manager. 2017-08-09 10:30:04 -07:00
ff8701a7bf Deprecate the promotion functions. 2017-08-08 15:29:19 -07:00
33b175a3c6 Fix some documentation glitches. 2017-08-08 14:39:41 -07:00
c95a6df304 Change the sorting order. 2017-08-08 14:26:04 -07:00
3316f02e2b Add documentation. 2017-08-08 14:18:14 -07:00
6767a0e4aa Change the width property bound to the width. 2017-08-08 14:18:08 -07:00
400e4578a0 Add documentation browsing to the abacus controller. 2017-08-08 13:49:19 -07:00
9d92d0eebb Add registering documentation to plugins. 2017-08-08 13:49:04 -07:00
fdcf2b5c6d Fix documentation loading code. 2017-08-08 13:47:03 -07:00
8c3de54d0c Add a matches function. 2017-08-08 13:46:54 -07:00
5a57544067 Add a plugin registration function to Plugins. 2017-08-08 11:27:59 -07:00
61f40c72aa Add a registered documentation set. 2017-08-08 11:09:46 -07:00
ea5ff08c09 Add documentation type for a documentation entry. 2017-08-08 10:54:36 -07:00
5f80c0bf14 Add a documentation class. 2017-08-08 10:50:30 -07:00
7dcc80fcae Merge branch 'master' of github.com:DanilaFe/abacus 2017-08-08 10:19:45 -07:00
d10536155b Make the map private. 2017-08-08 10:13:35 -07:00
536cac7b23 Convert Reducer interface to Kotlin. 2017-08-08 10:11:30 -07:00
Arthur Drobot
b6e4c6d2ea Merge branch 'sig-fig' 2017-08-08 09:46:46 -07:00
Arthur Drobot
f8b3559cec Add some tests to pow. 2017-08-08 09:45:13 -07:00
Arthur Drobot
4cf4ba98a8 Adjust unit tests. Set the number of significant figures in the output to 50. 2017-08-08 09:27:10 -07:00
12710c625b Add missing comments. 2017-08-07 22:48:56 -07:00
e71b037195 Switch the ToggleablePlugin class to Kotlin to avoid boilerplate. 2017-08-07 22:44:16 -07:00
fe92929856 Switch HistoryModel to Kotlin to avoid boilerplate. 2017-08-07 22:39:35 -07:00
e61cfdca46 Create a documentation object class. 2017-08-07 22:30:32 -07:00
ff7d90967e Fix toString errors failing unit tests. 2017-08-07 19:22:35 -07:00
355a91d690 Rewrite the Operator in Kotlin. 2017-08-07 19:16:51 -07:00
5f0fba15eb Add comments to the newly created Kotlin implementations. 2017-08-07 19:11:13 -07:00
3bdc0e2ae5 Rewrite tree nodes in Kotlin. Documentation pending. 2017-08-07 18:57:43 -07:00
Arthur Drobot
68fbcd2d7c Modify exp to use the non-alternating series and take a reciprocal in the case of a negative argument. 2017-08-07 18:13:18 -07:00
Arthur Drobot
ed92b382f0 Rewrite precise number to limit significant figures rather than decimal places. Add getMaxError to NumberInterface; modify numbers and StandardPlugin appropriately. 2017-08-07 17:58:18 -07:00
e54b5cdd66 Add Kotlin support to gradle. 2017-08-07 17:33:56 -07:00
fd87cb66a3 Merge branch 'master' of github.com:DanilaFe/abacus 2017-08-07 14:27:29 -07:00
200f4c7288 Add a filter. 2017-08-07 14:12:41 -07:00
Arthur Drobot
1cd544e712 Merge branch 'master' of https://github.com/DanilaFe/abacus 2017-08-07 14:08:17 -07:00
Arthur Drobot
a8c70a6bbe Add checking of negative bases raised to non-integer powers in matchesParams in OP_CARET. 2017-08-07 14:05:15 -07:00
f28e915c9a Fix not clearing unloaded plugins. 2017-08-07 13:55:24 -07:00
7a0863380a Add a list of functions to the controller. 2017-08-07 13:55:13 -07:00
Arthur Drobot
8a9df051cf Optimize pow for integer bases. 2017-08-07 13:43:12 -07:00
Arthur Drobot
4eda15b3fb Modify some functions in PreciseNumber for consistency. 2017-08-07 13:41:45 -07:00
c9e0d4f8d3 Fix broken documentation,. 2017-08-07 11:18:01 -07:00
213d7af10b Merge branch 'remove-caching'
# Conflicts:
#	src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
2017-08-07 11:14:11 -07:00
585a3839c1 Merge branch 'time-limit' 2017-08-07 11:12:12 -07:00
205b73f62c Add missing comments. 2017-08-07 11:11:41 -07:00
1cd332b97d Remove output. 2017-08-07 10:58:07 -07:00
314552f95a Read delay input from input field, and kill delay thread. 2017-08-07 10:58:04 -07:00
c5ec521996 Fix tests to work with the configuration. 2017-08-07 10:57:51 -07:00
4712bbfded Add a setting to the timeout delay. 2017-08-07 10:57:48 -07:00
7ae7f6d9a5 Add a timer to the computation thread to stop it from running. 2017-08-07 10:57:04 -07:00
Arthur Drobot
d0ccb8b625 Improve some comments of NumberInterface functions. 2017-08-07 10:54:27 -07:00
Arthur Drobot
7d5efa1fe6 Add fromInt function into StandardPlugin and replace existing instantiations and promotions of NaiveNumbers with integer values with fromInt calls. 2017-08-07 10:33:16 -07:00
35254d3e99 Rename getPi to piFor. 2017-08-06 21:56:49 -07:00
44f018060d Remove the useless caching in the plugin manager and the maps in plugins 2017-08-06 21:55:09 -07:00
arthur326
6a15c266c4 Fix typo in cot function. 2017-08-06 18:13:01 -07:00
9f61fc5dbe Remove the correct unused intPow function. 2017-08-05 18:23:24 -07:00
bae6ee5526 Revert "Remove the NumberInterface::intPow method."
0c16bb4e9b
2017-08-05 18:22:43 -07:00
4f94700aef Remove the NumberInterface::intPow method. 2017-08-05 18:11:16 -07:00
b7152da58d Merge branch 'stoppable-alternate' 2017-08-05 17:58:26 -07:00
d17a8a9fa7 Add missing javadoc. 2017-08-05 17:29:35 -07:00
71c9f0d141 Merge branch 'documentation' 2017-08-05 17:28:08 -07:00
fb02984e60 Decrease test intensity to prevent travis CI from killing gradle. 2017-08-05 17:24:16 -07:00
a9ac4681f0 Use a specific configuration instead of chancing it with a local file. 2017-08-05 17:13:03 -07:00
62d7053441 Get rid of unnecessary supplier. 2017-08-05 17:09:12 -07:00
f3cbb600ac Remove the default load-from-file behavior from the Abacus core. 2017-08-05 17:04:07 -07:00
abc0e2d59f Add tests for more complex functions. 2017-08-05 16:57:52 -07:00
f7d1be086b Add tests for basic operations. 2017-08-05 16:57:22 -07:00
21a925d6d2 Write two functions to help test the code. 2017-08-05 16:56:50 -07:00
0d21898f20 Make loading plugins a non-core part of Abacus, avoiding desktop APIs. 2017-08-05 16:21:02 -07:00
3e39087fde Add numerous documentation fixes. 2017-08-05 16:15:30 -07:00
a984f2960d Prevent leaving unparsed tokens ignored, throwing error instead. 2017-08-05 16:01:08 -07:00
a6832e09f4 Fix mismatched parentheses causing exceptions. 2017-08-05 15:59:49 -07:00
0bcb3b25d9 Fix exception handling. 2017-08-05 15:58:43 -07:00
2f5f967be4 Add new comments. 2017-08-05 15:19:39 -07:00
72a2a8f1c1 Set output string correctly. 2017-08-05 14:43:24 -07:00
58fc94e9d0 Fix clearing input field. 2017-08-05 14:36:42 -07:00
9cedb100ad Re-introduce arthur326's fix for ln speed. 2017-08-05 14:34:57 -07:00
99be2d80f1 Run calculations via thread, and stop thread if necessary. 2017-08-05 14:34:31 -07:00
2523b9b04b Add a stop button. 2017-08-05 13:57:27 -07:00
cd60c9d52f Convert NumberInterface into abstract class, and check for interruption. 2017-08-05 13:54:06 -07:00
23a3eb88f1 Remove old stopping code. 2017-08-05 13:26:29 -07:00
508e98413d Fix caret just multiplying. 2017-08-04 14:54:01 -07:00
d06f611a2e Remove leftover merge conflict marker. 2017-08-04 14:48:08 -07:00
c541eaab97 Format code. 2017-08-04 14:29:24 -07:00
0058ec9c71 Merge branch 'stoppable-new'
# Conflicts:
#	src/main/java/org/nwapw/abacus/fx/AbacusController.java
#	src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
2017-08-04 14:28:22 -07:00
Riley Jones
f8bf60f383 Fix exp function 2017-08-04 13:52:41 -07:00
Riley Jones
4369eba107 Allow all standard functions to end early 2017-08-04 13:45:29 -07:00
385a0c960d Merge the new edge cases. 2017-08-04 13:32:06 -07:00
Arthur Drobot
d7ae1a80f1 Merge branch 'master' of https://github.com/DanilaFe/abacus 2017-08-04 13:30:05 -07:00
Arthur Drobot
e4a45c0ec4 Add handling of edge cases to pow. 2017-08-04 13:29:53 -07:00
22cf99d23d Add missing comment. 2017-08-04 13:21:28 -07:00
39b36f84e0 Format code. 2017-08-04 13:20:57 -07:00
b036b6c242 Add comments and clean some code. 2017-08-04 12:52:02 -07:00
eb3410f854 Merge branch 'sin'
# Conflicts:
#	src/main/java/org/nwapw/abacus/Abacus.java
#	src/main/java/org/nwapw/abacus/plugin/PluginManager.java
2017-08-04 12:04:37 -07:00
f967053e3d Merge branch 'master' of github.com:DanilaFe/abacus 2017-08-04 11:55:06 -07:00
75824a2a77 Merge branch 'provider-rewrite' into sin
# Conflicts:
#	src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
2017-08-04 11:54:12 -07:00
da602876e7 Add comments to all the pi-related stuff. 2017-08-04 11:24:07 -07:00
Arthur Drobot
8df468e04a Check arguments in factorial function. 2017-08-04 10:33:55 -07:00
Arthur Drobot
e029ab1fea Add argument checks in division and natural log. 2017-08-04 10:05:18 -07:00
af56d31723 Implement a getPi function for the plugin, and use the new pi value. 2017-08-04 09:55:24 -07:00
Riley Jones
eff7be0204 StandardPlugin uses null 2017-08-03 23:59:23 -07:00
34ae4b42c6 Add attempt to find the number implementation from the class. 2017-08-03 22:16:08 -07:00
b680215f57 Make the promotion map protected and use classes. 2017-08-03 21:27:53 -07:00
e6cc08043e Add the number implementation to the plugin manager, and use it. 2017-08-03 21:05:25 -07:00
3e10ea223f Add a class that keeps track of the implementation information. 2017-08-03 20:50:53 -07:00
44c52b412c Remove old reference to the promotion system and the number class map. 2017-08-03 20:50:39 -07:00
eb51d5d3e4 Add a save and reload button. 2017-08-03 19:00:13 -07:00
8ae28f2dab Add the apply warnings when switching tabs. 2017-08-03 18:16:48 -07:00
0bade4a7df Add warnings that trigger if configuration has been changed. 2017-08-03 18:12:40 -07:00
Riley Jones
9d5f9d901c Plugin fixes 2017-08-03 15:16:26 -07:00
0f02867a4e Add the list of number interface providers to Plugins. 2017-08-03 14:10:04 -07:00
Riley Jones
dad546c5b5 Add stop button 2017-08-03 14:04:09 -07:00
f0e1b85dcf Make sure disk writes are only on save, and add an alert dialog. 2017-08-03 13:55:39 -07:00
37261c2f58 Fix order of operations bug. 2017-08-03 13:14:09 -07:00
691118c206 Add a number provider cache. 2017-08-03 10:54:09 -07:00
Arthur Drobot
95845a1585 Add tan, sec, csc, cot in terms of what we currently have. 2017-08-03 10:30:42 -07:00
819fff6391 Change the cache search function to be more generic. 2017-08-03 10:03:13 -07:00
Arthur Drobot
8cf0c94947 Add cos. 2017-08-03 09:52:56 -07:00
20f6e0b0b2 Merge branch 'plugin-list' 2017-08-03 09:34:14 -07:00
4056013d1f Add defaults that actually work. 2017-08-02 21:57:53 -07:00
c7b5d4c4fc Merge branch 'unit-tests' (only typos fixed) 2017-08-02 21:30:50 -07:00
be28e26607 Stop autosaving, switch to save + reload buttons. 2017-08-02 19:40:22 -07:00
2f1ed5f0d1 Change the default implementation string to "<default>" 2017-08-02 19:26:14 -07:00
2615273d28 Refresh all settings on plugin load. 2017-08-02 19:18:33 -07:00
6e1d2ce629 Clear caches on unload and call onUnload before plugins are removed. 2017-08-02 19:14:50 -07:00
44b8efd9bc Actually disable loading the plugin functions in the PluginManager. 2017-08-02 19:06:16 -07:00
2502c90837 Write disabled / enabled plugins to the configuration. 2017-08-02 19:01:01 -07:00
e49f28a850 Add a check box list cell generator. 2017-08-02 18:48:42 -07:00
88e4a87d81 Add a data model for the plugins displayed in the enabled plugins list. 2017-08-02 18:39:00 -07:00
cda09518c3 Add the disabled plugins configuration option. 2017-08-02 18:38:37 -07:00
56510d97de Add the new UI components required for the plugin loading. 2017-08-02 18:24:20 -07:00
Arthur Drobot
86533d53c9 Fix scaling for optimization in FUNCTION_LN, in the positive direction towards unity (i.e., when the argument passed to ln is small). 2017-08-02 15:33:34 -07:00
Arthur Drobot
9b71f9aaf4 Add comments for FUNCTION_SIN and intFactorial in StandardPlugin. 2017-08-02 15:13:04 -07:00
Arthur Drobot
cf953da40a Fix getPi function. 2017-08-02 14:13:30 -07:00
Arthur Drobot
27ad10c0f1 Remember to use floor in the angle reduction function. Comment debugging output. 2017-08-02 13:27:39 -07:00
Arthur Drobot
601c4fea55 Change ceiling and floor to return NumberInterface. Add fractional part function. Add intValue function. Change StandardPlugin correspondingly. 2017-08-02 12:00:56 -07:00
c2ae0b4138 Merge branch 'negatives' 2017-08-02 11:33:21 -07:00
16938b4e06 Fix division to not multiply numbers. 2017-08-02 11:28:49 -07:00
d964fbfb6f Implement the negation operator. 2017-08-02 11:26:59 -07:00
Arthur Drobot
52fbfd5134 Change getPi to calculate pi using a series. 2017-08-02 11:03:17 -07:00
9713f24ed2 Rename nodes to more general names. 2017-08-02 10:41:52 -07:00
5de9453bec Merge branch 'config-rewrite' 2017-08-01 16:42:58 -07:00
Arthur Drobot
b31151384d Implement sin function and helper functions such as getSmallAngle and floor. 2017-08-01 15:36:54 -07:00
d205651332 Add a number implementation selector box. 2017-08-01 11:52:48 -07:00
6f99f07150 Add comment to PreciseNumber. 2017-08-01 10:49:50 -07:00
2cf41c1029 Add comments to the JavaFX codebase 2017-08-01 10:49:00 -07:00
76677ef494 Merge the two configuration classes into one. 2017-08-01 10:24:32 -07:00
0cd40b028a Merge branch 'javafx' 2017-08-01 09:53:47 -07:00
7cb04a1222 Switch to the new UI. 2017-08-01 09:53:38 -07:00
0a97eeb442 Resize table columns. 2017-08-01 09:25:13 -07:00
Arthur Drobot
1ee8c7d231 Keep 15 additional decimal places. 2017-07-31 23:16:37 -07:00
Arthur Drobot
f97d16c640 Comment out debugging output. 2017-07-31 23:09:11 -07:00
Arthur Drobot
a0bba03c2c Separate power and factorial calculations to fix large precision loss in exp. 2017-07-31 22:56:55 -07:00
05d0755526 Implement a cell that copies input when clicked, and add it to table. 2017-07-31 22:53:42 -07:00
0b97a935bf Enable cell selection to later allow for data copying. 2017-07-31 22:34:49 -07:00
211e963db0 Populate the history table. 2017-07-31 22:29:44 -07:00
d8145acc8f Implement the history data model. 2017-07-31 17:49:57 -07:00
63b8162a9b Format the fxml. 2017-07-31 17:18:08 -07:00
c655c63233 Link up the evaluation and the UI buttons. 2017-07-31 17:17:56 -07:00
27ff1a47b5 Add the inputs to the calculator tab. 2017-07-31 17:16:26 -07:00
2941252f7d Add a tabbed pane as the main focus of the window. 2017-07-31 16:56:38 -07:00
44ed0199d4 Add initialization code to AbacusController 2017-07-31 16:52:34 -07:00
5b582a7dbe Add FXML loading application. 2017-07-31 16:50:39 -07:00
a02086e791 Create new fxml file and controller for it. 2017-07-31 16:48:04 -07:00
Arthur Drobot
8666e96420 Remove unused code and functions in StandardPlugin. 2017-07-31 14:53:41 -07:00
Arthur Drobot
fd40e6b297 Rewrite exp. (Now works faster.) Add private factorial function to StandardPlugin as well. 2017-07-31 14:49:25 -07:00
Arthur Drobot
79ccd61af3 Add ceiling to NumberInterface and the two numbers that implement it. 2017-07-31 13:25:23 -07:00
Arthur Drobot
699ba9e193 Merge branch 'master' of https://github.com/DanilaFe/abacus 2017-07-31 12:40:19 -07:00
Arthur Drobot
e43f223086 Optimize log. 2017-07-31 12:39:56 -07:00
2dbc91f79e Merge branch 'master' of github.com:DanilaFe/abacus 2017-07-31 11:54:25 -07:00
Arthur Drobot
782636a982 Fix comment. 2017-07-31 10:28:39 -07:00
97d63489cc Focus on the text field on startup. 2017-07-30 21:25:21 -07:00
a0a4f1fbfe Add comments to the newly defined static functions. 2017-07-30 21:15:01 -07:00
763683b6b4 Move OP_CARET back into place. 2017-07-30 21:12:50 -07:00
3ce74303ed Format code. 2017-07-30 21:11:32 -07:00
122874b97a Move all functions to a static context, stopping unnecessary lookups. 2017-07-30 21:10:11 -07:00
0125980c5a Write tests involving plugin loading, and generalize token testing code. 2017-07-30 19:21:26 -07:00
cb7d0f309b Remove the window as a part of the Abacus class. 2017-07-30 15:00:08 -07:00
cb98601ae5 Add some comments. 2017-07-30 14:59:20 -07:00
67b95edd44 Write basic tokenizer tests. 2017-07-30 14:52:10 -07:00
960f891393 Remove abacus dependency from PluginManager. 2017-07-30 14:42:06 -07:00
b599bef775 Write more tests for the Lexer. 2017-07-30 14:12:17 -07:00
61 changed files with 3101 additions and 1384 deletions

View File

@@ -1,3 +1,8 @@
plugins {
id 'java'
id 'application'
id 'org.jetbrains.kotlin.jvm' version '1.1.3'
}
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'application' apply plugin: 'application'
@@ -7,6 +12,7 @@ repositories {
dependencies { dependencies {
compile 'com.moandjiezana.toml:toml4j:0.7.1' compile 'com.moandjiezana.toml:toml4j:0.7.1'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

View File

@@ -1,22 +1,16 @@
package org.nwapw.abacus; package org.nwapw.abacus;
import org.nwapw.abacus.config.ConfigurationObject; import org.nwapw.abacus.config.Configuration;
import org.nwapw.abacus.number.NaiveNumber; import org.nwapw.abacus.fx.AbacusApplication;
import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.parsing.LexerTokenizer; import org.nwapw.abacus.parsing.LexerTokenizer;
import org.nwapw.abacus.parsing.ShuntingYardParser; import org.nwapw.abacus.parsing.ShuntingYardParser;
import org.nwapw.abacus.parsing.TreeBuilder; 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.PluginManager;
import org.nwapw.abacus.plugin.StandardPlugin; import org.nwapw.abacus.plugin.StandardPlugin;
import org.nwapw.abacus.tree.NumberReducer; import org.nwapw.abacus.tree.NumberReducer;
import org.nwapw.abacus.tree.TreeNode; import org.nwapw.abacus.tree.TreeNode;
import org.nwapw.abacus.window.Window;
import javax.swing.*;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
/** /**
* The main calculator class. This is responsible * The main calculator class. This is responsible
@@ -26,18 +20,10 @@ import java.lang.reflect.InvocationTargetException;
public class Abacus { public class Abacus {
/** /**
* The default implementation to use for the number representation. * The default number implementation to be used if no other one is available / selected.
*/ */
public static final Class<? extends NumberInterface> DEFAULT_NUMBER = NaiveNumber.class; public static final NumberImplementation DEFAULT_IMPLEMENTATION = StandardPlugin.IMPLEMENTATION_NAIVE;
/**
* The file used for saving and loading configuration.
*/
public static final File CONFIG_FILE = new File("config.toml");
/**
* The main Abacus UI.
*/
private Window mainUi;
/** /**
* The plugin manager responsible for * The plugin manager responsible for
* loading and unloading plugins, * loading and unloading plugins,
@@ -51,7 +37,7 @@ public class Abacus {
/** /**
* The configuration loaded from a file. * The configuration loaded from a file.
*/ */
private ConfigurationObject configuration; private Configuration configuration;
/** /**
* The tree builder used to construct a tree * The tree builder used to construct a tree
* from a string. * from a string.
@@ -60,33 +46,28 @@ public class Abacus {
/** /**
* Creates a new instance of the Abacus calculator. * Creates a new instance of the Abacus calculator.
*
* @param configuration the configuration object for this Abacus instance.
*/ */
public Abacus(){ public Abacus(Configuration configuration) {
pluginManager = new PluginManager(this); pluginManager = new PluginManager(this);
mainUi = new Window(this);
numberReducer = new NumberReducer(this); numberReducer = new NumberReducer(this);
configuration = new ConfigurationObject(CONFIG_FILE); this.configuration = new Configuration(configuration);
configuration.save(CONFIG_FILE);
LexerTokenizer lexerTokenizer = new LexerTokenizer(); LexerTokenizer lexerTokenizer = new LexerTokenizer();
ShuntingYardParser shuntingYardParser = new ShuntingYardParser(this); ShuntingYardParser shuntingYardParser = new ShuntingYardParser(this);
treeBuilder = new TreeBuilder<>(lexerTokenizer, shuntingYardParser); treeBuilder = new TreeBuilder<>(lexerTokenizer, shuntingYardParser);
pluginManager.addListener(lexerTokenizer);
pluginManager.addListener(shuntingYardParser); pluginManager.addListener(shuntingYardParser);
pluginManager.addInstantiated(new StandardPlugin(pluginManager)); pluginManager.addListener(lexerTokenizer);
try { }
ClassFinder.loadJars("plugins")
.forEach(plugin -> pluginManager.addClass(plugin));
} catch (IOException | ClassNotFoundException e) {
e.printStackTrace();
}
pluginManager.load();
mainUi.setVisible(true); public static void main(String[] args) {
AbacusApplication.launch(AbacusApplication.class, args);
} }
/** /**
* Gets the current tree builder. * Gets the current tree builder.
*
* @return the main tree builder in this abacus instance. * @return the main tree builder in this abacus instance.
*/ */
public TreeBuilder getTreeBuilder() { public TreeBuilder getTreeBuilder() {
@@ -95,23 +76,17 @@ public class Abacus {
/** /**
* Gets the current plugin manager, * Gets the current plugin manager,
*
* @return the plugin manager in this abacus instance. * @return the plugin manager in this abacus instance.
*/ */
public PluginManager getPluginManager() { public PluginManager getPluginManager() {
return pluginManager; return pluginManager;
} }
/**
* Gets the current UI.
* @return the UI window in this abacus instance.
*/
public Window getMainUi() {
return mainUi;
}
/** /**
* Get the reducer that is responsible for transforming * Get the reducer that is responsible for transforming
* an expression into a number. * an expression into a number.
*
* @return the number reducer in this abacus instance. * @return the number reducer in this abacus instance.
*/ */
public NumberReducer getNumberReducer() { public NumberReducer getNumberReducer() {
@@ -120,52 +95,46 @@ public class Abacus {
/** /**
* Gets the configuration object associated with this instance. * Gets the configuration object associated with this instance.
*
* @return the configuration object. * @return the configuration object.
*/ */
public ConfigurationObject getConfiguration() { public Configuration getConfiguration() {
return configuration; return configuration;
} }
/** /**
* Parses a string into a tree structure using the main * Parses a string into a tree structure using the main
* tree builder. * tree builder.
*
* @param input the input string to parse * @param input the input string to parse
* @return the resulting tree, null if the tree builder or the produced tree are null. * @return the resulting tree, null if the tree builder or the produced tree are null.
*/ */
public TreeNode parseString(String input){ public TreeNode parseString(String input) {
return treeBuilder.fromString(input); return treeBuilder.fromString(input);
} }
/** /**
* Evaluates the given tree using the main * Evaluates the given tree using the main
* number reducer. * number reducer.
*
* @param tree the tree to reduce, must not be null. * @param tree the tree to reduce, must not be null.
* @return the resulting number, or null of the reduction failed. * @return the resulting number, or null of the reduction failed.
*/ */
public NumberInterface evaluateTree(TreeNode tree){ public NumberInterface evaluateTree(TreeNode tree) {
return tree.reduce(numberReducer); return tree.reduce(numberReducer);
} }
public NumberInterface numberFromString(String numberString){ /**
Class<? extends NumberInterface> toInstantiate = * Creates a number from a string.
pluginManager.numberFor(configuration.getNumberImplementation()); *
if(toInstantiate == null) toInstantiate = DEFAULT_NUMBER; * @param numberString the string to create the number from.
* @return the resulting number.
*/
public NumberInterface numberFromString(String numberString) {
NumberImplementation toInstantiate =
pluginManager.numberImplementationFor(configuration.getNumberImplementation());
if (toInstantiate == null) toInstantiate = DEFAULT_IMPLEMENTATION;
try { return toInstantiate.instanceForString(numberString);
return toInstantiate.getConstructor(String.class).newInstance(numberString);
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
e.printStackTrace();
}
return null;
}
public static void main(String[] args){
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (ClassNotFoundException | InstantiationException | UnsupportedLookAndFeelException | IllegalAccessException e) {
e.printStackTrace();
}
new Abacus();
} }
} }

View File

@@ -1,14 +1,159 @@
package org.nwapw.abacus.config; 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 * The configuration object that stores
* configurations. * options that the user can change.
*/ */
public class Configuration { 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 computation delay for which the thread can run without interruption.
*/
private double computationDelay = 0;
/**
* 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 computationDelay the delay before the computation gets killed.
* @param numberImplementation the number implementation, like "naive" or "precise"
* @param disabledPlugins the list of disabled plugins.
*/
public Configuration(double computationDelay, String numberImplementation, String[] disabledPlugins) {
this.computationDelay = computationDelay;
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.computationDelay = otherConfiguration.computationDelay;
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;
}
/**
* Gets the computation delay specified in the configuration.
*
* @return the computaton delay.
*/
public double getComputationDelay() {
return computationDelay;
}
/**
* Sets the computation delay.
*
* @param computationDelay the new computation delay.
*/
public void setComputationDelay(double computationDelay) {
this.computationDelay = computationDelay;
}
} }

View File

@@ -1,105 +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;
/**
* 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;
}
/**
* 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());
}
}

View File

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

View File

@@ -1,10 +1,6 @@
package org.nwapw.abacus.function; package org.nwapw.abacus.function;
import org.nwapw.abacus.number.NaiveNumber;
import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.number.PreciseNumber;
import java.util.HashMap;
/** /**
* A function that operates on one or more * A function that operates on one or more
@@ -12,17 +8,9 @@ import java.util.HashMap;
*/ */
public abstract class Function { public abstract class Function {
/**
* A map to correctly promote different number implementations to each other.
*/
private static final HashMap<Class<? extends NumberInterface>, Integer> priorityMap =
new HashMap<Class<? extends NumberInterface>, Integer>() {{
put(NaiveNumber.class, 0);
put(PreciseNumber.class, 1);
}};
/** /**
* Checks whether the given params will work for the given function. * Checks whether the given params will work for the given function.
*
* @param params the given params * @param params the given params
* @return true if the params can be used with this function. * @return true if the params can be used with this function.
*/ */
@@ -31,6 +19,7 @@ public abstract class Function {
/** /**
* Internal apply implementation, which already receives appropriately promoted * Internal apply implementation, which already receives appropriately promoted
* parameters that have bee run through matchesParams * parameters that have bee run through matchesParams
*
* @param params the promoted parameters. * @param params the promoted parameters.
* @return the return value of the function. * @return the return value of the function.
*/ */
@@ -38,11 +27,12 @@ public abstract class Function {
/** /**
* Function to check, promote arguments and run the function. * Function to check, promote arguments and run the function.
*
* @param params the raw input parameters. * @param params the raw input parameters.
* @return the return value of the function, or null if an error occurred. * @return the return value of the function, or null if an error occurred.
*/ */
public NumberInterface apply(NumberInterface...params) { public NumberInterface apply(NumberInterface... params) {
if(!matchesParams(params)) return null; if (!matchesParams(params)) return null;
return applyInternal(params); return applyInternal(params);
} }

View File

@@ -1,70 +0,0 @@
package org.nwapw.abacus.function;
/**
* A class that represents a single infix operator.
*/
public class Operator {
/**
* The associativity of the operator.
*/
private OperatorAssociativity associativity;
/**
* The type of this operator.
*/
private OperatorType type;
/**
* The precedence of the operator.
*/
private int precedence;
/**
* The function that is called by this operator.
*/
private Function function;
/**
* Creates a new operator with the given parameters.
* @param associativity the associativity of the operator.
* @param precedence the precedence of the operator.
* @param function the function that the operator calls.
*/
public Operator(OperatorAssociativity associativity, OperatorType operatorType, int precedence, Function function){
this.associativity = associativity;
this.type = operatorType;
this.precedence = precedence;
this.function = function;
}
/**
* Gets the operator's associativity.
* @return the associativity.
*/
public OperatorAssociativity getAssociativity() {
return associativity;
}
/**
* Gets the operator's type.
* @return the type.
*/
public OperatorType getType() {
return type;
}
/**
* Gets the operator's precedence.
* @return the precedence.
*/
public int getPrecedence() {
return precedence;
}
/**
* Gets the operator's function.
* @return the function.
*/
public Function getFunction() {
return function;
}
}

View File

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

View File

@@ -0,0 +1,36 @@
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 {
/**
* The controller currently managing the application.
*/
private AbacusController controller;
@Override
public void start(Stage primaryStage) throws Exception {
FXMLLoader loader = new FXMLLoader(getClass().getResource("/abacus.fxml"));
Parent parent = loader.load();
controller = loader.getController();
Scene mainScene = new Scene(parent, 320, 480);
primaryStage.setScene(mainScene);
primaryStage.setTitle("Abacus");
primaryStage.show();
}
@Override
public void stop() throws Exception {
super.stop();
controller.performStop();
}
}

View File

@@ -0,0 +1,376 @@
package org.nwapw.abacus.fx;
import javafx.application.Platform;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.collections.transformation.FilteredList;
import javafx.fxml.FXML;
import javafx.scene.Node;
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.function.Documentation;
import org.nwapw.abacus.function.DocumentationType;
import org.nwapw.abacus.number.ComputationInterruptedException;
import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.plugin.ClassFinder;
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.ArrayList;
import java.util.Comparator;
import java.util.Set;
import java.util.stream.Collectors;
/**
* 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";
/**
* Constant string that is displayed if the calculations are interrupted by an exception.
*/
private static final String ERR_EXCEPTION = "Exception Thrown";
@FXML
private TabPane coreTabPane;
@FXML
private Tab calculateTab;
@FXML
private Tab settingsTab;
@FXML
private Tab functionListTab;
@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 Button stopButton;
@FXML
private ComboBox<String> numberImplementationBox;
@FXML
private ListView<ToggleablePlugin> enabledPluginView;
@FXML
private TextField computationLimitField;
@FXML
private ListView<Documentation> functionListView;
@FXML
private TextField functionListSearchField;
/**
* 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;
/**
* 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 list of functions that are registered in the calculator.
*/
private ObservableList<Documentation> functionList;
/**
* The filtered list displayed to the user.
*/
private FilteredList<Documentation> functionFilter;
/**
* The abacus instance used for changing the plugin configuration.
*/
private Abacus abacus;
/**
* Boolean which represents whether changes were made to the configuration.
*/
private boolean changesMade;
/**
* Whether an alert about changes to the configuration was already shown.
*/
private boolean reloadAlertShown;
/**
* The alert shown when a press to "apply" is needed.
*/
private Alert reloadAlert;
/**
* The runnable that takes care of killing computations that take too long.
*/
private final Runnable TIMER_RUNNABLE = () -> {
try {
Configuration abacusConfig = abacus.getConfiguration();
if(abacusConfig.getComputationDelay() == 0) return;
Thread.sleep((long) (abacusConfig.getComputationDelay() * 1000));
performStop();
} catch (InterruptedException e) { }
};
/**
* The runnable used to perform the calculation.
*/
private final Runnable CALCULATION_RUNNABLE = new Runnable() {
private String attemptCalculation(){
try {
TreeNode constructedTree = abacus.parseString(inputField.getText());
if (constructedTree == null) {
return ERR_SYNTAX;
}
NumberInterface evaluatedNumber = abacus.evaluateTree(constructedTree);
if (evaluatedNumber == null) {
return ERR_EVAL;
}
String resultingString = evaluatedNumber.toString();
historyData.add(new HistoryModel(inputField.getText(), constructedTree.toString(), resultingString));
return resultingString;
} catch (ComputationInterruptedException exception) {
return ERR_STOP;
} catch (RuntimeException exception){
exception.printStackTrace();
return ERR_EXCEPTION;
}
}
@Override
public void run() {
String calculation = attemptCalculation();
Platform.runLater(() -> {
outputText.setText(calculation);
inputField.setText("");
inputButton.setDisable(false);
stopButton.setDisable(true);
});
}
};
/**
* The thread that is waiting to pause the calculation.
*/
private Thread computationLimitThread;
/**
* The thread in which the computation runs.
*/
private Thread calculationThread;
/**
* 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::getEnabledProperty, 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(string, true);
}
});
functionList = FXCollections.observableArrayList();
functionFilter = new FilteredList<>(functionList, (s) -> true);
functionListView.setItems(functionFilter);
functionListSearchField.textProperty().addListener((observable, oldValue, newValue) ->
functionFilter.setPredicate((newValue.length() == 0) ? ((s) -> true) : ((s) -> s.matches(newValue))));
functionListView.setCellFactory(param -> new DocumentationCell());
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().getInputProperty());
parsedColumn.setCellFactory(cellFactory);
parsedColumn.setCellValueFactory(cell -> cell.getValue().getParsedProperty());
outputColumn.setCellFactory(cellFactory);
outputColumn.setCellValueFactory(cell -> cell.getValue().getOutputProperty());
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);
performScan();
computationLimitField.setText(Double.toString(abacus.getConfiguration().getComputationDelay()));
computationLimitField.textProperty().addListener((observable, oldValue, newValue) -> {
if(!newValue.matches("(\\d+(\\.\\d*)?)?")) {
computationLimitField.setText(oldValue);
} else {
changesMade = true;
}
});
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
public void performCalculation() {
inputButton.setDisable(true);
stopButton.setDisable(false);
calculationThread = new Thread(CALCULATION_RUNNABLE);
calculationThread.start();
computationLimitThread = new Thread(TIMER_RUNNABLE);
computationLimitThread.start();
}
@FXML
public void performStop(){
if(calculationThread != null) {
calculationThread.interrupt();
calculationThread = null;
}
if(computationLimitThread != null){
computationLimitThread.interrupt();
computationLimitThread = null;
}
}
@FXML
public void performSaveAndReload() {
performSave();
performReload();
changesMade = false;
reloadAlertShown = false;
}
@FXML
public void performScan(){
PluginManager abacusPluginManager = abacus.getPluginManager();
abacusPluginManager.removeAll();
abacusPluginManager.addInstantiated(new StandardPlugin(abacus.getPluginManager()));
try {
ClassFinder.loadJars("plugins").forEach(abacusPluginManager::addClass);
} catch (IOException | ClassNotFoundException e) {
e.printStackTrace();
}
abacusPluginManager.reload();
}
@FXML
public void performReload() {
alertIfApplyNeeded(true);
abacus.getPluginManager().reload();
}
@FXML
public 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());
}
if(computationLimitField.getText().matches("\\d*(\\.\\d+)?") && computationLimitField.getText().length() != 0)
configuration.setComputationDelay(Double.parseDouble(computationLimitField.getText()));
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(fullName, !disabledPlugins.contains(fullName));
plugin.getEnabledProperty().addListener(e -> changesMade = true);
enabledPlugins.add(plugin);
}
PluginManager pluginManager = abacus.getPluginManager();
functionList.addAll(manager.getAllFunctions().stream().map(name -> pluginManager.documentationFor(name, DocumentationType.FUNCTION))
.collect(Collectors.toCollection(ArrayList::new)));
functionList.sort(Comparator.comparing(Documentation::getCodeName));
}
@Override
public void onUnload(PluginManager manager) {
functionList.clear();
enabledPlugins.clear();
numberImplementationOptions.clear();
}
}

View File

@@ -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);
}
}

View File

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

View File

@@ -10,15 +10,111 @@ import java.util.*;
/** /**
* A lexer that can generate tokens of a given type given a list of regular expressions * A lexer that can generate tokens of a given type given a list of regular expressions
* to operate on. * to operate on.
*
* @param <T> the type used to identify which match belongs to which pattern. * @param <T> the type used to identify which match belongs to which pattern.
*/ */
public class Lexer<T> { public class Lexer<T> {
/**
* The registered patterns.
*/
private Map<PatternEntry<T>, Pattern<T>> patterns;
/**
* Creates a new lexer with no registered patterns.
*/
public Lexer() {
patterns = new HashMap<>();
}
/**
* Registers a single pattern.
*
* @param pattern the pattern regex
* @param id the ID by which to identify the pattern.
*/
public void register(String pattern, T id) {
Pattern<T> compiledPattern = new Pattern<>(pattern, id);
if (compiledPattern.getHead() != null) patterns.put(new PatternEntry<>(pattern, id), compiledPattern);
}
/**
* Unregisters a pattern.
*
* @param pattern the pattern to unregister
* @param id the ID by which to identify the pattern.
*/
public void unregister(String pattern, T id) {
patterns.remove(new PatternEntry<>(pattern, id));
}
/**
* Reads one token from the given string.
*
* @param from the string to read from
* @param startAt the index to start at
* @param compare the comparator used to sort tokens by their ID.
* @return the best match.
*/
public Match<T> lexOne(String from, int startAt, Comparator<T> compare) {
ArrayList<Match<T>> matches = new ArrayList<>();
HashSet<PatternNode<T>> currentSet = new HashSet<>();
HashSet<PatternNode<T>> futureSet = new HashSet<>();
int index = startAt;
for (Pattern<T> pattern : patterns.values()) {
pattern.getHead().addInto(currentSet);
}
while (!currentSet.isEmpty()) {
for (PatternNode<T> node : currentSet) {
if (index < from.length() && node.matches(from.charAt(index))) {
node.addOutputsInto(futureSet);
} else if (node instanceof EndNode) {
matches.add(new Match<>(from.substring(startAt, index), ((EndNode<T>) node).getPatternId()));
}
}
HashSet<PatternNode<T>> tmp = currentSet;
currentSet = futureSet;
futureSet = tmp;
futureSet.clear();
index++;
}
matches.sort((a, b) -> compare.compare(a.getType(), b.getType()));
if (compare != null) {
matches.sort(Comparator.comparingInt(a -> a.getContent().length()));
}
return matches.isEmpty() ? null : matches.get(matches.size() - 1);
}
/**
* Reads all tokens from a string.
*
* @param from the string to start from.
* @param startAt the index to start at.
* @param compare the comparator used to sort matches by their IDs.
* @return the resulting list of matches, in order, or null on error.
*/
public List<Match<T>> lexAll(String from, int startAt, Comparator<T> compare) {
int index = startAt;
ArrayList<Match<T>> matches = new ArrayList<>();
Match<T> lastMatch = null;
while (index < from.length() && (lastMatch = lexOne(from, index, compare)) != null) {
int length = lastMatch.getContent().length();
if (length == 0) return null;
matches.add(lastMatch);
index += length;
}
if (lastMatch == null) return null;
return matches;
}
/** /**
* An entry that represents a pattern that has been registered with the lexer. * An entry that represents a pattern that has been registered with the lexer.
*
* @param <T> the type used to identify the pattern. * @param <T> the type used to identify the pattern.
*/ */
private static class PatternEntry<T>{ private static class PatternEntry<T> {
/** /**
* The name of the entry. * The name of the entry.
*/ */
@@ -30,10 +126,11 @@ public class Lexer<T> {
/** /**
* Creates a new pattern entry with the given name and id. * Creates a new pattern entry with the given name and id.
*
* @param name the name of the pattern entry. * @param name the name of the pattern entry.
* @param id the id of the pattern entry. * @param id the id of the pattern entry.
*/ */
public PatternEntry(String name, T id){ public PatternEntry(String name, T id) {
this.name = name; this.name = name;
this.id = id; this.id = id;
} }
@@ -51,94 +148,4 @@ public class Lexer<T> {
} }
} }
/**
* The registered patterns.
*/
private Map<PatternEntry<T>, Pattern<T>> patterns;
/**
* Creates a new lexer with no registered patterns.
*/
public Lexer(){
patterns = new HashMap<>();
}
/**
* Registers a single pattern.
* @param pattern the pattern regex
* @param id the ID by which to identify the pattern.
*/
public void register(String pattern, T id){
Pattern<T> compiledPattern = new Pattern<>(pattern, id);
if(compiledPattern.getHead() != null) patterns.put(new PatternEntry<>(pattern, id), compiledPattern);
}
/**
* Unregisters a pattern.
* @param pattern the pattern to unregister
* @param id the ID by which to identify the pattern.
*/
public void unregister(String pattern, T id){
patterns.remove(new PatternEntry<>(pattern, id));
}
/**
* Reads one token from the given string.
* @param from the string to read from
* @param startAt the index to start at
* @param compare the comparator used to sort tokens by their ID.
* @return the best match.
*/
public Match<T> lexOne(String from, int startAt, Comparator<T> compare){
ArrayList<Match<T>> matches = new ArrayList<>();
HashSet<PatternNode<T>> currentSet = new HashSet<>();
HashSet<PatternNode<T>> futureSet = new HashSet<>();
int index = startAt;
for(Pattern<T> pattern : patterns.values()){
pattern.getHead().addInto(currentSet);
}
while(!currentSet.isEmpty()){
for(PatternNode<T> node : currentSet){
if(index < from.length() && node.matches(from.charAt(index))) {
node.addOutputsInto(futureSet);
} else if(node instanceof EndNode){
matches.add(new Match<>(from.substring(startAt, index), ((EndNode<T>) node).getPatternId()));
}
}
HashSet<PatternNode<T>> tmp = currentSet;
currentSet = futureSet;
futureSet = tmp;
futureSet.clear();
index++;
}
matches.sort((a, b) -> compare.compare(a.getType(), b.getType()));
if(compare != null) {
matches.sort(Comparator.comparingInt(a -> a.getContent().length()));
}
return matches.isEmpty() ? null : matches.get(matches.size() - 1);
}
/**
* Reads all tokens from a string.
* @param from the string to start from.
* @param startAt the index to start at.
* @param compare the comparator used to sort matches by their IDs.
* @return the resulting list of matches, in order, or null on error.
*/
public List<Match<T>> lexAll(String from, int startAt, Comparator<T> compare){
int index = startAt;
ArrayList<Match<T>> matches = new ArrayList<>();
Match<T> lastMatch = null;
while(index < from.length() && (lastMatch = lexOne(from, index, compare)) != null){
int length = lastMatch.getContent().length();
if(length == 0) return null;
matches.add(lastMatch);
index += length;
}
if(lastMatch == null) return null;
return matches;
}
} }

View File

@@ -2,6 +2,7 @@ package org.nwapw.abacus.lexing.pattern;
/** /**
* A pattern node that matches any character. * A pattern node that matches any character.
*
* @param <T> the type that's used to tell which pattern this node belongs to. * @param <T> the type that's used to tell which pattern this node belongs to.
*/ */
public class AnyNode<T> extends PatternNode<T> { public class AnyNode<T> extends PatternNode<T> {

View File

@@ -2,6 +2,7 @@ package org.nwapw.abacus.lexing.pattern;
/** /**
* A node that represents a successful match. * A node that represents a successful match.
*
* @param <T> the type that's used to tell which pattern this node belongs to. * @param <T> the type that's used to tell which pattern this node belongs to.
*/ */
public class EndNode<T> extends PatternNode<T> { public class EndNode<T> extends PatternNode<T> {
@@ -13,17 +14,19 @@ public class EndNode<T> extends PatternNode<T> {
/** /**
* Creates a new end node with the given ID. * Creates a new end node with the given ID.
*
* @param patternId the pattern ID. * @param patternId the pattern ID.
*/ */
public EndNode(T patternId){ public EndNode(T patternId) {
this.patternId = patternId; this.patternId = patternId;
} }
/** /**
* Gets the pattern ID. * Gets the pattern ID.
*
* @return the pattern ID. * @return the pattern ID.
*/ */
public T getPatternId(){ public T getPatternId() {
return patternId; return patternId;
} }

View File

@@ -1,17 +1,17 @@
package org.nwapw.abacus.lexing.pattern; package org.nwapw.abacus.lexing.pattern;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
/** /**
* A node that is used as structural glue in pattern compilation. * A node that is used as structural glue in pattern compilation.
*
* @param <T> the type that's used to tell which pattern this node belongs to. * @param <T> the type that's used to tell which pattern this node belongs to.
*/ */
public class LinkNode<T> extends PatternNode<T> { public class LinkNode<T> extends PatternNode<T> {
@Override @Override
public void addInto(Collection<PatternNode<T>> into) { public void addInto(Collection<PatternNode<T>> into) {
if(!into.contains(this)) { if (!into.contains(this)) {
into.add(this); into.add(this);
addOutputsInto(into); addOutputsInto(into);
} }

View File

@@ -2,6 +2,7 @@ package org.nwapw.abacus.lexing.pattern;
/** /**
* A match that has been generated by the lexer. * A match that has been generated by the lexer.
*
* @param <T> the type used to represent the ID of the pattern this match belongs to. * @param <T> the type used to represent the ID of the pattern this match belongs to.
*/ */
public class Match<T> { public class Match<T> {
@@ -17,16 +18,18 @@ public class Match<T> {
/** /**
* Creates a new match with the given parameters. * Creates a new match with the given parameters.
*
* @param content the content of this match. * @param content the content of this match.
* @param type the type of the match. * @param type the type of the match.
*/ */
public Match(String content, T type){ public Match(String content, T type) {
this.content = content; this.content = content;
this.type = type; this.type = type;
} }
/** /**
* Gets the content of this match. * Gets the content of this match.
*
* @return the content. * @return the content.
*/ */
public String getContent() { public String getContent() {
@@ -35,6 +38,7 @@ public class Match<T> {
/** /**
* Gets the pattern type of the node. * Gets the pattern type of the node.
*
* @return the ID of the pattern that this match matched. * @return the ID of the pattern that this match matched.
*/ */
public T getType() { public T getType() {

View File

@@ -8,6 +8,7 @@ import java.util.function.Function;
/** /**
* A pattern that can be compiled from a string and used in lexing. * A pattern that can be compiled from a string and used in lexing.
*
* @param <T> the type that is used to identify and sort this pattern. * @param <T> the type that is used to identify and sort this pattern.
*/ */
public class Pattern<T> { public class Pattern<T> {
@@ -40,13 +41,53 @@ public class Pattern<T> {
put('?', Pattern.this::transformQuestion); put('?', Pattern.this::transformQuestion);
}}; }};
/**
* Creates / compiles a new pattern with the given id from the given string.
*
* @param from the string to compile a pattern from.
* @param id the ID to use.
*/
public Pattern(String from, T id) {
this.id = id;
index = 0;
source = from;
PatternChain<T> chain = parseSegment(false);
if (chain == null) {
head = null;
} else {
chain.append(new EndNode<>(id));
head = chain.head;
}
}
/**
* Removes all characters that are considered "special" from
* the given string.
*
* @param from the string to sanitize.
* @return the resulting string.
*/
public static String sanitize(String from) {
Pattern<Integer> pattern = new Pattern<>("", 0);
from = from.replace(".", "\\.");
from = from.replace("|", "\\|");
from = from.replace("(", "\\(");
from = from.replace(")", "\\)");
for (Character key : pattern.operations.keySet()) {
from = from.replace("" + key, "\\" + key);
}
return from;
}
/** /**
* A regex operator function that turns the chain * A regex operator function that turns the chain
* into a one-or-more chain. * into a one-or-more chain.
*
* @param chain the chain to transform. * @param chain the chain to transform.
* @return the modified chain. * @return the modified chain.
*/ */
private PatternChain<T> transformPlus(PatternChain<T> chain){ private PatternChain<T> transformPlus(PatternChain<T> chain) {
chain.tail.outputStates.add(chain.head); chain.tail.outputStates.add(chain.head);
return chain; return chain;
} }
@@ -54,10 +95,11 @@ public class Pattern<T> {
/** /**
* A regex operator function that turns the chain * A regex operator function that turns the chain
* into a zero-or-more chain. * into a zero-or-more chain.
*
* @param chain the chain to transform. * @param chain the chain to transform.
* @return the modified chain. * @return the modified chain.
*/ */
private PatternChain<T> transformStar(PatternChain<T> chain){ private PatternChain<T> transformStar(PatternChain<T> chain) {
LinkNode<T> newTail = new LinkNode<>(); LinkNode<T> newTail = new LinkNode<>();
LinkNode<T> newHead = new LinkNode<>(); LinkNode<T> newHead = new LinkNode<>();
newHead.outputStates.add(chain.head); newHead.outputStates.add(chain.head);
@@ -72,10 +114,11 @@ public class Pattern<T> {
/** /**
* A regex operator function that turns the chain * A regex operator function that turns the chain
* into a zero-or-one chain. * into a zero-or-one chain.
*
* @param chain the chain to transform. * @param chain the chain to transform.
* @return the modified chain. * @return the modified chain.
*/ */
private PatternChain<T> transformQuestion(PatternChain<T> chain){ private PatternChain<T> transformQuestion(PatternChain<T> chain) {
LinkNode<T> newTail = new LinkNode<>(); LinkNode<T> newTail = new LinkNode<>();
LinkNode<T> newHead = new LinkNode<>(); LinkNode<T> newHead = new LinkNode<>();
newHead.outputStates.add(chain.head); newHead.outputStates.add(chain.head);
@@ -88,14 +131,15 @@ public class Pattern<T> {
/** /**
* Combines a collection of chains into one OR chain. * Combines a collection of chains into one OR chain.
*
* @param collection the collection of chains to combine. * @param collection the collection of chains to combine.
* @return the resulting OR chain. * @return the resulting OR chain.
*/ */
private PatternChain<T> combineChains(Collection<PatternChain<T>> collection){ private PatternChain<T> combineChains(Collection<PatternChain<T>> collection) {
LinkNode<T> head = new LinkNode<>(); LinkNode<T> head = new LinkNode<>();
LinkNode<T> tail = new LinkNode<>(); LinkNode<T> tail = new LinkNode<>();
PatternChain<T> newChain = new PatternChain<>(head, tail); PatternChain<T> newChain = new PatternChain<>(head, tail);
for(PatternChain<T> chain : collection){ for (PatternChain<T> chain : collection) {
head.outputStates.add(chain.head); head.outputStates.add(chain.head);
chain.tail.outputStates.add(tail); chain.tail.outputStates.add(tail);
} }
@@ -104,105 +148,108 @@ public class Pattern<T> {
/** /**
* Parses a single value from the input into a chain. * Parses a single value from the input into a chain.
*
* @return the resulting chain, or null on error. * @return the resulting chain, or null on error.
*/ */
private PatternChain<T> parseValue(){ private PatternChain<T> parseValue() {
if(index >= source.length()) return null; if (index >= source.length()) return null;
if(source.charAt(index) == '\\'){ if (source.charAt(index) == '\\') {
if(++index >= source.length()) return null; if (++index >= source.length()) return null;
} }
return new PatternChain<>(new ValueNode<>(source.charAt(index++))); return new PatternChain<>(new ValueNode<>(source.charAt(index++)));
} }
/** /**
* Parses a [] range from the input into a chain. * Parses a [] range from the input into a chain.
*
* @return the resulting chain, or null on error. * @return the resulting chain, or null on error.
*/ */
private PatternChain<T> parseOr(){ private PatternChain<T> parseOr() {
Stack<PatternChain<T>> orStack = new Stack<>(); Stack<PatternChain<T>> orStack = new Stack<>();
index++; index++;
while(index < source.length() && source.charAt(index) != ']'){ while (index < source.length() && source.charAt(index) != ']') {
if(source.charAt(index) == '-'){ if (source.charAt(index) == '-') {
index++; index++;
if(orStack.empty() || orStack.peek().tail.range() == '\0') return null; if (orStack.empty() || orStack.peek().tail.range() == '\0') return null;
PatternChain<T> bottomRange = orStack.pop(); PatternChain<T> bottomRange = orStack.pop();
PatternChain<T> topRange = parseValue(); PatternChain<T> topRange = parseValue();
if(topRange == null || topRange.tail.range() == '\0') return null; if (topRange == null || topRange.tail.range() == '\0') return null;
orStack.push(new PatternChain<>(new RangeNode<>(bottomRange.tail.range(), topRange.tail.range()))); orStack.push(new PatternChain<>(new RangeNode<>(bottomRange.tail.range(), topRange.tail.range())));
} else { } else {
PatternChain<T> newChain = parseValue(); PatternChain<T> newChain = parseValue();
if(newChain == null) return null; if (newChain == null) return null;
orStack.push(newChain); orStack.push(newChain);
} }
} }
if(index++ >= source.length()) return null; if (index++ >= source.length()) return null;
return (orStack.size() == 1) ? orStack.pop() : combineChains(orStack); return (orStack.size() == 1) ? orStack.pop() : combineChains(orStack);
} }
/** /**
* Parses a repeatable segment from the input into a chain * Parses a repeatable segment from the input into a chain
*
* @param isSubsegment whether the segment is a sub-expression "()", and therefore * @param isSubsegment whether the segment is a sub-expression "()", and therefore
* whether to expect a closing brace. * whether to expect a closing brace.
* @return the resulting chain, or null on error. * @return the resulting chain, or null on error.
*/ */
private PatternChain<T> parseSegment(boolean isSubsegment){ private PatternChain<T> parseSegment(boolean isSubsegment) {
if(index >= source.length() || ((source.charAt(index) != '(') && isSubsegment)) return null; if (index >= source.length() || ((source.charAt(index) != '(') && isSubsegment)) return null;
if(isSubsegment) index++; if (isSubsegment) index++;
Stack<PatternChain<T>> orChain = new Stack<>(); Stack<PatternChain<T>> orChain = new Stack<>();
PatternChain<T> fullChain = new PatternChain<>(); PatternChain<T> fullChain = new PatternChain<>();
PatternChain<T> currentChain = null; PatternChain<T> currentChain = null;
while (index < source.length() && source.charAt(index) != ')'){ while (index < source.length() && source.charAt(index) != ')') {
char currentChar = source.charAt(index); char currentChar = source.charAt(index);
if(operations.containsKey(currentChar)){ if (operations.containsKey(currentChar)) {
if(currentChain == null) return null; if (currentChain == null) return null;
currentChain = operations.get(currentChar).apply(currentChain); currentChain = operations.get(currentChar).apply(currentChain);
fullChain.append(currentChain); fullChain.append(currentChain);
currentChain = null; currentChain = null;
index++; index++;
} else if(currentChar == '|'){ } else if (currentChar == '|') {
if(currentChain == null) return null; if (currentChain == null) return null;
fullChain.append(currentChain); fullChain.append(currentChain);
orChain.push(fullChain); orChain.push(fullChain);
currentChain = null; currentChain = null;
fullChain = new PatternChain<>(); fullChain = new PatternChain<>();
if(++index >= source.length()) return null; if (++index >= source.length()) return null;
} else if(currentChar == '('){ } else if (currentChar == '(') {
if(currentChain != null) { if (currentChain != null) {
fullChain.append(currentChain); fullChain.append(currentChain);
} }
currentChain = parseSegment(true); currentChain = parseSegment(true);
if(currentChain == null) return null; if (currentChain == null) return null;
} else if(currentChar == '['){ } else if (currentChar == '[') {
if(currentChain != null){ if (currentChain != null) {
fullChain.append(currentChain); fullChain.append(currentChain);
} }
currentChain = parseOr(); currentChain = parseOr();
if(currentChain == null) return null; if (currentChain == null) return null;
} else if(currentChar == '.'){ } else if (currentChar == '.') {
if(currentChain != null){ if (currentChain != null) {
fullChain.append(currentChain); fullChain.append(currentChain);
} }
currentChain = new PatternChain<>(new AnyNode<>()); currentChain = new PatternChain<>(new AnyNode<>());
index++; index++;
} else { } else {
if(currentChain != null){ if (currentChain != null) {
fullChain.append(currentChain); fullChain.append(currentChain);
} }
currentChain = parseValue(); currentChain = parseValue();
if(currentChain == null) return null; if (currentChain == null) return null;
} }
} }
if(!(!isSubsegment || (index < source.length() && source.charAt(index) == ')'))) return null; if (!(!isSubsegment || (index < source.length() && source.charAt(index) == ')'))) return null;
if(isSubsegment) index++; if (isSubsegment) index++;
if(currentChain != null) fullChain.append(currentChain); if (currentChain != null) fullChain.append(currentChain);
if(!orChain.empty()){ if (!orChain.empty()) {
orChain.push(fullChain); orChain.push(fullChain);
fullChain = combineChains(orChain); fullChain = combineChains(orChain);
} }
@@ -210,48 +257,12 @@ public class Pattern<T> {
return fullChain; return fullChain;
} }
/**
* Creates / compiles a new pattern with the given id from the given string.
* @param from the string to compile a pattern from.
* @param id the ID to use.
*/
public Pattern(String from, T id){
this.id = id;
index = 0;
source = from;
PatternChain<T> chain = parseSegment(false);
if(chain == null) {
head = null;
} else {
chain.append(new EndNode<>(id));
head = chain.head;
}
}
/** /**
* Gets the head PatternNode, for use in matching * Gets the head PatternNode, for use in matching
*
* @return the pattern node. * @return the pattern node.
*/ */
public PatternNode<T> getHead() { public PatternNode<T> getHead() {
return head; return head;
} }
/**
* Removes all characters that are considered "special" from
* the given string.
* @param from the string to sanitize.
* @return the resulting string.
*/
public static String sanitize(String from){
Pattern<Integer> pattern = new Pattern<>("", 0);
from = from.replace(".", "\\.");
from = from.replace("|", "\\|");
from = from.replace("(", "\\(");
from = from.replace(")", "\\)");
for(Character key : pattern.operations.keySet()){
from = from.replace("" + key, "\\" + key);
}
return from;
}
} }

View File

@@ -3,6 +3,7 @@ package org.nwapw.abacus.lexing.pattern;
/** /**
* A chain of nodes that can be treated as a single unit. * A chain of nodes that can be treated as a single unit.
* Used during pattern compilation. * Used during pattern compilation.
*
* @param <T> the type used to identify which pattern has been matched. * @param <T> the type used to identify which pattern has been matched.
*/ */
public class PatternChain<T> { public class PatternChain<T> {
@@ -18,26 +19,28 @@ public class PatternChain<T> {
/** /**
* Creates a new chain with the given start and end. * Creates a new chain with the given start and end.
*
* @param head the start of the chain. * @param head the start of the chain.
* @param tail the end of the chain. * @param tail the end of the chain.
*/ */
public PatternChain(PatternNode<T> head, PatternNode<T> tail){ public PatternChain(PatternNode<T> head, PatternNode<T> tail) {
this.head = head; this.head = head;
this.tail = tail; this.tail = tail;
} }
/** /**
* Creates a chain that starts and ends with the same node. * Creates a chain that starts and ends with the same node.
*
* @param node the node to use. * @param node the node to use.
*/ */
public PatternChain(PatternNode<T> node){ public PatternChain(PatternNode<T> node) {
this(node, node); this(node, node);
} }
/** /**
* Creates an empty chain. * Creates an empty chain.
*/ */
public PatternChain(){ public PatternChain() {
this(null); this(null);
} }
@@ -45,10 +48,11 @@ public class PatternChain<T> {
* Appends the other chain to this one. This modifies * Appends the other chain to this one. This modifies
* the nodes, as well. * the nodes, as well.
* If this chain is empty, it is set to the other. * If this chain is empty, it is set to the other.
*
* @param other the other chain to append. * @param other the other chain to append.
*/ */
public void append(PatternChain<T> other){ public void append(PatternChain<T> other) {
if(other.head == null || tail == null) { if (other.head == null || tail == null) {
this.head = other.head; this.head = other.head;
this.tail = other.tail; this.tail = other.tail;
} else { } else {
@@ -61,10 +65,11 @@ public class PatternChain<T> {
* Appends a single node to this chain. This modifies * Appends a single node to this chain. This modifies
* the nodes, as well. * the nodes, as well.
* If this chain is empty, it is set to the node. * If this chain is empty, it is set to the node.
*
* @param node the node to append to this chain. * @param node the node to append to this chain.
*/ */
public void append(PatternNode<T> node){ public void append(PatternNode<T> node) {
if(tail == null){ if (tail == null) {
head = tail = node; head = tail = node;
} else { } else {
tail.outputStates.add(node); tail.outputStates.add(node);

View File

@@ -1,6 +1,5 @@
package org.nwapw.abacus.lexing.pattern; package org.nwapw.abacus.lexing.pattern;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@@ -9,6 +8,7 @@ import java.util.Set;
* A base class for a pattern node. Provides all functions * A base class for a pattern node. Provides all functions
* necessary for matching, and is constructed by a Pattern instance * necessary for matching, and is constructed by a Pattern instance
* from a string. * from a string.
*
* @param <T> the type that's used to tell which pattern this node belongs to. * @param <T> the type that's used to tell which pattern this node belongs to.
*/ */
public class PatternNode<T> { public class PatternNode<T> {
@@ -22,42 +22,46 @@ public class PatternNode<T> {
/** /**
* Creates a new pattern node. * Creates a new pattern node.
*/ */
public PatternNode(){ public PatternNode() {
outputStates = new HashSet<>(); outputStates = new HashSet<>();
} }
/** /**
* Determines whether the current input character can * Determines whether the current input character can
* be matched by this node. * be matched by this node.
*
* @param other the character being matched. * @param other the character being matched.
* @return true if the character can be matched, false otherwise. * @return true if the character can be matched, false otherwise.
*/ */
public boolean matches(char other){ public boolean matches(char other) {
return false; return false;
} }
/** /**
* If this node can be used as part of a range, returns that value. * If this node can be used as part of a range, returns that value.
*
* @return a NULL terminator if this character cannot be converted * @return a NULL terminator if this character cannot be converted
* into a range bound, or the appropriate range bound if it can. * into a range bound, or the appropriate range bound if it can.
*/ */
public char range(){ public char range() {
return '\0'; return '\0';
} }
/** /**
* Adds this node in a collection of other nodes. * Adds this node in a collection of other nodes.
*
* @param into the collection to add into. * @param into the collection to add into.
*/ */
public void addInto(Collection<PatternNode<T>> into){ public void addInto(Collection<PatternNode<T>> into) {
into.add(this); into.add(this);
} }
/** /**
* Adds the node's children into a collection of other nodes. * Adds the node's children into a collection of other nodes.
*
* @param into the collection to add into. * @param into the collection to add into.
*/ */
public void addOutputsInto(Collection<PatternNode<T>> into){ public void addOutputsInto(Collection<PatternNode<T>> into) {
outputStates.forEach(e -> e.addInto(into)); outputStates.forEach(e -> e.addInto(into));
} }

View File

@@ -2,6 +2,7 @@ package org.nwapw.abacus.lexing.pattern;
/** /**
* A node that matches a range of characters. * A node that matches a range of characters.
*
* @param <T> the type that's used to tell which pattern this node belongs to. * @param <T> the type that's used to tell which pattern this node belongs to.
*/ */
public class RangeNode<T> extends PatternNode<T> { public class RangeNode<T> extends PatternNode<T> {
@@ -17,10 +18,11 @@ public class RangeNode<T> extends PatternNode<T> {
/** /**
* Creates a new range node from the given range. * Creates a new range node from the given range.
*
* @param from the bottom bound of the range. * @param from the bottom bound of the range.
* @param to the top bound of hte range. * @param to the top bound of hte range.
*/ */
public RangeNode(char from, char to){ public RangeNode(char from, char to) {
this.from = from; this.from = from;
this.to = to; this.to = to;
} }

View File

@@ -2,6 +2,7 @@ package org.nwapw.abacus.lexing.pattern;
/** /**
* A node that matches a single value. * A node that matches a single value.
*
* @param <T> the type that's used to tell which pattern this node belongs to. * @param <T> the type that's used to tell which pattern this node belongs to.
*/ */
public class ValueNode<T> extends PatternNode<T> { public class ValueNode<T> extends PatternNode<T> {
@@ -13,9 +14,10 @@ public class ValueNode<T> extends PatternNode<T> {
/** /**
* Creates a new node that matches the given character. * Creates a new node that matches the given character.
* @param value *
* @param value the character value of the node.
*/ */
public ValueNode(char value){ public ValueNode(char value) {
this.value = value; this.value = value;
} }

View File

@@ -0,0 +1,16 @@
package org.nwapw.abacus.number;
/**
* Exception thrown when the computation is interrupted by
* the user.
*/
public class ComputationInterruptedException extends RuntimeException {
/**
* Creates a new exception of this type.
*/
public ComputationInterruptedException(){
super("Computation interrupted by user.");
}
}

View File

@@ -3,27 +3,7 @@ package org.nwapw.abacus.number;
/** /**
* An implementation of NumberInterface using a double. * An implementation of NumberInterface using a double.
*/ */
public class NaiveNumber implements NumberInterface { public class NaiveNumber extends NumberInterface {
/**
* The value of this number.
*/
private double value;
/**
* Creates a new NaiveNumber with the given string.
* @param value the value, which will be parsed as a double.
*/
public NaiveNumber(String value) {
this(Double.parseDouble(value));
}
/**
* Creates a new NaiveNumber with the given value.
* @param value the value to use.
*/
public NaiveNumber(double value) {
this.value = value;
}
/** /**
* The number zero. * The number zero.
@@ -33,6 +13,28 @@ public class NaiveNumber implements NumberInterface {
* The number one. * The number one.
*/ */
public static final NaiveNumber ONE = new NaiveNumber(1); public static final NaiveNumber ONE = new NaiveNumber(1);
/**
* The value of this number.
*/
private double value;
/**
* Creates a new NaiveNumber with the given string.
*
* @param value the value, which will be parsed as a double.
*/
public NaiveNumber(String value) {
this(Double.parseDouble(value));
}
/**
* Creates a new NaiveNumber with the given value.
*
* @param value the value to use.
*/
public NaiveNumber(double value) {
this.value = value;
}
@Override @Override
public int getMaxPrecision() { public int getMaxPrecision() {
@@ -40,42 +42,42 @@ public class NaiveNumber implements NumberInterface {
} }
@Override @Override
public NumberInterface multiply(NumberInterface multiplier) { public NumberInterface multiplyInternal(NumberInterface multiplier) {
return new NaiveNumber(value * ((NaiveNumber)multiplier).value); return new NaiveNumber(value * ((NaiveNumber) multiplier).value);
} }
@Override @Override
public NumberInterface divide(NumberInterface divisor) { public NumberInterface divideInternal(NumberInterface divisor) {
return new NaiveNumber(value / ((NaiveNumber)divisor).value); return new NaiveNumber(value / ((NaiveNumber) divisor).value);
} }
@Override @Override
public NumberInterface add(NumberInterface summand) { public NumberInterface addInternal(NumberInterface summand) {
return new NaiveNumber(value + ((NaiveNumber)summand).value); return new NaiveNumber(value + ((NaiveNumber) summand).value);
} }
@Override @Override
public NumberInterface subtract(NumberInterface subtrahend) { public NumberInterface subtractInternal(NumberInterface subtrahend) {
return new NaiveNumber(value - ((NaiveNumber)subtrahend).value); return new NaiveNumber(value - ((NaiveNumber) subtrahend).value);
} }
@Override @Override
public NumberInterface negate() { public NumberInterface negateInternal() {
return new NaiveNumber(-value); return new NaiveNumber(-value);
} }
@Override @Override
public NumberInterface intPow(int exponent) { public NumberInterface intPowInternal(int exponent) {
if(exponent == 0){ if (exponent == 0) {
return NaiveNumber.ONE; return NaiveNumber.ONE;
} }
boolean takeReciprocal = exponent < 0; boolean takeReciprocal = exponent < 0;
exponent = Math.abs(exponent); exponent = Math.abs(exponent);
NumberInterface power = this; NumberInterface power = this;
for(int currentExponent = 1; currentExponent < exponent; currentExponent++){ for (int currentExponent = 1; currentExponent < exponent; currentExponent++) {
power = power.multiply(this); power = power.multiply(this);
} }
if(takeReciprocal){ if (takeReciprocal) {
power = NaiveNumber.ONE.divide(power); power = NaiveNumber.ONE.divide(power);
} }
return power; return power;
@@ -93,18 +95,42 @@ public class NaiveNumber implements NumberInterface {
} }
@Override @Override
public NumberInterface promoteTo(Class<? extends NumberInterface> toClass) { public NumberInterface ceilingInternal() {
if(toClass == this.getClass()) return this; return new NaiveNumber(Math.ceil(value));
else if(toClass == PreciseNumber.class){ }
@Override
public NumberInterface floorInternal() {
return new NaiveNumber(Math.floor(value));
}
@Override
public NumberInterface fractionalPartInternal() {
return new NaiveNumber(value - Math.floor(value));
}
@Override
public int intValue() {
return (int) value;
}
@Override
public NumberInterface promoteToInternal(Class<? extends NumberInterface> toClass) {
if (toClass == this.getClass()) return this;
else if (toClass == PreciseNumber.class) {
return new PreciseNumber(Double.toString(value)); return new PreciseNumber(Double.toString(value));
} }
return null; return null;
} }
public String toString(){ public String toString() {
double shiftBy = Math.pow(10, 10); double shiftBy = Math.pow(10, 10);
return Double.toString(Math.round(value * shiftBy) / shiftBy); return Double.toString(Math.round(value * shiftBy) / shiftBy);
} }
@Override
public NumberInterface getMaxError(){
return new NaiveNumber(Math.pow(10, -18));
}
} }

View File

@@ -3,75 +3,265 @@ package org.nwapw.abacus.number;
/** /**
* An interface used to represent a number. * An interface used to represent a number.
*/ */
public interface NumberInterface { public abstract class NumberInterface {
/**
* Check if the thread was interrupted and
* throw an exception to end the computation.
*/
private static void checkInterrupted(){
if(Thread.currentThread().isInterrupted())
throw new ComputationInterruptedException();
}
/** /**
* The maximum precision to which this number operates. * The maximum precision to which this number operates.
*
* @return the precision. * @return the precision.
*/ */
int getMaxPrecision(); public abstract int getMaxPrecision();
/** /**
* Multiplies this number by another, returning * Multiplies this number by another, returning
* a new number instance. * a new number instance.
*
* @param multiplier the multiplier * @param multiplier the multiplier
* @return the result of the multiplication. * @return the result of the multiplication.
*/ */
NumberInterface multiply(NumberInterface multiplier); protected abstract NumberInterface multiplyInternal(NumberInterface multiplier);
/**
* Multiplies this number by another, returning
* a new number instance. Also, checks if the
* thread has been interrupted, and if so, throws
* an exception.
*
* @param multiplier the multiplier
* @return the result of the multiplication.
*/
public final NumberInterface multiply(NumberInterface multiplier){
checkInterrupted();
return multiplyInternal(multiplier);
}
/** /**
* Divides this number by another, returning * Divides this number by another, returning
* a new number instance. * a new number instance.
*
* @param divisor the divisor * @param divisor the divisor
* @return the result of the division. * @return the result of the division.
*/ */
NumberInterface divide(NumberInterface divisor); protected abstract NumberInterface divideInternal(NumberInterface divisor);
/**
* Divides this number by another, returning
* a new number instance. Also, checks if the
* thread has been interrupted, and if so, throws
* an exception.
*
* @param divisor the divisor
* @return the result of the division.
*/
public final NumberInterface divide(NumberInterface divisor){
checkInterrupted();
return divideInternal(divisor);
}
/** /**
* Adds this number to another, returning * Adds this number to another, returning
* a new number instance. * a new number instance.
*
* @param summand the summand * @param summand the summand
* @return the result of the summation. * @return the result of the summation.
*/ */
NumberInterface add(NumberInterface summand); protected abstract NumberInterface addInternal(NumberInterface summand);
/**
* Adds this number to another, returning
* a new number instance. Also, checks if the
* thread has been interrupted, and if so, throws
* an exception.
*
* @param summand the summand
* @return the result of the summation.
*/
public final NumberInterface add(NumberInterface summand){
checkInterrupted();
return addInternal(summand);
}
/** /**
* Subtracts another number from this number, * Subtracts another number from this number,
* a new number instance. * a new number instance.
*
* @param subtrahend the subtrahend. * @param subtrahend the subtrahend.
* @return the result of the subtraction. * @return the result of the subtraction.
*/ */
NumberInterface subtract(NumberInterface subtrahend); protected abstract NumberInterface subtractInternal(NumberInterface subtrahend);
/**
* Subtracts another number from this number,
* a new number instance. Also, checks if the
* thread has been interrupted, and if so, throws
* an exception.
*
* @param subtrahend the subtrahend.
* @return the result of the subtraction.
*/
public final NumberInterface subtract(NumberInterface subtrahend){
checkInterrupted();
return subtractInternal(subtrahend);
}
/** /**
* Returns a new instance of this number with * Returns a new instance of this number with
* the sign flipped. * the sign flipped.
*
* @return the new instance. * @return the new instance.
*/ */
NumberInterface negate(); protected abstract NumberInterface negateInternal();
/**
* Returns a new instance of this number with
* the sign flipped. Also, checks if the
* thread has been interrupted, and if so, throws
* an exception.
*
* @return the new instance.
*/
public final NumberInterface negate(){
checkInterrupted();
return negateInternal();
}
/** /**
* Raises this number to an integer power. * Raises this number to an integer power.
*
* @param exponent the exponent to which to take the number. * @param exponent the exponent to which to take the number.
* @return the resulting value. * @return the resulting value.
*/ */
NumberInterface intPow(int exponent); protected abstract NumberInterface intPowInternal(int exponent);
/**
* Raises this number to an integer power. Also, checks if the
* thread has been interrupted, and if so, throws
* an exception.
*
* @param exponent the exponent to which to take the number.
* @return the resulting value.
*/
public final NumberInterface intPow(int exponent){
checkInterrupted();
return intPowInternal(exponent);
}
/** /**
* Compares this number to another. * Compares this number to another.
*
* @param number the number to compare to. * @param number the number to compare to.
* @return same as Integer.compare(); * @return same as Integer.compare();
*/ */
int compareTo(NumberInterface number); public abstract int compareTo(NumberInterface number);
/** /**
* Same as Math.signum(). * Same as Math.signum().
*
* @return 1 if this number is positive, -1 if this number is negative, 0 if this number is 0. * @return 1 if this number is positive, -1 if this number is negative, 0 if this number is 0.
*/ */
int signum(); public abstract int signum();
/**
* Returns the least integer greater than or equal to the number.
*
* @return the least integer greater or equal to the number, if int can hold the value.
*/
protected abstract NumberInterface ceilingInternal();
/**
* Returns the least integer greater than or equal to the number.
* Also, checks if the thread has been interrupted, and if so, throws
* an exception.
*
* @return the least integer bigger or equal to the number.
*/
public final NumberInterface ceiling(){
checkInterrupted();
return ceilingInternal();
}
/**
* Return the greatest integer less than or equal to the number.
*
* @return the greatest integer smaller or equal the number.
*/
protected abstract NumberInterface floorInternal();
/**
* Return the greatest integer less than or equal to the number.
* Also, checks if the thread has been interrupted, and if so, throws
* an exception.
*
* @return the greatest int smaller than or equal to the number.
*/
public final NumberInterface floor(){
checkInterrupted();
return floorInternal();
}
/**
* Returns the fractional part of the number.
*
* @return the fractional part of the number.
*/
protected abstract NumberInterface fractionalPartInternal();
/**
* Returns the fractional part of the number, specifically x - floor(x).
* Also, checks if the thread has been interrupted,
* and if so, throws an exception.
* @return the fractional part of the number.
*/
public final NumberInterface fractionalPart(){
checkInterrupted();
return fractionalPartInternal();
}
/**
* Returns the integer representation of this number, discarding any fractional part,
* if int can hold the value.
*
* @return the integer value of this number.
*/
public abstract int intValue();
/** /**
* Promotes this class to another number class. * Promotes this class to another number class.
*
* @param toClass the class to promote to. * @param toClass the class to promote to.
* @return the resulting new instance. * @return the resulting new instance.
*/ */
NumberInterface promoteTo(Class<? extends NumberInterface> toClass); @Deprecated
protected abstract NumberInterface promoteToInternal(Class<? extends NumberInterface> toClass);
/**
* Promotes this class to another number class. Also, checks if the
* thread has been interrupted, and if so, throws
* an exception.
*
* @param toClass the class to promote to.
* @return the resulting new instance.
*/
@Deprecated
public final NumberInterface promoteTo(Class<? extends NumberInterface> toClass) {
checkInterrupted();
return promoteToInternal(toClass);
}
/**
* Returns the smallest error this instance can tolerate depending
* on its precision and value.
* @return the smallest error that should be permitted in calculations.
*/
public abstract NumberInterface getMaxError();
} }

View File

@@ -1,22 +1,41 @@
package org.nwapw.abacus.number; package org.nwapw.abacus.number;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.MathContext;
public class PreciseNumber implements NumberInterface{ /**
* A number that uses a BigDecimal to store its value,
* leading to infinite possible precision.
*/
public class PreciseNumber extends NumberInterface {
/** /**
* The number one. * The number one.
*/ */
static final PreciseNumber ONE = new PreciseNumber(BigDecimal.ONE); public static final PreciseNumber ONE = new PreciseNumber(BigDecimal.ONE);
/** /**
* The number zero. * The number zero.
*/ */
static final PreciseNumber ZERO = new PreciseNumber(BigDecimal.ZERO); public static final PreciseNumber ZERO = new PreciseNumber(BigDecimal.ZERO);
/** /**
* The number ten. * The number ten.
*/ */
static final PreciseNumber TEN = new PreciseNumber(BigDecimal.TEN); public static final PreciseNumber TEN = new PreciseNumber(BigDecimal.TEN);
/**
* The number of extra significant figures kept in calculations before rounding for output.
*/
private static int numExtraInternalSigFigs = 15;
/**
* MathContext that is used when rounding a number prior to output.
*/
private static MathContext outputContext = new MathContext(50);
/**
* MathContext that is actually used in calculations.
*/
private static MathContext internalContext = new MathContext(outputContext.getPrecision()+numExtraInternalSigFigs);
/** /**
* The value of the PreciseNumber. * The value of the PreciseNumber.
@@ -25,58 +44,60 @@ public class PreciseNumber implements NumberInterface{
/** /**
* Constructs a precise number from the given string. * Constructs a precise number from the given string.
*
* @param string a string representation of the number meeting the same conditions * @param string a string representation of the number meeting the same conditions
* as the BidDecimal(String) constructor. * as the BidDecimal(String) constructor.
*/ */
public PreciseNumber(String string){ public PreciseNumber(String string) {
value = new BigDecimal(string); value = new BigDecimal(string);
} }
/** /**
* Constructs a precise number from the given BigDecimal. * Constructs a precise number from the given BigDecimal.
*
* @param value a BigDecimal object representing the value of the number. * @param value a BigDecimal object representing the value of the number.
*/ */
public PreciseNumber(BigDecimal value){ public PreciseNumber(BigDecimal value) {
this.value = value; this.value = value;
} }
@Override @Override
public int getMaxPrecision() { public int getMaxPrecision() {
return 54; return internalContext.getPrecision();
} }
@Override @Override
public NumberInterface multiply(NumberInterface multiplier) { public NumberInterface multiplyInternal(NumberInterface multiplier) {
return new PreciseNumber(value.multiply(((PreciseNumber) multiplier).value)); return new PreciseNumber(this.value.multiply(((PreciseNumber) multiplier).value));
} }
@Override @Override
public NumberInterface divide(NumberInterface divisor) { public NumberInterface divideInternal(NumberInterface divisor) {
return new PreciseNumber(value.divide(((PreciseNumber) divisor).value, this.getMaxPrecision(), RoundingMode.HALF_UP)); return new PreciseNumber(value.divide(((PreciseNumber) divisor).value, internalContext));
} }
@Override @Override
public NumberInterface add(NumberInterface summand) { public NumberInterface addInternal(NumberInterface summand) {
return new PreciseNumber(value.add(((PreciseNumber) summand).value)); return new PreciseNumber(value.add(((PreciseNumber) summand).value));
} }
@Override @Override
public NumberInterface subtract(NumberInterface subtrahend) { public NumberInterface subtractInternal(NumberInterface subtrahend) {
return new PreciseNumber(value.subtract(((PreciseNumber) subtrahend).value)); return new PreciseNumber(value.subtract(((PreciseNumber) subtrahend).value));
} }
@Override @Override
public NumberInterface intPow(int exponent) { public NumberInterface intPowInternal(int exponent) {
if(exponent == 0){ if (exponent == 0) {
return PreciseNumber.ONE; return PreciseNumber.ONE;
} }
boolean takeReciprocal = exponent < 0; boolean takeReciprocal = exponent < 0;
exponent = Math.abs(exponent); exponent = Math.abs(exponent);
NumberInterface power = this; NumberInterface power = this;
for(int currentExponent = 1; currentExponent < exponent; currentExponent++){ for (int currentExponent = 1; currentExponent < exponent; currentExponent++) {
power = power.multiply(this); power = power.multiply(this);
} }
if(takeReciprocal){ if (takeReciprocal) {
power = PreciseNumber.ONE.divide(power); power = PreciseNumber.ONE.divide(power);
} }
return power; return power;
@@ -93,13 +114,47 @@ public class PreciseNumber implements NumberInterface{
} }
@Override @Override
public NumberInterface negate(){ public NumberInterface ceilingInternal() {
String str = value.toPlainString();
int decimalIndex = str.indexOf('.');
if (decimalIndex != -1) {
return this.floor().add(ONE);
}
return this;
}
@Override
public NumberInterface floorInternal() {
String str = value.toPlainString();
int decimalIndex = str.indexOf('.');
if (decimalIndex != -1) {
NumberInterface floor = new PreciseNumber(str.substring(0, decimalIndex));
if(signum() == -1){
floor = floor.subtract(ONE);
}
return floor;
}
return this;
}
@Override
public NumberInterface fractionalPartInternal() {
return this.subtractInternal(floorInternal());
}
@Override
public int intValue() {
return value.intValue();
}
@Override
public NumberInterface negateInternal() {
return new PreciseNumber(value.negate()); return new PreciseNumber(value.negate());
} }
@Override @Override
public NumberInterface promoteTo(Class<? extends NumberInterface> toClass) { public NumberInterface promoteToInternal(Class<? extends NumberInterface> toClass) {
if(toClass == this.getClass()){ if (toClass == this.getClass()) {
return this; return this;
} }
return null; return null;
@@ -107,7 +162,11 @@ public class PreciseNumber implements NumberInterface{
@Override @Override
public String toString() { public String toString() {
BigDecimal rounded = value.setScale(getMaxPrecision() - 4, RoundingMode.HALF_UP); return value.round(outputContext).toString();
return rounded.stripTrailingZeros().toPlainString(); }
@Override
public NumberInterface getMaxError(){
return new PreciseNumber(value.ulp()).multiplyInternal(TEN.intPowInternal(value.precision()-internalContext.getPrecision()));
} }
} }

View File

@@ -29,7 +29,7 @@ public class LexerTokenizer implements Tokenizer<Match<TokenType>>, PluginListen
/** /**
* Creates a new lexer tokenizer. * Creates a new lexer tokenizer.
*/ */
public LexerTokenizer(){ public LexerTokenizer() {
lexer = new Lexer<TokenType>() {{ lexer = new Lexer<TokenType>() {{
register(" ", TokenType.WHITESPACE); register(" ", TokenType.WHITESPACE);
register(",", TokenType.COMMA); register(",", TokenType.COMMA);
@@ -46,20 +46,20 @@ public class LexerTokenizer implements Tokenizer<Match<TokenType>>, PluginListen
@Override @Override
public void onLoad(PluginManager manager) { public void onLoad(PluginManager manager) {
for(String operator : manager.getAllOperators()){ for (String operator : manager.getAllOperators()) {
lexer.register(Pattern.sanitize(operator), TokenType.OP); lexer.register(Pattern.sanitize(operator), TokenType.OP);
} }
for(String function : manager.getAllFunctions()){ for (String function : manager.getAllFunctions()) {
lexer.register(Pattern.sanitize(function), TokenType.FUNCTION); lexer.register(Pattern.sanitize(function), TokenType.FUNCTION);
} }
} }
@Override @Override
public void onUnload(PluginManager manager) { public void onUnload(PluginManager manager) {
for(String operator : manager.getAllOperators()){ for (String operator : manager.getAllOperators()) {
lexer.unregister(Pattern.sanitize(operator), TokenType.OP); lexer.unregister(Pattern.sanitize(operator), TokenType.OP);
} }
for(String function : manager.getAllFunctions()){ for (String function : manager.getAllFunctions()) {
lexer.unregister(Pattern.sanitize(function), TokenType.FUNCTION); lexer.unregister(Pattern.sanitize(function), TokenType.FUNCTION);
} }
} }

View File

@@ -7,12 +7,14 @@ import java.util.List;
/** /**
* An itnerface that provides the ability to convert a list of tokens * An itnerface that provides the ability to convert a list of tokens
* into a parse tree. * into a parse tree.
*
* @param <T> the type of tokens accepted by this parser. * @param <T> the type of tokens accepted by this parser.
*/ */
public interface Parser<T> { public interface Parser<T> {
/** /**
* Constructs a tree out of the given tokens. * Constructs a tree out of the given tokens.
*
* @param tokens the tokens to construct a tree from. * @param tokens the tokens to construct a tree from.
* @return the constructed tree, or null on error. * @return the constructed tree, or null on error.
*/ */

View File

@@ -36,9 +36,10 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
/** /**
* Creates a new Shunting Yard parser with the given Abacus instance. * Creates a new Shunting Yard parser with the given Abacus instance.
*
* @param abacus the abacus instance. * @param abacus the abacus instance.
*/ */
public ShuntingYardParser(Abacus abacus){ public ShuntingYardParser(Abacus abacus) {
this.abacus = abacus; this.abacus = abacus;
precedenceMap = new HashMap<>(); precedenceMap = new HashMap<>();
associativityMap = new HashMap<>(); associativityMap = new HashMap<>();
@@ -47,39 +48,49 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
/** /**
* Rearranges tokens into a postfix list, using Shunting Yard. * Rearranges tokens into a postfix list, using Shunting Yard.
*
* @param from the tokens to be rearranged. * @param from the tokens to be rearranged.
* @return the resulting list of rearranged tokens. * @return the resulting list of rearranged tokens.
*/ */
public List<Match<TokenType>> intoPostfix(List<Match<TokenType>> from){ public List<Match<TokenType>> intoPostfix(List<Match<TokenType>> from) {
ArrayList<Match<TokenType>> output = new ArrayList<>(); ArrayList<Match<TokenType>> output = new ArrayList<>();
Stack<Match<TokenType>> tokenStack = new Stack<>(); Stack<Match<TokenType>> tokenStack = new Stack<>();
while(!from.isEmpty()){ TokenType previousType;
TokenType matchType = null;
while (!from.isEmpty()) {
Match<TokenType> match = from.remove(0); Match<TokenType> match = from.remove(0);
TokenType matchType = match.getType(); previousType = matchType;
if(matchType == TokenType.NUM) { matchType = match.getType();
if (matchType == TokenType.NUM) {
output.add(match); output.add(match);
} else if(matchType == TokenType.FUNCTION) { } else if (matchType == TokenType.FUNCTION) {
output.add(new Match<>("" , TokenType.INTERNAL_FUNCTION_END)); output.add(new Match<>("", TokenType.INTERNAL_FUNCTION_END));
tokenStack.push(match); tokenStack.push(match);
} else if(matchType == TokenType.OP){ } else if (matchType == TokenType.OP) {
String tokenString = match.getContent(); String tokenString = match.getContent();
OperatorType type = typeMap.get(tokenString); OperatorType type = typeMap.get(tokenString);
int precedence = precedenceMap.get(tokenString); int precedence = precedenceMap.get(tokenString);
OperatorAssociativity associativity = associativityMap.get(tokenString); OperatorAssociativity associativity = associativityMap.get(tokenString);
if(type == OperatorType.UNARY_POSTFIX){ if (type == OperatorType.UNARY_POSTFIX) {
output.add(match); output.add(match);
continue; 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(); Match<TokenType> otherMatch = tokenStack.peek();
TokenType otherMatchType = otherMatch.getType(); TokenType otherMatchType = otherMatch.getType();
if(!(otherMatchType == TokenType.OP || otherMatchType == TokenType.FUNCTION)) break; if (!(otherMatchType == TokenType.OP || otherMatchType == TokenType.FUNCTION)) break;
if(otherMatchType == TokenType.OP){ if (otherMatchType == TokenType.OP) {
int otherPrecedence = precedenceMap.get(match.getContent()); int otherPrecedence = precedenceMap.get(otherMatch.getContent());
if(otherPrecedence < precedence || if (otherPrecedence < precedence ||
(associativity == OperatorAssociativity.RIGHT && otherPrecedence == precedence)) { (associativity == OperatorAssociativity.RIGHT && otherPrecedence == precedence)) {
break; break;
} }
@@ -87,22 +98,22 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
output.add(tokenStack.pop()); output.add(tokenStack.pop());
} }
tokenStack.push(match); tokenStack.push(match);
} else if(matchType == TokenType.OPEN_PARENTH){ } else if (matchType == TokenType.OPEN_PARENTH) {
tokenStack.push(match); tokenStack.push(match);
} else if(matchType == TokenType.CLOSE_PARENTH || matchType == TokenType.COMMA){ } else if (matchType == TokenType.CLOSE_PARENTH || matchType == TokenType.COMMA) {
while(!tokenStack.empty() && tokenStack.peek().getType() != TokenType.OPEN_PARENTH){ while (!tokenStack.empty() && tokenStack.peek().getType() != TokenType.OPEN_PARENTH) {
output.add(tokenStack.pop()); output.add(tokenStack.pop());
} }
if(tokenStack.empty()) return null; if (tokenStack.empty()) return null;
if(matchType == TokenType.CLOSE_PARENTH){ if (matchType == TokenType.CLOSE_PARENTH) {
tokenStack.pop(); tokenStack.pop();
} }
} }
} }
while(!tokenStack.empty()){ while (!tokenStack.empty()) {
Match<TokenType> match = tokenStack.peek(); Match<TokenType> match = tokenStack.peek();
TokenType matchType = match.getType(); TokenType newMatchType = match.getType();
if(!(matchType == TokenType.OP || matchType == TokenType.FUNCTION)) return null; if (!(newMatchType == TokenType.OP || newMatchType == TokenType.FUNCTION)) return null;
output.add(tokenStack.pop()); output.add(tokenStack.pop());
} }
return output; return output;
@@ -110,37 +121,38 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
/** /**
* Constructs a tree recursively from a list of tokens. * Constructs a tree recursively from a list of tokens.
*
* @param matches the list of tokens from the source string. * @param matches the list of tokens from the source string.
* @return the construct tree expression. * @return the construct tree expression.
*/ */
public TreeNode constructRecursive(List<Match<TokenType>> matches){ public TreeNode constructRecursive(List<Match<TokenType>> matches) {
if(matches.size() == 0) return null; if (matches.size() == 0) return null;
Match<TokenType> match = matches.remove(0); Match<TokenType> match = matches.remove(0);
TokenType matchType = match.getType(); TokenType matchType = match.getType();
if(matchType == TokenType.OP){ if (matchType == TokenType.OP) {
String operator = match.getContent(); String operator = match.getContent();
OperatorType type = typeMap.get(operator); OperatorType type = typeMap.get(operator);
if(type == OperatorType.BINARY_INFIX){ if (type == OperatorType.BINARY_INFIX) {
TreeNode right = constructRecursive(matches); TreeNode right = constructRecursive(matches);
TreeNode left = constructRecursive(matches); TreeNode left = constructRecursive(matches);
if(left == null || right == null) return null; if (left == null || right == null) return null;
else return new BinaryInfixNode(operator, left, right); else return new BinaryNode(operator, left, right);
} else { } else {
TreeNode applyTo = constructRecursive(matches); TreeNode applyTo = constructRecursive(matches);
if(applyTo == null) return null; if (applyTo == null) return null;
else return new UnaryPrefixNode(operator, applyTo); else return new UnaryNode(operator, applyTo);
} }
} else if(matchType == TokenType.NUM){ } else if (matchType == TokenType.NUM) {
return new NumberNode(abacus.numberFromString(match.getContent())); return new NumberNode(abacus.numberFromString(match.getContent()));
} else if(matchType == TokenType.FUNCTION){ } else if (matchType == TokenType.FUNCTION) {
String functionName = match.getContent(); String functionName = match.getContent();
FunctionNode node = new FunctionNode(functionName); FunctionNode node = new FunctionNode(functionName);
while(!matches.isEmpty() && matches.get(0).getType() != TokenType.INTERNAL_FUNCTION_END){ while (!matches.isEmpty() && matches.get(0).getType() != TokenType.INTERNAL_FUNCTION_END) {
TreeNode argument = constructRecursive(matches); TreeNode argument = constructRecursive(matches);
if(argument == null) return null; if (argument == null) return null;
node.prependChild(argument); node.prependChild(argument);
} }
if(matches.isEmpty()) return null; if (matches.isEmpty()) return null;
matches.remove(0); matches.remove(0);
return node; return node;
} }
@@ -150,13 +162,15 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
@Override @Override
public TreeNode constructTree(List<Match<TokenType>> tokens) { public TreeNode constructTree(List<Match<TokenType>> tokens) {
tokens = intoPostfix(new ArrayList<>(tokens)); tokens = intoPostfix(new ArrayList<>(tokens));
if(tokens == null) return null;
Collections.reverse(tokens); Collections.reverse(tokens);
return constructRecursive(tokens); TreeNode constructedTree = constructRecursive(tokens);
return tokens.size() == 0 ? constructedTree : null;
} }
@Override @Override
public void onLoad(PluginManager manager) { public void onLoad(PluginManager manager) {
for(String operator : manager.getAllOperators()){ for (String operator : manager.getAllOperators()) {
Operator operatorInstance = manager.operatorFor(operator); Operator operatorInstance = manager.operatorFor(operator);
precedenceMap.put(operator, operatorInstance.getPrecedence()); precedenceMap.put(operator, operatorInstance.getPrecedence());
associativityMap.put(operator, operatorInstance.getAssociativity()); associativityMap.put(operator, operatorInstance.getAssociativity());

View File

@@ -4,12 +4,14 @@ import java.util.List;
/** /**
* Interface that provides the ability to convert a string into a list of tokens. * Interface that provides the ability to convert a string into a list of tokens.
*
* @param <T> the type of the tokens produced. * @param <T> the type of the tokens produced.
*/ */
public interface Tokenizer<T> { public interface Tokenizer<T> {
/** /**
* Converts a string into tokens. * Converts a string into tokens.
*
* @param string the string to convert. * @param string the string to convert.
* @return the list of tokens, or null on error. * @return the list of tokens, or null on error.
*/ */

View File

@@ -4,19 +4,46 @@ import org.nwapw.abacus.tree.TreeNode;
import java.util.List; import java.util.List;
/**
* TreeBuilder class used to piece together a Tokenizer and
* Parser of the same kind. This is used to essentially avoid
* working with any parameters at all, and the generics
* in this class are used only to ensure the tokenizer and parser
* are of the same type.
*
* @param <T> the type of tokens created by the tokenizer and used by the parser.
*/
public class TreeBuilder<T> { public class TreeBuilder<T> {
/**
* The tokenizer used to convert a string into tokens.
*/
private Tokenizer<T> tokenizer; private Tokenizer<T> tokenizer;
/**
* The parser used to parse a list of tokens into a tree.
*/
private Parser<T> parser; private Parser<T> parser;
public TreeBuilder(Tokenizer<T> tokenizer, Parser<T> parser){ /**
* Create a new Tree Builder with the given tokenizer and parser
*
* @param tokenizer the tokenizer to turn strings into tokens
* @param parser the parser to turn tokens into a tree
*/
public TreeBuilder(Tokenizer<T> tokenizer, Parser<T> parser) {
this.tokenizer = tokenizer; this.tokenizer = tokenizer;
this.parser = parser; this.parser = parser;
} }
public TreeNode fromString(String input){ /**
* Parse the given string into a tree.
*
* @param input the string to parse into a tree.
* @return the resulting tree.
*/
public TreeNode fromString(String input) {
List<T> tokens = tokenizer.tokenizeString(input); List<T> tokens = tokenizer.tokenizeString(input);
if(tokens == null) return null; if (tokens == null) return null;
return parser.constructTree(tokens); return parser.constructTree(tokens);
} }

View File

@@ -20,9 +20,10 @@ public class ClassFinder {
/** /**
* Loads all the plugin classes from the given plugin folder. * Loads all the plugin classes from the given plugin folder.
*
* @param filePath the path for the plugin folder. * @param filePath the path for the plugin folder.
* @return the list of all loaded classes. * @return the list of all loaded classes.
* @throws IOException thrown if an error occurred scanning the plugin folder. * @throws IOException thrown if an error occurred scanning the plugin folder.
* @throws ClassNotFoundException thrown if the class listed in the file doesn't get loaded. * @throws ClassNotFoundException thrown if the class listed in the file doesn't get loaded.
*/ */
public static List<Class<?>> loadJars(String filePath) throws IOException, ClassNotFoundException { public static List<Class<?>> loadJars(String filePath) throws IOException, ClassNotFoundException {
@@ -31,19 +32,20 @@ public class ClassFinder {
/** /**
* Loads all the plugin classes from the given plugin folder. * Loads all the plugin classes from the given plugin folder.
*
* @param pluginFolderPath the folder in which to look for plugins. * @param pluginFolderPath the folder in which to look for plugins.
* @return the list of all loaded classes. * @return the list of all loaded classes.
* @throws IOException thrown if an error occurred scanning the plugin folder. * @throws IOException thrown if an error occurred scanning the plugin folder.
* @throws ClassNotFoundException thrown if the class listed in the file doesn't get loaded. * @throws ClassNotFoundException thrown if the class listed in the file doesn't get loaded.
*/ */
public static List<Class<?>> loadJars(File pluginFolderPath) throws IOException, ClassNotFoundException { public static List<Class<?>> loadJars(File pluginFolderPath) throws IOException, ClassNotFoundException {
ArrayList<Class<?>> toReturn = new ArrayList<>(); ArrayList<Class<?>> toReturn = new ArrayList<>();
if(!pluginFolderPath.exists()) return toReturn; if (!pluginFolderPath.exists()) return toReturn;
ArrayList<File> files = Files.walk(pluginFolderPath.toPath()) ArrayList<File> files = Files.walk(pluginFolderPath.toPath())
.map(Path::toFile) .map(Path::toFile)
.filter(f -> f.getName().endsWith(".jar")) .filter(f -> f.getName().endsWith(".jar"))
.collect(Collectors.toCollection(ArrayList::new)); .collect(Collectors.toCollection(ArrayList::new));
for (File file : files){ for (File file : files) {
toReturn.addAll(loadJar(file)); toReturn.addAll(loadJar(file));
} }
return toReturn; return toReturn;
@@ -51,9 +53,10 @@ public class ClassFinder {
/** /**
* Loads the classes from a single path, given by the file. * Loads the classes from a single path, given by the file.
*
* @param jarLocation the location of the jar to load. * @param jarLocation the location of the jar to load.
* @return the list of loaded classes loaded from the jar. * @return the list of loaded classes loaded from the jar.
* @throws IOException thrown if there was an error reading the file * @throws IOException thrown if there was an error reading the file
* @throws ClassNotFoundException thrown if the class could not be loaded. * @throws ClassNotFoundException thrown if the class could not be loaded.
*/ */
public static List<Class<?>> loadJar(File jarLocation) throws IOException, ClassNotFoundException { public static List<Class<?>> loadJar(File jarLocation) throws IOException, ClassNotFoundException {

View File

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

View File

@@ -1,5 +1,7 @@
package org.nwapw.abacus.plugin; package org.nwapw.abacus.plugin;
import org.nwapw.abacus.function.Documentation;
import org.nwapw.abacus.function.DocumentationType;
import org.nwapw.abacus.function.Function; import org.nwapw.abacus.function.Function;
import org.nwapw.abacus.function.Operator; import org.nwapw.abacus.function.Operator;
import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.number.NumberInterface;
@@ -17,18 +19,6 @@ import java.util.Set;
*/ */
public abstract class Plugin { public abstract class Plugin {
/**
* A hash map of functions mapped to their string names.
*/
private Map<String, Function> functions;
/**
* A hash map of operators mapped to their string names.
*/
private Map<String, Operator> operators;
/**
* A hash map of operators mapped to their string names.
*/
private Map<String, Class<? extends NumberInterface>> numbers;
/** /**
* The plugin manager in which to search for functions * The plugin manager in which to search for functions
* not inside this package, * not inside this package,
@@ -39,77 +29,25 @@ public abstract class Plugin {
*/ */
private boolean enabled; private boolean enabled;
private Plugin(){ } private Plugin() {
}
/** /**
* Creates a new plugin with the given PluginManager. * Creates a new plugin with the given PluginManager.
*
* @param manager the manager controlling this plugin. * @param manager the manager controlling this plugin.
*/ */
public Plugin(PluginManager manager) { public Plugin(PluginManager manager) {
this.manager = manager; this.manager = manager;
functions = new HashMap<>();
operators = new HashMap<>();
numbers = new HashMap<>();
enabled = false; enabled = false;
} }
/**
* Gets the list of functions provided by this plugin.
* @return the list of registered functions.
*/
public final Set<String> providedFunctions(){
return functions.keySet();
}
/**
* Gets the list of functions provided by this plugin.
* @return the list of registered functions.
*/
public final Set<String> providedOperators(){
return operators.keySet();
}
/**
* Gets the list of all numbers provided by this plugin.
* @return the list of registered numbers.
*/
public final Set<String> providedNumbers(){
return numbers.keySet();
}
/**
* Gets a function under the given function name.
* @param functionName the name of the function to get
* @return the function, or null if this plugin doesn't provide it.
*/
public final Function getFunction(String functionName) {
return functions.get(functionName);
}
/**
* Gets an operator under the given operator name.
* @param operatorName the name of the operator to get.
* @return the operator, or null if this plugin doesn't provide it.
*/
public final Operator getOperator(String operatorName) {
return operators.get(operatorName);
}
/**
* Gets the class under the given name.
* @param numberName the name of the class.
* @return the class, or null if the plugin doesn't provide it.
*/
public final Class<? extends NumberInterface> getNumber(String numberName){
return numbers.get(numberName);
}
/** /**
* Enables the function, loading the necessary instances * Enables the function, loading the necessary instances
* of functions. * of functions.
*/ */
public final void enable(){ public final void enable() {
if(enabled) return; if (enabled) return;
onEnable(); onEnable();
enabled = true; enabled = true;
} }
@@ -118,51 +56,60 @@ public abstract class Plugin {
* Disables the plugin, clearing loaded data store by default * Disables the plugin, clearing loaded data store by default
* and calling its disable() method. * and calling its disable() method.
*/ */
public final void disable(){ public final void disable() {
if(!enabled) return; if (!enabled) return;
onDisable(); onDisable();
functions.clear();
operators.clear();
enabled = false; enabled = false;
} }
/** /**
* To be used in load(). Registers a function abstract class with the * To be used in load(). Registers a function abstract class with the
* plugin internally, which makes it accessible to the plugin manager. * plugin internally, which makes it accessible to the plugin manager.
* @param name the name to register by. *
* @param name the name to register by.
* @param toRegister the function implementation. * @param toRegister the function implementation.
*/ */
protected final void registerFunction(String name, Function toRegister) { protected final void registerFunction(String name, Function toRegister) {
functions.put(name, toRegister); manager.registerFunction(name, toRegister);
} }
/** /**
* To be used in load(). Registers an operator abstract class * To be used in load(). Registers an operator abstract class
* with the plugin internally, which makes it accessible to * with the plugin internally, which makes it accessible to
* the plugin manager. * the plugin manager.
* @param name the name of the operator. *
* @param name the name of the operator.
* @param operator the operator to register. * @param operator the operator to register.
*/ */
protected final void registerOperator(String name, Operator operator) { protected final void registerOperator(String name, Operator operator) {
operators.put(name, operator); manager.registerOperator(name, operator);
} }
/** /**
* To be used in load(). Registers a number class * To be used in load(). Registers a new number implementation with the plugin.
* with the plugin internally, which makes it possible * This makes it accessible to the plugin manager.
* for the user to select it as an "implementation" for the *
* number that they would like to use. * @param name the name of the implementation.
* @param name the name to register it under. * @param implementation the actual implementation class to register.
* @param toRegister the class to register.
*/ */
protected final void registerNumber(String name, Class<? extends NumberInterface> toRegister){ protected final void registerNumberImplementation(String name, NumberImplementation implementation) {
numbers.put(name, toRegister); manager.registerNumberImplementation(name, implementation);
}
/**
* To be used in load(). Registers a documentation instance
* used to explain some element of the plugin to the user.
* @param documentation the documentation instance.
*/
protected final void registerDocumentation(Documentation documentation){
manager.registerDocumentation(documentation);
} }
/** /**
* Searches the PluginManager for the given function name. * Searches the PluginManager for the given function name.
* This can be used by the plugins internally in order to call functions * This can be used by the plugins internally in order to call functions
* they do not provide. * they do not provide.
*
* @param name the name for which to search * @param name the name for which to search
* @return the resulting function, or null if none was found for that name. * @return the resulting function, or null if none was found for that name.
*/ */
@@ -174,6 +121,7 @@ public abstract class Plugin {
* Searches the PluginManager for the given operator name. * Searches the PluginManager for the given operator name.
* This can be used by the plugins internally in order to call * This can be used by the plugins internally in order to call
* operations they do not provide. * operations they do not provide.
*
* @param name the name for which to search * @param name the name for which to search
* @return the resulting operator, or null if none was found for that name. * @return the resulting operator, or null if none was found for that name.
*/ */
@@ -181,6 +129,42 @@ public abstract class Plugin {
return manager.operatorFor(name); return manager.operatorFor(name);
} }
/**
* Searches the PluginManager for the given number implementation
* name. This can be used by the plugins internally in order to find
* implementations that they do not provide.
*
* @param name the name for which to search.
* @return the resulting number implementation, or null if none was found.
*/
protected final NumberImplementation numberImplementationFor(String name) {
return manager.numberImplementationFor(name);
}
/**
* Searches the PluginManager for the given documentation name and type.
*
* @param name the name for which to search.
* @param type the type of documentation to search for.
* @return the found documentation, or null if none was found.
*/
protected final Documentation documentationFor(String name, DocumentationType type){
return manager.documentationFor(name, type);
}
/**
* Searches the plugin manager for a Pi value for the given number implementation.
* This is done so that number implementations with various degrees of precision
* 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 piFor(Class<? extends NumberInterface> forClass) {
return manager.piFor(forClass);
}
/** /**
* Abstract method to be overridden by plugin implementation, in which the plugins * Abstract method to be overridden by plugin implementation, in which the plugins
* are supposed to register the functions they provide and do any other * are supposed to register the functions they provide and do any other

View File

@@ -7,12 +7,14 @@ public interface PluginListener {
/** /**
* Called when the PluginManager loads plugins. * Called when the PluginManager loads plugins.
*
* @param manager the manager that fired the event. * @param manager the manager that fired the event.
*/ */
public void onLoad(PluginManager manager); public void onLoad(PluginManager manager);
/** /**
* Called when the PluginManager unloads all its plugins. * Called when the PluginManager unloads all its plugins.
*
* @param manager the manager that fired the event. * @param manager the manager that fired the event.
*/ */
public void onUnload(PluginManager manager); public void onUnload(PluginManager manager);

View File

@@ -1,6 +1,8 @@
package org.nwapw.abacus.plugin; package org.nwapw.abacus.plugin;
import org.nwapw.abacus.Abacus; import org.nwapw.abacus.Abacus;
import org.nwapw.abacus.function.Documentation;
import org.nwapw.abacus.function.DocumentationType;
import org.nwapw.abacus.function.Function; import org.nwapw.abacus.function.Function;
import org.nwapw.abacus.function.Operator; import org.nwapw.abacus.function.Operator;
import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.number.NumberInterface;
@@ -23,121 +25,186 @@ public class PluginManager {
*/ */
private Set<Plugin> plugins; private Set<Plugin> plugins;
/** /**
* List of functions that have been cached, * The map of functions registered by the plugins.
* that is, found in a plugin and returned.
*/ */
private Map<String, Function> cachedFunctions; private Map<String, Function> registeredFunctions;
/** /**
* List of operators that have been cached, * The map of operators registered by the plugins
* that is, found in a plugin and returned.
*/ */
private Map<String, Operator> cachedOperators; private Map<String, Operator> registeredOperators;
/** /**
* List of registered number implementations that have * The map of number implementations registered by the plugins.
* been cached, that is, found in a plugin and returned.
*/ */
private Map<String, Class<? extends NumberInterface>> cachedNumbers; private Map<String, NumberImplementation> registeredNumberImplementations;
/** /**
* List of all functions loaded by the plugins. * The map of documentation for functions registered by the plugins.
*/ */
private Set<String> allFunctions; private Set<Documentation> registeredDocumentation;
/** /**
* List of all operators loaded by the plugins. * The list of number implementations that have been
* found by their implementation class.
*/ */
private Set<String> allOperators; private Map<Class<? extends NumberInterface>, NumberImplementation> cachedInterfaceImplementations;
/** /**
* List of all numbers loaded by the plugins. * The pi values for each implementation class that have already been computer.
*/ */
private Set<String> allNumbers; private Map<Class<? extends NumberInterface>, NumberInterface> cachedPi;
/** /**
* The list of plugin listeners attached to this instance. * The list of plugin listeners attached to this instance.
*/ */
private Set<PluginListener> listeners; private Set<PluginListener> listeners;
/** /**
* The instance of Abacus that is used to interact with its other * The abacus instance used to access other
* components. * components of the application.
*/ */
private Abacus abacus; private Abacus abacus;
/** /**
* Creates a new plugin manager. * Creates a new plugin manager.
*
* @param abacus the abacus instance.
*/ */
public PluginManager(Abacus abacus){ public PluginManager(Abacus abacus) {
this.abacus = abacus; this.abacus = abacus;
loadedPluginClasses = new HashSet<>(); loadedPluginClasses = new HashSet<>();
plugins = new HashSet<>(); plugins = new HashSet<>();
cachedFunctions = new HashMap<>(); registeredFunctions = new HashMap<>();
cachedOperators = new HashMap<>(); registeredOperators = new HashMap<>();
cachedNumbers = new HashMap<>(); registeredNumberImplementations = new HashMap<>();
allFunctions = new HashSet<>(); registeredDocumentation = new HashSet<>();
allOperators = new HashSet<>(); cachedInterfaceImplementations = new HashMap<>();
allNumbers = new HashSet<>(); cachedPi = new HashMap<>();
listeners = new HashSet<>(); listeners = new HashSet<>();
} }
/** /**
* Searches the plugin list for a certain value, retrieving the Plugin's * Registers a function under the given name.
* list of items of the type using the setFunction and getting the value * @param name the name of the function.
* of it is available via getFunction. If the value is contained * @param function the function to register.
* in the cache, it returns the cached value instead.
* @param plugins the plugin list to search.
* @param cache the cache to use
* @param setFunction the function to retrieve a set of available T's from the plugin
* @param getFunction the function to get the T value under the given name
* @param name the name to search for
* @param <T> the type of element being search
* @return the retrieved element, or null if it was not found.
*/ */
private static <T> T searchCached(Collection<Plugin> plugins, Map<String, T> cache, public void registerFunction(String name, Function function){
java.util.function.Function<Plugin, Set<String>> setFunction, registeredFunctions.put(name, function);
java.util.function.BiFunction<Plugin, String, T> getFunction, }
String name){
if(cache.containsKey(name)) return cache.get(name);
T loadedValue = null; /**
for(Plugin plugin : plugins){ * Registers an operator under the given name.
if(setFunction.apply(plugin).contains(name)){ * @param name the name of the operator.
loadedValue = getFunction.apply(plugin, name); * @param operator the operator to register.
*/
public void registerOperator(String name, Operator operator){
registeredOperators.put(name, operator);
}
/**
* Registers a number implementation under the given name.
* @param name the name of the number implementation.
* @param implementation the number implementation to register.
*/
public void registerNumberImplementation(String name, NumberImplementation implementation){
registeredNumberImplementations.put(name, implementation);
}
/**
* Registers the given documentation with the plugin manager,
* making it accessible to the plugin manager etc.
* @param documentation the documentation to register.
*/
public void registerDocumentation(Documentation documentation){
registeredDocumentation.add(documentation);
}
/**
* Gets the function registered under the given name.
* @param name the name of the function.
* @return the function, or null if it was not found.
*/
public Function functionFor(String name){
return registeredFunctions.get(name);
}
/**
* Gets the operator registered under the given name.
* @param name the name of the operator.
* @return the operator, or null if it was not found.
*/
public Operator operatorFor(String name){
return registeredOperators.get(name);
}
/**
* Gets the number implementation registered under the given name.
* @param name the name of the number implementation.
* @return the number implementation, or null if it was not found.
*/
public NumberImplementation numberImplementationFor(String name){
return registeredNumberImplementations.get(name);
}
/**
* Gets the documentation for the given entity of the given type.
* @param name the name of the entity to search for.
* @param type the type that this entity is, to filter out similarly named documentation.
* @return the documentation object.
*/
public Documentation documentationFor(String name, DocumentationType type){
Documentation toReturn = null;
for(Documentation entry : registeredDocumentation){
if(entry.getCodeName().equals(name) && entry.getType() == type) {
toReturn = entry;
break; break;
} }
} }
if(toReturn == null){
cache.put(name, loadedValue); toReturn = new Documentation(name, "", "", "", type);
return loadedValue; registerDocumentation(toReturn);
} }
/** return toReturn;
* Gets a function under the given name.
* @param name the name of the function
* @return the function under the given name.
*/
public Function functionFor(String name){
return searchCached(plugins, cachedFunctions, Plugin::providedFunctions, Plugin::getFunction, name);
} }
/** /**
* Gets an operator under the given name. * Gets the number implementation for the given implementation class.
* @param name the name of the operator. *
* @return the operator under the given name. * @param name the class for which to find the implementation.
* @return the implementation.
*/ */
public Operator operatorFor(String name){ public NumberImplementation interfaceImplementationFor(Class<? extends NumberInterface> name) {
return searchCached(plugins, cachedOperators, Plugin::providedOperators, Plugin::getOperator, name); if (cachedInterfaceImplementations.containsKey(name)) return cachedInterfaceImplementations.get(name);
NumberImplementation toReturn = null;
for(String key : registeredNumberImplementations.keySet()){
NumberImplementation implementation = registeredNumberImplementations.get(key);
if(implementation.getImplementation() == name) {
toReturn = implementation;
break;
}
}
cachedInterfaceImplementations.put(name, toReturn);
return toReturn;
} }
/** /**
* Gets a numer implementation under the given name. * Gets the mathematical constant pi for the given implementation class.
* @param name the name of the implementation. *
* @return the implementation class * @param forClass the class for which to find pi.
* @return pi
*/ */
public Class<? extends NumberInterface> numberFor(String name){ public NumberInterface piFor(Class<? extends NumberInterface> forClass) {
return searchCached(plugins, cachedNumbers, Plugin::providedNumbers, Plugin::getNumber, name); if (cachedPi.containsKey(forClass)) return cachedPi.get(forClass);
NumberImplementation implementation = interfaceImplementationFor(forClass);
NumberInterface generatedPi = null;
if (implementation != null) {
generatedPi = implementation.instanceForPi();
}
cachedPi.put(forClass, generatedPi);
return generatedPi;
} }
/** /**
* Adds an instance of Plugin that already has been instantiated. * Adds an instance of Plugin that already has been instantiated.
*
* @param plugin the plugin to add. * @param plugin the plugin to add.
*/ */
public void addInstantiated(Plugin plugin){ public void addInstantiated(Plugin plugin) {
if(loadedPluginClasses.contains(plugin.getClass())) return; if (loadedPluginClasses.contains(plugin.getClass())) return;
plugins.add(plugin); plugins.add(plugin);
loadedPluginClasses.add(plugin.getClass()); loadedPluginClasses.add(plugin.getClass());
} }
@@ -145,10 +212,11 @@ public class PluginManager {
/** /**
* Instantiates a class of plugin, and adds it to this * Instantiates a class of plugin, and adds it to this
* plugin manager. * plugin manager.
*
* @param newClass the new class to instantiate. * @param newClass the new class to instantiate.
*/ */
public void addClass(Class<?> newClass){ public void addClass(Class<?> newClass) {
if(!Plugin.class.isAssignableFrom(newClass) || newClass == Plugin.class) return; if (!Plugin.class.isAssignableFrom(newClass) || newClass == Plugin.class) return;
try { try {
addInstantiated((Plugin) newClass.getConstructor(PluginManager.class).newInstance(this)); addInstantiated((Plugin) newClass.getConstructor(PluginManager.class).newInstance(this));
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
@@ -156,15 +224,32 @@ public class PluginManager {
} }
} }
/**
* Removes the plugin with the given class from the manager.
* @param toRemove the plugin to remove.
*/
public void removeClass(Class<? extends Plugin> toRemove){
if(!loadedPluginClasses.contains(toRemove)) return;
plugins.removeIf(plugin -> plugin.getClass() == toRemove);
loadedPluginClasses.remove(toRemove);
}
/**
* Removes all plugins from this plugin manager.
*/
public void removeAll(){
loadedPluginClasses.clear();
plugins.clear();
}
/** /**
* Loads all the plugins in the PluginManager. * Loads all the plugins in the PluginManager.
*/ */
public void load(){ public void load() {
for(Plugin plugin : plugins) plugin.enable(); Set<String> disabledPlugins = abacus.getConfiguration().getDisabledPlugins();
for(Plugin plugin : plugins){ for (Plugin plugin : plugins) {
allFunctions.addAll(plugin.providedFunctions()); if (disabledPlugins.contains(plugin.getClass().getName())) continue;
allOperators.addAll(plugin.providedOperators()); plugin.enable();
allNumbers.addAll(plugin.providedNumbers());
} }
listeners.forEach(e -> e.onLoad(this)); listeners.forEach(e -> e.onLoad(this));
} }
@@ -172,60 +257,82 @@ public class PluginManager {
/** /**
* Unloads all the plugins in the PluginManager. * Unloads all the plugins in the PluginManager.
*/ */
public void unload(){ public void unload() {
for(Plugin plugin : plugins) plugin.disable(); listeners.forEach(e -> e.onUnload(this));
allFunctions.clear(); Set<String> disabledPlugins = abacus.getConfiguration().getDisabledPlugins();
allOperators.clear(); for (Plugin plugin : plugins) {
allNumbers.clear(); if (disabledPlugins.contains(plugin.getClass().getName())) continue;
plugin.disable();
}
registeredFunctions.clear();
registeredOperators.clear();
registeredNumberImplementations.clear();
registeredDocumentation.clear();
cachedInterfaceImplementations.clear();
cachedPi.clear();
listeners.forEach(e -> e.onUnload(this)); listeners.forEach(e -> e.onUnload(this));
} }
/** /**
* Reloads all the plugins in the PluginManager. * Reloads all the plugins in the PluginManager.
*/ */
public void reload(){ public void reload() {
unload(); unload();
reload(); load();
} }
/** /**
* Gets all the functions loaded by the Plugin Manager. * Gets all the functions loaded by the Plugin Manager.
*
* @return the set of all functions that were loaded. * @return the set of all functions that were loaded.
*/ */
public Set<String> getAllFunctions() { public Set<String> getAllFunctions() {
return allFunctions; return registeredFunctions.keySet();
} }
/** /**
* Gets all the operators loaded by the Plugin Manager. * Gets all the operators loaded by the Plugin Manager.
*
* @return the set of all operators that were loaded. * @return the set of all operators that were loaded.
*/ */
public Set<String> getAllOperators() { public Set<String> getAllOperators() {
return allOperators; return registeredOperators.keySet();
} }
/** /**
* Gets all the number implementations loaded by the Plugin Manager * Gets all the number implementations loaded by the Plugin Manager.
* @return the set of all implementations that were loaded *
* @return the set of all implementations that were loaded.
*/ */
public Set<String> getAllNumbers() { public Set<String> getAllNumberImplementations() {
return allNumbers; return registeredNumberImplementations.keySet();
} }
/** /**
* Adds a plugin change listener to this plugin manager. * Adds a plugin change listener to this plugin manager.
*
* @param listener the listener to add. * @param listener the listener to add.
*/ */
public void addListener(PluginListener listener){ public void addListener(PluginListener listener) {
listeners.add(listener); listeners.add(listener);
} }
/** /**
* Remove the plugin change listener from this plugin manager. * Remove the plugin change listener from this plugin manager.
*
* @param listener the listener to remove. * @param listener the listener to remove.
*/ */
public void removeListener(PluginListener listener){ public void removeListener(PluginListener listener) {
listeners.remove(listener); 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;
}
} }

View File

@@ -1,13 +1,19 @@
package org.nwapw.abacus.plugin; package org.nwapw.abacus.plugin;
import org.nwapw.abacus.function.Function; import org.nwapw.abacus.function.*;
import org.nwapw.abacus.function.Operator; import org.nwapw.abacus.lexing.pattern.Match;
import org.nwapw.abacus.function.OperatorAssociativity;
import org.nwapw.abacus.function.OperatorType;
import org.nwapw.abacus.number.NaiveNumber; import org.nwapw.abacus.number.NaiveNumber;
import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.number.PreciseNumber; import org.nwapw.abacus.number.PreciseNumber;
import org.nwapw.abacus.parsing.Parser;
import org.nwapw.abacus.parsing.ShuntingYardParser;
import org.nwapw.abacus.tree.TokenType;
import org.nwapw.abacus.tree.TreeNode;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.function.BiFunction; import java.util.function.BiFunction;
/** /**
@@ -16,287 +22,664 @@ import java.util.function.BiFunction;
*/ */
public class StandardPlugin extends Plugin { public class StandardPlugin extends Plugin {
public StandardPlugin(PluginManager manager) { /**
super(manager); * Stores objects of NumberInterface with integer values for reuse.
} */
private final static HashMap<Class<? extends NumberInterface>, HashMap<Integer, NumberInterface>> integerValues = new HashMap<>();
@Override /**
public void onEnable() { * The addition operator, +
registerNumber("naive", NaiveNumber.class); */
registerNumber("precise", PreciseNumber.class); public static final Operator OP_ADD = new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0, new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length >= 1;
}
registerOperator("+", new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0, new Function() { @Override
@Override protected NumberInterface applyInternal(NumberInterface[] params) {
protected boolean matchesParams(NumberInterface[] params) { NumberInterface sum = params[0];
return params.length >= 1; for (int i = 1; i < params.length; i++) {
sum = sum.add(params[i]);
} }
return sum;
}
});
/**
* The subtraction operator, -
*/
public static final Operator OP_SUBTRACT = new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0, new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 2;
}
@Override @Override
protected NumberInterface applyInternal(NumberInterface[] params) { protected NumberInterface applyInternal(NumberInterface[] params) {
NumberInterface sum = params[0]; return params[0].subtract(params[1]);
for(int i = 1; i < params.length; i++){
sum = sum.add(params[i]); }
} });
return sum; /**
* 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) {
return params[0].negate();
}
});
/**
* The multiplication operator, *
*/
public static final Operator OP_MULTIPLY = new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1, new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length >= 1;
}
@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;
}
});
/**
* The division operator, /
*/
public static final Operator OP_DIVIDE = new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1, new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 2 && params[1].compareTo(fromInt(params[0].getClass(), 0)) != 0;
}
registerOperator("-", new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0, new Function() { @Override
@Override protected NumberInterface applyInternal(NumberInterface[] params) {
protected boolean matchesParams(NumberInterface[] params) { return params[0].divide(params[1]);
return params.length == 2; }
});
/**
* The factorial operator, !
*/
public static final Operator OP_FACTORIAL = new Operator(OperatorAssociativity.RIGHT, OperatorType.UNARY_POSTFIX, 0, new Function() {
//private HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> storedList = new HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>>();
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1
&& params[0].fractionalPart().compareTo(fromInt(params[0].getClass(), 0)) == 0
&& params[0].signum() >= 0;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
if (params[0].signum() == 0) {
return fromInt(params[0].getClass(), 1);
} }
NumberInterface one = fromInt(params[0].getClass(), 1);
@Override NumberInterface factorial = params[0];
protected NumberInterface applyInternal(NumberInterface[] params) { NumberInterface multiplier = params[0];
return params[0].subtract(params[1]); //It is necessary to later prevent calls of factorial on anything but non-negative integers.
while ((multiplier = multiplier.subtract(one)).signum() == 1) {
factorial = factorial.multiply(multiplier);
} }
})); return factorial;
registerOperator("*", new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX,1, new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length >= 1;
}
@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;
}
}));
registerOperator("/", new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX,1, new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 2;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return params[0].divide(params[1]);
}
}));
registerOperator("^", 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 StandardPlugin.this.getFunction("exp").apply(StandardPlugin.this.getFunction("ln").apply(params[0]).multiply(params[1]));
}
}));
registerOperator("!", new Operator(OperatorAssociativity.RIGHT, OperatorType.UNARY_POSTFIX, 0, new Function() {
//private HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> storedList = new HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>>();
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
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){
factorial = factorial.multiply(multiplier);
}
return factorial;
/*if(!storedList.containsKey(params[0].getClass())){ /*if(!storedList.containsKey(params[0].getClass())){
storedList.put(params[0].getClass(), new ArrayList<NumberInterface>()); storedList.put(params[0].getClass(), new ArrayList<NumberInterface>());
storedList.get(params[0].getClass()).add(NaiveNumber.ONE.promoteTo(params[0].getClass())); storedList.get(params[0].getClass()).add(NaiveNumber.ONE.promoteTo(params[0].getClass()));
storedList.get(params[0].getClass()).add(NaiveNumber.ONE.promoteTo(params[0].getClass())); storedList.get(params[0].getClass()).add(NaiveNumber.ONE.promoteTo(params[0].getClass()));
}*/ }*/
}
}));
registerFunction("abs", new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return params[0].multiply((new NaiveNumber(params[0].signum())).promoteTo(params[0].getClass()));
}
});
registerFunction("exp", new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
boolean takeReciprocal = params[0].signum() == -1;
params[0] = StandardPlugin.this.getFunction("abs").apply(params[0]);
NumberInterface sum = sumSeries(params[0], StandardPlugin.this::getExpSeriesTerm, getNTermsExp(getMaxError(params[0]), params[0]));
if(takeReciprocal){
sum = NaiveNumber.ONE.promoteTo(sum.getClass()).divide(sum);
}
return sum;
}
});
registerFunction("ln", new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
NumberInterface param = params[0];
int powersOf2 = 0;
while(StandardPlugin.this.getFunction("abs").apply(param.subtract(NaiveNumber.ONE.promoteTo(param.getClass()))).compareTo((new NaiveNumber(0.1)).promoteTo(param.getClass())) >= 0){
if(param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).signum() == 1) {
param = param.divide(new NaiveNumber(2).promoteTo(param.getClass()));
powersOf2++;
if(param.subtract(NaiveNumber.ONE.promoteTo(param.getClass())).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) {
break;
//No infinite loop for you.
}
}
}
return getLog2(param).multiply((new NaiveNumber(powersOf2)).promoteTo(param.getClass())).add(getLogPartialSum(param));
}
/**
* Returns the partial sum of the Taylor series for logx (around x=1).
* Automatically determines the number of terms needed based on the precision of x.
* @param x value at which the series is evaluated. 0 < x < 2. (x=2 is convergent but impractical.)
* @return the partial sum.
*/
private NumberInterface getLogPartialSum(NumberInterface x){
NumberInterface maxError = StandardPlugin.this.getMaxError(x);
x = x.subtract(NaiveNumber.ONE.promoteTo(x.getClass())); //Terms used are for log(x+1).
NumberInterface currentTerm = x, sum = x;
int n = 1;
while(StandardPlugin.this.getFunction("abs").apply(currentTerm).compareTo(maxError) > 0){
n++;
currentTerm = currentTerm.multiply(x).multiply((new NaiveNumber(n-1)).promoteTo(x.getClass())).divide((new NaiveNumber(n)).promoteTo(x.getClass())).negate();
sum = sum.add(currentTerm);
}
return sum;
}
/**
* Returns natural log of 2 to the required precision of the class of number.
* @param number a number of the same type as the return type. (Used for precision.)
* @return the value of log(2) with the appropriate precision.
*/
private NumberInterface getLog2(NumberInterface number){
NumberInterface maxError = StandardPlugin.this.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)
//In the following, a=1/3^n, b=1/4^n, c = 1/n.
//a is also an error bound.
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){
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));
}
return sum;
}
});
registerFunction("sqrt", new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return StandardPlugin.this.getOperator("^").getFunction().apply(params[0], ((new NaiveNumber(0.5)).promoteTo(params[0].getClass())));
}
});
}
@Override
public void onDisable() {
}
/**
* Returns the nth term of the Taylor series (centered at 0) of e^x
* @param n the term required (n >= 0).
* @param x the real number at which the series is evaluated.
* @return the nth term of the series.
*/
private NumberInterface getExpSeriesTerm(int n, NumberInterface x){
return x.intPow(n).divide(this.getOperator("!").getFunction().apply((new NaiveNumber(n)).promoteTo(x.getClass())));
}
/**
* Returns the number of terms needed to evaluate the exponential function (at x)
* such that the error is at most maxError.
* @param maxError Maximum error permissible (This should probably be positive.)
* @param x where the function is evaluated.
* @return the number of terms needed to evaluated the exponential function.
*/
private int getNTermsExp(NumberInterface maxError, NumberInterface x) {
//We need n such that |x^(n+1)| <= (n+1)! * maxError
//The variables LHS and RHS refer to the above inequality.
int n = 0;
x = this.getFunction("abs").apply(x);
NumberInterface LHS = x, RHS = maxError;
while (LHS.compareTo(RHS) > 0) {
n++;
LHS = LHS.multiply(x);
RHS = RHS.multiply(new NaiveNumber(n + 1).promoteTo(RHS.getClass()));
} }
return n; });
} /**
* The permutation operator.
*/
public static final Operator OP_NPR = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0, new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 2 && params[0].fractionalPart().signum() == 0
&& params[1].fractionalPart().signum() == 0;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
if(params[0].compareTo(params[1]) < 0 ||
params[0].signum() < 0 ||
(params[0].signum() == 0 && params[1].signum() != 0)) return fromInt(params[0].getClass(), 0);
NumberInterface total = fromInt(params[0].getClass(), 1);
NumberInterface multiplyBy = params[0];
NumberInterface remainingMultiplications = params[1];
NumberInterface halfway = params[0].divide(fromInt(params[0].getClass(), 2));
if(remainingMultiplications.compareTo(halfway) > 0){
remainingMultiplications = params[0].subtract(remainingMultiplications);
}
while(remainingMultiplications.signum() > 0){
total = total.multiply(multiplyBy);
remainingMultiplications = remainingMultiplications.subtract(fromInt(params[0].getClass(), 1));
multiplyBy = multiplyBy.subtract(fromInt(params[0].getClass(), 1));
}
return total;
}
});
/**
* The combination operator.
*/
public static final Operator OP_NCR = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0, new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 2 && params[0].fractionalPart().signum() == 0
&& params[1].fractionalPart().signum() == 0;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return OP_NPR.getFunction().apply(params).divide(OP_FACTORIAL.getFunction().apply(params[1]));
}
});
/**
* The absolute value function, abs(-3) = 3
*/
public static final Function FUNCTION_ABS = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return params[0].multiply(fromInt(params[0].getClass(), params[0].signum()));
}
};
/**
* The natural log function.
*/
public static final Function FUNCTION_LN = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1 && params[0].compareTo(fromInt(params[0].getClass(), 0)) > 0;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
NumberInterface param = params[0];
NumberInterface one = fromInt(param.getClass(), 1);
int powersOf2 = 0;
while (FUNCTION_ABS.apply(param.subtract(one)).compareTo(new NaiveNumber(0.1).promoteTo(param.getClass())) >= 0) {
if (param.subtract(one).signum() == 1) {
param = param.divide(fromInt(param.getClass(), 2));
powersOf2++;
if (param.subtract(one).signum() != 1) {
break;
//No infinite loop for you.
}
} else {
param = param.multiply(fromInt(param.getClass(), 2));
powersOf2--;
if (param.subtract(one).signum() != -1) {
break;
//No infinite loop for you.
}
}
}
return getLog2(param).multiply(fromInt(param.getClass(), powersOf2)).add(getLogPartialSum(param));
}
/**
* Returns the partial sum of the Taylor series for logx (around x=1).
* Automatically determines the number of terms needed based on the precision of x.
* @param x value at which the series is evaluated. 0 < x < 2. (x=2 is convergent but impractical.)
* @return the partial sum.
*/
private NumberInterface getLogPartialSum(NumberInterface x) {
NumberInterface maxError = x.getMaxError();
x = x.subtract(fromInt(x.getClass(), 1)); //Terms used are for log(x+1).
NumberInterface currentNumerator = x, currentTerm = x, sum = x;
int n = 1;
while (FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0) {
n++;
currentNumerator = currentNumerator.multiply(x).negate();
currentTerm = currentNumerator.divide(fromInt(x.getClass(), n));
sum = sum.add(currentTerm);
}
return sum;
}
/**
* Returns natural log of 2 to the required precision of the class of number.
* @param number a number of the same type as the return type. (Used for precision.)
* @return the value of log(2) with the appropriate precision.
*/
private NumberInterface getLog2(NumberInterface number) {
NumberInterface maxError = number.getMaxError();
//NumberInterface errorBound = fromInt(number.getClass(), 1);
//We'll use the series \sigma_{n >= 1) ((1/3^n + 1/4^n) * 1/n)
//In the following, a=1/3^n, b=1/4^n, c = 1/n.
//a is also an error bound.
NumberInterface a = fromInt(number.getClass(), 1), b = a, c = a;
NumberInterface sum = fromInt(number.getClass(), 0);
NumberInterface one = fromInt(number.getClass(), 1);
int n = 0;
while (a.compareTo(maxError) >= 1) {
n++;
a = a.divide(fromInt(number.getClass(), 3));
b = b.divide(fromInt(number.getClass(), 4));
c = one.divide(fromInt(number.getClass(), n));
sum = sum.add(a.add(b).multiply(c));
}
return sum;
}
};
/**
* The square root function.
*/
public static final Function FUNCTION_SQRT = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return OP_CARET.getFunction().apply(params[0], ((new NaiveNumber(0.5)).promoteTo(params[0].getClass())));
}
};
/**
* Gets a random number smaller or equal to the given number's integer value.
*/
public static final Function FUNCTION_RAND_INT = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 1;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return fromInt(params[0].getClass(), (int) Math.round(Math.random() * params[0].floor().intValue()));
}
};
/**
* The implementation for double-based naive numbers.
*/
public static final NumberImplementation IMPLEMENTATION_NAIVE = new NumberImplementation(NaiveNumber.class, 0) {
@Override
public NumberInterface instanceForString(String string) {
return new NaiveNumber(string);
}
@Override
public NumberInterface instanceForPi() {
return new NaiveNumber(Math.PI);
}
};
/**
* The implementation for the infinite-precision BigDecimal.
*/
public static final NumberImplementation IMPLEMENTATION_PRECISE = new NumberImplementation(PreciseNumber.class, 0) {
@Override
public NumberInterface instanceForString(String string) {
return new PreciseNumber(string);
}
@Override
public NumberInterface instanceForPi() {
NumberInterface C = FUNCTION_SQRT.apply(new PreciseNumber("10005")).multiply(new PreciseNumber("426880"));
NumberInterface M = PreciseNumber.ONE;
NumberInterface L = new PreciseNumber("13591409");
NumberInterface X = M;
NumberInterface sum = L;
int termsNeeded = C.getMaxPrecision() / 13 + 1;
NumberInterface lSummand = new PreciseNumber("545140134");
NumberInterface xMultiplier = new PreciseNumber("262537412")
.multiply(new PreciseNumber("1000000000"))
.add(new PreciseNumber("640768000"))
.negate();
for (int i = 0; i < termsNeeded; i++) {
M = M
.multiply(new PreciseNumber((12 * i + 2) + ""))
.multiply(new PreciseNumber((12 * i + 6) + ""))
.multiply(new PreciseNumber((12 * i + 10) + ""))
.divide(new PreciseNumber(Math.pow(i + 1, 3) + ""));
L = L.add(lSummand);
X = X.multiply(xMultiplier);
sum = sum.add(M.multiply(L).divide(X));
}
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 = params[0].getMaxError();
int n = 0;
if (params[0].signum() < 0) {
NumberInterface[] negatedParams = {params[0].negate()};
return fromInt(params[0].getClass(), 1).divide(applyInternal(negatedParams));
} else {
//We need n such that x^(n+1) * 3^ceil(x) <= maxError * (n+1)!.
//right and left refer to lhs and rhs in the above inequality.
NumberInterface sum = fromInt(params[0].getClass(), 1);
NumberInterface nextNumerator = params[0];
NumberInterface left = params[0].multiply(fromInt(params[0].getClass(), 3).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 = fromInt(params[0].getClass(), n + 1);
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) {
NumberInterface zero = fromInt(params[0].getClass(), 0);
return params.length == 2
&& !(params[0].compareTo(zero) == 0
&& params[1].compareTo(zero) == 0)
&& !(params[0].signum() == -1 && params[1].fractionalPart().compareTo(zero) != 0);
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
NumberInterface zero = fromInt(params[0].getClass(), 0);
if (params[0].compareTo(zero) == 0)
return zero;
else if (params[1].compareTo(zero) == 0)
return fromInt(params[0].getClass(), 1);
//Detect integer bases:
if(params[0].fractionalPart().compareTo(fromInt(params[0].getClass(), 0)) == 0
&& FUNCTION_ABS.apply(params[1]).compareTo(fromInt(params[0].getClass(), Integer.MAX_VALUE)) < 0
&& FUNCTION_ABS.apply(params[1]).compareTo(fromInt(params[1].getClass(), 1)) >= 0){
NumberInterface[] newParams = {params[0], params[1].fractionalPart()};
return params[0].intPow(params[1].floor().intValue()).multiply(applyInternal(newParams));
}
return FUNCTION_EXP.apply(FUNCTION_LN.apply(FUNCTION_ABS.apply(params[0])).multiply(params[1]));
}
});
/**
* The 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 = piFor(params[0].getClass());
NumberInterface twoPi = pi.multiply(fromInt(pi.getClass(), 2));
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(fromInt(pi.getClass(), 2))) > 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(piFor(params[0].getClass()).divide(fromInt(params[0].getClass(), 2))
.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 fromInt(params[0].getClass(), 1).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 fromInt(params[0].getClass(), 1).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(functionSin.apply(params[0]));
}
};
public StandardPlugin(PluginManager manager) {
super(manager);
}
/** /**
* Returns a partial sum of a series whose terms are given by the nthTermFunction, evaluated at x. * Returns a partial sum of a series whose terms are given by the nthTermFunction, evaluated at x.
* @param x the value at which the series is evaluated. *
* @param x the value at which the series is evaluated.
* @param nthTermFunction the function that returns the nth term of the series, in the format term(x, n). * @param nthTermFunction the function that returns the nth term of the series, in the format term(x, n).
* @param n the number of terms in the partial sum. * @param n the number of terms in the partial sum.
* @return the value of the partial sum that has the same class as x. * @return the value of the partial sum that has the same class as x.
*/ */
private NumberInterface sumSeries(NumberInterface x, BiFunction<Integer, NumberInterface, NumberInterface> nthTermFunction, int n){ private static NumberInterface sumSeries(NumberInterface x, BiFunction<Integer, NumberInterface, NumberInterface> nthTermFunction, int n) {
NumberInterface sum = NaiveNumber.ZERO.promoteTo(x.getClass()); NumberInterface sum = fromInt(x.getClass(), 0);
for(int i = 0; i <= n; i++){ for (int i = 0; i <= n; i++) {
sum = sum.add(nthTermFunction.apply(i, x)); sum = sum.add(nthTermFunction.apply(i, x));
} }
return sum; return sum;
} }
/** /**
* Returns the maximum error based on the precision of the class of number. * A factorial function that uses memoization for each number class; it efficiently
* @param number Any instance of the NumberInterface in question (should return an appropriate precision). * computes factorials of non-negative integers.
* @return the maximum error. *
* @param numberClass type of number to return.
* @param n non-negative integer.
* @return a number of numClass with value n factorial.
*/ */
private NumberInterface getMaxError(NumberInterface number){ public static NumberInterface factorial(Class<? extends NumberInterface> numberClass, int n) {
return (new NaiveNumber(10)).promoteTo(number.getClass()).intPow(-number.getMaxPrecision()); if (!FACTORIAL_LISTS.containsKey(numberClass)) {
FACTORIAL_LISTS.put(numberClass, new ArrayList<>());
FACTORIAL_LISTS.get(numberClass).add(fromInt(numberClass, 1));
FACTORIAL_LISTS.get(numberClass).add(fromInt(numberClass, 1));
}
ArrayList<NumberInterface> list = FACTORIAL_LISTS.get(numberClass);
if (n >= list.size()) {
while (list.size() < n + 16) {
list.add(list.get(list.size() - 1).multiply(fromInt(numberClass, list.size())));
}
}
return list.get(n);
} }
/**
* Returns the value of the Taylor series for sin (centered at 0) at x.
*
* @param x where the series is evaluated.
* @return the value of the series
*/
private static NumberInterface sinTaylor(NumberInterface x) {
NumberInterface power = x, multiplier = x.multiply(x).negate(), currentTerm = x, sum = x;
NumberInterface maxError = x.getMaxError();
int n = 1;
do {
n += 2;
power = power.multiply(multiplier);
currentTerm = power.divide(factorial(x.getClass(), n));
sum = sum.add(currentTerm);
} while (FUNCTION_ABS.apply(currentTerm).compareTo(maxError) > 0);
return sum;
}
/**
* Returns an equivalent angle in the interval [0, 2pi)
*
* @param phi an angle (in radians).
* @return theta in [0, 2pi) that differs from phi by a multiple of 2pi.
*/
private static NumberInterface getSmallAngle(NumberInterface phi, NumberInterface pi) {
NumberInterface twoPi = pi.multiply(fromInt(pi.getClass(), 2));
NumberInterface theta = FUNCTION_ABS.apply(phi).subtract(twoPi
.multiply(FUNCTION_ABS.apply(phi).divide(twoPi).floor())); //Now theta is in [0, 2pi).
if (phi.signum() < 0) {
theta = twoPi.subtract(theta);
}
return theta;
}
/**
* Returns a number of class numType with value n.
* @param numType class of number to return.
* @param n value of returned number.
* @return numClass instance with value n.
*/
private static NumberInterface fromInt(Class<? extends NumberInterface> numType, int n){
if(!integerValues.containsKey(numType)){
integerValues.put(numType, new HashMap<>());
}
if(!integerValues.get(numType).containsKey(n)){
integerValues.get(numType).put(n, new NaiveNumber(n).promoteTo(numType));
}
return integerValues.get(numType).get(n);
}
@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);
registerOperator("nPr", OP_NPR);
registerOperator("nCr", OP_NCR);
registerFunction("abs", FUNCTION_ABS);
registerFunction("exp", FUNCTION_EXP);
registerFunction("ln", FUNCTION_LN);
registerFunction("sqrt", FUNCTION_SQRT);
registerFunction("sin", functionSin);
registerFunction("cos", functionCos);
registerFunction("tan", functionTan);
registerFunction("sec", functionSec);
registerFunction("csc", functionCsc);
registerFunction("cot", functionCot);
registerFunction("random_int", FUNCTION_RAND_INT);
registerDocumentation(new Documentation("abs", "Absolute Value", "Finds the distance " +
"from zero of a number.", "Given a number, this function finds the distance form " +
"zero of a number, effectively turning negative numbers into positive ones.\n\n" +
"Example: abs(-2) -> 2", DocumentationType.FUNCTION));
registerDocumentation(new Documentation("exp", "Exponentiate", "Brings e to the given power.",
"This function evaluates e to the power of the given value, and is the inverse " +
"of the natural logarithm.\n\n" +
"Example: exp(1) -> 2.718...", DocumentationType.FUNCTION));
registerDocumentation(new Documentation("ln", "Natural Logarithm", "Gets the natural " +
"logarithm of the given value.", "The natural logarithm of a number is " +
"the power that e has to be brought to to be equal to the number.\n\n" +
"Example: ln(2.718) -> 1", DocumentationType.FUNCTION));
registerDocumentation(new Documentation("sqrt", "Square Root", "Finds the square root " +
"of the number.", "A square root a of a number is defined such that a times a is equal " +
"to that number.\n\n" +
"Example: sqrt(4) -> 2", DocumentationType.FUNCTION));
registerDocumentation(new Documentation("sin", "Sine", "Computes the sine of the given angle, " +
"in radians.", "", DocumentationType.FUNCTION));
registerDocumentation(new Documentation("cos", "Cosine", "Computes the cosine of the given angle, " +
"in radians.", "", DocumentationType.FUNCTION));
registerDocumentation(new Documentation("tan", "Tangent", "Computes the tangent of the given angle, " +
"in radians.", "", DocumentationType.FUNCTION));
registerDocumentation(new Documentation("sec", "Secant", "Computes the secant of the given angle, " +
"in radians.", "", DocumentationType.FUNCTION));
registerDocumentation(new Documentation("csc", "Cosecant", "Computes the cosecant of the given angle, " +
"in radians.", "", DocumentationType.FUNCTION));
registerDocumentation(new Documentation("cot", "Cotangent", "Computes the cotangent of the given angle, " +
"in radians.", "", DocumentationType.FUNCTION));
registerDocumentation(new Documentation("random_int", "Random Integer", "Generates a random integer [0, n].",
"Generates a pseudorandom number using the standard JVM random mechanism, keeping it less than or " +
"equal to the given number.\n\n" +
"Example: random_int(5) -> 4\n" +
"random_int(5) -> 3\n" +
"random_int(5) -> 3\n", DocumentationType.FUNCTION));
}
@Override
public void onDisable() {
}
} }

View File

@@ -1,100 +0,0 @@
package org.nwapw.abacus.tree;
/**
* A tree node that represents an operation being applied to two operands.
*/
public class BinaryInfixNode extends TreeNode {
/**
* The operation being applied.
*/
private String operation;
/**
* The left node of the operation.
*/
private TreeNode left;
/**
* The right node of the operation.
*/
private TreeNode right;
private BinaryInfixNode() {}
/**
* Creates a new operation node with the given operation
* and no child nodes.
* @param operation the operation.
*/
public BinaryInfixNode(String operation){
this(operation, null, null);
}
/**
* Creates a new operation node with the given operation
* and child nodes.
* @param operation the operation.
* @param left the left node of the expression.
* @param right the right node of the expression.
*/
public BinaryInfixNode(String operation, TreeNode left, TreeNode right){
this.operation = operation;
this.left = left;
this.right = right;
}
/**
* Gets the operation in this node.
* @return the operation in this node.
*/
public String getOperation() {
return operation;
}
/**
* Gets the left sub-expression of this node.
* @return the left node.
*/
public TreeNode getLeft() {
return left;
}
/**
* Sets the left sub-expression of this node.
* @param left the sub-expression to apply.
*/
public void setLeft(TreeNode left) {
this.left = left;
}
/**
* Gets the right sub-expression of this node.
* @return the right node.
*/
public TreeNode getRight() {
return right;
}
/**
* Sets the right sub-expression of this node.
* @param right the sub-expression to apply.
*/
public void setRight(TreeNode right) {
this.right = right;
}
@Override
public <T> T reduce(Reducer<T> reducer) {
T leftReduce = left.reduce(reducer);
T rightReduce = right.reduce(reducer);
if(leftReduce == null || rightReduce == null) return null;
return reducer.reduceNode(this, leftReduce, rightReduce);
}
@Override
public String toString() {
String leftString = left != null ? left.toString() : "null";
String rightString = right != null ? right.toString() : "null";
return "(" + leftString + operation + rightString + ")";
}
}

View File

@@ -1,80 +0,0 @@
package org.nwapw.abacus.tree;
import java.util.ArrayList;
import java.util.List;
/**
* A node that represents a function call.
*/
public class FunctionNode extends TreeNode {
/**
* The name of the function being called
*/
private String function;
/**
* The list of arguments to the function.
*/
private List<TreeNode> children;
/**
* Creates a function node with no function.
*/
private FunctionNode() { }
/**
* Creates a new function node with the given function name.
* @param function the function name.
*/
public FunctionNode(String function){
this.function = function;
children = new ArrayList<>();
}
/**
* Gets the function name for this node.
* @return the function name.
*/
public String getFunction() {
return function;
}
/**
* Adds a child to the end of this node's child list.
* @param node the child to add.
*/
public void appendChild(TreeNode node){
children.add(node);
}
/**
* Adds a new child to the beginning of this node's child list.
* @param node the node to add.
*/
public void prependChild(TreeNode node) {
children.add(0, node);
}
@Override
public <T> T reduce(Reducer<T> reducer) {
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;
}
return reducer.reduceNode(this, reducedChildren);
}
@Override
public String toString() {
StringBuilder buffer = new StringBuilder();
buffer.append(function);
buffer.append("(");
for(int i = 0; i < children.size(); i++){
buffer.append(children.get(i));
buffer.append(i == children.size() - 1 ? "" : ", ");
}
buffer.append(")");
return buffer.toString();
}
}

View File

@@ -1,48 +0,0 @@
package org.nwapw.abacus.tree;
import org.nwapw.abacus.number.NaiveNumber;
import org.nwapw.abacus.number.NumberInterface;
/**
* A node implementation that represents a single number.
*/
public class NumberNode extends TreeNode {
/**
* The number that is represented by this number node.
*/
private NumberInterface number;
/**
* Creates a number node with no number.
*/
public NumberNode(){
number = null;
}
/**
* Creates a new number node with the given double value.
* @param newNumber the number for which to create a number node.
*/
public NumberNode(NumberInterface newNumber){
this.number = newNumber;
}
/**
* Gets the number value of this node.
* @return the number value of this node.
*/
public NumberInterface getNumber() {
return number;
}
@Override
public <T> T reduce(Reducer<T> reducer) {
return reducer.reduceNode(this);
}
@Override
public String toString() {
return number != null ? number.toString() : "null";
}
}

View File

@@ -17,34 +17,35 @@ public class NumberReducer implements Reducer<NumberInterface> {
/** /**
* Creates a new number reducer. * Creates a new number reducer.
*
* @param abacus the calculator instance. * @param abacus the calculator instance.
*/ */
public NumberReducer(Abacus abacus){ public NumberReducer(Abacus abacus) {
this.abacus = abacus; this.abacus = abacus;
} }
@Override @Override
public NumberInterface reduceNode(TreeNode node, Object... children) { public NumberInterface reduceNode(TreeNode node, Object... children) {
if(node instanceof NumberNode) { if (node instanceof NumberNode) {
return ((NumberNode) node).getNumber(); return ((NumberNode) node).getNumber();
} else if(node instanceof BinaryInfixNode){ } else if (node instanceof BinaryNode) {
NumberInterface left = (NumberInterface) children[0]; NumberInterface left = (NumberInterface) children[0];
NumberInterface right = (NumberInterface) children[1]; 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; if (function == null) return null;
return function.apply(left, right); return function.apply(left, right);
} else if(node instanceof UnaryPrefixNode) { } else if (node instanceof UnaryNode) {
NumberInterface child = (NumberInterface) children[0]; 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; if (functionn == null) return null;
return functionn.apply(child); return functionn.apply(child);
} else if(node instanceof FunctionNode){ } else if (node instanceof FunctionNode) {
NumberInterface[] convertedChildren = new NumberInterface[children.length]; NumberInterface[] convertedChildren = new NumberInterface[children.length];
for(int i = 0; i < convertedChildren.length; i++){ for (int i = 0; i < convertedChildren.length; i++) {
convertedChildren[i] = (NumberInterface) children[i]; convertedChildren[i] = (NumberInterface) children[i];
} }
Function function = abacus.getPluginManager().functionFor(((FunctionNode) node).getFunction()); Function function = abacus.getPluginManager().functionFor(((FunctionNode) node).getFunction());
if(function == null) return null; if (function == null) return null;
return function.apply(convertedChildren); return function.apply(convertedChildren);
} }
return null; return null;

View File

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

View File

@@ -16,9 +16,10 @@ public enum TokenType {
/** /**
* Creates a new token type with the given priority. * Creates a new token type with the given priority.
*
* @param priority the priority of this token type. * @param priority the priority of this token type.
*/ */
TokenType(int priority){ TokenType(int priority) {
this.priority = priority; this.priority = priority;
} }

View File

@@ -1,22 +0,0 @@
package org.nwapw.abacus.tree;
import org.nwapw.abacus.function.OperatorAssociativity;
import org.nwapw.abacus.lexing.Lexer;
import org.nwapw.abacus.lexing.pattern.Match;
import java.util.*;
/**
* An abstract class that represents an expression tree node.
*/
public abstract class TreeNode {
/**
* The function that reduces a tree to a single vale.
* @param reducer the reducer used to reduce the tree.
* @param <T> the type the reducer produces.
* @return the result of the reduction, or null on error.
*/
public abstract <T> T reduce(Reducer<T> reducer);
}

View File

@@ -1,59 +0,0 @@
package org.nwapw.abacus.tree;
public class UnaryPrefixNode extends TreeNode {
/**
* The operation this node will apply.
*/
private String operation;
/**
* The tree node to apply the operation to.
*/
private TreeNode applyTo;
/**
* Creates a new node with the given operation and no child.
* @param operation the operation for this node.
*/
public UnaryPrefixNode(String operation){
this(operation, null);
}
/**
* Creates a new node with the given operation and child.
* @param operation the operation for this node.
* @param applyTo the node to apply the function to.
*/
public UnaryPrefixNode(String operation, TreeNode applyTo){
this.operation = operation;
this.applyTo = applyTo;
}
@Override
public <T> T reduce(Reducer<T> reducer) {
Object reducedChild = applyTo.reduce(reducer);
if(reducedChild == null) return null;
return reducer.reduceNode(this, reducedChild);
}
/**
* Gets the operation of this node.
* @return the operation this node performs.
*/
public String getOperation() {
return operation;
}
/**
* Gets the node to which this node's operation applies.
* @return the tree node to which the operation will be applied.
*/
public TreeNode getApplyTo() {
return applyTo;
}
@Override
public String toString() {
return "(" + (applyTo == null ? "null" : applyTo.toString()) + ")" + operation;
}
}

View File

@@ -2,9 +2,7 @@ package org.nwapw.abacus.window;
import org.nwapw.abacus.tree.TreeNode; import org.nwapw.abacus.tree.TreeNode;
import javax.swing.event.TableModelListener;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableModel;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -31,30 +29,6 @@ public class HistoryTableModel extends AbstractTableModel {
TreeNode.class, TreeNode.class,
String.class String.class
}; };
/**
* Class used specifically to hold data about
* the previous entries into the calculator.
*/
public static class HistoryEntry {
public String input;
public TreeNode parsedInput;
public String output;
public HistoryEntry(String input, TreeNode parsedInput, String output){
this.input = input;
this.parsedInput = parsedInput;
this.output = output;
}
Object nthValue(int n){
if(n == 0) return input;
if(n == 1) return parsedInput;
if(n == 2) return output;
return null;
}
}
/** /**
* The list of entries. * The list of entries.
*/ */
@@ -69,9 +43,10 @@ public class HistoryTableModel extends AbstractTableModel {
/** /**
* Adds an entry to the model. * Adds an entry to the model.
*
* @param entry the entry to add. * @param entry the entry to add.
*/ */
public void addEntry(HistoryEntry entry){ public void addEntry(HistoryEntry entry) {
entries.add(entry); entries.add(entry);
} }
@@ -105,4 +80,27 @@ public class HistoryTableModel extends AbstractTableModel {
return entries.get(rowIndex).nthValue(columnIndex); return entries.get(rowIndex).nthValue(columnIndex);
} }
/**
* Class used specifically to hold data about
* the previous entries into the calculator.
*/
public static class HistoryEntry {
public String input;
public TreeNode parsedInput;
public String output;
public HistoryEntry(String input, TreeNode parsedInput, String output) {
this.input = input;
this.parsedInput = parsedInput;
this.output = output;
}
Object nthValue(int n) {
if (n == 0) return input;
if (n == 1) return parsedInput;
if (n == 2) return output;
return null;
}
}
} }

View File

@@ -119,12 +119,12 @@ public class Window extends JFrame {
*/ */
private ActionListener evaluateListener = (event) -> { private ActionListener evaluateListener = (event) -> {
TreeNode parsedExpression = abacus.parseString(inputField.getText()); TreeNode parsedExpression = abacus.parseString(inputField.getText());
if(parsedExpression == null){ if (parsedExpression == null) {
lastOutputArea.setText(SYNTAX_ERR_STRING); lastOutputArea.setText(SYNTAX_ERR_STRING);
return; return;
} }
NumberInterface numberInterface = abacus.evaluateTree(parsedExpression); NumberInterface numberInterface = abacus.evaluateTree(parsedExpression);
if(numberInterface == null) { if (numberInterface == null) {
lastOutputArea.setText(EVAL_ERR_STRING); lastOutputArea.setText(EVAL_ERR_STRING);
return; return;
} }
@@ -146,9 +146,10 @@ public class Window extends JFrame {
/** /**
* Creates a new window with the given manager. * Creates a new window with the given manager.
*
* @param abacus the calculator instance to interact with other components. * @param abacus the calculator instance to interact with other components.
*/ */
public Window(Abacus abacus){ public Window(Abacus abacus) {
this(); this();
this.abacus = abacus; this.abacus = abacus;
} }
@@ -218,11 +219,11 @@ public class Window extends JFrame {
inputField.setEnabled(enabled); inputField.setEnabled(enabled);
inputEnterButton.setEnabled(enabled); inputEnterButton.setEnabled(enabled);
for(ActionListener removingListener : inputEnterButton.getActionListeners()){ for (ActionListener removingListener : inputEnterButton.getActionListeners()) {
inputEnterButton.removeActionListener(removingListener); inputEnterButton.removeActionListener(removingListener);
inputField.removeActionListener(removingListener); inputField.removeActionListener(removingListener);
} }
if(listener != null){ if (listener != null) {
inputEnterButton.addActionListener(listener); inputEnterButton.addActionListener(listener);
inputField.addActionListener(listener); inputField.addActionListener(listener);
} }
@@ -236,7 +237,7 @@ public class Window extends JFrame {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
Point clickPoint = e.getPoint(); Point clickPoint = e.getPoint();
if(e.getClickCount() == 2){ if (e.getClickCount() == 2) {
int row = historyTable.rowAtPoint(clickPoint); int row = historyTable.rowAtPoint(clickPoint);
int column = historyTable.columnAtPoint(clickPoint); int column = historyTable.columnAtPoint(clickPoint);
String toCopy = historyTable.getValueAt(row, column).toString(); String toCopy = historyTable.getValueAt(row, column).toString();
@@ -246,4 +247,9 @@ public class Window extends JFrame {
}); });
} }
@Override
public void setVisible(boolean b) {
super.setVisible(b);
if (b) inputField.requestFocusInWindow();
}
} }

View File

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

View File

@@ -0,0 +1,14 @@
package org.nwapw.abacus.function
/**
* A single operator that can be used by Abacus.
*
* This is a data class that holds the information about a single operator, such as a plus or minus.
*
* @param associativity the associativity of this operator, used for order of operations;.
* @param type the type of this operator, used for parsing (infix / prefix / postfix and binary / unary)
* @param precedence the precedence of this operator, used for order of operations.
* @param function the function this operator applies to its arguments.
*/
data class Operator(val associativity: OperatorAssociativity, val type: OperatorType,
val precedence: Int, val function: Function)

View File

@@ -0,0 +1,32 @@
package org.nwapw.abacus.fx
import javafx.beans.property.SimpleStringProperty
/**
* A model representing an input / output in the calculator.
*
* The HistoryModel class stores a record of a single user-provided input,
* its parsed form as it was interpreted by the calculator, and the output
* that was provided by the calculator. These are represented as properties
* to allow easy access by JavaFX cells.
*
* @param input the user input
* @param parsed the parsed version of the input.
* @param output the output string.
*/
class HistoryModel(input: String, parsed: String, output: String){
/**
* The property that holds the input.
*/
val inputProperty = SimpleStringProperty(input)
/**
* The property that holds the parsed input.
*/
val parsedProperty = SimpleStringProperty(parsed)
/**
* The property that holds the output.
*/
val outputProperty = SimpleStringProperty(output)
}

View File

@@ -0,0 +1,31 @@
package org.nwapw.abacus.fx
import javafx.beans.property.SimpleBooleanProperty
/**
* A model representing a plugin that can be disabled or enabled.
*
* ToggleablePlugin is a model that is used to present to the user the option
* of disabling / enabling plugins. The class name in this plugin is stored if
* its "enabledPropery" is false, essentially blacklisting the plugin.
*
* @param className the name of the class that this model concerns.
* @param enabled whether or not the model should start enabled.
*/
class ToggleablePlugin (val className: String, enabled: Boolean) {
/**
* The property used to interact with JavaFX components.
*/
val enabledProperty = SimpleBooleanProperty(enabled)
/**
* Checks whether this plugin is currently enabled or not.
*
* @return true if it is enabled, false otherwise.
*/
fun isEnabled(): Boolean {
return enabledProperty.value
}
}

View File

@@ -0,0 +1,26 @@
package org.nwapw.abacus.tree
/**
* A tree node that holds a binary operation.
*
* This node represents any binary operation, such as binary infix or binary postfix. The only
* currently implemented into Abacus is binary infix, but that has more to do with the parser than
* this class, which doesn't care about the order that its operation and nodes were found in text.
*
* @param operation the operation this node performs on its children.
* @param left the left node.
* @param right the right node.
*/
data class BinaryNode(val operation: String, val left: TreeNode? = null, val right: TreeNode?) : TreeNode() {
override fun <T : Any> reduce(reducer: Reducer<T>): T? {
val leftReduce = left?.reduce(reducer) ?: return null
val rightReduce = right?.reduce(reducer) ?: return null
return reducer.reduceNode(this, leftReduce, rightReduce)
}
override fun toString(): String {
return "(" + (left?.toString() ?: "null") + operation + (right?.toString() ?: "null") + ")"
}
}

View File

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

View File

@@ -0,0 +1,23 @@
package org.nwapw.abacus.tree
import org.nwapw.abacus.number.NumberInterface
/**
* A tree node that holds a single number value.
*
* This is a tree node that holds a single NumberInterface, which represents any number,
* and is not defined during compile time.
*
* @number the number value of this node.
*/
data class NumberNode(val number: NumberInterface) : TreeNode() {
override fun <T : Any> reduce(reducer: Reducer<T>): T? {
return reducer.reduceNode(this)
}
override fun toString(): String {
return number.toString()
}
}

View File

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

View File

@@ -0,0 +1,10 @@
package org.nwapw.abacus.tree
/**
* A tree node.
*/
abstract class TreeNode {
abstract fun <T: Any> reduce(reducer: Reducer<T>) : T?
}

View File

@@ -0,0 +1,23 @@
package org.nwapw.abacus.tree
/**
* A tree node that holds a unary operation.
*
* This node holds a single operator applied to a single parameter, and does not care
* whether the operation was found before or after the parameter in the text.
*
* @param operation the operation applied to the given node.
* @param applyTo the node to which the operation will be applied.
*/
data class UnaryNode(val operation: String, val applyTo: TreeNode? = null) : TreeNode() {
override fun <T : Any> reduce(reducer: Reducer<T>): T? {
val reducedChild = applyTo?.reduce(reducer) ?: return null
return reducer.reduceNode(this, reducedChild)
}
override fun toString(): String {
return "(" + (applyTo?.toString() ?: "null") + ")" + operation
}
}

View File

@@ -0,0 +1,76 @@
<?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="#performStop" disable="true"/>
</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"/>
<Text GridPane.columnIndex="0" GridPane.rowIndex="2" text="Computation Limit"/>
<TextField fx:id="computationLimitField" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
<FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="3" hgap="10"
vgap="10">
<Button text="Apply" onAction="#performSave"/>
<Button text="Reload Plugins" onAction="#performReload"/>
<Button text="Apply and Reload" onAction="#performSaveAndReload"/>
<Button text="Scan Plugins" onAction="#performScan"/>
</FlowPane>
</GridPane>
</Tab>
<Tab fx:id="functionListTab" text="Functions" closable="false">
<VBox spacing="10">
<padding>
<Insets left="10" right="10" top="10" bottom="10"/>
</padding>
<TextField fx:id="functionListSearchField" maxWidth="Infinity"/>
<ListView maxWidth="Infinity" fx:id="functionListView"/>
</VBox>
</Tab>
</TabPane>
</center>
</BorderPane>

View File

@@ -0,0 +1,107 @@
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(0, "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)", "1.9424263952412559365842088360176992193662086");
testOutput("exp(-500)", "exp((500)`)", "7.1245764067412855315491573771227552469277568");
}
@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");
testOutput("7^(-sqrt2*17)", "(7^((sqrt(2)*17))`)", "4.81354609155297814551845300063563");
testEvalError("0^0", "(0^0)");
testEvalError("(-13)^.9999", "((13)`^0.9999)");
}
}

View File

@@ -10,18 +10,19 @@ import java.util.List;
public class LexerTests { public class LexerTests {
@Test @Test
public void testBasicSuccess(){ public void testBasicSuccess() {
Lexer<Integer> lexer = new Lexer<>(); Lexer<Integer> lexer = new Lexer<>();
lexer.register("abc", 0); lexer.register("abc", 0);
lexer.register("def", 1); lexer.register("def", 1);
List<Match<Integer>> matchedIntegers = lexer.lexAll("abcdefabc", 0, Integer::compare); List<Match<Integer>> matchedIntegers = lexer.lexAll("abcdefabc", 0, Integer::compare);
Assert.assertNotNull(matchedIntegers);
Assert.assertEquals(matchedIntegers.get(0).getType(), Integer.valueOf(0)); Assert.assertEquals(matchedIntegers.get(0).getType(), Integer.valueOf(0));
Assert.assertEquals(matchedIntegers.get(1).getType(), Integer.valueOf(1)); Assert.assertEquals(matchedIntegers.get(1).getType(), Integer.valueOf(1));
Assert.assertEquals(matchedIntegers.get(2).getType(), Integer.valueOf(0)); Assert.assertEquals(matchedIntegers.get(2).getType(), Integer.valueOf(0));
} }
@Test @Test
public void testBasicFailure(){ public void testBasicFailure() {
Lexer<Integer> lexer = new Lexer<>(); Lexer<Integer> lexer = new Lexer<>();
lexer.register("abc", 0); lexer.register("abc", 0);
lexer.register("def", 1); lexer.register("def", 1);
@@ -29,16 +30,104 @@ public class LexerTests {
} }
@Test @Test
public void testNoPatterns(){ public void testNoPatterns() {
Lexer<Integer> lexer = new Lexer<>(); Lexer<Integer> lexer = new Lexer<>();
Assert.assertNull(lexer.lexAll("abcdefabc", 0, Integer::compare)); Assert.assertNull(lexer.lexAll("abcdefabc", 0, Integer::compare));
} }
@Test @Test
public void testEmptyMatches(){ public void testEmptyMatches() {
Lexer<Integer> lexer = new Lexer<>(); Lexer<Integer> lexer = new Lexer<>();
lexer.register("a?", 0); lexer.register("a?", 0);
Assert.assertNull(lexer.lexAll("", 0, Integer::compare)); Assert.assertNull(lexer.lexAll("", 0, Integer::compare));
} }
@Test
public void testOneOrMore() {
Lexer<Integer> lexer = new Lexer<>();
lexer.register("a+", 0);
List<Match<Integer>> tokens = lexer.lexAll("aaaa", 0, Integer::compare);
Assert.assertNotNull(tokens);
Assert.assertEquals(tokens.size(), 1);
}
@Test
public void testZeroOrMore() {
Lexer<Integer> lexer = new Lexer<>();
lexer.register("a*", 0);
List<Match<Integer>> tokens = lexer.lexAll("aaaa", 0, Integer::compare);
Assert.assertNotNull(tokens);
Assert.assertEquals(tokens.size(), 1);
}
@Test
public void testZeroOrOne() {
Lexer<Integer> lexer = new Lexer<>();
lexer.register("a?", 0);
List<Match<Integer>> tokens = lexer.lexAll("aaaa", 0, Integer::compare);
Assert.assertNotNull(tokens);
Assert.assertEquals(tokens.size(), 4);
}
@Test
public void testGreedyMatching() {
Lexer<Integer> lexer = new Lexer<>();
lexer.register("a*a", 0);
List<Match<Integer>> tokens = lexer.lexAll("aaaa", 0, Integer::compare);
Assert.assertNotNull(tokens);
Assert.assertEquals(tokens.size(), 1);
}
@Test
public void testAnyCharacter() {
String testString = "abcdef";
Lexer<Integer> lexer = new Lexer<>();
lexer.register(".", 0);
List<Match<Integer>> tokens = lexer.lexAll(testString, 0, Integer::compare);
Assert.assertNotNull(tokens);
Assert.assertEquals(tokens.size(), testString.length());
for (int i = 0; i < tokens.size(); i++) {
Assert.assertEquals(testString.substring(i, i + 1), tokens.get(i).getContent());
}
}
@Test
public void testBasicGroup() {
Lexer<Integer> lexer = new Lexer<>();
lexer.register("(abc)", 0);
List<Match<Integer>> tokens = lexer.lexAll("abc", 0, Integer::compare);
Assert.assertNotNull(tokens);
Assert.assertEquals(tokens.size(), 1);
Assert.assertEquals(tokens.get(0).getContent(), "abc");
}
@Test
public void testBasicRangeSuccess() {
String testString = "abcdef";
Lexer<Integer> lexer = new Lexer<>();
lexer.register("[a-f]", 0);
List<Match<Integer>> tokens = lexer.lexAll(testString, 0, Integer::compare);
Assert.assertNotNull(tokens);
Assert.assertEquals(testString.length(), tokens.size());
for (int i = 0; i < tokens.size(); i++) {
Assert.assertEquals(testString.substring(i, i + 1), tokens.get(i).getContent());
}
}
@Test
public void testBasicRangeFailure() {
Lexer<Integer> lexer = new Lexer<>();
lexer.register("[a-f]", 0);
Assert.assertNull(lexer.lexAll("g", 0, Integer::compare));
}
@Test
public void testGroupAndOperator() {
Lexer<Integer> lexer = new Lexer<>();
lexer.register("(abc)+", 0);
List<Match<Integer>> tokens = lexer.lexAll("abcabc", 0, Integer::compare);
Assert.assertNotNull(tokens);
Assert.assertEquals(tokens.size(), 1);
}
} }

View File

@@ -0,0 +1,125 @@
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.function.Function;
import org.nwapw.abacus.function.Operator;
import org.nwapw.abacus.function.OperatorAssociativity;
import org.nwapw.abacus.function.OperatorType;
import org.nwapw.abacus.lexing.pattern.Match;
import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.parsing.LexerTokenizer;
import org.nwapw.abacus.plugin.Plugin;
import org.nwapw.abacus.tree.TokenType;
import java.util.List;
public class TokenizerTests {
private static Abacus abacus = new Abacus(new Configuration(0, "precise", new String[]{}));
private static LexerTokenizer lexerTokenizer = new LexerTokenizer();
private static Function subtractFunction = new Function() {
@Override
protected boolean matchesParams(NumberInterface[] params) {
return params.length == 2;
}
@Override
protected NumberInterface applyInternal(NumberInterface[] params) {
return params[0].subtract(params[1]);
}
};
private static Plugin testPlugin = new Plugin(abacus.getPluginManager()) {
@Override
public void onEnable() {
registerOperator("+", new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX,
0, subtractFunction));
registerOperator("-", new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX,
0, subtractFunction));
registerFunction("subtract", subtractFunction);
}
@Override
public void onDisable() {
}
};
private static void assertTokensMatch(List<Match<TokenType>> tokenList, TokenType[] expectedTypes) {
Assert.assertNotNull(tokenList);
Assert.assertEquals(tokenList.size(), expectedTypes.length);
for (int i = 0; i < expectedTypes.length; i++) {
Assert.assertEquals(expectedTypes[i], tokenList.get(i).getType());
}
}
@BeforeClass
public static void prepareTests() {
abacus.getPluginManager().addListener(lexerTokenizer);
abacus.getPluginManager().addInstantiated(testPlugin);
abacus.getPluginManager().load();
}
@Test
public void testInteger() {
assertTokensMatch(lexerTokenizer.tokenizeString("11"), new TokenType[]{TokenType.NUM});
}
@Test
public void testLeadingZeroDecimal() {
assertTokensMatch(lexerTokenizer.tokenizeString("0.1"), new TokenType[]{TokenType.NUM});
}
@Test
public void testNonLeadingDecimal() {
assertTokensMatch(lexerTokenizer.tokenizeString(".1"), new TokenType[]{TokenType.NUM});
}
@Test
public void testSimpleChars() {
TokenType[] types = {
TokenType.OPEN_PARENTH,
TokenType.WHITESPACE,
TokenType.COMMA,
TokenType.CLOSE_PARENTH
};
assertTokensMatch(lexerTokenizer.tokenizeString("( ,)"), types);
}
@Test
public void testFunctionParsing() {
TokenType[] types = {
TokenType.FUNCTION,
TokenType.OPEN_PARENTH,
TokenType.NUM,
TokenType.COMMA,
TokenType.NUM,
TokenType.CLOSE_PARENTH
};
assertTokensMatch(lexerTokenizer.tokenizeString("subtract(1,2)"), types);
}
@Test
public void testOperatorParsing() {
TokenType[] types = {
TokenType.NUM,
TokenType.OP,
TokenType.NUM
};
assertTokensMatch(lexerTokenizer.tokenizeString("1-1"), types);
}
@Test
public void testSanitizedOperators() {
TokenType[] types = {
TokenType.NUM,
TokenType.OP,
TokenType.NUM
};
assertTokensMatch(lexerTokenizer.tokenizeString("1+1"), types);
}
}