aboutsummaryrefslogtreecommitdiff
path: root/libgo/go/container/heap
diff options
context:
space:
mode:
Diffstat (limited to 'libgo/go/container/heap')
-rw-r--r--libgo/go/container/heap/heap.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/libgo/go/container/heap/heap.go b/libgo/go/container/heap/heap.go
index 5fe23b9..7110c51 100644
--- a/libgo/go/container/heap/heap.go
+++ b/libgo/go/container/heap/heap.go
@@ -83,8 +83,9 @@ func Remove(h Interface, i int) interface{} {
// but less expensive than, calling Remove(h, i) followed by a Push of the new value.
// The complexity is O(log(n)) where n = h.Len().
func Fix(h Interface, i int) {
- down(h, i, h.Len())
- up(h, i)
+ if !down(h, i, h.Len()) {
+ up(h, i)
+ }
}
func up(h Interface, j int) {
@@ -98,7 +99,8 @@ func up(h Interface, j int) {
}
}
-func down(h Interface, i, n int) {
+func down(h Interface, i0, n int) bool {
+ i := i0
for {
j1 := 2*i + 1
if j1 >= n || j1 < 0 { // j1 < 0 after int overflow
@@ -114,4 +116,5 @@ func down(h Interface, i, n int) {
h.Swap(i, j)
i = j
}
+ return i > i0
}