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

bv: also refactor inter

Browse source
This commit is contained in:
Simon Cruanes 2021-05-17 10:03:58 -04:00
parent 1c8265c3f3
commit 795ae5c546
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/data/CCBV.ml
View file

@ -492,31 +492,29 @@ let union b1 b2 =
union (of_list [1;2;3;4;5]) (of_list [7;3;5;6]) |> to_sorted_list = CCList.range 1 7 union (of_list [1;2;3;4;5]) (of_list [7;3;5;6]) |> to_sorted_list = CCList.range 1 7
*) *)
(* Underlying size shrinks for inter. *)
let inter_into ~into bv = let inter_into_no_resize_ ~into bv =
if into.size > bv.size then ( assert (Array.length into.a <= Array.length bv.a);
shrink_ into bv.size;
);
for i = 0 to (Array.length into.a) - 1 do for i = 0 to (Array.length into.a) - 1 do
Array.unsafe_set into.a i Array.unsafe_set into.a i
((Array.unsafe_get into.a i) land (Array.unsafe_get bv.a i)) ((Array.unsafe_get into.a i) land (Array.unsafe_get bv.a i))
done done
(* Underlying size shrinks for inter. *)
let inter_into ~into bv =
if into.size > bv.size then (
shrink_ into bv.size;
);
inter_into_no_resize_ ~into bv
let inter b1 b2 = let inter b1 b2 =
if b1.size <= b2.size if b1.size <= b2.size then (
then (
let into = copy b1 in let into = copy b1 in
for i = 0 to (Array.length b1.a) - 1 do inter_into_no_resize_ ~into b2;
Array.unsafe_set into.a i
((Array.unsafe_get into.a i) land (Array.unsafe_get b2.a i))
done;
into into
) else ( ) else (
let into = copy b2 in let into = copy b2 in
for i = 0 to (Array.length b2.a) - 1 do inter_into_no_resize_ ~into b1;
Array.unsafe_set into.a i
((Array.unsafe_get into.a i) land (Array.unsafe_get b1.a i))
done;
into into
) )
@ -524,6 +522,16 @@ let inter b1 b2 =
inter (of_list [1;2;3;4]) (of_list [2;4;6;1]) |> to_sorted_list = [1;2;4] inter (of_list [1;2;3;4]) (of_list [2;4;6;1]) |> to_sorted_list = [1;2;4]
*) *)
(*$R
let bv1 = CCBV.of_list [1;2;3;4;200;201] in
let bv2 = CCBV.of_list [4;200;3] in
let bv = CCBV.inter bv1 bv2 in
let l = List.sort compare (CCBV.to_list bv) in
assert_equal ~printer:(CCFormat.(to_string (Dump.list int)))
[3;4;200] l;
()
*)
(*$R (*$R
let bv1 = CCBV.of_list [1;2;3;4] in let bv1 = CCBV.of_list [1;2;3;4] in
let bv2 = CCBV.of_list [4;200;3] in let bv2 = CCBV.of_list [4;200;3] in