Fix conn and conns, export _conn and _conns

EcoJulia · Nov 22, 2023 · 58e07bd · 58e07bd
1 parent 9e5e8ec
commit 58e07bd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/API.jl b/src/API.jl
@@ -23,7 +23,7 @@ using Unitful
 @traitimpl MatchBranchType{T, B} <- _matchbranchtype(T, B)
 
 @traitdef MatchBranchNodeType{T, B, N}
-@traitimpl MatchBranchNodeType{T, B, N} <- _matchbranchnodetype(T, N)
+@traitimpl MatchBranchNodeType{T, B, N} <- _matchbranchnodetype(T, B, N)
 
 @traitdef MatchTreeNameType{T, TN}
 @traitimpl MatchTreeNameType{T, TN} <- _matchtreenametype(T, TN)
@@ -86,9 +86,8 @@ _matchbranchtype(::Type{<:AbstractTree{TT, RT, NL, N, B}},
 Does this tree type prefer the branch and node types provided?
 """
 function _matchbranchnodetype end
-_matchbranchtype(::Type{T}, ::Type{B}, ::Type{N}) where
-    {TT, RT, NL, N, B, T <: AbstractTree{TT, RT, NL, N, B}} =
-                    _matchbranchtype(T, B) && _matchnodetype(T, N)
+_matchbranchnodetype(::Type{T}, ::Type{B}, ::Type{N}) where {T <: AbstractTree, B, N} =
+    _matchbranchtype(T, B) && _matchnodetype(T, N)
 
 """
     _matchtreenametype(::Type{<:AbstractTree}, ::Type{X})

diff --git a/src/LinkTree.jl b/src/LinkTree.jl
@@ -98,8 +98,7 @@ _src(::AbstractTree, branch::LinkBranch{<:Rooted}) = branch.inout[1]
 import Phylo.API: _dst
 _dst(::AbstractTree, branch::LinkBranch{<:Rooted}) = branch.inout[2]
 import Phylo.API: _conn
-function _conn(::AbstractTree, branch::LinkBranch{RT, NL, D},
-               exclude::AbstractNode{RT, NL}) where {RT, NL, D}
+function _conn(::LinkTree, branch::LinkBranch, exclude::LinkNode)
     return exclude ≡ branch.inout[1] ? branch.inout[2] :
         (exclude ≡ branch.inout[2] ? branch.inout[1] :
          error("Branch $(branch.name) not connected to $(exclude.name)"))

diff --git a/src/Phylo.jl b/src/Phylo.jl
@@ -80,7 +80,7 @@ export _getconnections, _addconnection!, _removeconnection!
 export MatchNodeType, MatchNodeTypes, PreferNodeObjects, _prefernodeobjects
 
 # AbstractBranch methods
-export _src, _dst, _getlength
+export _src, _dst, _getlength, _conn, _conns
 export MatchBranchType, PreferBranchObjects, _preferbranchobjects
 export MatchBranchNodeType
 

diff --git a/test/test_Interface.jl b/test/test_Interface.jl
@@ -76,6 +76,7 @@ matchbranch = true
         b3 = getinbound(tree, species[2])
         source = src(tree, b3)
         destination = dst(tree, b3)
+        @test Set(conns(tree, b3)) == Set([source, conn(tree, b3, source)])
         @test deletebranch!(tree, b3)
         branches = [branch for branch in branches if branch != b3]
         createbranch!(tree, who, species[1])