natas_hw
/
jidt
mirror of https://github.com/jlizier/jidt
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #67 from pmediano/master 

Add new set- and addObservations overloadings in KSG mixed calculator
This commit is contained in:
Joseph Lizier 2018-01-29 12:13:51 +11:00 committed by GitHub
parent b32d9443eb 08f25beee6
commit fa0bc96a6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
java/source/infodynamics/measures/mixed/kraskov/MutualInfoCalculatorMultiVariateWithDiscreteKraskov.java
View File

@ -317,6 +317,13 @@ public class MutualInfoCalculatorMultiVariateWithDiscreteKraskov implements Mutu
} }
} }
public void addObservations(double[] continuousObservations,
int[] discreteObservations) throws Exception {
double[][] observationsMatrix = new double[continuousObservations.length][1];
MatrixUtils.copyIntoColumn(observationsMatrix, 0, continuousObservations);
addObservations(observationsMatrix, discreteObservations);
}
public void addObservations(double[][] source, double[][] destination, int startTime, int numTimeSteps) throws Exception { public void addObservations(double[][] source, double[][] destination, int startTime, int numTimeSteps) throws Exception {
throw new RuntimeException("Not implemented yet"); throw new RuntimeException("Not implemented yet");
} }
@ -444,6 +451,14 @@ public class MutualInfoCalculatorMultiVariateWithDiscreteKraskov implements Mutu
finaliseAddObservations(); finaliseAddObservations();
} }
public void setObservations(double[] continuousObservations,
int[] discreteObservations) throws Exception {
double[][] observationsMatrix = new double[continuousObservations.length][1];
MatrixUtils.copyIntoColumn(observationsMatrix, 0, continuousObservations);
setObservations(observationsMatrix, discreteObservations);
}
/** /**
* Internal method to ensure that the Kd-tree data structures to represent the * Internal method to ensure that the Kd-tree data structures to represent the
* observational data have been constructed (should be called prior to attempting * observational data have been constructed (should be called prior to attempting

42
java/unittests/infodynamics/measures/mixed/kraskov/MutualInfoMultiVariateWithDiscreteKraskovTester.java
View File

@ -269,4 +269,46 @@ public class MutualInfoMultiVariateWithDiscreteKraskovTester extends TestCase {
// assertTrue(Math.abs(res5 - res1) > 0.001); // assertTrue(Math.abs(res5 - res1) > 0.001);
} }
public void testUnivariateOverloadings() throws Exception {
MutualInfoCalculatorMultiVariateWithDiscreteKraskov miCalc =
new MutualInfoCalculatorMultiVariateWithDiscreteKraskov();
// Generate data sets
RandomGenerator rg = new RandomGenerator();
double[][] contDataMatrix = rg.generateRandomData(100, 2);
double[] contDataVector = rg.generateRandomData(100);
int[] discData = rg.generateRandomInts(100, 2);
// Check that no exception is thrown for ok data:
boolean caughtException = false;
try {
miCalc.initialise(1, 2);
miCalc.setObservations(contDataVector, discData);
} catch (Exception e) {
caughtException = true;
}
assertFalse(caughtException);
// Check that exception is thrown when dimensions do not match
caughtException = false;
try {
miCalc.initialise(1, 2);
miCalc.setObservations(contDataMatrix, discData);
} catch (Exception e) {
caughtException = true;
}
assertTrue(caughtException);
caughtException = false;
try {
miCalc.initialise(2, 2);
miCalc.setObservations(contDataVector, discData);
} catch (Exception e) {
caughtException = true;
}
assertTrue(caughtException);
}
} }