From 08183a408f6cd44d7d77c99b21094490779f229c Mon Sep 17 00:00:00 2001
From: Michele Alberti <michele.alberti@cea.fr>
Date: Fri, 2 Jun 2023 11:34:01 +0200
Subject: [PATCH] [aimos][saver] Uniformize code style.
---
src/aimos.ml | 4 ++--
src/saver.ml | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/aimos.ml b/src/aimos.ml
index 2674d28..f51a3b1 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 c86a8b1..2a7f8e9 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) ->
--
GitLab