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

fix test and have CCRandom.split_list fail on len=0

Browse source
This commit is contained in:
Simon Cruanes 2016-04-18 15:33:37 +02:00
parent 2f196ee9a2
commit 203d870357
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/CCRandom.ml
View file

@ -112,6 +112,7 @@ let _diff_list ~last l =
If we define, y_k = x_{k+1} - x_{k} for k in 0..(len-1), then by construction If we define, y_k = x_{k+1} - x_{k} for k in 0..(len-1), then by construction
∑_k y_k = ∑_k (x_{k+1} - x_k ) = x_{len} - x_0 = i. *) ∑_k y_k = ∑_k (x_{k+1} - x_k ) = x_{len} - x_0 = i. *)
let split_list i ~len st = let split_list i ~len st =
if len=0 then invalid_arg "Random.split_list";
if i >= len then if i >= len then
let xs = sample_without_replacement (len-1) (int_range 1 (i-1)) st in let xs = sample_without_replacement (len-1) (int_range 1 (i-1)) st in
_diff_list ( 0::xs ) ~last:i _diff_list ( 0::xs ) ~last:i
@ -120,7 +121,7 @@ let split_list i ~len st =
(*$Q (*$Q
Q.(pair small_int small_int) (fun (i,j) -> \ Q.(pair small_int small_int) (fun (i,j) -> \
let len, n = min i j, max i j in \ let len, n = 1+min i j, max i j in \
let l = QCheck.Gen.generate1 (split_list n ~len) in \ let l = QCheck.Gen.generate1 (split_list n ~len) in \
match l with None -> true | Some l -> l<> [] && List.for_all (fun x->x>0) l) match l with None -> true | Some l -> l<> [] && List.for_all (fun x->x>0) l)
*) *)

1
src/core/CCRandom.mli
View file

@ -104,6 +104,7 @@ val split_list : int -> len:int -> int list option t
(** Split a value [n] into a list of values whose sum is [n] (** Split a value [n] into a list of values whose sum is [n]
and whose length is [length]. The list is never empty and does not and whose length is [length]. The list is never empty and does not
contain [0]. contain [0].
@raise Invalid_argument if [len=0]
@return [None] if the value is too small *) @return [None] if the value is too small *)
val retry : ?max:int -> 'a option t -> 'a option t val retry : ?max:int -> 'a option t -> 'a option t