lurette 0.21 Thu, 13 Dec 2001 16:05:10 +0100 by jahier

Parent-Version:      0.20
Version-Log:

Removes a few hard coded paths.

Project-Description: Lurette

Makefile

-LURETTE_DIR = /home/jahier/lurette
+LURETTE_DIR = ..
 OCAMLMAKEFILE = $(LURETTE_DIR)/OcamlMakefile
 
 # It seems that there is no speed up with those options...

interface/Makefile

-LURETTE_DIR = /home/jahier/lurette
+LURETTE_DIR = ..
 OCAMLMAKEFILE = $(LURETTE_DIR)/OcamlMakefile
 
 

lurette.prj

 ;; -*- Prcs -*-
 (Created-By-Prcs-Version 1 3 3)
 (Project-Description "Lurette")
-(Project-Version lurette 0 20)
-(Parent-Version lurette 0 19)
+(Project-Version lurette 0 21)
+(Parent-Version lurette 0 20)
 (Version-Log "
-Just a couple of cosmetic changes.
+Removes a few hard coded paths.
 ")
 (New-Version-Log "")
-(Checkin-Time "Thu, 06 Dec 2001 16:10:48 +0100")
+(Checkin-Time "Thu, 13 Dec 2001 16:05:10 +0100")
 (Checkin-Login jahier)
 (Populate-Ignore ())
 (Project-Keywords)
@@ -24,7 +24,7 @@ Just a couple of cosmetic changes.
   (source/graph.mli (lurette/13_graph.mli 1.2 644))
   (source/graph.ml (lurette/14_graph.ml 1.2 644))
 
-  (source/env.mli (lurette/15_env.mli 1.5 644))
+  (source/env.mli (lurette/15_env.mli 1.6 644))
   (source/env.ml (lurette/16_env.ml 1.9 644))
 
   (source/util.ml (lurette/35_util.ml 1.4 644))
@@ -50,16 +50,16 @@ Just a couple of cosmetic changes.
   (source/env_state.mli (lurette/50_env_state. 1.2 644))
   (source/env_state.ml (lurette/51_env_state. 1.3 644))
 
-  (source/wtree.mli (lurette/b/0_wtree.mli 1.1 644))
-  (source/wtree.ml (lurette/b/1_wtree.ml 1.1 644))
+  (source/wtree.mli (lurette/b/0_wtree.mli 1.2 644))
+  (source/wtree.ml (lurette/b/1_wtree.ml 1.2 644))
 
-  (source/gen_stubs.ml (lurette/24_generate_l 1.12 644))
+  (source/gen_stubs.ml (lurette/24_generate_l 1.13 644))
 
 ;; Make files
   (OcamlMakefile (lurette/17_OcamlMakef 1.7 644))
-  (Makefile (lurette/18_Makefile 1.11 644))
+  (Makefile (lurette/18_Makefile 1.12 644))
   (test/Makefile (../Makefile) :symlink)
-  (interface/Makefile (lurette/25_Makefile 1.5 644))
+  (interface/Makefile (lurette/25_Makefile 1.6 644))
   (make_lurette (lurette/27_make_luret 1.5 744))
 
 

source/env.mli

@@ -3,27 +3,22 @@
 ** This file may only be copied under the terms of the GNU Library General
 ** Public License 
 **-----------------------------------------------------------------------
-
+**
 ** File: env.mli
 ** Main author: jahier@imag.fr
-
+**
 ** This module simulates the test environement for lurette.
 ** It assumes that a description of the test environement exists in the
 ** form of an automata whose arcs are labelled by weighted formula. This
-** description is read from an *.aut file that has been produced by a
+** description is read from an *.env file that has been produced by a
 ** third party tool, issued from, e.g., a Lutin or a Lustre spec.
 **
 ** This module provides the automata data type, a procedure to read the
 ** automata from an *.aut file, as well as various procedures to step
 ** through the automata.
-
-XXX Raconter ici les histoires de env_state et de pourquoi il s'agit 
-d'une variable locale ...
-
-*)
-
-(* 
-** I defined env_state as a mutable data type for consistency with
+**
+** Remark:
+** I defined `env_state' as a mutable data type for consistency with
 ** what occurs in the oracle and in the SUT. Indeed, try and step
 ** commands modify oracle and SUT internal states via side-effects.
 ** Making the env_state mutable allows us to do the same for the 
@@ -67,8 +62,7 @@ val env_try : int -> int -> sut_out -> (node list list * sut_in * env_loc) list
 
 val env_step : node list list -> sut_in -> env_loc -> unit
   (*
-   ** [env_step node_to output local ] modifies the 
-   ** environment state by:
+   ** [env_step node_to output local ] modifies the environment state by:
    **      1 - performing a transition from the current_node to `node_to'
    **      2 - updating the memory (using `output' and `local').
    *)

source/gen_stubs.ml

@@ -905,7 +905,7 @@ let main2 sut oracle =
      ** We need to call camlidl now in order to get the ocaml types of the sut.
      *)
     if ((Sys.command ("echo \"camlidl -header sut_idl_stub.idl ...\" ;" ^
-		      " /home/jahier/sun/bin/camlidl -header sut_idl_stub.idl ")) <> 0)  
+		      " camlidl -header sut_idl_stub.idl ")) <> 0)  
     then print_string (" Can't call camlidl on sut_idl_stub.idl; " ^
 		       "is camlidl in your path? Does sut_idl_stub.idl exist?\n\n") 
     else print_string "     ... ok\n";

source/wtree.ml

@@ -3,7 +3,7 @@
 ** This file may only be copied under the terms of the GNU Library General
 ** Public License 
 **-----------------------------------------------------------------------
-
+**
 ** File: wtree.ml
 ** Main author: jahier@imag.fr
 **
@@ -110,13 +110,13 @@ let rec (rm_elt: node list -> wtree -> wtree) =
 	      N(w, swt)::(rm_elt l tail)
 	    else if (new_swt = []) then
 	      (* 
-	       ** remove empty sub trees otherwise it will be difficult to
+	       ** Remove empty sub trees otherwise it will be difficult to
 	       ** know when a tree in empty (when no formula is satisfiable).
 	       *)
 	      tail
 	    else
 	      (* 
-	       ** each list of nodes ougth to appear at most once. Hence
+	       ** Each list of nodes ougth to appear at most once. Hence
 	       ** it is useless to try to remove it if it has already been 
 	       ** removed somewhere.
 	       *)
@@ -159,13 +159,13 @@ let rec (choose_a_formula: formula_table -> wtree -> node list
 	   -> (node list) * (formula list)) =
   fun ft wt nodes_from -> 
     (*
-     ** draws a formula in a wtree (and the list of their corresponding 
+     ** Draws a formula in a wtree (and the list of their corresponding 
      ** target nodes) according to node weigths.
      **
      ** XXX ft is a mutable var in fact. Should I really claim that it is not?
      ** The reason why I do not directly use the global variable here is 
-     ** that this module seems sufficient general to be reused in an other 
-     ** context (???) 
+     ** that this module seems sufficiently general to be reused in an other 
+     ** context (???).
      **
      ** XXX check the performance penalty of that.
      *)
@@ -225,7 +225,7 @@ let (choose_n_formula: int -> formula_table -> node list -> wtree ->
 let rec (wtree_product: wtree -> wtree -> wtree) =
   fun wt1 wt2 -> 
     (*
-     ** returns the product of 2 wtrees.
+     ** Returns the product of 2 wtrees.
      ** XXX Define this product properly !!!
      *)
     match wt1 with

source/wtree.mli

@@ -3,7 +3,7 @@
 ** This file may only be copied under the terms of the GNU Library General
 ** Public License 
 **-----------------------------------------------------------------------
-
+**
 ** File: wtree.ml
 ** Main author: jahier@imag.fr
 **
@@ -13,7 +13,7 @@
 **
 ** This data type is specifically designed to:
 **    (1) be able to draw a value in the tree according to the nodes weigths
-**    (2) be able to compute the product of 2 wtree in such a way that the 
+**    (2) be able to compute the product of 2 wtrees in such a way that the 
 **      probabilities defined by the weigths are respected (i.e, drawing
 **      in the product leads to the same probabilities as drawing in each
 **      wtree separately)
@@ -21,7 +21,7 @@
 **
 ** The motivation for this data type is to be able to perform the
 ** product of several env automata ``virtually'', i.e., without
-** explicitely contructing the product of the whole automata (which
+** explicitly contructing the product of the whole automata (which
 ** would be exponential in space). Here, the product we compute is only
 ** ``local'' to each node, and it is done over list of integers
 ** (versus automata containing formula).