pre-branching updates

TGuillerme · Nov 23, 2023 · 8a8c3e3 · 8a8c3e3
1 parent 0e41fd9
commit 8a8c3e3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/src/bitwise.dist.o b/src/bitwise.dist.o
diff --git a/src/char.diff.o b/src/char.diff.o
diff --git a/src/dispRity.so b/src/dispRity.so
diff --git a/src/registerDynamicSymbol.o b/src/registerDynamicSymbol.o
diff --git a/tests/testthat/test-dispRity.utilities.R b/tests/testthat/test-dispRity.utilities.R
@@ -736,7 +736,7 @@ test_that("get.tree with subsets", {
     edgelabels()
     tiplabels()
     tiplabels(simple_tree$tip.label, adj = -1, col = "blue")
-    abline(v = c(0, 1, 2, 3, 3.5), col = "grey", lty = 2)
+    abline(v = c(0, 1, 2, 3, 3.8), col = "grey", lty = 2)
     dev.new()
     tree <- simple_tree
 
@@ -897,40 +897,40 @@ test_that("get.tree with subsets", {
 
 
 
-chrono.subset.tree <- function(subset_n, data, to.root) {
+# chrono.subset.tree <- function(subset_n, data, to.root) {
 
-    slice.type <- data$call$subsets[[1]]
-    age <- as.numeric(strsplit(names(data$subsets[subset_n]), split = " - ")[[1]])
+#     slice.type <- data$call$subsets[[1]]
+#     age <- as.numeric(strsplit(names(data$subsets[subset_n]), split = " - ")[[1]])
 
-    ## Time bin/slice behaviour
-    if(slice.type %in% c("discrete", "continuous")) {
-        if(to.root) {
+#     ## Time bin/slice behaviour
+#     if(slice.type %in% c("discrete", "continuous")) {
+#         if(to.root) {
 
-            slice.tree(data$tree[[1]], age = age[2], model = "acctran")
+#             slice.tree(data$tree[[1]], age = age[2], model = "acctran")
 
-            ## Maybe test this one?
-            # paleotree::timeSliceTree
+#             ## Maybe test this one?
+#             # paleotree::timeSliceTree
 
-            slice.tree(tree, age, model, FAD, LAD)
+#             slice.tree(tree, age, model, FAD, LAD)
 
-            ## cut the trees to the upper bound
-            return(output)
-        } else {
-            if(!to.root && slice.type == "discrete") {
-                ## cut the trees to the upper and lower bounds
-                return(output)
+#             ## cut the trees to the upper bound
+#             return(output)
+#         } else {
+#             if(!to.root && slice.type == "discrete") {
+#                 ## cut the trees to the upper and lower bounds
+#                 return(output)
 
 
 
 
-            }
-        }
-    }
+#             }
+#         }
+#     }
 
-    ## Out
-    return(output)
+#     ## Out
+#     return(output)
 
-}
+# }
 
 
 # #     ## BUG when using a matrix with just one column! (empty subsets)