From 8fed3ca1fa3cebac4ef0620adad60031b449f5ce Mon Sep 17 00:00:00 2001 From: Remco Bouckaert Date: Tue, 9 Aug 2022 09:00:53 +1200 Subject: [PATCH] fix potential recalculation issue due to refactoring #834 --- Dockerfile | 4 ++-- .../base/evolution/branchratemodel/UCRelaxedClockModel.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 50dbfcaf..f1fd7e14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,8 +31,8 @@ RUN chmod 600 /root/.vnc/passwd # Install BEAGLE RUN apt-get update && apt-get install -y build-essential autoconf automake libtool pkg-config -# use latest release v3.2.1, issue #786 -RUN cd /root && git clone --branch v3.2.1 --depth=1 https://github.com/beagle-dev/beagle-lib.git +# use latest release v3.1.2, issue #786 +RUN cd /root && git clone --branch v3.1.2 --depth=1 https://github.com/beagle-dev/beagle-lib.git RUN cd /root/beagle-lib && ./autogen.sh && ./configure --prefix=/usr/local && make install RUN ldconfig diff --git a/src/beast/base/evolution/branchratemodel/UCRelaxedClockModel.java b/src/beast/base/evolution/branchratemodel/UCRelaxedClockModel.java index 5310cc19..5caa5d7e 100644 --- a/src/beast/base/evolution/branchratemodel/UCRelaxedClockModel.java +++ b/src/beast/base/evolution/branchratemodel/UCRelaxedClockModel.java @@ -17,6 +17,7 @@ import beast.base.inference.distribution.ParametricDistribution; import beast.base.inference.parameter.IntegerParameter; import beast.base.inference.parameter.RealParameter; +import beast.base.inference.util.InputUtil; import beast.base.util.Randomizer; /** @@ -370,7 +371,7 @@ protected boolean requiresRecalculation() { if (rateInput.get() != null && rateInput.get().somethingIsDirty()) { return true; } - if (meanRate instanceof CalculationNode && ((CalculationNode)meanRate).isDirtyCalculation()) { + if (InputUtil.isDirty(meanRateInput)) { return true; }