From 7683a6559d4744b13e4fff3a4d2c2d87687d0ac0 Mon Sep 17 00:00:00 2001
From: Marc Suchard <msuchard@ucla.edu>
Date: Fri, 4 Oct 2024 13:41:45 -0700
Subject: [PATCH] fix tests for log operator schedule

---
 tests/{broken => TestXML}/testRepeatedMeasuresOUHmc.xml     | 6 +++++-
 .../testRepeatedMeasuresOUHmcTreeScaled.xml                 | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
 rename tests/{broken => TestXML}/testRepeatedMeasuresOUHmc.xml (99%)
 rename tests/{broken => TestXML}/testRepeatedMeasuresOUHmcTreeScaled.xml (99%)

diff --git a/tests/broken/testRepeatedMeasuresOUHmc.xml b/tests/TestXML/testRepeatedMeasuresOUHmc.xml
similarity index 99%
rename from tests/broken/testRepeatedMeasuresOUHmc.xml
rename to tests/TestXML/testRepeatedMeasuresOUHmc.xml
index 3c9bce63a2..5aafa14894 100644
--- a/tests/broken/testRepeatedMeasuresOUHmc.xml
+++ b/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/tests/broken/testRepeatedMeasuresOUHmcTreeScaled.xml b/tests/TestXML/testRepeatedMeasuresOUHmcTreeScaled.xml
similarity index 99%
rename from tests/broken/testRepeatedMeasuresOUHmcTreeScaled.xml
rename to tests/TestXML/testRepeatedMeasuresOUHmcTreeScaled.xml
index 7faf6f7eba..37800065ee 100644
--- a/tests/broken/testRepeatedMeasuresOUHmcTreeScaled.xml
+++ b/tests/TestXML/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>