From d6c084583d54240e4a34c66f6078ec666ce4d6de Mon Sep 17 00:00:00 2001
From: Walter <walterxie@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:47:20 +1200
Subject: [PATCH] update unit tests about BactrianScaleOperator #128

---
 .../src/test/java/mascot/lphybeast/H3N2TutorialTest.java      | 4 ++--
 lphybeast/src/test/java/lphybeast/H5N1TutorialTest.java       | 4 ++--
 lphybeast/src/test/java/lphybeast/RSV2TutorialTest.java       | 4 ++--
 .../src/test/java/lphybeast/SkylinePlotsTutorialTest.java     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lphybeast-mascot/src/test/java/mascot/lphybeast/H3N2TutorialTest.java b/lphybeast-mascot/src/test/java/mascot/lphybeast/H3N2TutorialTest.java
index e8a9b47..3008665 100644
--- a/lphybeast-mascot/src/test/java/mascot/lphybeast/H3N2TutorialTest.java
+++ b/lphybeast-mascot/src/test/java/mascot/lphybeast/H3N2TutorialTest.java
@@ -109,8 +109,8 @@ public void testMascot() {
                 xml.contains("A/Waikato/5/2000|CY011960|2000.661202|New_Zealand=New_Zealand") &&
                 xml.contains("<typeTrait"), "Trait set" );
 
-        // 7 ScaleOperator, incl. tree
-        assertEquals(7, xml.split("BactrianScaleOperator", -1).length - 1, "BactrianScaleOperator" );
+        // 6 ScaleOperator, Tree scaled is replaced by BICEPS
+        assertEquals(6, xml.split("BactrianScaleOperator", -1).length - 1, "BactrianScaleOperator" );
 
         assertTrue(xml.contains("Exchange") && xml.contains("BactrianSubtreeSlide") &&
                 xml.contains("BactrianNodeOperator") && xml.contains("WilsonBalding"), "Tree Operator" );
diff --git a/lphybeast/src/test/java/lphybeast/H5N1TutorialTest.java b/lphybeast/src/test/java/lphybeast/H5N1TutorialTest.java
index 0052b6e..d23361b 100644
--- a/lphybeast/src/test/java/lphybeast/H5N1TutorialTest.java
+++ b/lphybeast/src/test/java/lphybeast/H5N1TutorialTest.java
@@ -123,8 +123,8 @@ public void testDPG() {
 
         assertTrue(xml.contains("BitFlipOperator") && xml.contains("parameter=\"@I\""), "I.bitFlip Operator" );
 
-        // 6 ScaleOperator, incl. tree
-        assertEquals(6, xml.split("BactrianScaleOperator", -1).length - 1,
+        // 5 ScaleOperator, Tree scaled is replaced by BICEPS
+        assertEquals(5, xml.split("BactrianScaleOperator", -1).length - 1,
                 "BactrianScaleOperator" );
 
         assertTrue(xml.contains("Exchange") && xml.contains("BactrianSubtreeSlide") &&
diff --git a/lphybeast/src/test/java/lphybeast/RSV2TutorialTest.java b/lphybeast/src/test/java/lphybeast/RSV2TutorialTest.java
index 74dac8d..1e1dd53 100644
--- a/lphybeast/src/test/java/lphybeast/RSV2TutorialTest.java
+++ b/lphybeast/src/test/java/lphybeast/RSV2TutorialTest.java
@@ -87,8 +87,8 @@ public void testRSV2() {
         // 3 TreeLikelihood
         assertEquals(3,xml.split("ThreadedTreeLikelihood", -1).length - 1, "Tree Likelihood" );
 
-        // 5 ScaleOperator, incl. tree
-        assertEquals(5, xml.split("BactrianScaleOperator", -1).length - 1, "BactrianScaleOperator" );
+        // 4 ScaleOperator, Tree scaled is replaced by BICEPS
+        assertEquals(4, xml.split("BactrianScaleOperator", -1).length - 1, "BactrianScaleOperator" );
 
         assertTrue(xml.contains("Exchange") && xml.contains("BactrianSubtreeSlide") && xml.contains("BactrianNodeOperator") &&
                 xml.contains("WilsonBalding"), "Tree Operator" );
diff --git a/lphybeast/src/test/java/lphybeast/SkylinePlotsTutorialTest.java b/lphybeast/src/test/java/lphybeast/SkylinePlotsTutorialTest.java
index cad72ff..c3422d6 100644
--- a/lphybeast/src/test/java/lphybeast/SkylinePlotsTutorialTest.java
+++ b/lphybeast/src/test/java/lphybeast/SkylinePlotsTutorialTest.java
@@ -82,8 +82,8 @@ public void testBS() {
                 xml.contains("name=\"S\">2.0</parameter>"),  "gamma shape prior" );
         assertTrue(xml.contains("gammaCategoryCount=\"4\"") && xml.contains("shape=\"@gamma\""), "SiteModel" );
 
-        // 4 ScaleOperator, incl. tree
-        assertEquals(4, xml.split("BactrianScaleOperator", -1).length - 1,
+        // 3 ScaleOperator, Tree scaled is replaced by BICEPS
+        assertEquals(3, xml.split("BactrianScaleOperator", -1).length - 1,
                 "BactrianScaleOperator" );
 
         assertTrue(xml.contains("Exchange") && xml.contains("BactrianSubtreeSlide") &&