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

Initialising conditional TE calculator to have one conditional dimension by default instead of none. Also fixing the way the conditional parameters are printed via getProperty() when they are null.

This commit is contained in:
jlizier 2017-08-23 00:18:41 +10:00
parent 4bc411654f
commit 0e40ec2401
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
java/source/infodynamics/measures/continuous/ConditionalTransferEntropyCalculatorViaCondMutualInfo.java
View File

@ -98,17 +98,17 @@ public class ConditionalTransferEntropyCalculatorViaCondMutualInfo implements
* Array of embedding lengths for each conditional variable. * Array of embedding lengths for each conditional variable.
* Can be an empty array or null if there are no conditional variables. * Can be an empty array or null if there are no conditional variables.
*/ */
protected int[] condEmbedDims = null; protected int[] condEmbedDims = new int[] {1};
/** /**
* Array of embedding delays for the conditional variables. * Array of embedding delays for the conditional variables.
* Must be same length as condEmbedDims array. * Must be same length as condEmbedDims array.
*/ */
protected int[] cond_taus = null; protected int[] cond_taus = new int[] {1};
/** /**
* Array of time lags between last element of each conditional variable * Array of time lags between last element of each conditional variable
* and destination next value. * and destination next value.
*/ */
protected int[] condDelays = null; protected int[] condDelays = new int[] {1};
/** /**
* Time index of the last point in the destination embedding of the first * Time index of the last point in the destination embedding of the first
@ -380,11 +380,23 @@ public class ConditionalTransferEntropyCalculatorViaCondMutualInfo implements
} else if (propertyName.equalsIgnoreCase(DELAY_PROP_NAME)) { } else if (propertyName.equalsIgnoreCase(DELAY_PROP_NAME)) {
return Integer.toString(delay); return Integer.toString(delay);
} else if (propertyName.equalsIgnoreCase(COND_EMBED_LENGTHS_PROP_NAME)) { } else if (propertyName.equalsIgnoreCase(COND_EMBED_LENGTHS_PROP_NAME)) {
return MatrixUtils.arrayToString(condEmbedDims); if (condEmbedDims == null) {
return "";
} else {
return MatrixUtils.arrayToString(condEmbedDims);
}
} else if (propertyName.equalsIgnoreCase(COND_EMBED_DELAYS_PROP_NAME)) { } else if (propertyName.equalsIgnoreCase(COND_EMBED_DELAYS_PROP_NAME)) {
return MatrixUtils.arrayToString(cond_taus); if (cond_taus == null) {
return "";
} else {
return MatrixUtils.arrayToString(cond_taus);
}
} else if (propertyName.equalsIgnoreCase(COND_DELAYS_PROP_NAME)) { } else if (propertyName.equalsIgnoreCase(COND_DELAYS_PROP_NAME)) {
return MatrixUtils.arrayToString(condDelays); if (condDelays == null) {
return "";
} else {
return MatrixUtils.arrayToString(condDelays);
}
} else { } else {
// No property matches for this class, assume it is for the underlying // No property matches for this class, assume it is for the underlying
// conditional MI calculator // conditional MI calculator