fix BigFastTreeIntervalsTest fix; conflict btw Andrew's faster interv…

…als and JT's BigFastTreeIntervals
beast-dev · Sep 26, 2024 · 22012e2 · 22012e2
1 parent 5a4f563
commit 22012e2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/test/dr/evomodel/bigfasttree/BigFastTreeTreeIntervalsTest.java b/src/test/dr/evomodel/bigfasttree/BigFastTreeTreeIntervalsTest.java
@@ -302,7 +302,7 @@ public void testCompareIntervals() throws TreeUtils.MissingTaxonException, IOExc
                 }
             }
             for (int j = 0; j < bigFastTreeIntervals.getIntervalCount(); j++) {
-                if (intervals.getIntervalTime(j) != bigFastTreeIntervals.getIntervalTime(j)) {
+                if (intervals.getIntervalTime(j) != bigFastTreeIntervals.getIntervalTime(j + 1)) {
                     System.out.println(i);
                     System.out.println("times wrong");
                     pass = false;

diff --git a/src/test/dr/evomodel/speciation/YuleModelTest.java b/src/test/dr/evomodel/speciation/YuleModelTest.java
@@ -106,6 +106,8 @@ public void testYuleWithSubtreeSlide() {
 
     private void yuleTester(TreeModel treeModel, OperatorSchedule schedule) {
 
+        MathUtils.setSeed(666);
+
         MCMC mcmc = new MCMC("mcmc1");
         MCMCOptions options = new MCMCOptions(1000000);
 

diff --git a/src/test/dr/evomodel/substmodel/GeneralSubstitutionModelTest.java b/src/test/dr/evomodel/substmodel/GeneralSubstitutionModelTest.java
@@ -99,6 +99,8 @@ public void setUp() throws Exception {
 
     public void testGeneralSubstitutionModel() {
 
+        MathUtils.setSeed(666);
+
         // Sub model
         FrequencyModel freqModel = new FrequencyModel(dataType, alignment.getStateFrequencies());
         Parameter ratesPara = new Parameter.Default(GeneralSubstitutionModelParser.RATES, 5, 1.0); // dimension="5" value="1.0"