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

Bug fix to computeSignificance() of ConditionalMutualInformationCalculator

This commit is contained in:
joseph.lizier 2013-10-17 13:19:58 +00:00
parent 8991b4176c
commit c7b42e38ae
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/source/infodynamics/measures/discrete/ConditionalMutualInformationCalculator.java
View File

@ -259,7 +259,7 @@ public class ConditionalMutualInformationCalculator extends InfoMeasureCalculato
/** /**
* Compute the significance of obtaining the given average from the given observations, * Compute the significance of obtaining the given average from the given observations,
* assuming that the temporal relationship between variable1 and variable2-conditional * assuming that the temporal relationship between variable1 and variable2-conditional
* was detroyed, while variable2-conditional relationship was retained. * was destroyed, while variable2-conditional relationship was retained.
* *
* @param numPermutationsToCheck number of new orderings of the variable1 to compare against * @param numPermutationsToCheck number of new orderings of the variable1 to compare against
* @return * @return
@ -275,6 +275,10 @@ public class ConditionalMutualInformationCalculator extends InfoMeasureCalculato
* assuming that the temporal relationship between variable1 and variable2-conditional * assuming that the temporal relationship between variable1 and variable2-conditional
* was detroyed, while variable2-conditional relationship was retained. * was detroyed, while variable2-conditional relationship was retained.
* *
* TODO Need to alter the method signature to allow callers to specify
* which variable is shuffled. (Note to self: when doing this, will
* need to update machine learning code to the new method signature)
*
* @param newOrderings the reorderings for variable1 to use * @param newOrderings the reorderings for variable1 to use
* @return * @return
*/ */
@ -291,7 +295,7 @@ public class ConditionalMutualInformationCalculator extends InfoMeasureCalculato
int t_s = 0; int t_s = 0;
for (int val1 = 0; val1 < base1; val1++) { for (int val1 = 0; val1 < base1; val1++) {
for (int val2 = 0; val2 < base2; val2++) { for (int val2 = 0; val2 < base2; val2++) {
for (int condVal = 0; condVal < condBase; condBase++) { for (int condVal = 0; condVal < condBase; condVal++) {
int numberOfSamples = firstSecondCondCount[val1][val2][condVal]; int numberOfSamples = firstSecondCondCount[val1][val2][condVal];
MatrixUtils.fill(var1Values, val1, t_s, numberOfSamples); MatrixUtils.fill(var1Values, val1, t_s, numberOfSamples);
MatrixUtils.fill(var2Values, val2, t_s, numberOfSamples); MatrixUtils.fill(var2Values, val2, t_s, numberOfSamples);