App: Support null constraints in AdditionTree()

ms609 · Jun 26, 2023 · 6d893ba · 6d893ba
1 parent e5d5da9
commit 6d893ba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: TreeSearch
 Title: Phylogenetic Analysis with Discrete Character Data
-Version: 1.3.2.9000
+Version: 1.3.2.9001
 Authors@R: c(
     person(
       "Martin R.", 'Smith',

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# TreeSearch 1.3.2.9000 (development)
+# TreeSearch 1.3.2.9001 (development)
 
 - Default to use equal weighting during ratchet iterations
 - Support null constraints in `AdditionTree()`

diff --git a/inst/Parsimony/app.R b/inst/Parsimony/app.R
@@ -1564,10 +1564,16 @@ server <- function(input, output, session) {
         AdditionTree(r$dataset, concavity = concavity())
       } else {
         LogComment("Select starting tree")
-        firstOptimal <- which.min(scores())
-        LogCode(paste0("startTree <- trees[[", firstOptimal, "]]",
-                       " # First tree with optimal score"))
-        r$trees[[firstOptimal]]
+        if (all(TipLabels(r$dataset) %in% TipLabels(r$trees))) {
+          firstOptimal <- which.min(scores())
+          LogCode(paste0("startTree <- trees[[", firstOptimal, "]]",
+                         " # First tree with optimal score"))
+          r$trees[[firstOptimal]]
+        } else {
+          # TODO Could try fuzzy matching
+          AdditionTree(r$dataset, concavity = concavity(),
+                       constraint = KeepTip(r$trees[[1]], TipLabels(r$dataset)))
+        }
       }
       LogMsg("StartSearch()")
       PutData(r$dataset)