Commit 67c17ef7 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 1.9 Tue, 18 Nov 2003 11:17:12 +0100 by jahier

Parent-Version:      1.8
Version-Log:

A lot (too much...) of changes, mainly renaming files, and types, and
functions,
change the interface, move from one module to another, etc.

Bref, a lot of cleanning.

Project-Description: Lurette
parent a3e8a67b
This diff is collapsed.
......@@ -6,47 +6,47 @@
# Where to find libs
INCDIRS = $(HOME)/$(HOST_TYPE)/lib
LIBDIRS = $(HOME)/$(HOST_TYPE)/lib
LIBDIRS = $(HOME)/$(HOST_TYPE)/lib
OCAMLMAKEFILE = $(HOME)/lurette/OcamlMakefile
LURETTE_PATH = $(HOME)/lurette
SOURCES_LURETTE_LIB = $(LURETTE_PATH)/source/util.ml \
$(LURETTE_PATH)/source/genlex.mli $(LURETTE_PATH)/source/genlex.ml \
$(LURETTE_PATH)/source/lexeme.mli $(LURETTE_PATH)/source/lexeme.ml \
$(LURETTE_PATH)/source/prevar.mli $(LURETTE_PATH)/source/prevar.ml \
$(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
$(LURETTE_PATH)/source/polyDraw.mli \
$(LURETTE_PATH)/source/polyDraw.ml \
$(LURETTE_PATH)/source/command_line.mli $(LURETTE_PATH)/source/command_line.ml \
$(LURETTE_PATH)/source/value.mli $(LURETTE_PATH)/source/value.ml \
$(LURETTE_PATH)/source/ne.mli $(LURETTE_PATH)/source/ne.ml \
$(LURETTE_PATH)/source/constraint.mli $(LURETTE_PATH)/source/constraint.ml \
$(LURETTE_PATH)/source/formula.mli $(LURETTE_PATH)/source/formula.ml \
$(LURETTE_PATH)/source/lustreExp.mli $(LURETTE_PATH)/source/lustreExp.ml \
$(LURETTE_PATH)/source/parser.mly $(LURETTE_PATH)/source/lexer.mll \
$(LURETTE_PATH)/source/gne.mli $(LURETTE_PATH)/source/gne.ml \
$(LURETTE_PATH)/source/parse_luc.mli $(LURETTE_PATH)/source/parse_luc.ml \
$(LURETTE_PATH)/source/polyhedron.mli $(LURETTE_PATH)/source/polyhedron.ml \
$(LURETTE_PATH)/source/store.mli $(LURETTE_PATH)/source/store.ml \
$(LURETTE_PATH)/source/env_state.mli $(LURETTE_PATH)/source/env_state.ml \
$(LURETTE_PATH)/source/formula_to_bdd.mli \
$(LURETTE_PATH)/source/formula_to_bdd.ml \
$(LURETTE_PATH)/source/bddd.mli \
$(LURETTE_PATH)/source/bddd.ml \
$(LURETTE_PATH)/source/fair_bddd.mli \
$(LURETTE_PATH)/source/fair_bddd.ml \
$(LURETTE_PATH)/source/solver.mli $(LURETTE_PATH)/source/solver.ml \
$(LURETTE_PATH)/source/show_env.mli $(LURETTE_PATH)/source/show_env.ml \
$(LURETTE_PATH)/source/automata.mli $(LURETTE_PATH)/source/automata.ml \
$(LURETTE_PATH)/source/print.mli $(LURETTE_PATH)/source/print.ml \
$(LURETTE_PATH)/source/sim2chro.mli $(LURETTE_PATH)/source/sim2chro.ml \
$(LURETTE_PATH)/source/env.mli $(LURETTE_PATH)/source/env.ml \
$(LURETTE_PATH)/source/lurette.ml
ALL_SOURCES = $(SOURCES_LURETTE_LIB) $(SOURCES_OCAML)
# SOURCES_LURETTE_LIB = $(LURETTE_PATH)/source/util.ml \
# $(LURETTE_PATH)/source/genlex.mli $(LURETTE_PATH)/source/genlex.ml \
# $(LURETTE_PATH)/source/lexeme.mli $(LURETTE_PATH)/source/lexeme.ml \
# $(LURETTE_PATH)/source/prevar.mli $(LURETTE_PATH)/source/prevar.ml \
# $(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
# $(LURETTE_PATH)/source/polyDraw.mli \
# $(LURETTE_PATH)/source/polyDraw.ml \
# $(LURETTE_PATH)/source/command_line.mli $(LURETTE_PATH)/source/command_line.ml \
# $(LURETTE_PATH)/source/value.mli $(LURETTE_PATH)/source/value.ml \
# $(LURETTE_PATH)/source/ne.mli $(LURETTE_PATH)/source/ne.ml \
# $(LURETTE_PATH)/source/constraint.mli $(LURETTE_PATH)/source/constraint.ml \
# $(LURETTE_PATH)/source/formula.mli $(LURETTE_PATH)/source/formula.ml \
# $(LURETTE_PATH)/source/lustreExp.mli $(LURETTE_PATH)/source/lustreExp.ml \
# $(LURETTE_PATH)/source/parser.mly $(LURETTE_PATH)/source/lexer.mll \
# $(LURETTE_PATH)/source/gne.mli $(LURETTE_PATH)/source/gne.ml \
# $(LURETTE_PATH)/source/parse_luc.mli $(LURETTE_PATH)/source/parse_luc.ml \
# $(LURETTE_PATH)/source/polyhedron.mli $(LURETTE_PATH)/source/polyhedron.ml \
# $(LURETTE_PATH)/source/store.mli $(LURETTE_PATH)/source/store.ml \
# $(LURETTE_PATH)/source/env_state.mli $(LURETTE_PATH)/source/env_state.ml \
# $(LURETTE_PATH)/source/formula_to_bdd.mli \
# $(LURETTE_PATH)/source/formula_to_bdd.ml \
# $(LURETTE_PATH)/source/bddd.mli \
# $(LURETTE_PATH)/source/bddd.ml \
# $(LURETTE_PATH)/source/fair_bddd.mli \
# $(LURETTE_PATH)/source/fair_bddd.ml \
# $(LURETTE_PATH)/source/solver.mli $(LURETTE_PATH)/source/solver.ml \
# $(LURETTE_PATH)/source/show_env.mli $(LURETTE_PATH)/source/show_env.ml \
# $(LURETTE_PATH)/source/automata.mli $(LURETTE_PATH)/source/automata.ml \
# $(LURETTE_PATH)/source/print.mli $(LURETTE_PATH)/source/print.ml \
# $(LURETTE_PATH)/source/sim2chro.mli $(LURETTE_PATH)/source/sim2chro.ml \
# $(LURETTE_PATH)/source/env.mli $(LURETTE_PATH)/source/env.ml \
# $(LURETTE_PATH)/source/lurette.ml
ALL_SOURCES = $(SOURCES) $(SOURCES_OCAML)
ifeq ($(HOST_TYPE),cygwin)
EXE := .exe
......
*********** BUGS
* Quand je tire une solution dans le gras de l'épaisseur,
il faut que je tienne compte des poids des transitions
avec l'option --draw-all-formula
-> idem au sein du polyedre ; oui mais laquelle prendre ?
inside ? n'importe laquelle ?
-> if suffit de refaire en un env_try false 1 0 0 ....
* quand une formule s'avere fausse du point de vue des variables
numeriques, il ne faut pas repartir du haut du graphe, mais backtraker
depuis la branche qui s'avere fausse...
* compilé en mode "assert", lurette se fait tuer par un signal 11
au bout d'une dizaine de pas...
depuis la branche qui s'avere fausse. Sinon, les probabilités induites
par les poids sont un peu contre-intuitives.
* en mode fair, certaine requete aboutisse a qque chose de vraiment
* en mode fair, certaines requetes aboutissent a qque chose de vraiment
pas satisfaisant : pleins de polyhedres intermediaires inutiles
sont calcules, selon l'ordre dans lequel arrivent les contraintes...
......
......@@ -4,8 +4,18 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{ocamldoc}
[2001/12/04 v1.0 ocamldoc support]
\usepackage{color,xcolor,psfig,epsfig,graphics}
\newcommand{\red}{\color{red}}
\newcommand{\blue}[1]{{\color{blue} #1}}
\newcommand{\blued}[1]{{\color{blue2} #1}}
\newcommand{\bluet}[1]{{\color{blue3} #1}}
\newcommand{\green}[1]{{\color{green4} #1}}
\newcommand{\greent}[1]{{\color{green3} #1}}
\newenvironment{ocamldoccode}{%
\color{DarkSlateGrey}
\bgroup
\leftskip\@totalleftmargin
\rightskip\z@skip
......@@ -46,11 +56,13 @@
}
\newenvironment{ocamldocdescription}
{\list{}{\rightmargin0pt \topsep0pt}\raggedright\item\relax}
{ %\color{green3}
\list{}{\rightmargin0pt \topsep0pt}\raggedright\item\relax}
{\endlist\medskip}
\newenvironment{ocamldoccomment}
{\list{}{\leftmargin 2\leftmargini \rightmargin0pt \topsep0pt}\raggedright\item\relax}
{ \color{red}
\list{}{\leftmargin 2\leftmargini \rightmargin0pt \topsep0pt}\raggedright\item\relax}
{\endlist}
\endinput
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 1 8)
(Parent-Version lurette 1 7)
(Project-Version lurette 1 9)
(Parent-Version lurette 1 8)
(Version-Log "
Implement a new drawing policy in polyhedron.
The idea is to base the base (which is not so expensive), and to draw
in othogonal hypercube that is as small as possible until a point in
the polyhedron is found. However, it may happens in high dimension (>4)
that the volume of the cube is much bigger. In that case, after a few tries,
i call the old (unfair) method.
polyDram.ml/mli:
new module containing all the thing related to the drawing inside
a convex polyhedron.
Give up the idea of random walk (not clear what should be the default
step and length in big dimension).
A lot (too much...) of changes, mainly renaming files, and types, and functions,
change the interface, move from one module to another, etc.
Bref, a lot of cleanning.
")
(New-Version-Log ""
)
(Checkin-Time "Wed, 22 Oct 2003 18:30:52 +0200")
(Checkin-Time "Tue, 18 Nov 2003 11:17:12 +0100")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -35,71 +23,62 @@ polyDram.ml/mli:
;; 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.38 644))
(source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.3 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.39 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.19 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.12 644))
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.13 644))
(source/lurette.ml (lurette/12_lurette.ml 1.76 644))
(source/lurette.mli (lurette/11_lurette.ml 1.14 644))
(source/lurette.ml (lurette/12_lurette.ml 1.77 644))
(source/command_line.ml (lurette/b/20_command_li 1.16 644))
(source/command_line.mli (lurette/b/21_command_li 1.13 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.19 644))
(source/env.ml (lurette/16_env.ml 1.33 644))
(source/util.ml (lurette/35_util.ml 1.57 644))
(source/graph.mli (lurette/13_graph.mli 1.12 644))
(source/graph.ml (lurette/14_graph.ml 1.10 644))
(source/formula_to_bdd.ml (lurette/g/34_formula_to 1.1 644))
(source/formula_to_bdd.mli (lurette/g/35_formula_to 1.2 644))
(source/lucky.mli (lurette/15_env.mli 1.20 644))
(source/lucky.ml (lurette/16_env.ml 1.34 644))
(source/fair_bddd.ml (lurette/g/38_fair_bddd. 1.2 644))
(source/fair_bddd.mli (lurette/g/39_fair_bddd. 1.2 644))
(source/bddd.ml (lurette/g/36_bddd.ml 1.3 644))
(source/bddd.mli (lurette/g/37_bddd.mli 1.3 644))
(source/util.ml (lurette/35_util.ml 1.58 644))
(source/solver.mli (lurette/38_solver.mli 1.18 644))
(source/solver.ml (lurette/39_solver.ml 1.56 644))
(source/formula_to_bdd.ml (lurette/g/34_formula_to 1.2 644))
(source/formula_to_bdd.mli (lurette/g/35_formula_to 1.3 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.10 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.5 644))
(source/fair_bddd.ml (lurette/g/38_fair_bddd. 1.3 644))
(source/fair_bddd.mli (lurette/g/39_fair_bddd. 1.3 644))
(source/bddd.ml (lurette/g/36_bddd.ml 1.4 644))
(source/bddd.mli (lurette/g/37_bddd.mli 1.4 644))
(source/store.mli (lurette/b/26_rnumsolver 1.21 644))
(source/store.ml (lurette/b/27_rnumsolver 1.29 644))
(source/solver.mli (lurette/38_solver.mli 1.19 644))
(source/solver.ml (lurette/39_solver.ml 1.57 644))
(source/pnumsolver.ml (lurette/d/23_pnumsolver 1.2 644))
(source/pnumsolver.mli (lurette/d/24_pnumsolver 1.2 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.11 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.6 644))
(source/parse_luc.mli (lurette/40_parse_env. 1.16 644))
(source/parse_luc.ml (lurette/41_parse_env. 1.48 644))
(source/store.mli (lurette/b/26_rnumsolver 1.22 644))
(source/store.ml (lurette/b/27_rnumsolver 1.30 644))
(source/show_env.mli (lurette/42_show_env.m 1.10 644))
(source/show_env.ml (lurette/43_show_env.m 1.19 644))
(source/parse_luc.mli (lurette/40_parse_env. 1.17 644))
(source/parse_luc.ml (lurette/41_parse_env. 1.49 644))
(source/formula.mli (lurette/44_formula.ml 1.27 644))
(source/formula.ml (lurette/45_formula.ml 1.32 644))
(source/show_env.mli (lurette/42_show_env.m 1.11 644))
(source/show_env.ml (lurette/43_show_env.m 1.20 644))
(source/print.mli (lurette/46_print.mli 1.13 644))
(source/print.ml (lurette/47_print.ml 1.24 644))
(source/print.mli (lurette/46_print.mli 1.14 644))
(source/print.ml (lurette/47_print.ml 1.25 644))
(source/eval.mli (lurette/48_eval.mli 1.11 644))
(source/eval.ml (lurette/49_eval.ml 1.16 644))
(source/env_state.mli (lurette/50_env_state. 1.35 644))
(source/env_state.ml (lurette/51_env_state. 1.50 644))
(source/env_state.mli (lurette/50_env_state. 1.34 644))
(source/env_state.ml (lurette/51_env_state. 1.49 644))
(source/run_aut.mli (lurette/b/46_automata.m 1.6 644))
(source/run_aut.ml (lurette/b/47_automata.m 1.16 644))
(source/automata.mli (lurette/b/46_automata.m 1.5 644))
(source/automata.ml (lurette/b/47_automata.m 1.15 644))
(source/sim2chro.mli (lurette/b/23_sim2chro.m 1.7 644))
(source/sim2chro.ml (lurette/b/24_sim2chro.m 1.20 644))
(source/sim2chro.mli (lurette/b/23_sim2chro.m 1.8 644))
(source/sim2chro.ml (lurette/b/24_sim2chro.m 1.21 644))
(source/gne.mli (lurette/b/36_gne.mli 1.6 644))
(source/gne.ml (lurette/b/37_gne.ml 1.6 644))
......@@ -107,7 +86,7 @@ polyDram.ml/mli:
(source/lurettetop.ml (lurette/c/1_lurettetop 1.42 644))
(source/draw.mli (lurette/f/1_draw.mli 1.2 644))
(source/draw.ml (lurette/f/2_draw.ml 1.2 644))
(source/draw.ml (lurette/f/2_draw.ml 1.3 644))
(source/gen_stubs_poc.ml (lurette/f/3_gen_stubs_ 1.1 644))
(source/gen_stubs_poc.mli (lurette/f/4_gen_stubs_ 1.1 644))
......@@ -122,14 +101,14 @@ polyDram.ml/mli:
(source/control.mli (lurette/c/3_control.ml 1.3 644))
(source/control.ml (lurette/c/4_control.ml 1.5 644))
(source/constraint.mli (lurette/c/18_constraint 1.7 644))
(source/constraint.ml (lurette/c/19_constraint 1.9 644))
(source/constraint.mli (lurette/c/18_constraint 1.8 644))
(source/constraint.ml (lurette/c/19_constraint 1.10 644))
(source/ne.ml (lurette/c/21_ne.ml 1.10 644))
(source/ne.mli (lurette/c/22_ne.mli 1.8 644))
(source/ne.ml (lurette/c/21_ne.ml 1.11 644))
(source/ne.mli (lurette/c/22_ne.mli 1.9 644))
(source/value.ml (lurette/c/23_value.ml 1.6 644))
(source/value.mli (lurette/c/24_value.mli 1.4 644))
(source/value.mli (lurette/c/24_value.mli 1.5 644))
(source/prevar.ml (lurette/d/18_prevar.ml 1.4 644))
(source/prevar.mli (lurette/d/19_prevar.mli 1.4 644))
......@@ -138,7 +117,7 @@ polyDram.ml/mli:
(source/parse_poc.mli (lurette/d/29_parse_poc. 1.2 644))
(source/gen_fake_lutin.ml (lurette/d/16_gen_fake_l 1.5 644))
(source/show_luc.ml (lurette/e/25_show_luc.m 1.6 644))
(source/show_luc.ml (lurette/e/25_show_luc.m 1.7 644))
(source/ocaml2c.idl (lurette/e/26_ocaml2c.id 1.2 644))
(source/lurette_exe.c (lurette/e/27_lurette_ex 1.2 644))
(source/call_lurette_main.c (lurette/e/28_call_luret 1.1 644))
......@@ -166,27 +145,27 @@ polyDram.ml/mli:
(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.14 644))
(Makefile.common.source (lurette/e/33_Makefile.c 1.6 644))
(Makefile.common.source (lurette/e/33_Makefile.c 1.7 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.46 644))
(user-rules (lurette/c/14_myrules 1.47 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))
(source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.4 644))
(source/Makefile.show_luc (lurette/b/40_Makefile.s 1.11 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.26 644))
(source/Makefile.show_luc (lurette/b/40_Makefile.s 1.12 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.27 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.8 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.24 644))
(source/Makefile (lurette/c/20_Makefile 1.24 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.25 644))
(source/Makefile (lurette/c/20_Makefile 1.25 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
(doc/archi.fig (lurette/20_archi.fig 1.1 644))
(doc/synthese (lurette/b/2_synthese 1.1 644))
(doc/automata_format (lurette/b/3_automata_f 1.1 644))
(doc/ocamldoc.sty (lurette/b/12_ocamldoc.s 1.1 644))
(doc/ocamldoc.sty (lurette/b/12_ocamldoc.s 1.2 644))
(doc/ocamldoc.hva (lurette/b/13_ocamldoc.h 1.1 644))
;; Misc
......@@ -194,19 +173,19 @@ polyDram.ml/mli:
(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.27 644))
(TODO (lurette/d/22_TODO 1.28 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.5 744))
(share/plot (lurette/e/35_plot 1.4 744))
(share/plot (lurette/e/35_plot 1.5 744))
(test/time-ossau.exp (lurette/b/48_time.exp 1.51 644))
(test/time-ossau.res (lurette/b/49_time.res 1.55 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.30 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.29 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.9 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.10 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.52 644))
(test/time-ossau.res (lurette/b/49_time.res 1.56 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.31 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.30 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.10 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.11 644))
;; Various files used for testing purposes
(test/cudd_gc_problem.luc (lurette/e/29_cudd_gc_pr 1.2 644))
......@@ -228,7 +207,7 @@ polyDram.ml/mli:
(test/test_losange.lus (lurette/f/27_test_losan 1.1 644))
(test/losange-3d2.luc (lurette/e/32_losange-3d 1.5 644))
(test/onlyroll.lus (../demo-xlurette/Gyro/onlyroll.lus) :symlink)
(test/gyro.rif.exp (lurette/e/36_gyro.rif.e 1.6 644))
(test/gyro.rif.exp (lurette/e/36_gyro.rif.e 1.7 644))
(test/giro.luc (../demo-xlurette/Gyro/giro.luc) :symlink)
(test/allocator.lus (../demo-xlurette/Gyro/allocator.lus) :symlink)
......@@ -346,7 +325,7 @@ polyDram.ml/mli:
(mlcuddidl/bdd.ml (lurette/d/6_bdd.ml 1.1 640))
(mlcuddidl/bdd.idl (lurette/d/7_bdd.idl 1.1 644))
(mlcuddidl/README (lurette/d/8_README 1.1 644))
(mlcuddidl/Makefile (lurette/d/9_Makefile 1.7 644))
(mlcuddidl/Makefile (lurette/d/9_Makefile 1.8 644))
(mlcuddidl/Changes (lurette/d/10_Changes 1.1 644))
;; polka
......@@ -366,7 +345,7 @@ polyDram.ml/mli:
(polka/caml/polka_lexer.mll (lurette/d/42_polka_lexe 1.1 644))
(polka/caml/polkaIO.mli (lurette/d/43_polkaIO.ml 1.1 644))
(polka/caml/polkaIO.ml (lurette/d/44_polkaIO.ml 1.1 644))
(polka/caml/Makefile (lurette/d/45_Makefile 1.1 644))
(polka/caml/Makefile (lurette/d/45_Makefile 1.2 644))
(polka/C/Makefile.depend (lurette/d/46_Makefile.d 1.1 644))
(polka/C/vector.h (lurette/d/47_vector.h 1.1 644))
(polka/C/satmat.h (lurette/d/48_satmat.h 1.1 644))
......@@ -398,9 +377,6 @@ polyDram.ml/mli:
(polka/Changes (lurette/e/22_Changes 1.1 644))
;; Files added by populate at Tue, 17 Jun 2003 15:16:25 +0200,
;; to version 0.138(w), by jahier:
;; Files added by populate at Wed, 25 Jun 2003 18:18:57 +0200,
;; to version 0.140(w), by jahier:
......@@ -438,7 +414,7 @@ polyDram.ml/mli:
(share/lucky.bat.in (lurette/g/28_lucky.bat. 1.1 644))
(share/gen_stubs.sh.in (lurette/g/29_gen_stubs. 1.1 644))
(share/gen_fake_lutin.sh.in (lurette/g/30_gen_fake_l 1.1 644))
(share/gen_fake_lucky.sh.in (lurette/g/31_gen_fake_l 1.1 644))
(share/gen_fake_lucky.sh.in (lurette/g/31_gen_fake_l 1.1 644))
;; Files added by populate at Wed, 17 Sep 2003 09:47:12 +0200,
......@@ -452,11 +428,6 @@ polyDram.ml/mli:
(test/heater.lus (lurette/g/33_heater.lus 1.1 644))
;; Files added by populate at Mon, 29 Sep 2003 09:41:23 +0200,
;; to version 1.6(w), by jahier:
(source/fair_bdd.mli (lurette/g/40_fair_bdd.m 1.1 644))
;; Files added by populate at Wed, 01 Oct 2003 13:55:49 +0200,
;; to version 1.6(w), by jahier:
......@@ -470,12 +441,43 @@ polyDram.ml/mli:
;; Files added by populate at Fri, 17 Oct 2003 12:22:17 +0200,
;; to version 1.7(w), by jahier:
(source/polyDraw.ml (lurette/g/43_polyDraw.m 1.1 644))
(source/poly_draw.ml (lurette/g/43_polyDraw.m 1.2 644))
;; Files added by populate at Fri, 17 Oct 2003 12:22:20 +0200,
;; to version 1.7(w), by jahier:
(source/polyDraw.mli (lurette/g/44_polyDraw.m 1.1 644))
(source/poly_draw.mli (lurette/g/44_polyDraw.m 1.2 644))
;; Files added by populate at Thu, 13 Nov 2003 16:59:39 +0100,
;; to version 1.8(w), by jahier:
(source/lustreExp.ml (lurette/g/45_lustreExp. 1.1 644))
;; Files added by populate at Thu, 13 Nov 2003 16:59:41 +0100,
;; to version 1.8(w), by jahier:
(source/lustreExp.mli (lurette/g/46_lustreExp. 1.1 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:47 +0100,
;; to version 1.8(w), by jahier:
(source/exp.ml (lurette/g/47_exp.ml 1.1 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:49 +0100,
;; to version 1.8(w), by jahier:
(source/exp.mli (lurette/g/48_exp.mli 1.1 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:53 +0100,
;; to version 1.8(w), by jahier:
(source/var.ml (lurette/g/49_var.ml 1.1 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:55 +0100,
;; to version 1.8(w), by jahier:
(source/var.mli (lurette/g/50_var.mli 1.1 644))
)
(Merge-Parents)
(New-Merge-Parents)
......@@ -74,7 +74,7 @@ ICFLAGS = \
# XCFLAGS should be the same than the flags with which CUDD has been compiled
# i386-linux
# XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
# sparc-sun
# XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
......
......@@ -100,6 +100,13 @@ clean:
# C part
#-----------------------------------
# COBJS=matrix.o polka.o polka_lexer.o polkag_caml.o polyg_caml.o vectorg_caml.o matrixg_caml.o polkaIO.o polka_parser.o poly.o vector.o
COBJS= polkag_caml.o polyg_caml.o vectorg_caml.o matrixg_caml.o polkaIO.o
libpolka.a: $(COBJS)
ocamlmklib -o polka $(COBJS) -cclib -lcamlidl
libpolkai_caml.a: $(CCFILES_CAML:%=%i_caml.o)
ar rcs $@ $^
libpolkal_caml.a: $(CCFILES_CAML:%=%l_caml.o)
......@@ -143,7 +150,7 @@ libpolkag_caml_prof.a: $(CCFILES_CAML:%=%g_caml_prof.o)
#-----------------------------------
polka.cma: polka_parser.cmo polka_lexer.cmo $(MLFILES:%=%.cmo) polkaIO.cmo
$(OCAMLC) $(MLFLAGS) -a -o $@ $^
$(OCAMLC) $(MLFLAGS) -a -o $@ -custom -cclib -lpolkag_caml $^
polka.cmxa: polka_parser.cmx polka_lexer.cmx $(MLFILES:%=%.cmx) polkaIO.cmx
$(OCAMLOPT) $(MLFLAGS) $(MLOPTFLAGS) -a -o $@ $^
......
#!/bin/sh
# $Id: plot 1.4 Wed, 17 Sep 2003 10:09:24 +0200 jahier $
# $Id: plot 1.5 Tue, 18 Nov 2003 11:17:12 +0100 jahier $
#
# pl: general wrapper script for plotting with gnuplot from shell cmdline
#
......@@ -70,8 +70,9 @@ HOME_RCFILE=$HOME/.plrc
if [ -f $CODE ]; then rm $CODE; fi
cat > $CODE << EOT
# defaults
set data style linespoints
set style data linespoints
set grid
set pointsize 0.1
EOT
# default term setting
......
......@@ -200,7 +200,7 @@ lucky_bc:
make -k bc -f Makefile.lucky OCAMLFLAGS=""
lucky_debug:
make -k dc -f Makefile.lucky OCAMLFLAGS=""
make -k dc -f Makefile.lucky OCAMLFLAGS="" MLONLY=yes
lucky_debug_no_assert:
make -k dc -f Makefile.lucky OCAMLFLAGS="-noassert"
......
......@@ -12,14 +12,17 @@ ifndef OCAMLFLAGS
endif
OCAMLLDFLAGS=-cclib -lpolkag_caml -cclib -lpolkag -cclib $(HOME)/$(HOST_TYPE)/lib/libgmp.a
OCAMLLDFLAGS= \
-cclib -lpolkag_caml \
-cclib -lpolkag \
-cclib $(HOME)/$(HOST_TYPE)/lib/libgmp.a
CC=gcc #g++
#POLKA_CLIB = polkai_caml polkai gmp
POLKA_CLIB =
# POLKA_CLIB = polkag_caml polkag gmp
#POLKA_CLIB = polkag_caml david_polkag_print parme gmpxx
# POLKA_CLIB = polkag_caml david_polkag_print parme gmpxx
LIBS = unix str nums polka cudd
CLIBS = cudd_caml cuddaux cudd $(POLKA_CLIB) camlidl mtr st epd util
......@@ -30,26 +33,65 @@ USE_CAMLP4 = yes
SOURCES_OCAML = \
$(LURETTE_PATH)/source/util.ml \
$(LURETTE_PATH)/source/genlex.mli $(LURETTE_PATH)/source/genlex.ml \
$(LURETTE_PATH)/source/lexeme.mli $(LURETTE_PATH)/source/lexeme.ml \
$(LURETTE_PATH)/source/genlex.ml \
$(LURETTE_PATH)/source/lexeme.ml \
$(LURETTE_PATH)/source/graph.ml \
$(LURETTE_PATH)/source/poly_draw.ml \
$(LURETTE_PATH)/source/prevar.ml \
$(LURETTE_PATH)/source/command_line_luc_exe.ml \
$(LURETTE_PATH)/source/value.ml \
$(LURETTE_PATH)/source/var.ml \
$(LURETTE_PATH)/source/ne.ml \
$(LURETTE_PATH)/source/exp.ml \
$(LURETTE_PATH)/source/constraint.ml \
$(LURETTE_PATH)/source/lustreExp.ml \
$(LURETTE_PATH)/source/parser.mly \
$(LURETTE_PATH)/source/lexer.mll \
$(LURETTE_PATH)/source/gne.ml \
$(LURETTE_PATH)/source/parse_luc.ml \
$(LURETTE_PATH)/source/polyhedron.ml \
$(LURETTE_PATH)/source/store.ml \
$(LURETTE_PATH)/source/env_state.ml \
$(LURETTE_PATH)/source/formula_to_bdd.ml \
$(LURETTE_PATH)/source/bddd.ml \
$(LURETTE_PATH)/source/fair_bddd.ml \
$(LURETTE_PATH)/source/solver.ml \
$(LURETTE_PATH)/source/show_env.ml \
$(LURETTE_PATH)/source/run_aut.ml \
$(LURETTE_PATH)/source/print.ml \
$(LURETTE_PATH)/source/sim2chro.ml \
$(LURETTE_PATH)/source/lucky.ml \
$(LURETTE_PATH)/source/luc_exe.ml
ifndef MLONLY
SOURCES_OCAML := \
$(LURETTE_PATH)/source/util.ml \
$(LURETTE_PATH)/source/genlex.mli \
$(LURETTE_PATH)/source/genlex.ml \
$(LURETTE_PATH)/source/lexeme.mli \
$(LURETTE_PATH)/source/lexeme.ml \
$(LURETTE_PATH)/source/graph.mli \
$(LURETTE_PATH)/source/graph.ml \
$(LURETTE_PATH)/source/polyDraw.mli \
$(LURETTE_PATH)/source/polyDraw.ml \
$(LURETTE_PATH)/source/poly_draw.mli \
$(LURETTE_PATH)/source/poly_draw.ml \
$(LURETTE_PATH)/source/prevar.mli \
$(LURETTE_PATH)/source/prevar.ml \
$(LURETTE_PATH)/source/command_line_luc_exe.mli \
$(LURETTE_PATH)/source/command_line_luc_exe.ml \
$(LURETTE_PATH)/source/value.mli \
$(LURETTE_PATH)/source/value.ml \
$(LURETTE_PATH)/source/var.mli \
$(LURETTE_PATH)/source/var.ml \
$(LURETTE_PATH)/source/ne.mli \
$(LURETTE_PATH)/source/ne.ml \
$(LURETTE_PATH)/source/formula.mli \
$(LURETTE_PATH)/source/formula.ml \
$(LURETTE_PATH)/source/exp.mli \
$(LURETTE_PATH)/source/exp.ml \
$(LURETTE_PATH)/source/constraint.mli \
$(LURETTE_PATH)/source/constraint.ml \
$(LURETTE_PATH)/source/lustreExp.mli $(LURETTE_PATH)/source/lustreExp.ml \
$(LURETTE_PATH)/source/parser.mly $(LURETTE_PATH)/source/lexer.mll \
$(LURETTE_PATH)/source/lustreExp.mli \
$(LURETTE_PATH)/source/lustreExp.ml \
$(LURETTE_PATH)/source/parser.mly \
$(LURETTE_PATH)/source/lexer.mll \
$(LURETTE_PATH)/source/gne.mli \
$(LURETTE_PATH)/source/gne.ml \
$(LURETTE_PATH)/source/parse_luc.mli \
......@@ -70,17 +112,17 @@ SOURCES_OCAML = \
$(LURETTE_PATH)/source/solver.ml \
$(LURETTE_PATH)/source/show_env.mli \
$(LURETTE_PATH)/source/show_env.ml \
$(LURETTE_PATH)/source/automata.mli \