From e9b24fb8b1f9d3c900e16118458496b3f52b2b3c Mon Sep 17 00:00:00 2001
From: guo-yong-zhi <55872791+guo-yong-zhi@users.noreply.github.com>
Date: Sat, 20 Apr 2024 13:16:52 +0800
Subject: [PATCH] change childnumber 4 to 0

---
 Project.toml  |  2 +-
 src/qtrees.jl | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Project.toml b/Project.toml
index f0f08b6..4b74caa 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "Stuffing"
 uuid = "4175e07e-e5b7-423e-8796-3ea7f6d48281"
 authors = ["guoyongzhi <guo-yong-zhi@outlook.com>"]
-version = "0.10.0"
+version = "0.10.1"
 
 [deps]
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
diff --git a/src/qtrees.jl b/src/qtrees.jl
index 7f35106..dd76bae 100644
--- a/src/qtrees.jl
+++ b/src/qtrees.jl
@@ -15,7 +15,7 @@ const PERM4 = ((1, 2, 3, 4), (1, 2, 4, 3), (1, 3, 2, 4), (1, 3, 4, 2), (1, 4, 2,
 @assert length(PERM4) == 24
 @inline shuffle4() = @inbounds PERM4[rand(1:24)]
 const Index = Tuple{Int, Int, Int}
-@inline function child(ind::Index, n::Int)
+@inline function child(ind::Index, n::Int) # n: 0 or 4, 1, 2, 3
     @inbounds (ind[1] - 1, 2ind[2] - n & 0x01, 2ind[3] - (n & 0x02) >> 1)
 end
 @inline parent(ind::Index) = @inbounds (ind[1] + 1, (ind[2] + 1) ÷ 2, (ind[3] + 1) ÷ 2)
@@ -23,12 +23,10 @@ indexcenter(l::Integer, a::Integer, b::Integer) = l == 1 ? (a, b) : (2^(l - 1) *
 indexcenter(ind) = indexcenter(ind...)
 function childnumber(ancestor::Index, descendant::Index) #assume the ancestor-descendant relationship exists
     o2, o3 = indexcenter(ancestor[1] - descendant[1] + 1, ancestor[2], ancestor[3])
-    n = ((descendant[3] <= o3)<<1) | (descendant[2] <= o2)
-    n == 0 ? 4 : n
+    ((descendant[3] <= o3) << 1) | (descendant[2] <= o2) # 0, 1, 2, 3
 end
 function childnumber(ind::Index)
-    n = ((ind[3]&0x01)<<0x01)| (ind[2]&0x01)
-    n == 0 ? 4 : n
+    ((ind[3]&0x01)<<0x01) | (ind[2]&0x01) # 0, 1, 2, 3
 end
 function indexrange(l::Integer, a::Integer, b::Integer)
     r = 2^(l - 1)
@@ -472,7 +470,7 @@ function remove_tree_node(t::LinkedSpacialQTree, node::SpacialQTreeNode)
     p = node.parent
     ind = spacial_index(node)
     # @show ind
-    p.children[childnumber(ind)] = p
+    p.children[childnumber(ind)+1] = p
 end
 function Base.push!(t::LinkedSpacialQTree, ind::Index, label::Int)
     # @show ind, label
@@ -485,10 +483,10 @@ function Base.push!(t::LinkedSpacialQTree, ind::Index, label::Int)
             aind[1] <= ind[1] && break
             cn = childnumber(aind, ind)
             # @show aind, ind, cn
-            cnode = tn.children[cn]
+            cnode = tn.children[cn+1]
             if isemptychild(tn, cnode)
                 cnode = new_spacial_qtree_node(t, tn, child(aind, cn))
-                tn.children[cn] = cnode
+                tn.children[cn+1] = cnode
             end
             tn = cnode
         end