diff --git a/src/aimos.ml b/src/aimos.ml index 2674d286c82881d248fafd85c612da36c57ee02d..f51a3b178e2c9bf1cb805ecb290dda302f91779f 100644 --- a/src/aimos.ml +++ b/src/aimos.ml @@ -23,7 +23,7 @@ open Why3 open Base -let aimos_file = Re__Core.(compile (str "%{aimos_file}")) +let re_aimos_file = Re__Core.(compile (str "%{aimos_file}")) let write_config inputs_path models_path perturbation perturbation_path out_mode amplitude = @@ -94,7 +94,7 @@ let build_command config_prover amplitude in let command = Whyconf.get_complete_command ~with_steps:false config_prover in - Re__Core.replace_string aimos_file ~by:aimos_config command + Re__Core.replace_string re_aimos_file ~by:aimos_config command let re_aimos_output = Re__Pcre.regexp "((,\\s)(\\d+\\.\\d+))" diff --git a/src/saver.ml b/src/saver.ml index c86a8b1e917ef387f009617e3e11115af0089f11..2a7f8e9be9bef9156b1baed742b0319fd30a08cd 100644 --- a/src/saver.ml +++ b/src/saver.ml @@ -23,21 +23,21 @@ open Why3 open Base -let svm = Re__Core.(compile (str "%{svm}")) -let dataset = Re__Core.(compile (str "%{dataset}")) -let epsilon = Re__Core.(compile (str "%{epsilon}")) -let abstraction = Re__Core.(compile (str "%{abstraction}")) -let distance = Re__Core.(compile (str "%{distance}")) +let re_svm = Re__Core.(compile (str "%{svm}")) +let re_dataset = Re__Core.(compile (str "%{dataset}")) +let re_eps = Re__Core.(compile (str "%{epsilon}")) +let re_abstraction = Re__Core.(compile (str "%{abstraction}")) +let re_distance = Re__Core.(compile (str "%{distance}")) let build_command config_prover svm_filename dataset_filename eps = let command = Whyconf.get_complete_command ~with_steps:false config_prover in let params = [ - (svm, Unix.realpath svm_filename); - (dataset, Unix.realpath dataset_filename); - (epsilon, Option.(value (map ~f:Dataset.string_of_eps eps)) ~default:"0"); - (distance, "l_inf"); - (abstraction, "hybrid"); + (re_svm, Unix.realpath svm_filename); + (re_dataset, Unix.realpath dataset_filename); + (re_eps, Option.(value (map ~f:Dataset.string_of_eps eps)) ~default:"0"); + (re_distance, "l_inf"); + (re_abstraction, "hybrid"); ] in List.fold params ~init:command ~f:(fun cmd (param, by) ->