simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-06 03:05:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: ask for lt in the mutable heap arg

Browse source
This commit is contained in:
Simon Cruanes 2020-10-07 12:03:27 -04:00
parent 3484efc691
commit aed72685fc
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/data/CCMutHeap.ml
View file

@ -24,12 +24,12 @@ module Make(Elt : RANKED) = struct
let[@inline] parent i = (i - 1) asr 1 (* (i-1) / 2 *) let[@inline] parent i = (i - 1) asr 1 (* (i-1) / 2 *)
(* (*
let rec heap_property cmp ({heap=heap} as s) i = let rec heap_property ({heap=heap} as s) i =
i >= (Vec.size heap) || i >= (Vec.size heap) ||
((i = 0 || not(cmp (Vec. get heap i) (Vec.get heap (parent i)))) ((i = 0 || not(cmp (Vec.get heap i) (Vec.get heap (parent i))))
&& heap_property cmp s (left i) && heap_property cmp s (right i)) && heap_property s (left i) && heap_property s (right i))
let heap_property cmp s = heap_property cmp s 1 let heap_property s = heap_property s 1
*) *)
(* [elt] is above or at its expected position. Move it up the heap (* [elt] is above or at its expected position. Move it up the heap
@ -37,7 +37,7 @@ module Make(Elt : RANKED) = struct
let percolate_up {heap} (elt:Elt.t) : unit = let percolate_up {heap} (elt:Elt.t) : unit =
let pi = ref (parent (Elt.idx elt)) in let pi = ref (parent (Elt.idx elt)) in
let i = ref (Elt.idx elt) in let i = ref (Elt.idx elt) in
while !i <> 0 && Elt.cmp elt (Vec.get heap !pi) do while !i <> 0 && Elt.lt elt (Vec.get heap !pi) do
Vec.set heap !i (Vec.get heap !pi); Vec.set heap !i (Vec.get heap !pi);
Elt.set_idx (Vec.get heap !i) !i; Elt.set_idx (Vec.get heap !i) !i;
i := !pi; i := !pi;
@ -55,11 +55,11 @@ module Make(Elt : RANKED) = struct
try try
while !li < sz do while !li < sz do
let child = let child =
if !ri < sz && Elt.cmp (Vec.get heap !ri) (Vec.get heap !li) if !ri < sz && Elt.lt (Vec.get heap !ri) (Vec.get heap !li)
then !ri then !ri
else !li else !li
in in
if not (Elt.cmp (Vec.get heap child) elt) then raise Exit; if not (Elt.lt (Vec.get heap child) elt) then raise Exit;
Vec.set heap !i (Vec.get heap child); Vec.set heap !i (Vec.get heap child);
Elt.set_idx (Vec.get heap !i) !i; Elt.set_idx (Vec.get heap !i) !i;
i := child; i := child;

2
src/data/CCMutHeap_intf.ml
View file

@ -7,7 +7,7 @@ module type RANKED = sig
type t type t
val idx: t -> int (** Index in heap. return -1 if never set *) val idx: t -> int (** Index in heap. return -1 if never set *)
val set_idx : t -> int -> unit (** Update index in heap *) val set_idx : t -> int -> unit (** Update index in heap *)
val cmp : t -> t -> bool val lt : t -> t -> bool (** [cmp a b] is true iff [a < b] *)
end end
module type S = sig module type S = sig