Computes the local values of the multi-information, * for each valid observation in the previously supplied observations @@ -337,20 +331,4 @@ public interface MultiInfoCalculator { * is not equal to the number N samples that were previously supplied. */ public EmpiricalMeasurementDistribution computeSignificance(int[][][] newOrderings) throws Exception; - - /** - * Set or clear debug mode for extra debug printing to stdout - * - * @param debug new setting for debug mode (on/off) - */ - public void setDebug(boolean debug); - - /** - * Return the multi-information last calculated in a call to {@link #computeAverageLocalOfObservations()} - * or {@link #computeLocalOfPreviousObservations()} after the previous - * {@link #initialise(int)} call. - * - * @return the last computed multi-information value - */ - public double getLastAverage(); } diff --git a/java/source/infodynamics/measures/continuous/MultiInfoCalculatorCommon.java b/java/source/infodynamics/measures/continuous/MultiInfoCalculatorCommon.java index f6ad8e7..256e555 100755 --- a/java/source/infodynamics/measures/continuous/MultiInfoCalculatorCommon.java +++ b/java/source/infodynamics/measures/continuous/MultiInfoCalculatorCommon.java @@ -45,7 +45,7 @@ public abstract class MultiInfoCalculatorCommon implements MultiInfoCalculator { /** * Number of joint variables to consider */ - protected int dimensions = 0; + protected int dimensions = 1; /** * Number of samples supplied */ @@ -81,6 +81,11 @@ public abstract class MultiInfoCalculatorCommon implements MultiInfoCalculator { private double samplingFactor = 0.1; private Random rand; + @Override + public void initialise() { + initialise(dimensions); + } + @Override public void initialise(int dimensions) { this.dimensions = dimensions; @@ -127,6 +132,17 @@ public abstract class MultiInfoCalculatorCommon implements MultiInfoCalculator { } } + @Override + public String getProperty(String propertyName) throws Exception { + if (propertyName.equalsIgnoreCase(PROP_NORMALISE)) { + return Boolean.toString(normalise); + } else if (propertyName.equalsIgnoreCase(SAMPLING_FACTOR_PROP_NAME)) { + return Double.toString(samplingFactor); + } else { + return null; + } + } + @Override public void setObservations(double[][] observations) throws Exception { startAddObservations(); @@ -258,6 +274,11 @@ public abstract class MultiInfoCalculatorCommon implements MultiInfoCalculator { return miSurrogateCalculator.computeAverageLocalOfObservations(); } + @Override + public int getNumObservations() throws Exception { + return totalObservations; + } + @Override public void setDebug(boolean debug) { this.debug = debug; diff --git a/java/source/infodynamics/measures/continuous/gaussian/MultiInfoCalculatorGaussian.java b/java/source/infodynamics/measures/continuous/gaussian/MultiInfoCalculatorGaussian.java index 54b8dcc..dd4b4af 100644 --- a/java/source/infodynamics/measures/continuous/gaussian/MultiInfoCalculatorGaussian.java +++ b/java/source/infodynamics/measures/continuous/gaussian/MultiInfoCalculatorGaussian.java @@ -2,7 +2,6 @@ package infodynamics.measures.continuous.gaussian; import infodynamics.measures.continuous.MultiInfoCalculatorCommon; import infodynamics.utils.MatrixUtils; -import infodynamics.utils.MathsUtils; /** *
Computes the differential multi-information of a given multivariate diff --git a/java/source/infodynamics/measures/continuous/kernel/MultiInfoCalculatorKernel.java b/java/source/infodynamics/measures/continuous/kernel/MultiInfoCalculatorKernel.java index 950ace4..d78dddb 100755 --- a/java/source/infodynamics/measures/continuous/kernel/MultiInfoCalculatorKernel.java +++ b/java/source/infodynamics/measures/continuous/kernel/MultiInfoCalculatorKernel.java @@ -209,6 +209,19 @@ public class MultiInfoCalculatorKernel } } + @Override + public String getProperty(String propertyName) throws Exception { + if (propertyName.equalsIgnoreCase(KERNEL_WIDTH_PROP_NAME) || + propertyName.equalsIgnoreCase(EPSILON_PROP_NAME)) { + return Double.toString(kernelWidth); + } else if (propertyName.equalsIgnoreCase(DYN_CORR_EXCL_TIME_NAME)) { + return Integer.toString(dynCorrExclTime); + } else { + // Try the superclass, including for PROP_NORMALISE + return super.getProperty(propertyName); + } + } + @Override public void startAddObservations() { if (dynCorrExcl) { diff --git a/java/source/infodynamics/measures/continuous/kraskov/MultiInfoCalculatorKraskov.java b/java/source/infodynamics/measures/continuous/kraskov/MultiInfoCalculatorKraskov.java index bb8518a..9853774 100755 --- a/java/source/infodynamics/measures/continuous/kraskov/MultiInfoCalculatorKraskov.java +++ b/java/source/infodynamics/measures/continuous/kraskov/MultiInfoCalculatorKraskov.java @@ -183,7 +183,7 @@ public abstract class MultiInfoCalculatorKraskov *
Unknown property values are ignored.
@@ -244,6 +246,24 @@ public abstract class MultiInfoCalculatorKraskov } } + @Override + public String getProperty(String propertyName) throws Exception { + if (propertyName.equalsIgnoreCase(PROP_K)) { + return Integer.toString(k); + } else if (propertyName.equalsIgnoreCase(PROP_NORM_TYPE)) { + return KdTree.convertNormTypeToString(normType); + } else if (propertyName.equalsIgnoreCase(PROP_DYN_CORR_EXCL_TIME)) { + return Integer.toString(dynCorrExclTime); + } else if (propertyName.equalsIgnoreCase(PROP_ADD_NOISE)) { + return Double.toString(noiseLevel); + } else if (propertyName.equalsIgnoreCase(PROP_NUM_THREADS)) { + return Integer.toString(numThreads); + } else { + // try the superclass, including for PROP_NORMALISE: + return super.getProperty(propertyName); + } + } + /** * Set observations from two separate time series: join the rows at each time step * together to make a joint vector, then effectively call {@link #setObservations(double[][])}