diff --git a/test/k-clustering/state.ml b/test/k-clustering/state.ml index 00b9556c555dbaf984d68132aa80492557609844..9492421d24c7270f43354307a89f0d14db186aa0 100644 --- a/test/k-clustering/state.ml +++ b/test/k-clustering/state.ml @@ -1,3 +1,5 @@ +(* Time-stamp: <2022-07-12 11:01:25 emile> *) + open Algo let d = max_degree() @@ -6,11 +8,14 @@ type t = { isRoot:bool; alpha:int; par:int -} + } + +(*let boolVint (b:bool):int = + if b then 1 else 0*) let (to_string: (t -> string)) = fun s -> - Printf.sprintf "alpha=%d" s.alpha + Printf.sprintf "isRoot=%b alpha=%d par=%d" s.isRoot s.alpha s.par let (of_string: (string -> t) option) = Some (fun s -> @@ -21,4 +26,4 @@ let (copy : ('v -> 'v)) = fun x -> x let actions = ["change_alpha"] let k = 2 - + diff --git a/test/unison/state.ml b/test/unison/state.ml index 2298b66ca4243cdb91c1349975dd10d278df9acf..36fa4acebfa26dcfeaee2fb9346cc74429d557aa 100644 --- a/test/unison/state.ml +++ b/test/unison/state.ml @@ -1,7 +1,14 @@ type t = int let to_string = (fun s -> Printf.sprintf "c=%i" s) -let of_string = None + +let (of_string: (string -> t) option) = + Some (fun s -> + let res = Scanf.sscanf s "c=%d" (fun i -> i ) in + res + ) + + let copy x = x let actions = ["g"] let potential = None diff --git a/test/unison/unison.ml b/test/unison/unison.ml index cdeed961eb789fcb352aa3353c6a64ec52979192..bfc450106d8bfcc93c9dbafeb3299924d76d58ee 100644 --- a/test/unison/unison.ml +++ b/test/unison/unison.ml @@ -1,11 +1,11 @@ -(* Time-stamp: <modified the 05/03/2020 (at 21:38) by Erwan Jahier> *) +(* Time-stamp: <2022-07-18 15:47:53 emile> *) open Algo (* let m=10 (* max 2 (1+2*diameter ()) *) *) let diameter = Algo.diameter () -let m = max 2 (2*diameter-1) +let m = max 2 (2*diameter-1) let (init_state: int -> string -> 'v) = fun _ _ ->