lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-26 08:45:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rbt: fix rbtree search for neel

Browse Source
This commit is contained in:
c9s 2021-06-07 02:17:00 +08:00
parent 5d8f7b3ea6
commit 9622956c71
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/types/rbtree.go
View File

@ -229,7 +229,7 @@ func (tree *RBTree) Insert(key, val fixedpoint.Value) {
func (tree *RBTree) Search(key fixedpoint.Value) *RBNode {
var current = tree.Root
for current != nil && key != current.Key {
for current != tree.neel && key != current.Key {
if key < current.Key {
current = current.Left
} else {
@ -237,6 +237,10 @@ func (tree *RBTree) Search(key fixedpoint.Value) *RBNode {
}
}
if current == tree.neel {
return nil
}
return current
}

8
pkg/types/rbtree_test.go
View File

@ -31,6 +31,7 @@ func TestRBTree_Rightmost(t *testing.T) {
tree.Insert(10, 10)
node = tree.Rightmost()
assert.Equal(t, fixedpoint.Value(10), node.Key)
assert.Equal(t, fixedpoint.Value(10), node.Value)
tree.Insert(12, 12)
tree.Insert(9, 9)
@ -38,17 +39,20 @@ func TestRBTree_Rightmost(t *testing.T) {
assert.Equal(t, fixedpoint.Value(12), node.Key)
}
func TestRBTree_RandomInsertAndDelete(t *testing.T) {
func TestRBTree_RandomInsertSearchAndDelete(t *testing.T) {
var keys []fixedpoint.Value
tree := NewRBTree()
for i := 1; i < 100; i++ {
v := fixedpoint.NewFromFloat(rand.Float64()*100 + 1.0)
keys = append(keys, v)
tree.Insert(v, fixedpoint.NewFromFloat(float64(i)))
tree.Insert(v, v)
}
for _, key := range keys {
node := tree.Search(key)
assert.NotNil(t, node)
ok := tree.Delete(key)
assert.True(t, ok, "should find and delete the node")
}