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

Allow negative timeDiff in KSG mixed calc.

This commit is contained in:
Pedro Martinez Mediano 2017-11-20 14:02:00 +00:00
parent 83e77e8b3a
commit d40024e1cd
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,11 +287,7 @@ public class MutualInfoCalculatorMultiVariateWithDiscreteKraskov implements Mutu
noiseLevel = Double.parseDouble(propertyValue);
}
} else if (propertyName.equalsIgnoreCase(PROP_TIME_DIFF)) {
int val = Integer.parseInt(propertyValue);
if (val < 0) {
throw new Exception("Time difference must be >= 0. Flip data1 and data2 around if required.");
}
timeDiff = val;
timeDiff = Integer.parseInt(propertyValue);
}
}
@ -309,7 +305,7 @@ public class MutualInfoCalculatorMultiVariateWithDiscreteKraskov implements Mutu
if (continuousObservations[0].length != dimensions) {
throw new Exception("The continuous observations do not have the expected number of variables (" + dimensions + ")");
}
if (continuousObservations.length > timeDiff) {
if (continuousObservations.length > Math.abs(timeDiff)) {
vectorOfContinuousObservations.add(continuousObservations);
vectorOfDiscreteObservations.add(discreteObservations);
}
@ -355,7 +351,7 @@ public class MutualInfoCalculatorMultiVariateWithDiscreteKraskov implements Mutu
// First work out the size to allocate the joint vectors, and do the allocation:
totalObservations = 0;
for (double[][] destination : vectorOfContinuousObservations) {
totalObservations += destination.length - timeDiff;
totalObservations += destination.length - Math.abs(timeDiff);
}
continuousData = new double[totalObservations][dimensions];
discreteData = new int[totalObservations];
@ -367,12 +363,24 @@ public class MutualInfoCalculatorMultiVariateWithDiscreteKraskov implements Mutu
for (int[] dct : vectorOfDiscreteObservations) {
double[][] cnt = iterator.next();
// Copy the data from these given observations into our master
// array, aligning them incorporating the timeDiff:
// array, aligning them incorporating the timeDiff. Depending on whether
// timeDiff >= 0, we have to put first the elements of one array or the
// other.
if (timeDiff >= 0) {
MatrixUtils.arrayCopy(cnt, 0, 0,
continuousData, startObservation, 0,
cnt.length - timeDiff, dimensions);
System.arraycopy(dct, timeDiff, discreteData, startObservation, dct.length - timeDiff);
startObservation += cnt.length - timeDiff;
} else {
MatrixUtils.arrayCopy(cnt, Math.abs(timeDiff), 0,
continuousData, startObservation, 0,
cnt.length - Math.abs(timeDiff), dimensions);
System.arraycopy(dct, 0, discreteData, startObservation, dct.length - Math.abs(timeDiff));
startObservation += cnt.length - Math.abs(timeDiff);
}
}
// We don't need to keep the vectors of observation sets anymore:
vectorOfContinuousObservations = null;