simon/sidekick
1
0
Fork 0
mirror of https://github.com/c-cube/sidekick.git synced 2026-01-24 02:16:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix heap

Browse source
This commit is contained in:
Simon Cruanes 2019-11-29 14:44:01 -06:00
parent 0266a39b04
commit 99fed971d6
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/core/Heap.ml
View file

@ -124,17 +124,22 @@ module Make(Elt : RANKED) = struct
*)
let remove_min ({heap} as s) =
if Vec.size heap=0 then raise Not_found;
let x = Vec.get heap 0 in
let new_hd = Vec.pop heap in (* new head *)
Vec.set heap 0 new_hd;
Elt.set_idx new_hd 0;
(* remove [x]. do it after [new_hd.idx<-0] in case [x==new_hd] *)
Elt.set_idx x _absent_index;
(* enforce heap property again *)
if Vec.size heap > 1 then (
percolate_down s new_hd;
);
x
match Vec.size heap with
| 0 -> raise Not_found
| 1 ->
let x = Vec.pop heap in
Elt.set_idx x _absent_index;
x
| _ ->
let x = Vec.get heap 0 in
let new_hd = Vec.pop heap in (* heap.last() *)
Vec.set heap 0 new_hd;
Elt.set_idx x _absent_index;
Elt.set_idx new_hd 0;
(* enforce heap property again *)
if Vec.size heap > 1 then (
percolate_down s new_hd;
);
x
end [@@inline]