a bug that should have been caught long time ago..

beast-dev · Apr 19, 2024 · cf3b8b6 · cf3b8b6
1 parent d82b6d2
commit cf3b8b6
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/src/dr/inference/operators/hmc/MassPreconditioner.java b/src/dr/inference/operators/hmc/MassPreconditioner.java
@@ -10,10 +10,7 @@
 import dr.inference.model.*;
 import dr.math.*;
 import dr.math.distributions.MultivariateNormalDistribution;
-import dr.math.matrixAlgebra.ReadableVector;
-import dr.math.matrixAlgebra.RobustEigenDecomposition;
-import dr.math.matrixAlgebra.WrappedMatrix;
-import dr.math.matrixAlgebra.WrappedVector;
+import dr.math.matrixAlgebra.*;
 import dr.util.Transform;
 
 import java.util.ArrayList;
@@ -720,10 +717,8 @@ protected void computeInverseMass() {
 
             if (variance.getUpdateCount() > minimumUpdates) {
                 double[] newVariance = variance.getVariance();
-//                adaptiveDiagonal.update(new WrappedVector.Raw(newVariance));
-//                return normalizeVector(adaptiveDiagonal.getMean(), dim);
-//                setInverseMassFromArray(normalizeVector(new WrappedVector.Raw(newVariance), dim));
-                setInverseMassFromArray(DiagonalHessianPreconditioning.boundMassInverse(newVariance,
+                adaptiveDiagonal.update(new WrappedVector.Raw(newVariance));
+                setInverseMassFromArray(DiagonalHessianPreconditioning.boundMassInverse(((WrappedVector) adaptiveDiagonal.getMean()).getBuffer(),
                         options.preconditioningEigenLowerBound(), options.preconditioningEigenUpperBound(), dim,
                         DiagonalHessianPreconditioning.VarianceConverter.VARIANCE));
             }