Move count_nodes back to EquationUtils.jl

Author: MilesCranmer

src/EquationUtils.jl

@@ -18,7 +18,16 @@ import ..EquationModule:
 
 Count the number of nodes in the tree.
 """
-count_nodes
+function count_nodes(tree::AbstractNode; break_sharing=Val(false))
+    return tree_mapreduce(
+        _ -> 1,
+        +,
+        tree,
+        Int64;
+        f_on_shared=(c, is_shared) -> is_shared ? 0 : c,
+        break_sharing,
+    )
+end
 
 """
     count_depth(tree::AbstractNode)::Int

src/base.jl

@@ -128,7 +128,7 @@ end
 function allocate_id_map(tree::AbstractNode, ::Type{RT}) where {RT}
     d = Dict{UInt,RT}()
     # Preallocate maximum storage (counting with duplicates is fast)
-    N = count_nodes(tree; break_sharing=Val(true))
+    N = length(tree; break_sharing=Val(true))
     sizehint!(d, N)
     return d
 end
@@ -318,17 +318,6 @@ function count(
     ) + init
 end
 
-function count_nodes(tree::AbstractNode; break_sharing=Val(false))
-    return tree_mapreduce(
-        _ -> 1,
-        +,
-        tree,
-        Int64;
-        f_on_shared=(c, is_shared) -> is_shared ? 0 : c,
-        break_sharing,
-    )
-end
-
 function sum(
     f::F,
     tree::AbstractNode;