mirror of
https://github.com/fluencelabs/tendermint
synced 2025-05-23 19:31:18 +00:00
Change heap.Push to mean int priority
This commit is contained in:
parent
988e190ef7
commit
03dfb724c7
@ -4,25 +4,21 @@ import (
|
|||||||
"container/heap"
|
"container/heap"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Comparable interface {
|
|
||||||
Less(o interface{}) bool
|
|
||||||
}
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Example usage:
|
Example usage:
|
||||||
|
|
||||||
|
```
|
||||||
h := NewHeap()
|
h := NewHeap()
|
||||||
|
|
||||||
h.Push(String("msg1"), 1)
|
h.Push("msg1", 1)
|
||||||
h.Push(String("msg3"), 3)
|
h.Push("msg3", 3)
|
||||||
h.Push(String("msg2"), 2)
|
h.Push("msg2", 2)
|
||||||
|
|
||||||
fmt.Println(h.Pop())
|
fmt.Println(h.Pop()) // msg1
|
||||||
fmt.Println(h.Pop())
|
fmt.Println(h.Pop()) // msg2
|
||||||
fmt.Println(h.Pop())
|
fmt.Println(h.Pop()) // msg3
|
||||||
|
```
|
||||||
*/
|
*/
|
||||||
|
|
||||||
type Heap struct {
|
type Heap struct {
|
||||||
pq priorityQueue
|
pq priorityQueue
|
||||||
}
|
}
|
||||||
@ -35,7 +31,11 @@ func (h *Heap) Len() int64 {
|
|||||||
return int64(len(h.pq))
|
return int64(len(h.pq))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Heap) Push(value interface{}, priority Comparable) {
|
func (h *Heap) Push(value interface{}, priority int) {
|
||||||
|
heap.Push(&h.pq, &pqItem{value: value, priority: cmpInt(priority)})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Heap) PushComparable(value interface{}, priority Comparable) {
|
||||||
heap.Push(&h.pq, &pqItem{value: value, priority: priority})
|
heap.Push(&h.pq, &pqItem{value: value, priority: priority})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,8 +56,6 @@ func (h *Heap) Pop() interface{} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
///////////////////////
|
|
||||||
// From: http://golang.org/pkg/container/heap/#example__priorityQueue
|
// From: http://golang.org/pkg/container/heap/#example__priorityQueue
|
||||||
|
|
||||||
type pqItem struct {
|
type pqItem struct {
|
||||||
@ -101,3 +99,16 @@ func (pq *priorityQueue) Update(item *pqItem, value interface{}, priority Compar
|
|||||||
item.priority = priority
|
item.priority = priority
|
||||||
heap.Fix(pq, item.index)
|
heap.Fix(pq, item.index)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------
|
||||||
|
// Comparable
|
||||||
|
|
||||||
|
type Comparable interface {
|
||||||
|
Less(o interface{}) bool
|
||||||
|
}
|
||||||
|
|
||||||
|
type cmpInt int
|
||||||
|
|
||||||
|
func (i cmpInt) Less(o interface{}) bool {
|
||||||
|
return int(i) < int(o.(cmpInt))
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user