fix tests for log operator schedule

beast-dev · Oct 4, 2024 · 6a929e7 · 6a929e7
1 parent 8d77919
commit 6a929e7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/tests/broken/testRepeatedMeasuresOUHmc.xml → tests/TestXML/testRepeatedMeasuresOUHmc.xml b/tests/broken/testRepeatedMeasuresOUHmc.xml → tests/TestXML/testRepeatedMeasuresOUHmc.xml
@@ -253,7 +253,7 @@
         <compoundGradient idref="simTrait.prior.gradient"/>
     </jointGradient>
 
-    <operators id="operators">
+    <operators id="operators" optimizationSchedule="log">
         <hamiltonianMonteCarloOperator weight="1" nSteps="10" stepSize="0.01" mode="vanilla"
                                        drawVariance="1.0" gradientCheckCount="1" gradientCheckTolerance="0.5">
             <pathGradient>
@@ -345,8 +345,12 @@
             <varianceProportionStatistic idref="varianceLog"/>
         </actual>
         <expected>
+        	0.9997531382609257 		0.19550438061492784
+        	0.19550438061492784     0.9258670139080631
+<!-- Using POWER optimization
 			0.9994180   0.022429281  
 			0.022429281 0.8911881
+ -->
         </expected>
     </assertEqual>
 

diff --git a/...n/testRepeatedMeasuresOUHmcTreeScaled.xml → ...L/testRepeatedMeasuresOUHmcTreeScaled.xml b/...n/testRepeatedMeasuresOUHmcTreeScaled.xml → ...L/testRepeatedMeasuresOUHmcTreeScaled.xml
@@ -253,7 +253,7 @@
         <compoundGradient idref="simTrait.prior.gradient"/>
     </jointGradient>
 
-    <operators id="operators">
+    <operators id="operators" optimizationSchedule="log">
         <hamiltonianMonteCarloOperator weight="1" nSteps="10" stepSize="0.01" mode="vanilla"
                                        drawVariance="1.0" gradientCheckCount="1" gradientCheckTolerance="0.5">
             <pathGradient>
@@ -345,8 +345,12 @@
             <varianceProportionStatistic idref="varianceLog"/>
         </actual>
         <expected>
+			0.9881278234958323		0.027051233440815354}
+			0.027051233440815354 	0.011934240128512253       
+<!-- 
 			0.9966896    0.04666217
 			0.04666217   0.02887752
+ -->
         </expected>
     </assertEqual>