diff --git a/test/kclustering/kclustering_oracle.lus b/test/kclustering/kclustering_oracle.lus index 3c246d53a8498243ec3a281c0bc0a621011b2cb8..451322b5306a55aff7bb3ed566ee6c72063e9b14 100644 --- a/test/kclustering/kclustering_oracle.lus +++ b/test/kclustering/kclustering_oracle.lus @@ -18,14 +18,13 @@ node kclustering_oracle( round : bool; round_nb : int; ) -returns (ok : bool; +returns (ok : bool); +var lustre_cost:int; lustre_config : state^card; lustre_enabled : bool^actions_number^card; lustre_round:bool; - lustre_round_nb:int); ---var - + lustre_round_nb:int; let lustre_config, lustre_enabled, lustre_round, lustre_round_nb = topology(active -> pre active, -- ignored at the first step @@ -36,9 +35,9 @@ let -- compare the sasa dot interpretation and the salut dot to lustre compilation and lustre_config = ocaml_config -- and lustre_round = round --- and lustre_round_nb = round_nb + and lustre_round_nb = round_nb -- compare the lustre and the ocaml version of the processes - and Lustre::real2int(ocaml_cost) = lustre_cost +-- and Lustre::real2int(ocaml_cost) = lustre_cost -- compare the cost functions ; tel diff --git a/test/kclustering/verify.lus b/test/kclustering/verify.lus index 59ecd2198ba9cf0be7c7bf80bdc4196e9051f11b..08aa21edf65de71b5dadcd4e841358923e4c0e7c 100644 --- a/test/kclustering/verify.lus +++ b/test/kclustering/verify.lus @@ -23,7 +23,7 @@ let config, enables, lustre_round, lustre_round_nb = topology(active, init_config); -- assert(config = init_config -> true); - legitimate = legitimate<<actions_number,card>>(enables,config);; + legitimate = legitimate<<actions_number,card>>(enables,config); closure = true -> (pre(legitimate) => legitimate); -- cost = cost(enabled, config);