Commit 27272998 authored by Erwan Jahier's avatar Erwan Jahier

lurette 0.125 Fri, 21 Feb 2003 16:30:11 +0100 by jahier

Parent-Version:      0.124
Version-Log:

source/parse_env.ml:
   Make most fields of the automata syntax optional so that
   people are not obliged to refer to empty list of, eg,
   formula.

   Also add a field formula that let one defines global formula.
   This field is currently unplugged (ie, it parses, but the information
   contained in that fied in ignored).

Project-Description: Lurette
parent 3ea22e95
......@@ -4,15 +4,15 @@
(source/automata.ml 15954 1036675177 b/47_automata.m 1.6)
(source/formula.mli 2811 1045834161 44_formula.ml 1.21)
(test/heater_float.lus 177 1034351455 b/44_heater_flo 1.2)
(test/passerelle.luc 984 1032789516 b/17_passerelle 1.8)
(test/passerelle.luc 999 1045841411 b/17_passerelle 1.9)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(source/polyhedron.mli 940 1045489850 d/26_polyhedron 1.1)
(test/temp_float.luc 730 1036511217 b/51_temp_float 1.4)
(test/temp_float.luc 745 1045841411 b/51_temp_float 1.5)
(test/ControleurPorte.rif.exp 4860 1034951022 b/29_Controleur 1.11)
(doc/ocamldoc.sty 1380 1008328137 b/12_ocamldoc.s 1.1)
(mlcuddidl/Makefile 7150 1034006019 d/9_Makefile 1.1)
(test/tram_simple.h 1746 1013519411 b/25_tram_simpl 1.1)
(test/time-ossau.res 6399 1045834161 b/49_time.res 1.32)
(test/time-ossau.res 6399 1045841411 b/49_time.res 1.33)
(mlcuddidl/session.ml 603 1034006019 c/37_session.ml 1.1)
(cuddaux/cuddauxGenCof.c 12011 1034006019 c/29_cuddauxGen 1.1)
(mlcuddidl/rdd.idl 14806 1034006019 c/42_rdd.idl 1.1)
......@@ -24,17 +24,17 @@
(source/ne.ml 9275 1045489850 c/21_ne.ml 1.5)
(source/store.mli 2967 1045834161 b/26_rnumsolver 1.14)
(source/prevar.ml 981 1037192189 d/18_prevar.ml 1.1)
(test/time-ecrins.exp 6398 1045834161 d/21_time-ecrin 1.6)
(test/time-ecrins.exp 6398 1045841411 d/21_time-ecrin 1.7)
(source/value.mli 1101 1033723811 c/24_value.mli 1.1)
(user-rules.skel 1167 1040226023 c/25_user-rules 1.2)
(source/Makefile.gen_stubs 212 1036048863 b/42_Makefile.g 1.5)
(test/heater_float.rif.exp 1116 1045834161 b/30_heater_flo 1.12)
(test/temp_int.luc 685 1033723811 b/50_temp_int.e 1.3)
(test/temp_int.luc 700 1045841411 b/50_temp_int.e 1.4)
(source/luc_exe.ml 12316 1045489850 b/32_ima_exe.ml 1.24)
(source/prevar.mli 623 1037192189 d/19_prevar.mli 1.1)
(source/graph.ml 2339 1037625990 14_graph.ml 1.8)
(ihm/xlurette/makefile 1601 1040226023 c/16_makefile 1.7)
(test/usager.luc 495 1032789516 b/14_usager.env 1.9)
(test/usager.luc 510 1045841411 b/14_usager.env 1.10)
(mlcuddidl/manager.ml 8017 1034006019 c/47_manager.ml 1.1)
(cuddaux/cuddauxInt.h 2058 1034006019 c/28_cuddauxInt 1.1)
(cuddaux/cuddauxTDGenCof.c 15712 1034006019 c/26_cuddauxTDG 1.1)
......@@ -44,11 +44,11 @@
(source/Makefile.show_luc 1026 1037192189 b/40_Makefile.s 1.8)
(source/env_state.mli 6791 1036675177 50_env_state. 1.25)
(mlcuddidl/idd.ml 7061 1034006019 d/0_idd.ml 1.1)
(test/time-ossau.exp 6399 1045834161 b/48_time.exp 1.29)
(test/time-ossau.exp 6399 1045841411 b/48_time.exp 1.30)
(source/print.mli 1136 1045558187 46_print.mli 1.13)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(test/Makefile 32 1035531408 c/0_Makefile 1.8)
(source/parse_env.ml 31326 1045558187 41_parse_env. 1.36)
(source/parse_env.ml 33544 1045841411 41_parse_env. 1.37)
(ihm/xlurette/xlurette_glade_main.ml 23620 1036675177 c/12_xlurette_g 1.15)
(demo/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(source/solver.ml 29805 1045834161 39_solver.ml 1.42)
......@@ -56,7 +56,7 @@
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(source/gen_fake_lutin.ml 3449 1036048863 d/16_gen_fake_l 1.1)
(source/lurette.ml 14220 1044958837 12_lurette.ml 1.61)
(TODO 5540 1045834161 d/22_TODO 1.4)
(TODO 5448 1045841411 d/22_TODO 1.5)
(source/Makefile 1627 1044958837 c/20_Makefile 1.10)
(source/util.ml 21117 1045834161 35_util.ml 1.39)
(mlcuddidl/manager.mli 7912 1034006019 c/46_manager.ml 1.1)
......@@ -68,7 +68,7 @@
(TAGS 9825 1007379917 21_TAGS 1.6)
(mlcuddidl/rdd.ml 8746 1034006019 c/41_rdd.ml 1.1)
(source/Makefile.lurette_lib 2023 1045834161 c/2_Makefile.l 1.14)
(source/parse_env.mli 1028 1036511217 40_parse_env. 1.11)
(source/parse_env.mli 1130 1045841411 40_parse_env. 1.12)
(source/gen_stubs.ml 27065 1036048863 24_generate_l 1.41)
(OcamlMakefile 22765 1045558187 17_OcamlMakef 1.47)
(source/polyhedron.ml 7493 1045834161 d/25_polyhedron 1.3)
......@@ -76,7 +76,7 @@
(mlcuddidl/bdd.ml 10889 1034006019 d/6_bdd.ml 1.1)
(mlcuddidl/idd_caml.c 15964 1034006019 c/50_idd_caml.c 1.1)
(cuddaux/cuddauxCompose.c 13638 1034006019 c/30_cuddauxCom 1.1)
(test/porte.luc 1050 1032789516 b/16_porte.env 1.8)
(test/porte.luc 994 1045841411 b/16_porte.env 1.9)
(make_lurette 1306 1034006019 27_make_luret 1.17)
(source/control.ml 4445 1036675177 c/4_control.ml 1.4)
(ihm/xlurette/xlurette_glade_interface.ml 32774 1035885606 c/15_xlurette_g 1.8)
......@@ -87,7 +87,7 @@
(source/ne.mli 2116 1045834161 c/22_ne.mli 1.5)
(README 2266 1037625990 10_README 1.5)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/env_state.ml 21336 1045558187 51_env_state. 1.36)
(source/env_state.ml 21351 1045841411 51_env_state. 1.37)
(mlcuddidl/manager_caml.c 39233 1034006019 c/45_manager_ca 1.1)
(mlcuddidl/mtbdd.mli 4395 1034006019 c/43_mtbdd.mli 1.1)
(source/env.mli 2026 1040290175 15_env.mli 1.17)
......@@ -117,7 +117,7 @@
(source/pnumsolver.mli 2322 1045489850 d/24_pnumsolver 1.2)
(cuddaux/Changes 42 1034006019 c/36_Changes 1.1)
(test/vrai_tram.h 2468 1027066799 b/7_vrai_tram. 1.3)
(test/tram.luc 1079 1032789516 b/15_tram.env 1.8)
(test/tram.luc 1094 1045841411 b/15_tram.env 1.9)
(source/eval.mli 1395 1027066799 48_eval.mli 1.10)
(mlcuddidl/mtbdd.ml 10185 1034006019 c/44_mtbdd.ml 1.1)
(demo/chaudiere/chaudiere_ctrl.lus 177 1031732392 c/9_chaudiere_ 1.1)
......@@ -149,7 +149,7 @@
(mlcuddidl/cudd_caml.h 1210 1034006019 d/2_cudd_caml. 1.1)
(source/value.ml 2364 1045489850 c/23_value.ml 1.2)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(test/time-ecrins.res 6398 1045834161 d/20_time-ecrin 1.6)
(test/time-ecrins.res 6398 1045841411 d/20_time-ecrin 1.7)
(lurette.depfull.dot 49 1007651448 b/5_lurette.de 1.2)
(mlcuddidl/idd.mli 5470 1034006019 c/51_idd.mli 1.1)
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
......@@ -7,14 +7,12 @@
* Rajouter la precision des calculs comme parametres de lurette/lucky
* Traité les variables stables (signaux purs)
* Traiter les variables stables (signaux purs)
* gen_fake_lutin devrait etre une commande lurettetop et non pas code
en dur dans xlurette...
idem pour la sauvegarde des options dans .lurette-rc.
* Il faudrait que le parseur ne rale pas quand il manque une entrée
optionnelle (par ex "types = ...")
* Mettre a jour le parseur wrt les modifs que j'ai faite a la syntax
(noeuds transiants/stationnaires + formula = ...)
......@@ -28,7 +26,7 @@ optionnelle (par ex "types = ...")
* Inferer la croix, plutot que de verifier !!!
* Commencer par tirer sur les bords.
* Documenter les 2 nouvelles notions de tirage
* La notion d'epaisseur est mal branlée, surtout en presence de var
numériques. Il faudrait un 3eme parametre sui dit le nombre
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 124)
(Parent-Version lurette 0 123)
(Project-Version lurette 0 125)
(Parent-Version lurette 0 124)
(Version-Log "
Implement the polyhedron drawing primitives.
source/util.ml.in:
Change my_string_of_float so that it truncates floats 4 digits after the dot.
The rational is that, for testing, we do not care the extra precision and
too much precision may kill Polka. This precison ougth to be a parameter
though.
source/solver.ml:
source/polyhedron.ml:
source/store.ml:
Implement the polyhedron drawing primitives.
source/store.ml:
Apply the substitutions in store.subtsl to the cstr to add.
source/parse_env.ml:
Make most fields of the automata syntax optional so that
people are not obliged to refer to empty list of, eg,
formula.
Also add a field formula that let one defines global formula.
This field is currently unplugged (ie, it parses, but the information
contained in that fied in ignored).
")
(New-Version-Log ""
)
(Checkin-Time "Fri, 21 Feb 2003 14:29:21 +0100")
(Checkin-Time "Fri, 21 Feb 2003 16:30:11 +0100")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -68,8 +61,8 @@ source/store.ml:
(source/pnumsolver.ml (lurette/d/23_pnumsolver 1.2 644))
(source/pnumsolver.mli (lurette/d/24_pnumsolver 1.2 644))
(source/parse_env.mli (lurette/40_parse_env. 1.11 644))
(source/parse_env.ml (lurette/41_parse_env. 1.36 644))
(source/parse_env.mli (lurette/40_parse_env. 1.12 644))
(source/parse_env.ml (lurette/41_parse_env. 1.37 644))
(source/show_env.mli (lurette/42_show_env.m 1.8 644))
(source/show_env.ml (lurette/43_show_env.m 1.16 644))
......@@ -84,7 +77,7 @@ source/store.ml:
(source/eval.ml (lurette/49_eval.ml 1.13 644))
(source/env_state.mli (lurette/50_env_state. 1.25 644))
(source/env_state.ml (lurette/51_env_state. 1.36 644))
(source/env_state.ml (lurette/51_env_state. 1.37 644))
(source/automata.mli (lurette/b/46_automata.m 1.3 644))
(source/automata.ml (lurette/b/47_automata.m 1.6 644))
......@@ -151,18 +144,18 @@ source/store.ml:
(lurette.depfull.dot (lurette/b/5_lurette.de 1.2 644))
(TAGS (lurette/21_TAGS 1.6 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.29 644))
(test/time-ossau.res (lurette/b/49_time.res 1.32 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.6 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.6 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.30 644))
(test/time-ossau.res (lurette/b/49_time.res 1.33 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.7 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.7 644))
;; Various files used for testing purposes
(test/usager.luc (lurette/b/14_usager.env 1.9 644))
(test/tram.luc (lurette/b/15_tram.env 1.8 644))
(test/porte.luc (lurette/b/16_porte.env 1.8 644))
(test/passerelle.luc (lurette/b/17_passerelle 1.8 644))
(test/temp_int.luc (lurette/b/50_temp_int.e 1.3 644))
(test/temp_float.luc (lurette/b/51_temp_float 1.4 644))
(test/usager.luc (lurette/b/14_usager.env 1.10 644))
(test/tram.luc (lurette/b/15_tram.env 1.9 644))
(test/porte.luc (lurette/b/16_porte.env 1.9 644))
(test/passerelle.luc (lurette/b/17_passerelle 1.9 644))
(test/temp_int.luc (lurette/b/50_temp_int.e 1.4 644))
(test/temp_float.luc (lurette/b/51_temp_float 1.5 644))
(test/ControleurPorte.h (lurette/b/18_Controleur 1.1 644))
(test/ControleurPorte.c (lurette/b/19_Controleur 1.1 644))
......@@ -241,7 +234,7 @@ source/store.ml:
(mlcuddidl/Changes (lurette/d/10_Changes 1.1 644))
(TODO (lurette/d/22_TODO 1.4 644))
(TODO (lurette/d/22_TODO 1.5 644))
)
(Merge-Parents)
......
......@@ -491,7 +491,7 @@ let (read_env_state_one_file : string -> node) =
let
(* Parses the content of [file]. *)
Parse_env.Automata(init_node, list_in, list_out, list_loc,
list_pre, list_ce, list_arcs) =
list_pre, list_ce, list_form_def, list_arcs) =
try
let ic = open_in file in
......
(*pp camlp4o *)
(*-----------------------------------------------------------------------
** Copyright (C) 2001, 2002 - Verimag.
** Copyright (C) 2001 - 2003 - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
**-----------------------------------------------------------------------
......@@ -17,15 +17,17 @@ let debug_parsing = false
type read_arc = Arc of node * arc_info * node
type label_ce = (string * Control.expr)
type formula_def = (string * formula)
type read_automata = Automata of
node (* Initial node *)
* vnt list (* Input var list *)
* vnt list (* Output var list *)
* vnt list (* Local var list *)
* vnt list (* pre var list *)
* label_ce list (* Definition of labels representing control expressions *)
* read_arc list (* Transition list *)
node (* Initial node *)
* vnt list (* Input var list *)
* vnt list (* Output var list *)
* vnt list (* Local var list *)
* vnt list (* pre var list *)
* label_ce list (* Definition of labels representing control expressions *)
* formula_def list (* Definition of formula *)
* read_arc list (* Transition list *)
(* Keywords of the automata format *)
let lexer = Genlex.make_lexer ["("; ")"; ","; ";"; ".";
......@@ -169,7 +171,7 @@ let rec
failwith ""
and (parse_list_var_tail: in_channel -> (in_channel -> aut_token -> 'a) -> aut_token -> 'a list) =
fun ic parse tok ->
let _ = print_debug ic ("parse_list_var_t \n") in
let _ = print_debug ic ("parse_list_var_tail \n") in
let tok_list = Stream.npeek 10 tok in
try
(
......@@ -270,29 +272,20 @@ let rec (parse_automata: in_channel -> aut_token -> read_automata) =
try
(
match tok with parser
[< 'Genlex.Ident "inputs"; 'Genlex.Kwd "="; li = parse_list_var ic;
'Genlex.Kwd ",";
'Genlex.Ident "outputs"; 'Genlex.Kwd "="; lo = parse_list_genvar ic ;
'Genlex.Kwd ",";
'Genlex.Ident "locals"; 'Genlex.Kwd "="; ll = parse_list_genvar ic ;
'Genlex.Kwd ",";
'Genlex.Ident "pre"; 'Genlex.Kwd "="; lpre = parse_list_prevar ic ;
'Genlex.Kwd ",";
'Genlex.Ident "ctrl_expr"; 'Genlex.Kwd "="; llabel_ce = parse_list_label_ce ic ;
'Genlex.Kwd ",";
(* 'Genlex.Ident "formula"; 'Genlex.Kwd "="; fl = parse_list_formuladef ic ; *)
(* 'Genlex.Kwd "," ; *)
'Genlex.Ident "start_node"; 'Genlex.Kwd "="; 'Genlex.Int node_id ;
'Genlex.Kwd "," ;
'Genlex.Ident "arcs_nb"; 'Genlex.Kwd "="; 'Genlex.Int arcs_nb ;
'Genlex.Kwd "," ;
'Genlex.Ident "nodes_nb"; 'Genlex.Kwd "="; 'Genlex.Int nodes_nb ;
'Genlex.Kwd "," ;
'Genlex.Ident "arcs"; 'Genlex.Kwd "="; la = parse_list_arc ic
(List.append li (List.append lo (List.append ll lpre))) ;
'Genlex.Kwd ".";
>]
-> Automata(node_id, li, lo, ll, lpre, llabel_ce, la)
[<
li = parse_list_inputs_opt ic;
lo = parse_list_outputs_opt ic;
ll = parse_list_locals_opt ic;
lpre = parse_list_pre_opt ic;
llabel_ce = parse_list_label_ce_opt ic ;
fdl = parse_list_formula_def_opt ic (li @ lo @ ll @ lpre) ;
'Genlex.Ident "start_node"; 'Genlex.Kwd "="; 'Genlex.Int node_id; 'Genlex.Kwd "," ;
arcs_nb = parse_list_arcs_nb_opt ic;
nodes_nb = parse_list_nodes_nb_opt ic;
'Genlex.Ident "arcs"; 'Genlex.Kwd "="; la = parse_list_arc ic (li @ lo @ ll @ lpre) ;
'Genlex.Kwd ".";
>]
-> Automata(node_id, li, lo, ll, lpre, llabel_ce, fdl, la)
)
with Failure
_ -> failwith ""
......@@ -303,12 +296,67 @@ let rec (parse_automata: in_channel -> aut_token -> read_automata) =
"locals = <var list> ,\n\t" ^
"pre = <pre var list> ,\n\t" ^
"ctrl_expr = <ctrl expr list> ,\n\t" ^
"formula = <formula def list> ,\n\t" ^
"start_node = <int> ,\n\t" ^
"arc_nb = <int> ,\n\t" ^
"node_nb = <int> ,\n\t" ^
"arcs = <arc list> .") "" ;
failwith ""
and parse_list_inputs_opt ic tok =
match tok with parser
[<'Genlex.Ident "inputs"; 'Genlex.Kwd "="; l = parse_list_var ic ;'Genlex.Kwd ","
>] -> l
| [< >] -> []
and parse_list_outputs_opt ic tok =
match tok with parser
[<'Genlex.Ident "outputs"; 'Genlex.Kwd "="; l = parse_list_genvar ic ;'Genlex.Kwd ","
>] -> l
| [< >] -> []
and parse_list_locals_opt ic tok =
match tok with parser
[<'Genlex.Ident "locals"; 'Genlex.Kwd "="; l = parse_list_genvar ic ;'Genlex.Kwd ","
>] -> l
| [< >] -> []
and parse_list_pre_opt ic tok =
match tok with parser
[<'Genlex.Ident "pre"; 'Genlex.Kwd "="; l = parse_list_prevar ic ;'Genlex.Kwd ","
>] -> l
| [< >] -> []
and parse_list_arcs_nb_opt ic tok =
match tok with parser
[< 'Genlex.Ident "arcs_nb"; 'Genlex.Kwd "="; 'Genlex.Int arcs_nb ; 'Genlex.Kwd ","
>] -> arcs_nb
| [< >] -> 0
and parse_list_nodes_nb_opt ic tok =
match tok with parser
[< 'Genlex.Ident "nodes_nb"; 'Genlex.Kwd "="; 'Genlex.Int nodes_nb ; 'Genlex.Kwd ","
>] -> nodes_nb
| [< >] -> 0
and parse_list_label_ce_opt ic tok =
match tok with parser
[< 'Genlex.Ident "ctrl_expr"; 'Genlex.Kwd "=";
llabel_ce = parse_list_label_ce ic ;'Genlex.Kwd ","
>] -> llabel_ce
| [< >] -> []
and parse_list_formula_def_opt ic vars tok =
match tok with parser
[< 'Genlex.Ident "formula"; 'Genlex.Kwd "=";
fdl = parse_list_formula_def ic vars ; 'Genlex.Kwd ","
>] -> fdl
| [< >] -> []
and (parse_list_var: in_channel -> aut_token -> vnt list) =
fun ic tok ->
......@@ -461,6 +509,38 @@ and (parse_prevar: in_channel -> aut_token -> vnt) =
print_err_msg ic tok tok_list "parse_prevar" "" "";
failwith ""
and (parse_list_formula_def: in_channel -> vnt list -> aut_token
-> (string * formula) list) =
fun ic vars tok ->
let _ = print_debug ic ("parse_list_formula_def \n") in
let tok_list = Stream.npeek 10 tok in
try
parse_list ic (fun ic -> parse_formula_def ic vars) tok
with Failure _ -> failwith "" | e ->
print_err_msg ic tok tok_list "parse_list_formula_def" "" "";
failwith ""
and (parse_formula_def: in_channel -> vnt list -> aut_token -> string * formula) =
fun ic vars tok ->
let _ = print_debug ic ("parse_formula_def \n") in
let tok_list = Stream.npeek 10 tok in
try (
match tok with parser
[< 'Genlex.Kwd "(" ;
'Genlex.Ident label ;
'Genlex.Kwd "," ;
f = parse_formula ic vars ;
'Genlex.Kwd ")"
>]
->
(label, f)
)
with Failure _ -> failwith "" | e ->
print_err_msg ic tok tok_list "parse_formula_def" "" "";
failwith ""
and (parse_list_label_ce: in_channel -> aut_token -> label_ce list) =
fun ic tok ->
let _ = print_debug ic ("parse_list_label_ce \n") in
......@@ -540,7 +620,8 @@ and (parse_ctrl_expr: in_channel -> aut_token -> Control.expr) =
Control.ite test cel_then cel_else
)
with Failure _ -> failwith "" | e ->
print_err_msg ic tok tok_list "parse_ctrl_expr" "Set\n\tSet_between\n\tDraw_gauss\n\tDec\n\tIfThenElse ( <ctrl expr> ) ( <ctrl expr> )" "";
print_err_msg ic tok tok_list "parse_ctrl_expr"
"Set\n\tSet_between\n\tDraw_gauss\n\tDec\n\tIfThenElse ( <ctrl expr> ) ( <ctrl expr> )" "";
failwith ""
and (parse_float: in_channel -> aut_token -> float) =
......
......@@ -20,15 +20,17 @@ type aut_token = Genlex.token Stream.t
type read_arc = Arc of int * arc_info * int
type label_ce = (string * Control.expr)
type formula_def = (string * formula)
type read_automata = Automata of
int (* Initial node *)
* vnt list (* Input var list *)
* vnt list (* Output var list *)
* vnt list (* Local var list *)
* vnt list (* pre var list *)
* label_ce list (* Definition of labels representing control expressions *)
* read_arc list (* Transition list *)
int (* Initial node *)
* vnt list (* Input var list *)
* vnt list (* Output var list *)
* vnt list (* Local var list *)
* vnt list (* pre var list *)
* label_ce list (* Definition of labels representing control expressions *)
* formula_def list (* Definition of formula *)
* read_arc list (* Transition list *)
val lexer : char Stream.t -> aut_token
......
......@@ -11,6 +11,7 @@ outputs =
locals = ,
pre = ,
ctrl_expr = ,
formula = ,
start_node = 0,
arcs_nb = 0,
nodes_nb = 0,
......
......@@ -8,13 +8,9 @@ inputs = (baisser_pass,bool);
outputs = (porte_ouverte,bool);
(porte_fermee,bool),
locals = ,
pre = (pre(2,en_marche),bool),
ctrl_expr = ,
start_node = 0,
arcs_nb = 0,
nodes_nb = 0,
arcs =
From 0 To 1 With 1 : && ! porte_fermee ! porte_ouverte ;
From 1 To 2 With 1 : eps ;
......
......@@ -5,6 +5,7 @@ outputs = (U,float, 1., 60.),
locals = (Dudt %"scr":"15,2,16,2"; "foo":"bar"%,float, -100., 100.),
pre = (pre(1,U),float); (pre(1, Dudt), float) ; (pre(1,Heat_on), bool),
ctrl_expr = ,
formula = ,
start_node = 0,
arcs_nb = 0,
nodes_nb = 0,
......
......@@ -7,6 +7,7 @@ ctrl_expr =
(w2, Draw_gauss titi 10. 1.;
Dec titi;
IfThenElse (> titi 0) ( Set toto 0) ( Set toto 1 )),
formula = ,
start_node = 0,
arcs_nb = 0,
nodes_nb = 0,
......
Linux ecrins 2.4.20-verimag #1 SMP Fri Jan 24 10:16:46 CET 2003 i686 unknown
Command being timed: "/tmp/lurette5/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 3.35
System time (seconds): 0.17
Percent of CPU this job got: 95%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.68
User time (seconds): 3.48
System time (seconds): 0.21
Percent of CPU this job got: 92%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.99
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 238
Minor (reclaiming a frame) page faults: 18590
Major (requiring I/O) page faults: 242
Minor (reclaiming a frame) page faults: 18592
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -24,18 +24,18 @@ Linux ecrins 2.4.20-verimag #1 SMP Fri Jan 24 10:16:46 CET 2003 i686 unknown
Exit status: 0
Command being timed: "/tmp/lurette5/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 8.11
System time (seconds): 0.34
Percent of CPU this job got: 99%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:08.46
User time (seconds): 8.12
System time (seconds): 0.43
Percent of CPU this job got: 95%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:08.92
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 238
Minor (reclaiming a frame) page faults: 33200
Major (requiring I/O) page faults: 242
Minor (reclaiming a frame) page faults: 33059
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -48,18 +48,18 @@ Linux ecrins 2.4.20-verimag #1 SMP Fri Jan 24 10:16:46 CET 2003 i686 unknown
Exit status: 0
Command being timed: "/tmp/lurette5/lurette 100 50 50 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 18.70
System time (seconds): 0.41
Percent of CPU this job got: 99%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:19.12
User time (seconds): 18.95
System time (seconds): 0.48
Percent of CPU this job got: 98%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:19.75
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 238
Minor (reclaiming a frame) page faults: 54445
Major (requiring I/O) page faults: 242
Minor (reclaiming a frame) page faults: 54444
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -72,18 +72,18 @@ Linux ecrins 2.4.20-verimag #1 SMP Fri Jan 24 10:16:46 CET 2003 i686 unknown
Exit status: 0
Command being timed: "/tmp/lurette5/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_float.luc"
User time (seconds): 1.09
System time (seconds): 0.17
Percent of CPU this job got: 89%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:01.40
User time (seconds): 1.13
System time (seconds): 0.14
Percent of CPU this job got: 96%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:01.31
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 253
Minor (reclaiming a frame) page faults: 18584
Major (requiring I/O) page faults: 256
Minor (reclaiming a frame) page faults: 18585
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -96,18 +96,18 @@ Linux ecrins 2.4.20-verimag #1 SMP Fri Jan 24 10:16:46 CET 2003 i686 unknown
Exit status: 0
Command being timed: "/tmp/lurette5/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_float.luc"
User time (seconds): 2.39
System time (seconds): 0.25
Percent of CPU this job got: 99%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:02.65
User time (seconds): 2.34
System time (seconds): 0.26
Percent of CPU this job got: 95%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:02.72
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 253
Minor (reclaiming a frame) page faults: 23503
Major (requiring I/O) page faults: 256
Minor (reclaiming a frame) page faults: 23670
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -120,18 +120,18 @@ Linux ecrins 2.4.20-verimag #1 SMP Fri Jan 24 10:16:46 CET 2003 i686 unknown
Exit status: 0
Command being timed: "/tmp/lurette5/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_int.luc"
User time (seconds): 0.92
System time (seconds): 0.17
Percent of CPU this job got: 99%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:01.10
User time (seconds): 0.94
System time (seconds): 0.16
Percent of CPU this job got: 98%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:01.11
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 252
Minor (reclaiming a frame) page faults: 18584
Major (requiring I/O) page faults: 253
Minor (reclaiming a frame) page faults: 18585
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -144,18 +144,18 @@ Linux ecrins 2.4.20-verimag #1 SMP Fri Jan 24 10:16:46 CET 2003 i686 unknown
Exit status: 0
Command being timed: "/tmp/lurette5/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_int.luc"
User time (seconds): 2.85
System time (seconds): 0.19
User time (seconds): 2.80
System time (seconds): 0.22
Percent of CPU this job got: 99%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.04
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.02
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0