Merge pull request #165 from uclahs-cds/hwinata-fix-simple-dend

Fix bug in simple dendrograms

NEWS.md

@@ -28,6 +28,7 @@
 
 ## Bug
 * Resolved issue where the spread parameter was not applied in dendrogram mode.
+* Resolved issue for simple dendrogram trees ( < 6 nodes or binary tree), where node angles were not calculated correctly.
 
 # CancerEvolutionVisualization 2.0.1 (2023-11-17)
 

R/calculate.clone.polygons.R

@@ -332,8 +332,8 @@ compute.clones <- function(
 	v <- rbind(root, v);
 	v <- count.leaves.per.node(v);
 	if (no.ccf) {
-	    tree$angle <- if ((is.null(fixed.angle) && nrow(v) > 6) || any(table(v$parent) > 2)) {
-    		tau <- -(pi / 2.5);
+	    tree$angle <- if ((is.null(fixed.angle) && nrow(v) > 6) || any(table(v$parent) > 2) || any(v$mode == 'dendrogram')) {
+			tau <- -(pi / 2.5);
     		vi <- v[v$parent == -1, ];
     		calculate.angles.radial(v, tree, spread, abs(tau));
 	    } else {

R/create.phylogenetic.tree.R

@@ -9,6 +9,7 @@ create.phylogenetic.tree <- function(
     ...
     ) {
 
+    tree <- as.data.frame(tree);
     if ('node.id' %in% colnames(tree)) {
         rownames(tree) <- tree$node.id;
         }