Commit Graph

909 Commits

Author SHA1 Message Date
Joseph Lizier ccbccc6302 Merge branch 'master' of github.com:jlizier/JIDT 2020-05-15 17:37:32 +10:00
Joseph Lizier cbcca8d0ff fixing addedMoreThanOneObservationSet for the MultiInfoCalculator 2020-05-15 17:35:54 +10:00
Joseph Lizier 510f999d2e Adds addObservations calls with validity arrays for conditional transfer entropy 2020-05-15 17:34:00 +10:00
Pedro Mediano 64a7a80e30
Changed name of LDFLAGS to avoid potential conflicts
Closes #80 .
2020-05-02 14:37:27 +01:00
Joseph Lizier 1c2ccda1eb
Updated contributors list 2020-01-24 11:42:56 +11:00
Joseph Lizier edb8f997cb Added new loader file for 2D xls format to flocking analysis demo 2019-12-17 17:08:27 +11:00
Joseph Lizier 502f7ac22c Merge branch 'master' of github.com:jlizier/JIDT 2019-12-13 11:44:03 +11:00
Joseph Lizier 2c2d012e20 Sooraj Sekhar's addition to flocking analysis of allowing speed to be included in the information-theoretic calculations. Includes updated NetLogo demo where speed coherence is also added 2019-12-13 11:40:58 +11:00
Joseph Lizier f53ecba635
Added Emanuele Crosato to author's list for the flocking demo code 2019-09-01 22:06:27 +10:00
Joseph Lizier 4966fdabc2 Adding a code suite to run active information storage and transfer entropy analysis of positional / heading data from swarms/flocks/schools, including a demonstration of how to use the suite with a NetLogo example. Documentation on a wiki page to follow later ... 2019-08-29 23:08:16 +10:00
Joseph Lizier c22e37d1ab Adding new lecture slides for Module 0 Introduction to course 2019-08-09 17:20:12 +10:00
Joseph Lizier 61ae6fb40b Minor updates to AutoAnalyser to put fixtures in place for array conversion to Python with eventual handling of 2D arrays (code isn't really changed at the moment, but has methods to make this easy later) 2019-07-25 23:56:56 +10:00
Joseph Lizier 2ab3ac01bb Adding non-overloaded method signatures for adding 1D vs 2D observations for common class for continuous MI and CMI estimators, since JPype 0.7 does not seem able to resolve overloaded 1D vs 2D arrays any longer 2019-07-25 23:11:44 +10:00
Joseph Lizier 1667b9fe7a Added utility for subsampling rows from 2D matrix 2019-07-25 14:36:54 +10:00
Joseph Lizier 1dc2dc8b86 Updating all discrete calculators (except SeparableInfo, since it's outmoded) to have a default empty constructor, with an overloaded initialise method added that provides all relevant properties. Fixes #77, and provides a first step for #66. Also aligned PredictiveInfo and ConditionalTE calculators to use the appropriate super classes. 2019-07-25 14:29:51 +10:00
Joseph Lizier d545793bc5 Patching unit test on KSG MI with discrete which tested that result changed from K=2 to 4, but the threshold for change was too large. 2019-07-25 10:14:57 +10:00
Joseph Lizier 0dae162d82 Added new unit tests for TE with k=0 for Gaussian and KSG estimators 2019-07-23 11:43:55 +10:00
Joseph Lizier 17bf0e0be7 Updating octave-java interface to use non-overloaded method signatures for int and boolean arrays (this seemed to have caused an issue on some versions with ints being converted to boolean first, thus losing all values except 0-1) 2019-07-23 11:33:04 +10:00
Joseph Lizier fba941362d Adding further unit tests for Conditional TE (continuous-valued) to check different delays on conditional variables, and patching test of validity of calling univariate versus multivariate method signatures. 2019-07-12 14:45:23 +10:00
Joseph Lizier 1db8a2ac63 Making local computation for CMI Gaussian calculator store the lastAverage if it was called with the previous observations 2019-05-17 22:47:16 +10:00
Joseph Lizier 681c9196ee Added methods to MatrixUtils (plus unit tests) for adding/removing/swapping sample points into existing means and covariances 2019-05-17 22:27:30 +10:00
Joseph Lizier 9f9c79bc95 Handling infinites in Chi square CDF function properly 2019-05-17 22:24:54 +10:00
Joseph Lizier 8542d217ea Added support for Chi^2 analytic distribution to support degrees of freedom 0 (this will handle e.g. where a source had no independent dimensions) 2019-05-17 22:20:54 +10:00
Joseph Lizier fce1b34a5c Adding NORMALISE and NOISE_LEVEL_TO_ADD properties to all conditional mutual information calculators for continuous-valued data (extends this capability from only KSG to Gaussian as well) 2019-04-03 00:12:00 +11:00
Joseph Lizier d9db7a15ab Further clarifications for including NORMALISE and NOISE_LEVEL_TO_ADD properties to all mutual information calculators, and handling linear redundancy sub-cases 2019-04-03 00:07:05 +11:00
Joseph Lizier b1437452e4 Adding NORMALISE and NOISE_LEVEL_TO_ADD properties to all mutual information calculators for continuous-valued data (extends this capability from only KSG to Gaussian and kernel as well, the latter already had NORMALISE) 2019-04-02 12:38:17 +11:00
Joseph Lizier ecec4d20e3 Added unit tests for linear dependency possibilities for issue #16 2019-03-31 23:22:55 +11:00
Joseph Lizier 988d32de70 Added bug fix within recent changes to MatrixUtils Cholesky decomposition calculation, along with unit testing of the linear dependency combinations for issue #17 2019-03-31 23:21:39 +11:00
Joseph Lizier 2a0024ad83 Fixes issue #17: Handling sub-cases for linear redundancy within and across variables in the linear-Gaussian mutual information estimator. This is done by detecting such redundancies and either returning 0 or infinity as the requisite result. Mirrors how this is done for conditional MI. 2019-03-29 00:01:36 +11:00
Joseph Lizier 66676a2692 A rewrite of parts of the linear Gaussian conditional MI estimator, in order to more deftly handle linear dependencies within variables 1 and 2, and between each of them and the conditional. Previously we removed sub-variables of those arbitrarily, now the removal is targetted to those sub-variables that are problematic. Also required some variable name changes to reflect different ordering of how variables and the conditionals are concatenated in arrays. 2019-03-28 23:58:53 +11:00
Joseph Lizier d58c393c53 Added methods to MatrixUtils to make a Cholesky decomposition of independent components only (useful for MI and conditional MI calculations), with a required update to the NonPositiveDefiniteMatrixException to include a field defining which row in the matrix was a problem. Also includes code to convert between native int[] arrays and ArrayList<Integers>, and new method signatures for column selection from matricies.
Also added new unit tests for the Cholesky decomposition.
2019-03-28 23:52:47 +11:00
Joseph Lizier 1d2c7c42b9 Updating javaMatrixToOctave to handle new conversion routine in octave (and be backwards compatible to old) 2019-03-21 09:35:41 +11:00
Joseph Lizier 9aed0d4590 Merge remote branch 'origin/master' 2019-03-11 12:04:18 +11:00
Joseph Lizier c4349140f1 Updating ant javadoc target to use packageset instead of fileset (for JDK >= 8 it seems that fileset is not properly handling the java source code I want the javadocs to ignore; packageset is doing this ok). Fixes Issue #75 (the javadocs part) 2019-03-11 11:58:17 +11:00
David Shorten 4985def021 fixed weirdness 2019-02-01 15:35:26 +11:00
Joseph Lizier c693b5d57e
Edited funding acknowledgements on README.md 2019-02-01 13:38:35 +11:00
David Shorten ea8a322b61 end Tues 2019-01-29 19:51:21 +11:00
David Shorten fcbf5e7dac end Thurs 2019-01-22 19:17:36 +11:00
David Shorten 8bcf41e572 end Wed 2018-12-19 17:15:47 +11:00
David Shorten 504c6262f0 end Tues 2018-12-18 20:32:37 +11:00
David Shorten 23abc021ac modification to calculation for point inclusion 2018-12-11 16:15:03 +11:00
David Shorten 064953c584 bit of cleaning up 2018-12-11 15:18:51 +11:00
David Shorten b467ea22a1 option of using same K for dest history 2018-12-11 15:15:26 +11:00
David Shorten 9f51dc284c option of not doing radius trimming 2018-12-11 12:21:27 +11:00
David Shorten 6f8ae62fee option of excluding the point itself 2018-12-11 12:03:44 +11:00
David Shorten 267796dc83 forced inclusion of TransferEntropyCalculatorSpikingIntegration.java 2018-12-10 20:29:54 +11:00
David Shorten ec01683592 Incorporated JL code from 21/11/2018 2018-12-10 20:22:15 +11:00
David Shorten fa9a45a9cf added in the original spiking estimator code 2018-12-10 17:12:15 +11:00
Joseph Lizier 2ba27f30ac
Merge pull request #73 from pmediano/master
Minor updates to GPU tests and examples following v1.5 release.
2018-11-26 10:28:15 +11:00
Pedro Martinez Mediano 4908276333 GPU tests and example now compute multiple surrogates. 2018-11-25 19:45:48 +02:00