diff --git a/java/source/infodynamics/measures/continuous/ActiveInfoStorageCalculator.java b/java/source/infodynamics/measures/continuous/ActiveInfoStorageCalculator.java index 6bb22cf..782ef30 100755 --- a/java/source/infodynamics/measures/continuous/ActiveInfoStorageCalculator.java +++ b/java/source/infodynamics/measures/continuous/ActiveInfoStorageCalculator.java @@ -52,6 +52,8 @@ public interface ActiveInfoStorageCalculator { /** * Allows the user to set properties for the underlying calculator implementation + * New property values are not guaranteed to take effect until the next call + * to an initialise method. * * @param propertyName * @param propertyValue diff --git a/java/source/infodynamics/measures/continuous/ChannelCalculator.java b/java/source/infodynamics/measures/continuous/ChannelCalculator.java index 6ea60f7..15164c1 100755 --- a/java/source/infodynamics/measures/continuous/ChannelCalculator.java +++ b/java/source/infodynamics/measures/continuous/ChannelCalculator.java @@ -12,8 +12,6 @@ package infodynamics.measures.continuous; */ public interface ChannelCalculator extends ChannelCalculatorCommon { - public void initialise() throws Exception; - /** *

Sets the single set of observations to compute the PDFs from. * Cannot be called in conjunction with diff --git a/java/source/infodynamics/measures/continuous/ChannelCalculatorCommon.java b/java/source/infodynamics/measures/continuous/ChannelCalculatorCommon.java index 0259866..f784276 100755 --- a/java/source/infodynamics/measures/continuous/ChannelCalculatorCommon.java +++ b/java/source/infodynamics/measures/continuous/ChannelCalculatorCommon.java @@ -18,7 +18,17 @@ import infodynamics.utils.EmpiricalMeasurementDistribution; public abstract interface ChannelCalculatorCommon { /** - * Allows the user to set properties for the underlying calculator implementation + * Initialise the calculator for re-use with new observations. + * All parameters remain unchanged. + * + * @throws Exception + */ + public void initialise() throws Exception; + + /** + * Allows the user to set properties for the underlying calculator implementation. + * New property values are not guaranteed to take effect until the next call + * to an initialise method. * * @param propertyName * @param propertyValue diff --git a/java/source/infodynamics/measures/continuous/ConditionalMutualInfoCalculatorMultiVariate.java b/java/source/infodynamics/measures/continuous/ConditionalMutualInfoCalculatorMultiVariate.java index e16cb18..998ce7e 100755 --- a/java/source/infodynamics/measures/continuous/ConditionalMutualInfoCalculatorMultiVariate.java +++ b/java/source/infodynamics/measures/continuous/ConditionalMutualInfoCalculatorMultiVariate.java @@ -45,6 +45,8 @@ public interface ConditionalMutualInfoCalculatorMultiVariate { /** * Allows the user to set properties for the underlying calculator implementation + * New property values are not guaranteed to take effect until the next call + * to an initialise method. * * @param propertyName * @param propertyValue diff --git a/java/source/infodynamics/measures/continuous/ConditionalMutualInfoMultiVariateCommon.java b/java/source/infodynamics/measures/continuous/ConditionalMutualInfoMultiVariateCommon.java index aeb02cc..2473198 100755 --- a/java/source/infodynamics/measures/continuous/ConditionalMutualInfoMultiVariateCommon.java +++ b/java/source/infodynamics/measures/continuous/ConditionalMutualInfoMultiVariateCommon.java @@ -120,6 +120,8 @@ public abstract class ConditionalMutualInfoMultiVariateCommon implements /** * Sets common properties for the calculator. + * New property values are not guaranteed to take effect until the next call + * to an initialise method. * Valid properties include: *