Skip to content

Commit 8a8c9b0

Browse files
authored
Merge pull request #24 from nossleinad/newick-binarize-patch
Fix binarize! during newick import
2 parents 9c711c6 + 459e941 commit 8a8c9b0

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/core/nodes/AbstractTreeNode.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,15 @@ function gettreefromnewick(str, T::DataType; tagged = false, disable_binarize =
309309
i += 1
310310
elseif c == ';'
311311
try_apply_char_arr(currnode, char_arr)
312-
return (tagged ? (currnode, tag_dict) : currnode)
312+
break
313313
else
314314
push!(char_arr, c)
315315
#println(char_arr)
316316
i += 1
317317
end
318318
end
319319

320-
binarize!(currnode)
320+
!disable_binarize && binarize!(currnode)
321321

322322
return (tagged ? (currnode, tag_dict) : currnode)
323323
end

src/utils/misc.jl

+1-4
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,7 @@ function read_newick_tree(
261261
strip_single_quotes = true,
262262
)
263263
treestring = read(treefile, String)
264-
tree = gettreefromnewick(treestring, FelNode)
265-
if binarize
266-
binarize!(tree)
267-
end
264+
tree = gettreefromnewick(treestring, FelNode, disable_binarize=!binarize)
268265
if ladderize
269266
ladderize!(tree)
270267
end

0 commit comments

Comments
 (0)