Commit 801c2882 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.41 Fri, 08 Mar 2002 17:30:37 +0100 by jahier

Parent-Version:      0.40
Version-Log:

Change sligthly the ima format to make it more consistent.

Project-Description: Lurette
parent 9d1241f6
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 40)
(Parent-Version lurette 0 39)
(Version-Log "
Change the naming convention of prevars. Now, _pretoto is noted
_pre1toto, and _pre_pre_pretoto is noted _pre3toto.
Also fix a bug in the default initialization of ranges : min_float
is the smallest positive float, not the smallet one !!
(Project-Version lurette 0 41)
(Parent-Version lurette 0 40)
(Version-Log "
Change sligthly the ima format to make it more consistent.
")
(New-Version-Log "")
(Checkin-Time "Thu, 07 Mar 2002 16:26:47 +0100")
(Checkin-Time "Fri, 08 Mar 2002 17:30:37 +0100")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -42,7 +36,7 @@ is the smallest positive float, not the smallet one !!
(source/rnumsolver.ml (lurette/b/27_rnumsolver 1.3 644))
(source/parse_env.mli (lurette/40_parse_env. 1.5 644))
(source/parse_env.ml (lurette/41_parse_env. 1.7 644))
(source/parse_env.ml (lurette/41_parse_env. 1.8 644))
(source/show_env.mli (lurette/42_show_env.m 1.5 644))
(source/show_env.ml (lurette/43_show_env.m 1.3 644))
......@@ -96,10 +90,10 @@ is the smallest positive float, not the smallet one !!
;; Various files used for testing purposes
(test/usager.env (lurette/b/14_usager.env 1.3 644))
(test/tram.env (lurette/b/15_tram.env 1.2 644))
(test/porte.env (lurette/b/16_porte.env 1.2 644))
(test/passerelle.env (lurette/b/17_passerelle 1.2 644))
(test/usager.env (lurette/b/14_usager.env 1.4 644))
(test/tram.env (lurette/b/15_tram.env 1.3 644))
(test/porte.env (lurette/b/16_porte.env 1.3 644))
(test/passerelle.env (lurette/b/17_passerelle 1.3 644))
(test/ControleurPorte.h (lurette/b/18_Controleur 1.1 644))
(test/ControleurPorte.c (lurette/b/19_Controleur 1.1 644))
......
(*pp camlp4o *)
(*-----------------------------------------------------------------------
** 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
**-----------------------------------------------------------------------
......@@ -139,7 +139,7 @@ and (parse_var: aut_token -> vnt) =
"bool" -> (var, BoolT)
(* XXX Rajouter dans le format un moyen de prciser ces bornes *)
| "float" -> (var, FloatT(-.max_float, max_float))
| "int" -> (var, IntT(-min_int, max_int))
| "int" -> (var, IntT(min_int, max_int))
| str -> failwith ("*** Bad type in .env: " ^ str )
)
with e ->
......@@ -159,7 +159,7 @@ and (parse_arc: aut_token -> read_arc) =
let tok_list = Stream.npeek 10 tok in
try
match tok with parser
[< 'Genlex.Ident "arc"; 'Genlex.Kwd "("; 'Genlex.Int node_from ;
[< 'Genlex.Kwd "("; 'Genlex.Int node_from ;
'Genlex.Kwd ","; arc_info = parse_arc_info ;
'Genlex.Kwd "," ; 'Genlex.Int node_to ; 'Genlex.Kwd ")"; >]
-> Arc(node_from, arc_info, node_to)
......
......@@ -14,19 +14,19 @@ output vars = [
local vars = [],
pre vars = [],
arcs = [
arc(0, 1: Not pass_rentree And Not pass_baissee,1) ;
arc(1, 1: eps,2);
arc(2, 1: eps,3);
arc(3, 1: Not pass_baissee And Not pass_rentree And Not baisser_pass And Not rentrer_pass,2);
arc(2, 1: eps,4);
arc(4, 1: eps,5);
arc(5, 1: eps,6);
arc(6, 1: Not pass_baissee And Not pass_rentree And baisser_pass,5);
arc(5, 1: eps,7);
arc(7, 1: Not pass_rentree And pass_baissee,1);
arc(4, 1: eps,8);
arc(8, 1: eps,9);
arc(9, 1: Not pass_baissee And Not pass_rentree And rentrer_pass,8);
arc(8, 1: eps,10);
arc(10, 1: pass_rentree And Not pass_baissee,1)
(0, 1: Not pass_rentree And Not pass_baissee,1) ;
(1, 1: eps,2);
(2, 1: eps,3);
(3, 1: Not pass_baissee And Not pass_rentree And Not baisser_pass And Not rentrer_pass,2);
(2, 1: eps,4);
(4, 1: eps,5);
(5, 1: eps,6);
(6, 1: Not pass_baissee And Not pass_rentree And baisser_pass,5);
(5, 1: eps,7);
(7, 1: Not pass_rentree And pass_baissee,1);
(4, 1: eps,8);
(8, 1: eps,9);
(9, 1: Not pass_baissee And Not pass_rentree And rentrer_pass,8);
(8, 1: eps,10);
(10, 1: pass_rentree And Not pass_baissee,1)
]
......@@ -6,19 +6,19 @@ output vars = [(porte_ouverte,bool);(porte_fermee,bool)],
local vars = [],
pre vars = [],
arcs = [
arc(0, 1 : Not porte_fermee And Not porte_ouverte,1);
arc(1, 1 : eps,2);
arc(2, 1 : eps,3);
arc(3, 1 : Not porte_ouverte And Not porte_fermee And Not ouvrir_porte And Not fermer_porte,2);
arc(2, 1 : eps,4);
arc(4, 1 : eps,5);
arc(5, 1 : eps,6);
arc(6, 1 : Not porte_ouverte And Not porte_fermee And ouvrir_porte,5);
arc(5, 1 : eps,7);
arc(7, 1 : Not porte_fermee And porte_ouverte,1);
arc(4, 1 : eps,8);
arc(8, 1 : eps,9);
arc(9, 1 : Not porte_ouverte And Not porte_fermee And fermer_porte,8);
arc(8, 1 : eps,10);
arc(10,1 : porte_fermee And Not porte_ouverte,1)
(0, 1 : Not porte_fermee And Not porte_ouverte,1);
(1, 1 : eps,2);
(2, 1 : eps,3);
(3, 1 : Not porte_ouverte And Not porte_fermee And Not ouvrir_porte And Not fermer_porte,2);
(2, 1 : eps,4);
(4, 1 : eps,5);
(5, 1 : eps,6);
(6, 1 : Not porte_ouverte And Not porte_fermee And ouvrir_porte,5);
(5, 1 : eps,7);
(7, 1 : Not porte_fermee And porte_ouverte,1);
(4, 1 : eps,8);
(8, 1 : eps,9);
(9, 1 : Not porte_ouverte And Not porte_fermee And fermer_porte,8);
(8, 1 : eps,10);
(10,1 : porte_fermee And Not porte_ouverte,1)
]
......@@ -13,17 +13,17 @@ output vars = [(en_marche,bool);
local vars = [],
pre vars = [],
arcs = [
arc(0,1:eps,1);
arc(1,1:eps,2);
arc(2,1:en_marche And Not debut_ramassage And Not fin_ramassage,1);
arc(1,1:eps,3);
arc(3,1:Not fin_ramassage And debut_ramassage And Not en_marche,4);
arc(4,1:eps,5);
arc(5,1:Not fin_ramassage And Not debut_ramassage And Not en_marche,4);
arc(4,1:eps,6);
arc(6,1:fin_ramassage And Not debut_ramassage And Not en_marche,7);
arc(7,1:eps,8);
arc(8,1:Not fin_ramassage And Not debut_ramassage And Not en_marche And Not porte_et_pass_ok,7);
arc(7,1:eps,9);
arc(9,1:Not fin_ramassage And Not debut_ramassage And en_marche And porte_et_pass_ok,0)
(0,1:eps,1);
(1,1:eps,2);
(2,1:en_marche And Not debut_ramassage And Not fin_ramassage,1);
(1,1:eps,3);
(3,1:Not fin_ramassage And debut_ramassage And Not en_marche,4);
(4,1:eps,5);
(5,1:Not fin_ramassage And Not debut_ramassage And Not en_marche,4);
(4,1:eps,6);
(6,1:fin_ramassage And Not debut_ramassage And Not en_marche,7);
(7,1:eps,8);
(8,1:Not fin_ramassage And Not debut_ramassage And Not en_marche And Not porte_et_pass_ok,7);
(7,1:eps,9);
(9,1:Not fin_ramassage And Not debut_ramassage And en_marche And porte_et_pass_ok,0)
]
......@@ -8,9 +8,9 @@ output vars = [(demande_pass,bool);(demande_porte,bool)],
local vars = [],
pre vars = [],
arcs = [
arc(0, 1: eps,1);
arc(1, 1: eps,2);
arc(2, 1: demande_porte Or demande_pass,0);
arc(1, 1: eps,3);
arc(3, 1: (Not demande_porte) Or (Not demande_pass),0)
(0, 1: eps,1);
(1, 1: eps,2);
(2, 1: demande_porte Or demande_pass,0);
(1, 1: eps,3);
(3, 1: (Not demande_porte) Or (Not demande_pass),0)
]
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