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

Refactored KernelEstimatorSingleVariate to be called UniVariate

This commit is contained in:
joseph.lizier 2012-10-25 01:25:10 +00:00
parent 997fe0fbef
commit 839da1c81f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/source/infodynamics/measures/continuous/kernel/EntropyCalculatorKernel.java
View File

@ -4,7 +4,7 @@ import infodynamics.measures.continuous.EntropyCalculator;
public class EntropyCalculatorKernel implements EntropyCalculator {
protected KernelEstimatorSingleVariate svke = null;
protected KernelEstimatorUniVariate svke = null;
protected int totalObservations = 0;
protected boolean debug = false;
protected double[] observations;
@ -23,7 +23,7 @@ public class EntropyCalculatorKernel implements EntropyCalculator {
public static final String EPSILON_PROP_NAME = "EPSILON";
public EntropyCalculatorKernel() {
svke = new KernelEstimatorSingleVariate();
svke = new KernelEstimatorUniVariate();
svke.setDebug(debug);
svke.setNormalise(normalise);
}

2
java/source/infodynamics/measures/continuous/kernel/KernelEstimatorMultiVariate.java
View File

@ -16,7 +16,7 @@ import java.util.Hashtable;
* see Kantz and Schreiber (below).
* </p>
*
* @see KernelEstimatorSingleVariate
* @see KernelEstimatorUniVariate
* @see "H. Kantz and T. Schreiber, 'Nonlinear Time Series Analysis'.
* Cambridge, MA: Cambridge University Press, 1997"
* @author Joseph Lizier, <a href="mailto:joseph.lizier at gmail.com">joseph.lizier at gmail.com</>

4
java/source/infodynamics/measures/continuous/kernel/KernelEstimatorSingleVariate.java → java/source/infodynamics/measures/continuous/kernel/KernelEstimatorUniVariate.java
View File

@ -19,7 +19,7 @@ import java.util.Arrays;
* @author Joseph Lizier, <a href="mailto:joseph.lizier at gmail.com">joseph.lizier at gmail.com</>
*
*/
public class KernelEstimatorSingleVariate {
public class KernelEstimatorUniVariate {
private double suppliedKernelWidth = 0.1;
private double kernelWidthInUse;
@ -69,7 +69,7 @@ public class KernelEstimatorSingleVariate {
}
}
public KernelEstimatorSingleVariate() {
public KernelEstimatorUniVariate() {
}
/**

6
java/source/infodynamics/measures/continuous/kernel/MultiInfoCalculatorKernel.java
View File

@ -10,7 +10,7 @@ import java.util.Random;
public class MultiInfoCalculatorKernel implements
MultiInfoCalculator {
KernelEstimatorSingleVariate[] svkeMarginals = null;
KernelEstimatorUniVariate[] svkeMarginals = null;
KernelEstimatorMultiVariate mvkeJoint = null;
private int dimensions = 0;
@ -58,9 +58,9 @@ public class MultiInfoCalculatorKernel implements
if (this.dimensions != dimensions) {
// Need to create a new array of marginal kernel estimators
this.dimensions = dimensions;
svkeMarginals = new KernelEstimatorSingleVariate[dimensions];
svkeMarginals = new KernelEstimatorUniVariate[dimensions];
for (int i = 0; i < dimensions; i++) {
svkeMarginals[i] = new KernelEstimatorSingleVariate();
svkeMarginals[i] = new KernelEstimatorUniVariate();
svkeMarginals[i].setNormalise(normalise);
if (dynCorrExcl) {
svkeMarginals[i].setDynamicCorrelationExclusion(dynCorrExclTime);