Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit b8ce1df2 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.98 Fri, 04 Oct 2002 13:06:16 +0200 by jahier

Parent-Version:      0.97
Version-Log:

source/rnumsolver.ml:
   Remove valI and ValF from the range type as now, when a var is bound,
   it is put into store.substl.

Project-Description: Lurette
parent 5d9a1618
......@@ -40,7 +40,7 @@
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(source/lurette.ml 13532 1033723811 12_lurette.ml 1.53)
(source/util.ml 15664 1033723811 35_util.ml 1.27)
(test/time.res 5580 1033723811 b/49_time.res 1.11)
(test/time.res 5580 1033729576 b/49_time.res 1.12)
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(source/sim2chro.mli 1455 1027943375 b/23_sim2chro.m 1.5)
(TAGS 9825 1007379917 21_TAGS 1.6)
......@@ -84,7 +84,7 @@
(doc/automata_format 0 1007379917 b/3_automata_f 1.1)
(source/solver.mli 1003 1027092697 38_solver.mli 1.13)
(test/passerelle.ima 984 1032789516 b/17_passerelle 1.8)
(source/rnumsolver.ml 22707 1033723811 b/27_rnumsolver 1.11)
(source/rnumsolver.ml 20788 1033729576 b/27_rnumsolver 1.12)
(test/usager.ima 495 1032789516 b/14_usager.env 1.9)
(source/print.ml 5807 1033723811 47_print.ml 1.21)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
......@@ -93,7 +93,7 @@
(source/rnumsolver.mli 2280 1033723811 b/26_rnumsolver 1.8)
(source/sim2chro.ml 2721 1033397911 b/24_sim2chro.m 1.14)
(source/value.ml 2355 1033723811 c/23_value.ml 1.1)
(test/time.exp 5580 1033723811 b/48_time.exp 1.8)
(test/time.exp 5580 1033729576 b/48_time.exp 1.9)
(bin/Makefile.ima_exe 2013 1027066799 b/41_Makefile.i 1.3)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(demo/chaudiere/chaudiere.ima 446 1032789516 c/11_chaudiere. 1.5)
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 97)
(Parent-Version lurette 0 96)
(Project-Version lurette 0 98)
(Parent-Version lurette 0 97)
(Version-Log "
Handling equalities smartlier. .
source/rnumsolver.ml:
Remove valI and ValF from the range type as now, when a var is bound,
it is put into store.substl.
")
(New-Version-Log ""
)
(Checkin-Time "Fri, 04 Oct 2002 11:30:11 +0200")
(Checkin-Time "Fri, 04 Oct 2002 13:06:16 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -45,7 +47,7 @@ Handling equalities smartlier. .
(source/solver.ml (lurette/39_solver.ml 1.31 644))
(source/rnumsolver.mli (lurette/b/26_rnumsolver 1.8 644))
(source/rnumsolver.ml (lurette/b/27_rnumsolver 1.11 644))
(source/rnumsolver.ml (lurette/b/27_rnumsolver 1.12 644))
(source/parse_env.mli (lurette/40_parse_env. 1.9 644))
(source/parse_env.ml (lurette/41_parse_env. 1.29 644))
......@@ -118,8 +120,8 @@ Handling equalities smartlier. .
(lurette.depfull.dot (lurette/b/5_lurette.de 1.2 644))
(TAGS (lurette/21_TAGS 1.6 644))
(test/time.exp (lurette/b/48_time.exp 1.8 644))
(test/time.res (lurette/b/49_time.res 1.11 644))
(test/time.exp (lurette/b/48_time.exp 1.9 644))
(test/time.res (lurette/b/49_time.res 1.12 644))
;; Various files used for testing purposes
(test/usager.ima (lurette/b/14_usager.env 1.9 644))
......
......@@ -20,8 +20,6 @@ open List
type range =
RangeI of int * int (* min and max *)
| RangeF of float * float (* Ditto for floats *)
| ValI of int (* whenever min = max *)
| ValF of float (* Ditto for floats *)
(* exported *)
exception No_numeric_solution
......@@ -113,11 +111,6 @@ let (range_to_string : range -> string) =
("[" ^ (string_of_int min) ^ ", " ^ (string_of_int max) ^ "] ")
| RangeF(min, max) ->
("[" ^ (string_of_float min) ^ ", " ^ (string_of_float max) ^ "] ")
| ValI(v) ->
("[" ^ (string_of_int v) ^ ", " ^ (string_of_int v) ^ "] ")
| ValF(v) ->
("[" ^ (string_of_float v) ^ ", " ^ (string_of_float v) ^ "] ")
(* exported *)
let (store_to_string : store -> string) =
......@@ -450,27 +443,6 @@ and (split_store_do : store -> Constraint.t -> store * store) =
{ var=Some(tbl2) ; substl=sl2 ; delay=d }
)
)
| (NSupEqI(i), ValI(v)) ->
if i <= v
then (
{var=Some(tbl) ; substl=sl ; delay=d },
{var=None ; substl=sl ; delay=d }
)
else (
{var=None ; substl=sl ; delay=d },
{var=Some(tbl) ; substl=sl ; delay=d }
)
| (NInfEqI(i), ValI(v)) ->
if i < v
then (
{var=None ; substl=sl ; delay=d },
{var=Some(tbl) ; substl=sl ; delay=d }
)
else (
{var=Some(tbl) ; substl=sl ; delay=d },
{var=None ; substl=sl ; delay=d }
)
(** **)
| (NSupEqF(f), RangeF(min, max)) ->
......@@ -564,28 +536,6 @@ and (split_store_do : store -> Constraint.t -> store * store) =
{ var=Some(tbl2) ; substl=sl2 ; delay=d }
)
)
| (NSupEqF(f), ValF(v)) ->
if f <= v
then (
{var=Some(tbl) ; substl=sl ; delay=d },
{var=None ; substl=sl ; delay=d }
)
else (
{var=None ; substl=sl ; delay=d },
{var=Some(tbl) ; substl=sl ; delay=d }
)
| (NInfEqF(f), ValF(v)) ->
if f < v
then (
{var=None ; substl=sl ; delay=d },
{var=Some(tbl) ; substl=sl ; delay=d }
)
else (
{var=Some(tbl) ; substl=sl ; delay=d },
{var=None ; substl=sl ; delay=d }
)
| (NSupF(f), RangeF(min, max)) ->
if f < min
......@@ -678,27 +628,6 @@ and (split_store_do : store -> Constraint.t -> store * store) =
{ var=Some(tbl2) ; substl=sl2 ; delay=d }
)
)
| (NSupF(f), ValF(v)) ->
if f < v
then (
{var=Some(tbl) ; substl=sl ; delay=d },
{var=None ; substl=sl ; delay=d }
)
else (
{var=None ; substl=sl ; delay=d },
{var=Some(tbl) ; substl=sl ; delay=d }
)
| (NInfF(f), ValF(v)) ->
if f <= v
then (
{var=None ; substl=sl ; delay=d },
{var=Some(tbl) ; substl=sl ; delay=d }
)
else (
{var=Some(tbl) ; substl=sl ; delay=d },
{var=None ; substl=sl ; delay=d }
)
| _ -> assert false
)
......@@ -785,8 +714,6 @@ and (split_store_eq : store -> Ne.t -> store * store * store ) =
| RangeF(min, max) ->
GeqZ(Ne.diff (Ne.make "" (F (-.min))) ne_tail),
GeqZ(Ne.diff (Ne.make "" (F max)) ne_tail)
| ValI _ -> assert false
| ValF _ -> assert false
in
if
dim = 2
......@@ -859,17 +786,12 @@ let (draw_inside : store -> Formula.subst list) =
Hashtbl.fold
(fun vn range acc ->
( match range with
ValI(i) ->
((vn, I(i))::acc)
| RangeI(min, max) ->
let ran = Random.int (max - min + 1)
in
((vn, I(min + ran))::acc)
| ValF(f) ->
((vn, F(f))::acc)
| RangeF(min, max) ->
let n = max -. min in
let ran = Random.float n in
......@@ -893,8 +815,6 @@ let (draw_verteces : store -> Formula.subst list) =
Hashtbl.fold
(fun vn range acc ->
( match range with
ValI(i) ->
((vn, N(I(i)))::acc)
| RangeI(min, max) ->
let ran = Random.int 2
in
......@@ -902,8 +822,8 @@ let (draw_verteces : store -> Formula.subst list) =
then ((vn, N(I(min)))::acc)
else ((vn, N(I(max)))::acc)
| ValF(f) ->
((vn, N(F(f)))::acc)
(* | ValF(f) -> *)
(* ((vn, N(F(f)))::acc) *)
| RangeF(min, max) ->
let ran = Random.int 2 in
if ran = 0
......
Command being timed: "./lurette 10000 1 1 tram.ima usager.ima porte.ima passerelle.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 10.61
System time (seconds): 0.07
Percent of CPU this job got: 91%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:11.70
User time (seconds): 10.81
System time (seconds): 0.12
Percent of CPU this job got: 88%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:12.34
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
......@@ -10,7 +10,7 @@
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 198
Minor (reclaiming a frame) page faults: 2457
Minor (reclaiming a frame) page faults: 2454
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -23,10 +23,10 @@
Exit status: 0
Command being timed: "./lurette 10 100 100 tram.ima usager.ima porte.ima passerelle.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 23.10
System time (seconds): 0.37
Percent of CPU this job got: 95%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:24.63
User time (seconds): 23.45
System time (seconds): 0.33
Percent of CPU this job got: 85%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:27.67
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
......@@ -34,7 +34,7 @@
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 198
Minor (reclaiming a frame) page faults: 17308
Minor (reclaiming a frame) page faults: 17335
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -47,10 +47,10 @@
Exit status: 0
Command being timed: "./lurette 100 50 50 tram.ima usager.ima porte.ima passerelle.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 53.06
System time (seconds): 0.70
Percent of CPU this job got: 84%
Elapsed (wall clock) time (h:mm:ss or m:ss): 1:03.94
User time (seconds): 52.82
System time (seconds): 0.93
Percent of CPU this job got: 91%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:58.73
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
......@@ -58,7 +58,7 @@
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 198
Minor (reclaiming a frame) page faults: 38158
Minor (reclaiming a frame) page faults: 38191
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -71,17 +71,17 @@
Exit status: 0
Command being timed: "./lurette 10000 1 1 temp_float.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 3.65
System time (seconds): 0.05
Percent of CPU this job got: 87%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.21
User time (seconds): 3.58
System time (seconds): 0.11
Percent of CPU this job got: 72%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:05.10
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: 218
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 2449
Voluntary context switches: 0
Involuntary context switches: 0
......@@ -95,18 +95,18 @@
Exit status: 0
Command being timed: "./lurette 10 100 100 temp_float.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 8.46
System time (seconds): 0.21
Percent of CPU this job got: 91%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:09.51
User time (seconds): 8.32
System time (seconds): 0.12
Percent of CPU this job got: 95%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:08.88
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: 218
Minor (reclaiming a frame) page faults: 7396
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 7356
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -119,17 +119,17 @@
Exit status: 0
Command being timed: "./lurette 10000 1 1 temp_int.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 3.01
System time (seconds): 0.10
Percent of CPU this job got: 82%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.77
User time (seconds): 2.98
System time (seconds): 0.11
Percent of CPU this job got: 90%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.43
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: 225
Major (requiring I/O) page faults: 211
Minor (reclaiming a frame) page faults: 2449
Voluntary context switches: 0
Involuntary context switches: 0
......@@ -143,18 +143,18 @@
Exit status: 0
Command being timed: "./lurette 10 100 100 temp_int.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 9.99
System time (seconds): 0.26
Percent of CPU this job got: 81%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:12.62
User time (seconds): 9.95
System time (seconds): 0.14
Percent of CPU this job got: 94%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:10.67
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: 214
Minor (reclaiming a frame) page faults: 7611
Major (requiring I/O) page faults: 211
Minor (reclaiming a frame) page faults: 7612
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......
Command being timed: "./lurette 10000 1 1 tram.ima usager.ima porte.ima passerelle.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 10.61
System time (seconds): 0.07
Percent of CPU this job got: 91%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:11.70
User time (seconds): 10.81
System time (seconds): 0.12
Percent of CPU this job got: 88%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:12.34
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
......@@ -10,7 +10,7 @@
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 198
Minor (reclaiming a frame) page faults: 2457
Minor (reclaiming a frame) page faults: 2454
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -23,10 +23,10 @@
Exit status: 0
Command being timed: "./lurette 10 100 100 tram.ima usager.ima porte.ima passerelle.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 23.10
System time (seconds): 0.37
Percent of CPU this job got: 95%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:24.63
User time (seconds): 23.45
System time (seconds): 0.33
Percent of CPU this job got: 85%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:27.67
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
......@@ -34,7 +34,7 @@
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 198
Minor (reclaiming a frame) page faults: 17308
Minor (reclaiming a frame) page faults: 17335
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -47,10 +47,10 @@
Exit status: 0
Command being timed: "./lurette 100 50 50 tram.ima usager.ima porte.ima passerelle.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 53.06
System time (seconds): 0.70
Percent of CPU this job got: 84%
Elapsed (wall clock) time (h:mm:ss or m:ss): 1:03.94
User time (seconds): 52.82
System time (seconds): 0.93
Percent of CPU this job got: 91%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:58.73
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
......@@ -58,7 +58,7 @@
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 198
Minor (reclaiming a frame) page faults: 38158
Minor (reclaiming a frame) page faults: 38191
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -71,17 +71,17 @@
Exit status: 0
Command being timed: "./lurette 10000 1 1 temp_float.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 3.65
System time (seconds): 0.05
Percent of CPU this job got: 87%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.21
User time (seconds): 3.58
System time (seconds): 0.11
Percent of CPU this job got: 72%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:05.10
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: 218
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 2449
Voluntary context switches: 0
Involuntary context switches: 0
......@@ -95,18 +95,18 @@
Exit status: 0
Command being timed: "./lurette 10 100 100 temp_float.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 8.46
System time (seconds): 0.21
Percent of CPU this job got: 91%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:09.51
User time (seconds): 8.32
System time (seconds): 0.12
Percent of CPU this job got: 95%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:08.88
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: 218
Minor (reclaiming a frame) page faults: 7396
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 7356
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -119,17 +119,17 @@
Exit status: 0
Command being timed: "./lurette 10000 1 1 temp_int.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 3.01
System time (seconds): 0.10
Percent of CPU this job got: 82%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.77
User time (seconds): 2.98
System time (seconds): 0.11
Percent of CPU this job got: 90%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.43
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: 225
Major (requiring I/O) page faults: 211
Minor (reclaiming a frame) page faults: 2449
Voluntary context switches: 0
Involuntary context switches: 0
......@@ -143,18 +143,18 @@
Exit status: 0
Command being timed: "./lurette 10 100 100 temp_int.ima -seed 1015403953 -ns2c --no-oracle"
User time (seconds): 9.99
System time (seconds): 0.26
Percent of CPU this job got: 81%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:12.62
User time (seconds): 9.95
System time (seconds): 0.14
Percent of CPU this job got: 94%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:10.67
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: 214
Minor (reclaiming a frame) page faults: 7611
Major (requiring I/O) page faults: 211
Minor (reclaiming a frame) page faults: 7612
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 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