From fcbf5e7dacc036b1d7eef92d04303fdd0b7f3c59 Mon Sep 17 00:00:00 2001 From: David Shorten Date: Tue, 22 Jan 2019 19:17:36 +1100 Subject: [PATCH] end Thurs --- .../TransferEntropyCalculatorSpikingIntegration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/source/infodynamics/measures/spiking/integration/TransferEntropyCalculatorSpikingIntegration.java b/java/source/infodynamics/measures/spiking/integration/TransferEntropyCalculatorSpikingIntegration.java index 005afe5..3baa10e 100644 --- a/java/source/infodynamics/measures/spiking/integration/TransferEntropyCalculatorSpikingIntegration.java +++ b/java/source/infodynamics/measures/spiking/integration/TransferEntropyCalculatorSpikingIntegration.java @@ -28,7 +28,7 @@ import infodynamics.utils.UnivariateNearestNeighbourSearcher; public class TransferEntropyCalculatorSpikingIntegration implements TransferEntropyCalculatorSpiking { - protected final static boolean USE_POINT_ITSELF = false; + protected final static boolean USE_POINT_ITSELF = true; protected final static boolean TRIM_RADII = false; protected final static boolean USE_SAME_RADII = false; @@ -867,8 +867,8 @@ public class TransferEntropyCalculatorSpikingIntegration implements double logRateGivenDestCorrected = MathsUtils.digamma(countOfDestNextMatched) // - (1.0 / (double) countOfDestNextMatched) // I don't think this correction is required - Math.log(timeInWindowWithMatchingDestHistory); if(USE_POINT_ITSELF) { - logRateGivenSourceAndDestCorrected = MathsUtils.digamma(Knns + 1) - Math.log(timeInWindowWithMatchingJointHistories); - logRateGivenDestCorrected = MathsUtils.digamma(countOfDestNextMatched) - Math.log(timeInWindowWithMatchingDestHistory); + logRateGivenSourceAndDestCorrected = MathsUtils.digamma(Knns) - Math.log(timeInWindowWithMatchingJointHistories); + logRateGivenDestCorrected = MathsUtils.digamma(countOfDestNextMatched - 1) - Math.log(timeInWindowWithMatchingDestHistory); } //============================