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

Patched digamma function for large k; added extra debug prints to Kraskov MI calculator 2

This commit is contained in:
joseph.lizier 2013-03-07 12:46:52 +00:00
parent cb2e0a2588
commit 16cc8e3db2
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
java/source/infodynamics/measures/continuous/kraskov/MutualInfoCalculatorMultiVariateKraskov2.java
View File

@ -210,16 +210,21 @@ public class MutualInfoCalculatorMultiVariateKraskov2
// And take the digamma before adding into the
// average:
averageDiGammas += MathsUtils.digamma(n_x) + MathsUtils.digamma(n_y);
// if (debug) {
// System.out.printf("n=%d, \n");
// }
}
averageDiGammas /= (double) N;
mi = MathsUtils.digamma(k) - 1.0/(double)k - averageDiGammas + MathsUtils.digamma(N);
miComputed = true;
if (debug) {
avNx /= (double)N;
avNy /= (double)N;
System.out.println(String.format("Average n_x=%.3f, Average n_y=%.3f", avNx, avNy));
System.out.printf("Average n_x=%.3f, Average n_y=%.3f", avNx, avNy);
System.out.printf("psi(k=%d)=%.4f - 1/k=%.4f - averageDiGammas=%.4f -psi(N)=%.4f => %.4f\n",
k, MathsUtils.digamma(k), 1.0/(double)k, averageDiGammas, MathsUtils.digamma(N), mi);
}
mi = MathsUtils.digamma(k) - 1.0/(double)k - averageDiGammas + MathsUtils.digamma(N);
miComputed = true;
return mi;
}
@ -301,14 +306,16 @@ public class MutualInfoCalculatorMultiVariateKraskov2
averageDiGammas += MathsUtils.digamma(n_x) + MathsUtils.digamma(n_y);
}
averageDiGammas /= (double) N;
mi = MathsUtils.digamma(k) - 1.0/(double)k - averageDiGammas + MathsUtils.digamma(N);
miComputed = true;
if (debug) {
avNx /= (double)N;
avNy /= (double)N;
System.out.println(String.format("Average n_x=%.3f, Average n_y=%.3f", avNx, avNy));
System.out.printf("Average n_x=%.3f, Average n_y=%.3f\n", avNx, avNy);
System.out.printf("psi(k=%d)=%.4f - 1/k=%.4f - averageDiGammas=%.4f + psi(N)=%.4f => %.4f\n",
k, MathsUtils.digamma(k), 1.0/(double)k, averageDiGammas, MathsUtils.digamma(N), mi);
}
mi = MathsUtils.digamma(k) - 1.0/(double)k - averageDiGammas + MathsUtils.digamma(N);
miComputed = true;
return mi;
}

2
java/source/infodynamics/utils/MathsUtils.java
View File

@ -259,7 +259,7 @@ public class MathsUtils {
double result = storedDigammas[highestDigammaArgCalced];
for (int n = highestDigammaArgCalced + 1; n <= d; n++) {
result += 1.0 / (double) (n-1);
if (d < NUM_STORED_DIGAMMAS) {
if (n < NUM_STORED_DIGAMMAS) {
storedDigammas[n] = result;
}
}