lurette 1.3 Tue, 23 Sep 2003 16:56:51 +0200 by jahier

Parent-Version:      1.2
Version-Log:

source/store.ml:
source/store.ml:
source/solver.ml:
   Add a numeric thickness at the numeric level.

Project-Description: Lurette

TODO

@@ -42,6 +42,9 @@
     puis on tronque (truncate) => l'entier tiré n'est alors parfois 
     meme pas solution des contraintes !!!
 
+* dire aussi comment le tirage pour les entiers est effectué (cf brrr)
+  en dimension > 2
+
 * dire dans la doc que on ne peut avoir qu'au plus une transition sortante
   avec un poids infini (ca n'a pas un sens bien clair et on peut toujours
   faire autrement). Dire aussi que 2 transitions ne peuvent a la fois avoir 
@@ -52,26 +55,16 @@
 
 *********** A faire  
 
-* Integrer la possibilité d'utiliser des types structurés avec lurette et scade
-
-* supprimer l'epaisseur au niveau des transitions (?) et rajouter une 
-  au niveau des numérique
-
-  La notion d'epaisseur est mal branlée, surtout en presence de var
-  numériques. Il faudrait un 3eme parametre qui dit le nombre 
-  de tirage que l'on fait dans chaque polyedres.
 
- ->  remplacer l'epaisseur de formules par un taux de couverture
+* Integrer la possibilité d'utiliser des types structurés avec lurette et scade
 
+* il faudrait au moins pouvoir avoir des pre sur des var de types structurés
 
 * mettre les fichiers de test dans un repertoire exemple et faire des liens symbo
 
 
 * autoriser plusieurs automates dans le meme fichier
 
-* il faudrait au moins pouvoir avoir des pre sur des var de types structurés
-
-
 * Faire un lustre2lucky comme TP avec Yussef
 
 * Faire l'elimination des DAGS, ie, 
@@ -80,22 +73,21 @@
 
 * faire un passage sur map vs rev_map
 
+(1) Portage Reluc
 
 
-* ajouter les options --product-mode {multiply | arbiter}
-  qui disent comment on multiplie 2 automates (cf papier)
 
-* env_state devrait etre un objet ...
 
+* ajouter les options --product-mode {multiply | arbiter}
+  qui disent comment on multiplie 2 automates (cf papier)
 
-(1) Portage Reluc
-
-* compiler sim2chrogtk sous cygwin
 
 * Chercher a detecter des egalites lors de l'ajout d'une inegalité.
   pour les contraintes de dimension > 1 (cf code commenté dans store.ml)
 
 
+* compiler sim2chrogtk sous cygwin
+
 
 
 
@@ -113,7 +105,6 @@
 * Faire un gestionnaire de sessions comme le propose Pascal
   
 
- 
 
 * zipper et dezipper les .rif a la vollée (cf zlib et camlzip)
 
@@ -148,29 +139,6 @@
   dans des cas ou les polyedres peteraient...
 
 
-*********** Cosmétisme
-
-* changer le nom du type formula en Formula.t (faire pareil partout)
-  ce qui devrait permettre d'enlever tout plein de <<open Formula>>
-
-* Le type node n'a rien a faire dans le module formula ...
-  de meme pour arc_info. Les mettre dans un module type par exemple.
-
-
-*********** Performances
-
-* Pour le train, que je fais le produit de tous les environnements,
-  j'ai quand meme un pb de perf que je n'avais pas avant. Regarder
-  pourquoi (cf version 0.68). D'une maniere générale, Graph.t est elle
-  vraiment la bonne structure de donnees pour les sous-graphes ?
-
-
-*********** A faire  
-
-
-* Ecrire une batterie de test plus sérieuse !
-
-
 * Réfléchir à une version d'un tireur sans bdd ou les choix seraient
   effectués pendant le parcours de la formule (pas d'équité, mais bon) +
   backtracking quand ca n'est pas satisfiable. Le gros pb a priori 
@@ -181,8 +149,19 @@
   meme dimension que le polyhedre (quitte à faire un changement de
   variable) puis tirer dans le cube enveloppant.
 
+
+
 * dans gne.ml, rajouter partout assertion <<is_a_partition>>
 
+*********** Cosmétisme
+
+* env_state devrait etre un objet ...
+
+* changer le nom du type formula en Formula.t (faire pareil partout)
+  ce qui devrait permettre d'enlever tout plein de <<open Formula>>
+
+* Le type node n'a rien a faire dans le module formula ...
+  de meme pour arc_info. Les mettre dans un module type par exemple.
 
 
 ***********************************************************************

demo-xlurette/chaudiere/chaudiere.luc

@@ -15,12 +15,12 @@ locals  {
 }
 
 
-start_node  { 0 }
 
 
 nodes { 
 
 }
+start_node  { 0 }
 
 
 transitions { 

ihm/xlurette/xlurette_glade_main.ml

@@ -107,7 +107,6 @@ let (cygpath_w2u : string -> string) =
 	output_string stderr ("cygpath_w2u " ^ str0 ^ " failed.\n");
 	str0
 
-type draw_mode = Vertices | Edges | Inside
 type tok = Genlex.token Stream.t
 
 let ok_str = "   OK!
@@ -437,6 +436,14 @@ class customized_callbacks = object(self)
   method ok_oracle_help_clicked () =  
     self#top_oracle_help_window#oracle_help_window#misc#hide () 
 
+  (* test_thickness help window *) 
+  method on_test_thickness_help_button_clicked () =  
+    self#top_test_thickness_help_window#test_thickness_help_window#show () 
+
+  method ok_test_thickness_help_clicked () =  
+    self#top_test_thickness_help_window#test_thickness_help_window#misc#hide () 
+
+
 
   (* set env var window *) 
   method on_extra_var_button_clicked () =
@@ -491,7 +498,6 @@ class customized_callbacks = object(self)
   method cancel_oracle_clicked () = 
     self#top_fileselection_oracle#fileselection_oracle#misc#hide ()
 
-
   (* env file selection window *)
   method browse_env_clicked () = 
     self#top_fileselection_env#fileselection_env#show ()
@@ -766,9 +772,6 @@ class customized_callbacks = object(self)
     let test_length = self#top_xlurette#test_length#text in
     let cmd_test_length = ("set_test_length " ^ test_length ^ "\n") in
 
-    let formula_nb = self#top_xlurette#formula_nb#text in
-    let cmd_formula_nb = ("set_formula_nb " ^ formula_nb ^ "\n") in
-
     let draw_nb = self#top_xlurette#draw_nb#text in
     let cmd_draw_nb = ("set_draw_nb " ^ draw_nb ^ "\n") in
 
@@ -789,12 +792,25 @@ class customized_callbacks = object(self)
       else ("set_seed " ^ self#top_xlurette#user_seed#text ^ "\n")
     in
 
-    let cmd_draw_mode =
-      if self#top_xlurette#radiobutton_inside#active 
-      then "set_draw_mode inside \n" 
-      else if self#top_xlurette#radiobutton_edges#active 
-      then "set_draw_mode edges \n" 
-      else "set_draw_mode vertices \n" 
+    let cmd_draw_all_formula = 
+      if self#top_xlurette#radiobutton_draw_all_formula#active
+      then "set_draw_all_formula true\n" 
+      else "set_draw_all_formula false\n"
+    in
+    let cmd_draw_inside = 
+      ("set_draw_inside " ^ self#top_xlurette#inside_nb#text ^ "\n")
+    in
+    let cmd_draw_edges = 
+      ("set_draw_edges " ^ self#top_xlurette#edges_nb#text ^ "\n")
+    in
+    let cmd_draw_vertices = 
+      if 
+	self#top_xlurette#radiobutton_draw_all#active
+      then 
+	"set_draw_all_vertices true\n"
+      else
+	("set_draw_all_vertices false" ^ 
+	 "\nset_draw_vertices " ^ self#top_xlurette#vertices_nb#text ^ "\n")
     in
 
     let cmd_call_sim2chro =
@@ -836,11 +852,12 @@ class customized_callbacks = object(self)
        (String.escaped self#top_extra_env_var_window#extra_includedirs_entry#text) ^ "\"\n")
     in      
 
-      cmd_test_length ^ cmd_formula_nb ^ cmd_draw_nb
+      cmd_test_length ^ cmd_draw_nb
       ^ cmd_rif_file ^ cmd_sut ^ cmd_env ^ cmd_oracle ^ cmd_step ^ cmd_seed
-      ^ cmd_draw_mode ^ cmd_call_sim2chro ^ cmd_display_local
-      ^ cmd_verbose ^ cmd_show_step ^ cmd_sut_compiler ^ cmd_oracle_compiler ^
-      extra_cfiles ^ extra_libs ^ extra_libdirs ^ extra_includedirs
+      ^ cmd_draw_inside ^ cmd_draw_edges ^ cmd_draw_vertices ^ cmd_call_sim2chro 
+      ^ cmd_display_local ^ cmd_verbose ^ cmd_show_step ^ cmd_sut_compiler 
+      ^ cmd_oracle_compiler ^ extra_cfiles ^ extra_libs ^ extra_libdirs 
+      ^ extra_includedirs
 	
 
   method on_sut_name_changed () =
@@ -1052,16 +1069,31 @@ class customized_callbacks = object(self)
   method set_seed i =
     self#top_xlurette#user_seed#set_text (string_of_int i)
 
-  method get_formula_nb () =
-    int_of_string self#top_xlurette#formula_nb#text
-  method set_formula_nb i =
-    self#top_xlurette#formula_nb#set_text (string_of_int i)
+
 
   method get_draw_nb () =
     int_of_string self#top_xlurette#draw_nb#text
   method set_draw_nb i =
     self#top_xlurette#draw_nb#set_text (string_of_int i)
 
+
+  method get_draw_inside () =
+    int_of_string self#top_xlurette#inside_nb#text
+  method set_draw_inside i =
+    self#top_xlurette#inside_nb#set_text (string_of_int i)
+
+  method get_draw_edges () =
+    int_of_string self#top_xlurette#edges_nb#text
+  method set_draw_edges i =
+    self#top_xlurette#edges_nb#set_text (string_of_int i)
+
+  method get_draw_vertices () =
+    int_of_string self#top_xlurette#vertices_nb#text
+  method set_draw_vertices i =
+    self#top_xlurette#inside_nb#set_text (string_of_int i)
+
+
+
   method get_rif_file_basename () =
     self#top_xlurette#rif_file_basename#text
   method set_rif_file_basename str =
@@ -1072,12 +1104,6 @@ class customized_callbacks = object(self)
   method set_restore str =
     self#top_xlurette#saved_session_file#set_text str
 
-  method set_draw_mode dm =
-    match dm with
-	Edges -> self#top_xlurette#radiobutton_edges#set_active true
-      | Vertices -> self#top_xlurette#radiobutton_vertices#set_active true
-      | Inside -> self#top_xlurette#radiobutton_inside#set_active true
-
 
 
 	  
@@ -1121,14 +1147,7 @@ class customized_callbacks = object(self)
       (* : 'a -> tok -> unit) = *)
       
       ( match tok with parser
-	  | [< 'Genlex.Ident "set_draw_mode" ;'Genlex.Ident id >] -> 
-	      (
-		match id with 
-		    "inside" -> self#set_draw_mode Inside
-		  | "edges"  -> self#set_draw_mode Edges
-		  | "vertices" -> self#set_draw_mode Vertices
-		  | _ -> print_string ("Unknown draw mode (" ^ id ^ ")\n")
-	      )
+
 	  | [< 'Genlex.Ident "set_env" ; 'Genlex.String str >] ->
 	      self#set_env str
 	      
@@ -1150,8 +1169,6 @@ class customized_callbacks = object(self)
 	  | [< 'Genlex.Ident "set_test_length" ; 'Genlex.Int i >] ->
 	      self#set_test_length i
 	      
-	  | [< 'Genlex.Ident "set_formula_nb" ; 'Genlex.Int i >] -> 
-	      self#set_formula_nb i
 
 	  | [< 'Genlex.Ident "set_draw_nb" ; 'Genlex.Int i >] -> 
 	      self#set_draw_nb i
@@ -1254,26 +1271,20 @@ let rec speclist callbacks =
     "-l", Arg.Int (fun i -> callbacks#set_test_length i),  
     ("<int>\t\t(default=" ^ (string_of_int (callbacks#get_test_length ())) ^ ").\n");
 
-    "--thick-form", Arg.Int (fun i -> callbacks#set_formula_nb i),
-       "<int>\tNumber of formula to be drawn at each step";
-    "-tf", Arg.Int (fun i -> callbacks#set_formula_nb i), 
-    ("<int>\t\t(default=" ^ (string_of_int (callbacks#get_formula_nb ())) ^ ").\n");
-
     "--thick-draw", Arg.Int (fun i -> callbacks#set_draw_nb i),
        "<int>\tNumber of draw to be done in each formula ";
     "-td", Arg.Int (fun i -> callbacks#set_draw_nb i),
     ("<int>\t\tat each step (default=" ^ 
      (string_of_int (callbacks#get_draw_nb ())) ^ ").\n");
     
-    "--draw-inside", Arg.Unit (fun _ -> callbacks#set_draw_mode Inside),
-       "\tDraw inside the polyhedron of solutions.\n ";
-
-    "--draw-edges", Arg.Unit (fun _ -> callbacks#set_draw_mode Edges),
-       "\t\tDraw on the edges of the polyhedron of solutions.\n ";
+    "--draw-inside", Arg.Int (fun i -> callbacks#set_draw_inside i),
+       "<int>\tDraw on the edges of the convex hull of solutions.";
 
-    "--draw-vertices", Arg.Unit (fun _ -> callbacks#set_draw_mode Vertices),
-       "\tDraw among the vertices of the polyhedron of solutions.\n ";
+    "--draw-edges", Arg.Int (fun i -> callbacks#set_draw_edges i),
+       "<int>\t\tDraw on the edges of the convex hull of solutions.";
 
+    "--draw-vertices", Arg.Int (fun i -> callbacks#set_draw_vertices i),
+       "<int>\tDraw among the vertices of the convex hull of solutions.\n ";
 
 
     "--output", Arg.String (fun s -> callbacks#set_rif_file_basename s),
@@ -1352,6 +1363,9 @@ let main () =
   let on_oracle_help_button =  
     new Xlurette_glade_interface.top_oracle_help_window callbacks  
   in 
+  let on_test_thickness_help_button =  
+    new Xlurette_glade_interface.top_test_thickness_help_window callbacks  
+  in 
 
   let on_extra_env_var_button =  
     new Xlurette_glade_interface.top_extra_env_var_window callbacks  

lurette.prj

 ;; -*- Prcs -*-
 (Created-By-Prcs-Version 1 3 3)
 (Project-Description "Lurette")
-(Project-Version lurette 1 2)
-(Parent-Version lurette 1 1)
+(Project-Version lurette 1 3)
+(Parent-Version lurette 1 2)
 (Version-Log "
-
-share/
-   Do not use the lucky_init.sh to set up env var anymore but wrap executables
-   by scripts that set them.
-
-test/
-   Add more test cases.
-
-source/lurettetop.ml:
-   lauch gnuplot via an xterm to turn around a buggy behavior of gnuplot
-   (this fix is far from ideal however, because the xterm window have to 
-   be killed manually, which is boring).
-   
+source/store.ml:
+source/store.ml:
+source/solver.ml:
+   Add a numeric thickness at the numeric level.
 
 ")
 (New-Version-Log ""
 )
-(Checkin-Time "Wed, 17 Sep 2003 10:09:24 +0200")
+(Checkin-Time "Tue, 23 Sep 2003 16:56:51 +0200")
 (Checkin-Login jahier)
 (Populate-Ignore ())
 (Project-Keywords)
@@ -33,35 +24,35 @@ source/lurettetop.ml:
 
 ;; Sources files for luc_exe
   (source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.2 644))
-  (source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.34 644))
+  (source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.35 644))
 
-  (source/command_line_luc_exe.ml (lurette/b/33_command_li 1.17 644))
-  (source/command_line_luc_exe.mli (lurette/b/34_command_li 1.10 644))
+  (source/command_line_luc_exe.ml (lurette/b/33_command_li 1.18 644))
+  (source/command_line_luc_exe.mli (lurette/b/34_command_li 1.11 644))
 
 ;; Sources files for lurette only
   (source/lurette.mli (lurette/11_lurette.ml 1.13 644))
-  (source/lurette.ml (lurette/12_lurette.ml 1.73 644))
+  (source/lurette.ml (lurette/12_lurette.ml 1.74 644))
 
-  (source/command_line.ml (lurette/b/20_command_li 1.14 644))
-  (source/command_line.mli (lurette/b/21_command_li 1.11 644))
+  (source/command_line.ml (lurette/b/20_command_li 1.15 644))
+  (source/command_line.mli (lurette/b/21_command_li 1.12 644))
 
 ;; Sources files common to lurette and luc_exe
   (source/graph.mli (lurette/13_graph.mli 1.11 644))
   (source/graph.ml (lurette/14_graph.ml 1.9 644))
 
-  (source/env.mli (lurette/15_env.mli 1.18 644))
-  (source/env.ml (lurette/16_env.ml 1.31 644))
+  (source/env.mli (lurette/15_env.mli 1.19 644))
+  (source/env.ml (lurette/16_env.ml 1.32 644))
 
-  (source/util.ml (lurette/35_util.ml 1.53 644))
+  (source/util.ml (lurette/35_util.ml 1.54 644))
 
-  (source/solver.mli (lurette/38_solver.mli 1.15 644))
-  (source/solver.ml (lurette/39_solver.ml 1.51 644))
+  (source/solver.mli (lurette/38_solver.mli 1.16 644))
+  (source/solver.ml (lurette/39_solver.ml 1.52 644))
 
   (source/polyhedron.ml (lurette/d/25_polyhedron 1.7 644))
   (source/polyhedron.mli (lurette/d/26_polyhedron 1.2 644))
 
-  (source/store.mli (lurette/b/26_rnumsolver 1.17 644))
-  (source/store.ml (lurette/b/27_rnumsolver 1.25 644))
+  (source/store.mli (lurette/b/26_rnumsolver 1.18 644))
+  (source/store.ml (lurette/b/27_rnumsolver 1.26 644))
 
   (source/pnumsolver.ml (lurette/d/23_pnumsolver 1.2 644))
   (source/pnumsolver.mli (lurette/d/24_pnumsolver 1.2 644))
@@ -81,11 +72,11 @@ source/lurettetop.ml:
   (source/eval.mli (lurette/48_eval.mli 1.11 644))
   (source/eval.ml (lurette/49_eval.ml 1.15 644))
 
-  (source/env_state.mli (lurette/50_env_state. 1.32 644))
-  (source/env_state.ml (lurette/51_env_state. 1.47 644))
+  (source/env_state.mli (lurette/50_env_state. 1.33 644))
+  (source/env_state.ml (lurette/51_env_state. 1.48 644))
 
-  (source/automata.mli (lurette/b/46_automata.m 1.4 644))
-  (source/automata.ml (lurette/b/47_automata.m 1.11 644))
+  (source/automata.mli (lurette/b/46_automata.m 1.5 644))
+  (source/automata.ml (lurette/b/47_automata.m 1.12 644))
 
   (source/sim2chro.mli (lurette/b/23_sim2chro.m 1.7 644))
   (source/sim2chro.ml (lurette/b/24_sim2chro.m 1.20 644))
@@ -93,7 +84,7 @@ source/lurettetop.ml:
   (source/gne.mli (lurette/b/36_gne.mli 1.6 644))
   (source/gne.ml (lurette/b/37_gne.ml 1.6 644))
 
-  (source/lurettetop.ml (lurette/c/1_lurettetop 1.40 644))
+  (source/lurettetop.ml (lurette/c/1_lurettetop 1.41 644))
 
   (source/draw.mli (lurette/f/1_draw.mli 1.1 644))
   (source/draw.ml (lurette/f/2_draw.ml 1.1 644))
@@ -154,13 +145,13 @@ source/lurettetop.ml:
   (share/pixmaps/chrono.xpm (lurette/f/23_chrono.xpm 1.1 644))
   (share/pixmaps/button-close.xpm (lurette/f/24_button-clo 1.1 644))
   (share/config.guess (lurette/f/25_config.gue 1.1 755))
-  (share/configure.in (lurette/d/11_configure. 1.13 644))
+  (share/configure.in (lurette/d/11_configure. 1.14 644))
   (share/Makefile.common.in (lurette/d/12_Makefile.c 1.5 644))
   (Makefile.common.source (lurette/e/33_Makefile.c 1.5 644))
   (OcamlMakefile (lurette/17_OcamlMakef 1.51 644))
   (share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.27 644))
-  (user-rules (lurette/c/14_myrules 1.42 644))
-  (share/Makefile.test (lurette/c/25_user-rules 1.9 644))
+  (user-rules (lurette/c/14_myrules 1.43 644))
+  (share/Makefile.test.in (lurette/c/25_user-rules 1.10 644))
   (Makefile (lurette/d/13_Makefile 1.4 644))
 
   (source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.5 644))
@@ -184,19 +175,19 @@ source/lurettetop.ml:
   (ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
   (INSTALL (lurette/f/26_INSTALL 1.2 744))
   (TAGS (lurette/21_TAGS 1.6 644))
-  (TODO (lurette/d/22_TODO 1.23 644))
+  (TODO (lurette/d/22_TODO 1.24 644))
   (share/lucky_init.csh.in (lurette/e/23_lucky_init 1.8 644))
   (share/lucky_init.sh.in (lurette/e/24_lucky_init 1.11 644))
 
-  (share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.4 744))
+  (share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.5 744))
   (share/plot (lurette/e/35_plot 1.4 744))
 
-  (test/time-ossau.exp (lurette/b/48_time.exp 1.47 644))
-  (test/time-ossau.res (lurette/b/49_time.res 1.51 644))
-  (test/time-ecrins.res (lurette/d/20_time-ecrin 1.25 644))
-  (test/time-ecrins.exp (lurette/d/21_time-ecrin 1.24 644))
+  (test/time-ossau.exp (lurette/b/48_time.exp 1.48 644))
+  (test/time-ossau.res (lurette/b/49_time.res 1.52 644))
+  (test/time-ecrins.res (lurette/d/20_time-ecrin 1.26 644))
+  (test/time-ecrins.exp (lurette/d/21_time-ecrin 1.25 644))
   (test/time-moucherotte.exp (lurette/e/37_time-mouch 1.6 644))
-  (test/time-moucherotte.res (lurette/e/38_time-mouch 1.6 644))
+  (test/time-moucherotte.res (lurette/e/38_time-mouch 1.7 644))
 
 ;; Various files used for testing purposes
   (test/cudd_gc_problem.luc (lurette/e/29_cudd_gc_pr 1.2 644))
@@ -223,9 +214,9 @@ source/lurettetop.ml:
   (test/allocator.lus (../demo-xlurette/Gyro/allocator.lus) :symlink)
 
 
-  (test/heater_int.rif.exp (lurette/b/28_heater_int 1.14 644))
-  (test/ControleurPorte.rif.exp (lurette/b/29_Controleur 1.17 644))
-  (test/heater_float.rif.exp (lurette/b/30_heater_flo 1.16 644))
+  (test/heater_int.rif.exp (lurette/b/28_heater_int 1.15 644))
+  (test/ControleurPorte.rif.exp (lurette/b/29_Controleur 1.18 644))
+  (test/heater_float.rif.exp (lurette/b/30_heater_flo 1.17 644))
   (test/heater_int.lus (lurette/b/43_heater_int 1.1 644))
   (test/heater_float.lus (lurette/b/44_heater_flo 1.2 644))
 
@@ -241,7 +232,7 @@ source/lurettetop.ml:
   (test/sparc-scade/exo1.vsp (lurette/e/49_exo1.vsp 1.1 644))
   (test/sparc-scade/exo1.saofdm (lurette/e/50_exo1.saofd 1.1 644))
   (test/sparc-scade/Direction_D1.saofd (lurette/e/51_Direction_ 1.1 644))
-  (test/sparc-scade/scade.rif.exp (lurette/f/0_scade.rif. 1.2 644))
+  (test/sparc-scade/scade.rif.exp (lurette/f/0_scade.rif. 1.3 644))
 
   (test/test-scade-cygwin.res (lurette/f/28_test-scade 1.1 644))
   (test/cygwin-scade/.lurette_rc (lurette/f/29_.lurette_r 1.2 644))
@@ -279,7 +270,7 @@ source/lurettetop.ml:
   (demo-xlurette/chaudiere/chaudiere_oracle.lus (lurette/c/8_chaudiere_ 1.1 644))
   (demo-xlurette/chaudiere/chaudiere_ctrl.lus (lurette/c/9_chaudiere_ 1.2 644))
   (demo-xlurette/chaudiere/buggy_chaudiere_ctrl.lus (lurette/c/10_buggy_chau 1.1 644))
-  (demo-xlurette/chaudiere/chaudiere.luc (lurette/c/11_chaudiere. 1.7 644))
+  (demo-xlurette/chaudiere/chaudiere.luc (lurette/c/11_chaudiere. 1.8 644))
 
   (test/losange.luc (lurette/d/27_losange.lu 1.2 644))
   (test/losange-3d.luc (lurette/d/28_losange-3d 1.4 644))
@@ -293,12 +284,12 @@ source/lurettetop.ml:
   (test/test9.rif.exp (lurette/g/17_test9.rif. 1.1 644))
   (test/test8.rif.exp (lurette/g/18_test8.rif. 1.1 644))
 
-  (test/Makefile (lurette/c/0_Makefile 1.12 644))
+  (test/Makefile (lurette/c/0_Makefile 1.13 644))
 
 ;; xlurette
-  (ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.26 644))
-  (ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.20 644))
-  (ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.19 644))
+  (ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.27 644))
+  (ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.21 644))
+  (ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.20 644))
   (ihm/xlurette/makefile (lurette/c/16_makefile 1.17 644))
 
 

share/Makefile.test → share/Makefile.test.in

-# Generated automatically from Makefile.test.in by configure.
 # 
 
 
@@ -6,7 +5,7 @@
 
 test1:
 	rm -f ControleurPorte.rif0; \
-	../i386-linux/bin/lurettetop --sut ControleurPorte.lus  -msn ControleurPorte -l 100 -tf 10 -td 10  \
+	../@HOST_TYPE@/bin/lurettetop --sut ControleurPorte.lus  -msn ControleurPorte -l 100 -tf 10 -td 10  \
 	   --do-not-show-step -o ControleurPorte.rif0  \
 	   --seed 1013219512 -ns2c -go  \
 	   tram.luc usager.luc porte.luc passerelle.luc ;\
@@ -15,7 +14,7 @@ test1:
 
 test2:
 	rm -f heater_int.rif0; \
-	../i386-linux/bin/lurettetop -l 30 -tf 10 -td 10 --sut heater_int -msn heater_int --seed 1013219512 \
+	../@HOST_TYPE@/bin/lurettetop -l 30 -tf 10 -td 10 --sut heater_int -msn heater_int --seed 1013219512 \
 	   --do-not-show-step -ns2c -go -o heater_int.rif0 \
 	   -go temp_int ;\
 	grep -v "lurette chronogram" heater_int.rif0 | sed -e "s/^M//" > heater_int.rif ;\
@@ -23,7 +22,7 @@ test2:
 
 test3: 
 	rm -f heater_float.rif0; \
-	../i386-linux/bin/lurettetop --precision 4 -go -l 30 -tf 10 -td 10  -msn heater_float --sut heater_float --seed 1013219512 \
+	../@HOST_TYPE@/bin/lurettetop --precision 4 -go -l 30 -tf 10 -td 10  -msn heater_float --sut heater_float --seed 1013219512 \
 	   --do-not-show-step -ns2c -o heater_float.rif0 \
 	   temp_float;\
 	grep -v "lurette chronogram" heater_float.rif0 | sed -e "s/^M//"> heater_float.rif ;\
@@ -31,12 +30,12 @@ test3:
 
 
 test5 :
-	../i386-linux/bin/lucky  -seed 834966010 -l 100 losange-3d2.luc | sed -e "s/^M//" > losange-3d.rif
+	../@HOST_TYPE@/bin/lucky  -seed 834966010 -l 100 losange-3d2.luc | sed -e "s/^M//" > losange-3d.rif
 	rm -f test5.res; diff -u losange-3d.rif.exp losange-3d.rif > test5.res
 
 test6 :
 	rm -f gyro.rif0; \
-	../i386-linux/bin/lurettetop --precision 4 -go -l 50 -tf 1 -td 1  -msn onlyroll --sut onlyroll --seed 1013219512 \
+	../@HOST_TYPE@/bin/lurettetop --precision 4 -go -l 50 -tf 1 -td 1  -msn onlyroll --sut onlyroll --seed 1013219512 \
 	   --do-not-show-step -ns2c -o gyro.rif0 giro;\
 	grep -v "lurette chronogram" gyro.rif0 | sed -e "s/^M//" > gyro.rif ;\
 	rm -f test6.res; diff -u gyro.rif.exp gyro.rif > test6.res
@@ -44,11 +43,29 @@ test6 :
 
 test7 :
 	rm -f test7.rif0; \
-	$(LURETTE_PATH)/$(HOST_TYPE)/bin/lucky  -seed 834966010 \
+	../@HOST_TYPE@/bin/lucky  -seed 834966010 \
 	infinite_weight.luc | sed -e "s/^M//" > test7.rif
 	rm -f test7.res; diff -u test7.rif.exp test7.rif > test7.res
 
+test8 :
+	rm -f test8.rif0; \
+	../@HOST_TYPE@/bin/lucky -l 20 -seed 834966010 \
+	dynamic_weight.luc | sed -e "s/^M//" > test8.rif
+	rm -f test8.res; diff -u test8.rif.exp test8.rif > test8.res
 
-test:  test1 test2 test3 test5 test6 test7
+test9 :
+	rm -f test9.rif0; \
+	../@HOST_TYPE@/bin/lucky -l 10 -seed 834966010 \
+	structured_type.luc | sed -e "s/^M//" > test9.rif
+	rm -f test9.res; diff -u test9.rif.exp test9.rif > test9.res
+
+test10 :
+	rm -f test10.rif0; \
+	../@HOST_TYPE@/bin/lurettetop -l 100 -go -seed 834966010 \
+	 --do-not-show-step -ns2c -sut heater.lus -o test10.rif0 window.luc  ;\
+	grep -v "lurette chronogram" test10.rif0 | sed -e "s/^M//" > test10.rif
+	rm -f test10.res; diff -u test10.rif.exp test10.rif > test10.res
+
+test:  test1 test2 test3 test5 test6 test7 test8 test9 test10
 	ls -l *.res
 

share/configure.in

@@ -227,7 +227,7 @@ AC_CHECK_PROG(XTERM,xterm,xterm,no)
 if test "$XTERM" = no ; then
     GNUPLOT_TERM=""
 else
-    GNUPLOT_TERM="xterm -e "
+    GNUPLOT_TERM="\"xterm -e \""
 fi
 
 AC_SUBST(GNUPLOT_TERM)

share/gnuplot-rif

@@ -7,11 +7,16 @@
 
 if test $# -lt 1
     then
-    echo "usage: gnuplot-rif <rif file> "
+    echo "usage: gnuplot-rif <rif file> [-plot]"
+    echo ""
+    echo "gnuplot-rif generate a .plot file to used by gnuplot"
+    echo "if -plot option is provided, then it calls gnuplot on the generated file."
     exit 1
 fi;
 
 
+
+
 FILE=$1
 
 if test -f $FILE ; 
@@ -52,8 +57,15 @@ if test -f $FILE ;
 
     cat $FILE.gp | plot  -dump > $FILE.plot
     rm $FILE.gp
-#    gnuplot  $FILE.plot
-    
+
+    case $2 in
+	-plot|-gnuplot|-print|-p) 
+	    gnuplot  $FILE.plot
+	    ;;
+	*)
+	    ;;
+    esac
+