add filter_tree method + bug fixes

Author: maltezfaria

src/Geometry/Geometry.jl

@@ -14,7 +14,7 @@ using OrderedCollections
 using AbstractTrees
 using RecipesBase
 using Printf
-using Statistics: median
+using Statistics:median
 
 using WavePropBase
 using WavePropBase.Utils
@@ -62,7 +62,6 @@ export
     new_tag,
     global_add_entity!,
     index_range,
-    children,
     parent,
     container,
     loc2glob,

src/IO/plotsIO.jl

@@ -141,7 +141,7 @@ struct PlotTree end
     grid   --> false
     aspect_ratio --> :equal
     # plot nodes
-    blocks = filter(predicate,tree)
+    blocks = filter_tree(predicate,tree)
     for block in blocks
         @series begin
             block

src/Trees/Trees.jl

@@ -36,14 +36,22 @@ export
     PrincipalComponentSplitter,
     DyadicSplitter,
     CardinalitySplitter,
+    # re-exported from AbstractTrees
+    Leaves,
+    PreOrderDFS,
+    PostOrderDFS,
+    print_tree,
     # functions
     children,
     parent,
     isroot,
     isleaf,
+    depth,
     container,
     loc2glob,
     root_elements,
-    index_range
+    index_range,
+    filter_tree,
+    filter_tree!
 
 end # module

src/Trees/abstracttree.jl

@@ -19,7 +19,7 @@ end
 
 The node's parent. If `t` is a root, then `parent(t)==t`.
 """
-function parent(t::AbstractTree)
+function Base.parent(t::AbstractTree)
     abstractmethod(t)
 end
 
@@ -58,29 +58,30 @@ function depth(tree::AbstractTree,acc=0)
 end
 
 """
-    filter(filter,tree::AbstractTree,[isterminal=true])
+    filter_tree(f,tree,isterminal=true)
 
-Return all the nodes of `tree` satisfying `filter(node)==true`. If
-`isterminal`, do not recurse on children of nodes for which `filter(node)==true`.
+Return a vector containing all the nodes of `tree` such that
+`filter(node)==true`.  The argument `isterminal` can be used to control whether
+to continue the search on `children` of nodes for which `f(node)==true`.
 """
-function Base.filter(f,tree::AbstractTree,isterminal=true)
+function filter_tree(f,tree,isterminal=true)
     nodes = Vector{typeof(tree)}()
-    filter!(f,nodes,tree,isterminal)
+    filter_tree!(f,nodes,tree,isterminal)
 end
 
 """
-    filter!(filter,nodes,tree,[isterminal=true])
+    filter_tree!(filter,nodes,tree,[isterminal=true])
 
-Like [`filter`](@ref), but appends results to `nodes`.
+Like [`filter_tree`](@ref), but appends results to `nodes`.
 """
-function Base.filter!(f,nodes,tree::AbstractTree,isterminal=true)
+function filter_tree!(f,nodes,tree,isterminal=true)
     if f(tree)
         push!(nodes,tree)
         # terminate the search along this path if terminal=true
-        isterminal || map(x->filter!(f,nodes,x,isterminal),getchildren(tree))
+        isterminal || map(x->filter_tree!(f,nodes,x,isterminal),children(tree))
     else
         # continue on on children
-        map(x->filter!(f,nodes,x,isterminal),tree.children)
+        map(x->filter_tree!(f,nodes,x,isterminal),children(tree))
     end
     return nodes
 end

src/Trees/clustertree.jl

@@ -51,7 +51,7 @@ index_range(clt::ClusterTree)   = clt.index_range
 
 children(clt::ClusterTree)      = clt.children
 
-parent(clt::ClusterTree)        = clt.parent
+Base.parent(clt::ClusterTree)        = clt.parent
 
 """
     container(clt::ClusterTree)