Commit ee264c20 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.46 Wed, 13 Mar 2002 14:51:14 +0100 by jahier

Parent-Version:      0.45
Version-Log:

Clean up a little bit lurette.ml

Project-Description: Lurette
parent a23032bf
......@@ -8,8 +8,8 @@
(source/util.ml 10907 1016011748 35_util.ml 1.14)
(source/wtree.ml 8518 1016011748 b/1_wtree.ml 1.9)
(source/solver.ml 13688 1016011748 39_solver.ml 1.16)
(source/command_line.ml 3971 1014048376 b/20_command_li 1.3)
(source/lurette.ml 11456 1016011748 12_lurette.ml 1.26)
(source/command_line.ml 3998 1016024341 b/20_command_li 1.4)
(source/lurette.ml 10729 1016027474 12_lurette.ml 1.28)
(source/solver.mli 1059 1015250295 38_solver.mli 1.9)
(source/env.mli 2389 1015250295 15_env.mli 1.9)
(test/heater_float.rif.exp 1461 1015514807 b/30_heater_flo 1.2)
......@@ -33,7 +33,7 @@
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(doc/ocamldoc.hva 313 1008328137 b/13_ocamldoc.h 1.1)
(source/formula.mli 2161 1015250295 44_formula.ml 1.7)
(source/command_line.mli 1302 1014048376 b/21_command_li 1.3)
(source/command_line.mli 1317 1016024341 b/21_command_li 1.4)
(TAGS 9825 1007379917 21_TAGS 1.6)
(source/wtree.mli 2340 1016011748 b/0_wtree.mli 1.7)
(test/porte.env 834 1015605037 b/16_porte.env 1.3)
......@@ -53,10 +53,10 @@
(test/tram_simple.h 1746 1013519411 b/25_tram_simpl 1.1)
(Makefile 1758 1015514807 18_Makefile 1.23)
(test/vrai_tram.c 3060 1012914629 b/8_vrai_tram. 1.2)
(source/print.mli 559 1016011748 46_print.mli 1.6)
(source/print.mli 606 1016027474 46_print.mli 1.7)
(source/graph.mli 1493 1015250295 13_graph.mli 1.6)
(test/heater_int.rif.exp 785 1015408234 b/28_heater_int 1.1)
(source/formula.ml 4618 1015408234 45_formula.ml 1.9)
(source/lurette.mli 433 1015250295 11_lurette.ml 1.11)
(source/print.ml 5533 1016011748 47_print.ml 1.11)
(source/lurette.mli 448 1016027474 11_lurette.ml 1.12)
(source/print.ml 5700 1016027474 47_print.ml 1.12)
(test/vrai_tram.h 2468 1012914629 b/7_vrai_tram. 1.2)
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 45)
(Parent-Version lurette 0 44)
(Project-Version lurette 0 46)
(Parent-Version lurette 0 45)
(Version-Log "
Comment out all the stuff related to the heap initialisation
of cudd since it is unused for the moment.
Clean up a little bit lurette.ml
")
(New-Version-Log "")
(Checkin-Time "Wed, 13 Mar 2002 13:59:01 +0100")
(Checkin-Time "Wed, 13 Mar 2002 14:51:14 +0100")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -19,8 +19,8 @@ of cudd since it is unused for the moment.
;; Sources files
(source/lurette.mli (lurette/11_lurette.ml 1.11 644))
(source/lurette.ml (lurette/12_lurette.ml 1.27 644))
(source/lurette.mli (lurette/11_lurette.ml 1.12 644))
(source/lurette.ml (lurette/12_lurette.ml 1.28 644))
(source/graph.mli (lurette/13_graph.mli 1.6 644))
(source/graph.ml (lurette/14_graph.ml 1.5 644))
......@@ -45,8 +45,8 @@ of cudd since it is unused for the moment.
(source/formula.mli (lurette/44_formula.ml 1.7 644))
(source/formula.ml (lurette/45_formula.ml 1.9 644))
(source/print.mli (lurette/46_print.mli 1.6 644))
(source/print.ml (lurette/47_print.ml 1.11 644))
(source/print.mli (lurette/46_print.mli 1.7 644))
(source/print.ml (lurette/47_print.ml 1.12 644))
(source/eval.mli (lurette/48_eval.mli 1.8 644))
(source/eval.ml (lurette/49_eval.ml 1.11 644))
......
(*-----------------------------------------------------------------------
** Copyright (C) 2001 - Verimag.
** Copyright (C) 2001, 2002 - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
**-----------------------------------------------------------------------
......@@ -19,12 +19,6 @@ open Command_line
(*------------------------------------------------------------------------*)
let (print_vn_str : (string * string) list -> unit) =
fun vl ->
List.iter
(fun (v, t) ->
print_string ("\n " ^ v ^ " of type " ^ t ^ ","))
vl
let (options:Command_line.optionsT) = {
step_by_step = false ;
......@@ -36,9 +30,9 @@ let (options:Command_line.optionsT) = {
}
let (var_decl_are_inconsistent : (vn * string) list -> (vn * string) list -> unit) =
let (check_var_decl_consistency : (vn * string) list -> (vn * string) list -> unit) =
fun in_sut out_sut ->
(** [var_decl_are_inconsistent out_env in_sut out_sut] checks the
(** [check_var_decl_consistency out_env in_sut out_sut] checks the
consistency of variable declarations made in the environment and the
SUT. It raises an exception if the declarations are inconsistent.
*)
......@@ -57,9 +51,9 @@ let (var_decl_are_inconsistent : (vn * string) list -> (vn * string) list -> uni
if not(list_are_equals out_env2 in_sut) then
(
print_string "\nenv outputs: ";
print_vn_str out_env2;
Print.vn_str out_env2;
print_string "\nsut inputs: ";
print_vn_str in_sut;
Print.vn_str in_sut;
print_string "\n*** env outputs and sut inputs should be the same.\n";
flush stdout ;
assert false
......@@ -67,9 +61,9 @@ let (var_decl_are_inconsistent : (vn * string) list -> (vn * string) list -> uni
else if not(list_are_equals in_env2 out_sut) then
(
print_string "\nenv inputs: ";
print_vn_str in_env2;
Print.vn_str in_env2;
print_string "\nsut outputs: ";
print_vn_str out_sut;
Print.vn_str out_sut;
print_string "\n*** env inputs and sut outputs should be the same.\n";
flush stdout ;
assert false
......@@ -83,26 +77,6 @@ let (var_decl_are_inconsistent : (vn * string) list -> (vn * string) list -> uni
(*------------------------------------------------------------------------*)
let (read_var_names: string -> (vn * string) list * (vn * string) list) =
fun file ->
let rec (read_var_list: in_channel -> (vn * string) list ->
(vn * string) list) =
fun ic acc ->
let str = input_line ic in
if ((str = "\\\\OUTPUT") || (str = "\\\\THE_END"))
then acc
else
let str2 = input_line ic in
read_var_list ic ((str, str2)::acc)
in
let ic = (open_in file) in
let _ = input_line ic in
let i = read_var_list ic [] in
let o = read_var_list ic [] in
(i, o)
(*------------------------------------------------------------------------*)
let arg_nb = (Array.length Sys.argv)
external random_seed: unit -> int = "sys_random_seed";;
......@@ -196,7 +170,6 @@ and
(main2 : int -> int -> int -> 'a) =
fun s n p ->
(* Initialisation of `Env_state.env_state' *)
let env_llist = (get_env_from_args 4 []) in
let () = Env.read_env_state env_llist in
......@@ -227,7 +200,7 @@ and
Sut_idl_stub.sut_init ();
Oracle_idl_stub.oracle_init ();
var_decl_are_inconsistent Lurette_stub.sut_input_var_name_and_type_list
check_var_decl_consistency Lurette_stub.sut_input_var_name_and_type_list
Lurette_stub.sut_output_var_name_and_type_list;
(* Sim2chro *)
......@@ -305,9 +278,9 @@ and
" at time " ^ (string_of_int t) ^
" with the following values:\n ");
print_string "\n*** sut inputs names and types:" ;
print_vn_str Lurette_stub.sut_input_var_name_and_type_list;
Print.vn_str Lurette_stub.sut_input_var_name_and_type_list;
print_string "\n*** sut outputs names and types: " ;
print_vn_str Lurette_stub.sut_output_var_name_and_type_list;
Print.vn_str Lurette_stub.sut_output_var_name_and_type_list;
print_string "\n***" ;
Util.list_iter3
......
(*-----------------------------------------------------------------------
** Copyright (C) 2001 - Verimag.
** Copyright (C) 2001, 2002 - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
**-----------------------------------------------------------------------
......@@ -8,7 +8,7 @@
** Main author: jahier@imag.fr
*)
(** Main module. *)
(** Lurette main module. *)
(* {% \psfig{figure=lurette.dep.ps} %} *)
......
......@@ -210,3 +210,13 @@ let (snt: (Bdd.t, (Util.sol_nb * Util.sol_nb)) Hashtbl.t -> unit) =
("bdd__" ^ n_str ^ "__" ^ m_str ^ "_" ^ (string_of_int (Hashtbl.hash bdd)));
)
t
let (vn_str : (string * string) list -> unit) =
fun vl ->
List.iter
(fun (v, t) ->
print_string ("\n " ^ v ^ " of type " ^ t ^ ","))
vl
......@@ -26,3 +26,7 @@ val print_bdd : Bdd.t -> unit
val bdd_to_graph: Bdd.t -> (int -> string) -> (string * string * string) list
val bdd_with_dot: Bdd.t -> (int -> string) -> string -> unit
val vn_str : (string * string) list -> unit
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment