Commit Graph

629 Commits

Author SHA1 Message Date
jlizier 10cc5f25bf Adding image (for wiki) of AutoAnalyser Launcher 2017-11-26 18:12:53 +11:00
jlizier db0503d763 Having AutoAnalyser continue with the calculation where the generated code cannot be written 2017-11-26 18:04:29 +11:00
jlizier 20e8fcef47 Fix of jar location for revised launchAutoAnalyser scripts 2017-11-26 01:18:08 +11:00
jlizier df8724b872 Altered AutoAnalyserLauncher to either auto-detect jar location or assume demos/AutoAnalyser folder is current location (if a command line argument is given). Similarly, altered AutoAnalyser to either take location of demos/AutoAnalyser folder, or assume it is the current folder. 2017-11-26 01:10:30 +11:00
jlizier fd804d0d0c Added properties for running GPU calculation to MI AutoAnalyser 2017-11-26 01:07:19 +11:00
jlizier 69af7252cd Added debug print on working directory to AutoAnalyser startup 2017-11-25 00:15:37 +11:00
jlizier d09a9e804d Patched location of jar file in the AutoAnalyser launcher scripts after having added the change directory to JIDT top level. 2017-11-24 22:00:28 +11:00
jlizier 950ee70f9e Fixing the individual AutoAnalyser shell script launchers to no longer need to compile the GUI app, nor to require the demo location to be on the path 2017-11-24 21:54:32 +11:00
jlizier 4fe82359ff Fixing launch location of where the AutoAnalyserLauncher GUI is run from by its launcher shell scripts (to be the JIDT root) 2017-11-24 21:53:21 +11:00
jlizier 4881daadf2 Altering ant to reflect the new location of autoanalyser java files (now inside the main source tree), removing the autoanalyser target, as well as setting the Main-Class in the jar manifest (and making jar executable) so that on double click of the jar the AutoAnalyserLauncher is run. Also noticed that the debug build hadn't reverted back to Java 1.6 yet 2017-11-24 21:42:20 +11:00
jlizier 326e5fbe77 AutoAnalyserLauncher shell scripts added (this is a new GUI to start all AutoAnalysers from, which was added two commits ago (but I forgot to comment in the message that it was added!) 2017-11-24 21:41:30 +11:00
jlizier 7390c1d643 Altered build.xml to have consistent tabs for whitespace rather than mix of tabs and 2xSpace. 2017-11-24 21:08:02 +11:00
jlizier ddf3b4de0a Moving AutoAnalyser java files into the main source location rather than in the demos location. This commit includes the moving of the files themselves. Further commits will alter the ant script and run scripts to have correct classpath, etc. 2017-11-24 21:07:33 +11:00
jlizier 072ee35b37 Added generated java, python and matlab/octave files from the AutoAnalyser to .gitignore 2017-11-24 15:36:12 +11:00
jlizier 142fbb4541 Merge branch 'master' of github.com:jlizier/jidt
Merging in Pedro's mixed Kraskov changes, plus further work on GPU for Kraskov MI
2017-11-24 15:30:20 +11:00
jlizier e1212c0ce9 Added AutoAnalyserLauncher applet, a one-stop shop for launching an AutoAnalyser applet. Gives buttons to launch each one. This requires some minor changes to the super AutoAnalyser class (to allow constructor to specify offset of the working directory from the demos/AutoAnalyser directory) and child classes to allow the new constructors 2017-11-24 00:09:21 +11:00
Joseph Lizier 8d0d0e23aa
Merge pull request #60 from pmediano/master
Further improvements to GPU Kraskov MI.
2017-11-22 21:04:19 +11:00
jlizier 9e77ebdadf Tweak to method to print out an array of ints 2017-11-22 20:49:05 +11:00
jlizier 1bb67f0840 Adding neighbour search utilities in preparation for attempting fast surrogate generation (performing multiple neighbour searches at once where we can); in particular adding a countPointsWithinR with a remapping of the point's indices. Unit test added as well for this. 2017-11-22 20:48:30 +11:00
Pedro Martinez Mediano 446ac4ae59 Merge branch 'master' into gpu 2017-11-21 14:58:15 +00:00
Pedro Martinez Mediano 86cd661a9c Small clarification in build.xml comments. 2017-11-21 14:49:13 +00:00
Pedro Martinez Mediano decbcd5445 Small fix to GPU MI surrogate unit test. 2017-11-21 14:48:32 +00:00
Joseph Lizier c5c38335ef
Merge pull request #58 from pmediano/master
Major improvements to KSG mixed (continuous-discrete) MI calculator.
2017-11-22 00:23:10 +11:00
Pedro Martinez Mediano ecda70f8e9 Hard-setting dynCorrExclTime to 0 in KSG mixed calc.
Previous implementation was incomplete due to a mismatch between the
sample indices in the full and marginal KdTrees. Some code has been left
to guide future development.
2017-11-20 14:47:00 +00:00
Pedro Martinez Mediano 25df49fa5a KSG mixed calc now allocates memory for locals only if requested. 2017-11-20 14:26:25 +00:00
Pedro Martinez Mediano 8f169171e1 Fixed small bug in KSG mixed calc surrogates.
Surrogate calculator was applying timeDiff twice, so surrogate
dataset had abs(timeDiff) less observations than it should.
2017-11-20 14:14:49 +00:00
Pedro Martinez Mediano d40024e1cd Allow negative timeDiff in KSG mixed calc. 2017-11-20 14:02:00 +00:00
jlizier 0c5bed62d6 Fixing tab/spaces mix in Python code for all combos for loops generated by AutoAnalyser calculators 2017-10-24 11:34:42 +11:00
jlizier 6a48112818 In AutoAnalyser, limiting the use of variableCombinations to when we're actually making a calculation. (It chews up memory for large combinations, which makes AutoAnalyser take a long time even if we're not computing) 2017-09-06 13:51:34 +10:00
jlizier 0e27dbcbc2 Fixed default value of dynamic exclusion window in Kernel MI calculator to be 0. Technically it is zero (because dynCorrExcl boolean is set to false, but gets reported as 100 because the integer value of dynCorrExclTime was not set to 0 itself) 2017-09-02 20:18:36 +10:00
Pedro Martinez Mediano 8c7e94b0fa Change build.xml file to revert back to Java 1.6 2017-08-31 16:28:44 +01:00
Pedro Martinez Mediano ed71502bc2 Remove old cudaLibraryLoad code and unnecessary dependencies. 2017-08-31 16:22:12 +01:00
Pedro Martinez Mediano 83e77e8b3a Merge Joe's master into Pedro's master with KSG mixed changes. 2017-08-30 17:36:32 +01:00
Pedro Martinez Mediano 9b7d7c70c8 Add unittests for noise level and Theiler window in KSG mixed calc. 2017-08-30 13:31:13 +01:00
Pedro Martinez Mediano f56ac6e69e Fix bug with Theiler window in KSG mixed calc. 2017-08-30 13:30:30 +01:00
Pedro Martinez Mediano 5961fb6246 Add Theiler window and jitter to KSG mixed calc. 2017-08-30 12:17:02 +01:00
Pedro Martinez Mediano 9aea9c4a02 Added some tests for KSG mixed setProperty. 2017-08-30 09:14:56 +01:00
jlizier d36c803e41 Added utilities to convert between estimate values and p-values for an analytic null distribution in bulk (array calls) 2017-08-30 16:24:17 +10:00
jlizier 257ef285d3 Added a Matlab utility function to save CA data in a (relatively) efficient data format, since Matlab will only save doubles for ascii format. 2017-08-30 15:39:59 +10:00
jlizier c2b1f7ef25 Altered code generated by AutoAnalyser to generate absolute paths to jar and Matlab/Python utilities, so that it doesn't matter if the user moves the generated code to another location. Also added warning suppression in Matlab for attempting to add the jar to the path multiple times. 2017-08-30 12:06:02 +10:00
Pedro Martinez Mediano 626293b84d More docs for KSG mixed calc. 2017-08-30 01:19:54 +01:00
Pedro Martinez Mediano e11218631e Added myself as author of KSG mixed calculator. 2017-08-29 23:56:28 +01:00
Pedro Martinez Mediano 49afa343fc Removed old variables and functions from KSG mixed, added docs. 2017-08-29 23:55:10 +01:00
jlizier bba00f07fc In AutoAnalyser switching to store calculator as its actual class rather than superclass, since otherwise you can't access features like analytic surrogates without casting to the correct interface. 2017-08-29 15:08:50 +10:00
jlizier 1f236dee49 Added AnalyticMeasurementDistribution to the generated Java headers for AutoAnalyser 2017-08-29 14:55:44 +10:00
jlizier b7154fab62 Patched issue where Analytic stat sig checkbox was still generating Empirical in the generated code (even though it was computing it properly) 2017-08-29 14:51:56 +10:00
jlizier 5196c204a9 Fixed Matlab paths to only have one variable to change, and fixed Python spacing in AutoAnalyser 2017-08-28 13:31:38 +10:00
jlizier 5dcb89bed7 Adding AutoAnalyser for Active information storage, including run scripts in demo folder 2017-08-28 09:45:05 +10:00
jlizier 19f2c5abbc Performance tweaks for TE Discrete, which should make a difference when the state space is large in comparison to the number of samples. 2017-08-28 00:36:24 +10:00
jlizier 9f4ce02363 Added Conditional Transfer Entropy AutoAnalyser source code, and startup scripts. 2017-08-23 00:37:28 +10:00