Skip to content

GitLab

Commit 3797df71 authored by Erwan Jahier's avatar Erwan Jahier
Browse files
Options

lurette 0.99 Fri, 04 Oct 2002 13:49:58 +0200 by jahier 

Parent-Version:      0.98
Version-Log:

source/solver.ml:
source/rnumsolver.mli,.ml:
source/constraint.ml,.mli:
   Split the Constraint.t type into t and ineq where
   inequalities are in ineq. The rational is that most
   operations on constaint.t are actually done on ineq.
   This change therefore avoid pattern like
   <<_ -> assert false>> and let the type checher check
   that sort of things.

Project-Description: Lurette
parent b8ce1df2
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 156 deletions
.lurette.prcs_aux
View file @ 3797df71
......@@ -13,7 +13,7 @@
(test/tram_simple.h 1746 1013519411 b/25_tram_simpl 1.1)
(source/command_line_ima_exe.mli 1082 1021651153 b/34_command_li 1.3)
(test/porte.ima 1050 1032789516 b/16_porte.env 1.8)
(source/constraint.mli 1225 1033723811 c/18_constraint 1.3)
(source/constraint.mli 1478 1033732198 c/18_constraint 1.4)
(source/automata.mli 3397 1027349504 b/46_automata.m 1.2)
(test/heater_int.rif.exp 860 1033397911 b/28_heater_int 1.8)
(source/ne.ml 9140 1033723811 c/21_ne.ml 1.1)
......@@ -36,11 +36,11 @@
(ihm/xlurette/xlurette_glade_main.ml 16705 1032789516 c/12_xlurette_g 1.6)
(demo/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(test/temp_float.ima 728 1032789516 b/51_temp_float 1.3)
(source/solver.ml 31961 1033723811 39_solver.ml 1.31)
(source/solver.ml 31802 1033732198 39_solver.ml 1.32)
(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 1033729576 b/49_time.res 1.12)
(test/time.res 5580 1033732198 b/49_time.res 1.13)
(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)
......@@ -65,7 +65,7 @@
(source/show_env.mli 1091 1027066799 42_show_env.m 1.7)
(Makefile.lurette 698 1032940601 b/38_Makefile.l 1.11)
(lurette.dep.dot 49 1007651448 b/4_lurette.de 1.2)
(source/constraint.ml 1907 1033723811 c/19_constraint 1.3)
(source/constraint.ml 2418 1033732198 c/19_constraint 1.4)
(test/vrai_tram.c 3060 1027066799 b/8_vrai_tram. 1.3)
(source/command_line.mli 1442 1031053030 b/21_command_li 1.7)
(source/graph.mli 2218 1027066799 13_graph.mli 1.9)
......@@ -84,16 +84,16 @@
(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 20788 1033729576 b/27_rnumsolver 1.12)
(source/rnumsolver.ml 20636 1033732198 b/27_rnumsolver 1.13)
(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)
(source/show_env.ml 3603 1030532285 43_show_env.m 1.12)
(source/ima_exe.ml 12108 1033397911 b/32_ima_exe.ml 1.19)
(source/rnumsolver.mli 2280 1033723811 b/26_rnumsolver 1.8)
(source/rnumsolver.mli 2198 1033732198 b/26_rnumsolver 1.9)
(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 1033729576 b/48_time.exp 1.9)
(test/time.exp 5580 1033732198 b/48_time.exp 1.10)
(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)
......
lurette.prj
View file @ 3797df71
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 98)
(Parent-Version lurette 0 97)
(Project-Version lurette 0 99)
(Parent-Version lurette 0 98)
(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.
source/solver.ml:
source/rnumsolver.mli,.ml:
source/constraint.ml,.mli:
Split the Constraint.t type into t and ineq where
inequalities are in ineq. The rational is that most
operations on constaint.t are actually done on ineq.
This change therefore avoid pattern like
<<_ -> assert false>> and let the type checher check
that sort of things.
")
(New-Version-Log ""
)
(Checkin-Time "Fri, 04 Oct 2002 13:06:16 +0200")
(Checkin-Time "Fri, 04 Oct 2002 13:49:58 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -44,10 +52,10 @@ source/rnumsolver.ml:
(source/util.ml (lurette/35_util.ml 1.27 644))
(source/solver.mli (lurette/38_solver.mli 1.13 644))
(source/solver.ml (lurette/39_solver.ml 1.31 644))
(source/solver.ml (lurette/39_solver.ml 1.32 644))
(source/rnumsolver.mli (lurette/b/26_rnumsolver 1.8 644))
(source/rnumsolver.ml (lurette/b/27_rnumsolver 1.12 644))
(source/rnumsolver.mli (lurette/b/26_rnumsolver 1.9 644))
(source/rnumsolver.ml (lurette/b/27_rnumsolver 1.13 644))
(source/parse_env.mli (lurette/40_parse_env. 1.9 644))
(source/parse_env.ml (lurette/41_parse_env. 1.29 644))
......@@ -82,8 +90,8 @@ source/rnumsolver.ml:
(source/control.mli (lurette/c/3_control.ml 1.2 644))
(source/control.ml (lurette/c/4_control.ml 1.3 644))
(source/constraint.mli (lurette/c/18_constraint 1.3 644))
(source/constraint.ml (lurette/c/19_constraint 1.3 644))
(source/constraint.mli (lurette/c/18_constraint 1.4 644))
(source/constraint.ml (lurette/c/19_constraint 1.4 644))
(source/ne.ml (lurette/c/21_ne.ml 1.1 644))
(source/ne.mli (lurette/c/22_ne.mli 1.1 644))
......@@ -120,8 +128,8 @@ source/rnumsolver.ml:
(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.9 644))
(test/time.res (lurette/b/49_time.res 1.12 644))
(test/time.exp (lurette/b/48_time.exp 1.10 644))
(test/time.res (lurette/b/49_time.res 1.13 644))
;; Various files used for testing purposes
(test/usager.ima (lurette/b/14_usager.env 1.9 644))
......
source/constraint.ml
View file @ 3797df71
......@@ -10,68 +10,92 @@
(* exported *)
type t =
| Bv of string (** booleans *)
type ineq =
| GZ of Ne.t (** expr > 0 *)
| GeqZ of Ne.t (** expr >= 0 *)
| EqZ of Ne.t (** expr = 0 *)
(* exported *)
type t =
| Bv of string (** booleans *)
| EqZ of Ne.t (** expr = 0 *)
| Ineq of ineq (** > or >= *)
(* exported *)
let (dimension_ineq : ineq -> int) =
fun cstr ->
match cstr with
GZ(ne) -> Ne.dimension ne
| GeqZ(ne) -> Ne.dimension ne
(* exported *)
let (dimension : t -> int) =
fun cstr ->
match cstr with
Bv(_) -> 1
| GZ(ne) -> Ne.dimension ne
| GeqZ(ne) -> Ne.dimension ne
| Ineq(ineq) -> dimension_ineq ineq
| EqZ(ne) -> Ne.dimension ne
(* exported *)
let (neg_ineq : t -> t) =
let (neg_ineq : ineq -> ineq) =
fun cstr ->
match cstr with
Bv(_) -> assert false
| GZ(ne) -> GeqZ(Ne.neg_nexpr ne)
GZ(ne) -> GeqZ(Ne.neg_nexpr ne)
| GeqZ(ne) -> GZ(Ne.neg_nexpr ne)
| EqZ(ne) -> assert false
(* exported *)
let (opp_ineq : t -> t) =
let (opp_ineq : ineq -> ineq) =
fun cstr ->
match cstr with
Bv(_) -> assert false
| GZ(ne) -> GZ(Ne.neg_nexpr ne)
GZ(ne) -> GZ(Ne.neg_nexpr ne)
| GeqZ(ne) -> GeqZ(Ne.neg_nexpr ne)
| EqZ(ne) -> EqZ(Ne.neg_nexpr ne)
(* exported *)
let (apply_subst_ineq : Ne.subst -> ineq -> ineq) =
fun s cstr ->
match cstr with
GZ(ne) -> GZ(Ne.apply_subst ne s)
| GeqZ(ne) -> GeqZ(Ne.apply_subst ne s)
(* exported *)
let (apply_subst : Ne.subst -> t -> t) =
fun s cstr ->
match cstr with
Bv(_) -> cstr
| GZ(ne) -> GZ(Ne.apply_subst ne s)
| GeqZ(ne) -> GeqZ(Ne.apply_subst ne s)
| Ineq(ineq) -> Ineq(apply_subst_ineq s ineq)
| EqZ(ne) -> EqZ(Ne.apply_subst ne s)
(* exported *)
let (apply_substl_ineq : Ne.subst list -> ineq -> ineq) =
fun s cstr ->
match cstr with
GZ(ne) -> GZ(Ne.apply_substl s ne)
| GeqZ(ne) -> GeqZ(Ne.apply_substl s ne)
(* exported *)
let (apply_substl : Ne.subst list -> t -> t) =
fun s cstr ->
match cstr with
Bv(_) -> cstr
| GZ(ne) -> GZ(Ne.apply_substl s ne)
| GeqZ(ne) -> GeqZ(Ne.apply_substl s ne)
| Ineq(ineq) -> Ineq(apply_substl_ineq s ineq)
| EqZ(ne) -> EqZ(Ne.apply_substl s ne)
(* exported *)
let (to_string : t -> string) =
let (ineq_to_string : ineq -> string) =
fun f ->
match f with
| Bv(str) -> str
| GZ(ne) -> ((Ne.to_string ne) ^ " > 0 ")
| GeqZ(ne) -> ((Ne.to_string ne) ^ " >= 0 ")
(* exported *)
let (to_string : t -> string) =
fun f ->
match f with
| Bv(str) -> str
| Ineq(ineq) -> ineq_to_string ineq
| EqZ(ne) -> ((Ne.to_string ne) ^ " = 0 ")
source/constraint.mli
View file @ 3797df71
......@@ -13,25 +13,35 @@
(** Normalised linear constraints. *)
(* exported *)
type ineq =
| GZ of Ne.t (** expr > 0 *)
| GeqZ of Ne.t (** expr >= 0 *)
(* exported *)
type t =
| Bv of string (** boolean variable *)
| GZ of Ne.t (** expr > 0 *)
| GeqZ of Ne.t (** expr >= 0 *)
| Bv of string (** booleans *)
| EqZ of Ne.t (** expr = 0 *)
| Ineq of ineq (** > or >= *)
(** Returns the number of variables involved in the constraint *)
val dimension : t -> int
val dimension_ineq : ineq -> int
(** [apply_subst cstr s] applies [s] to [cstr]. Note that the result could
have been multiplied by a constant. *)
val apply_subst : Ne.subst -> t -> t
val apply_subst_ineq : Ne.subst -> ineq -> ineq
val apply_substl : Ne.subst list -> t -> t
val apply_substl_ineq : Ne.subst list -> ineq -> ineq
(** [neg_ineq cstr] returns the negation of an inequality constraint. *)
val neg_ineq : t -> t
val neg_ineq : ineq -> ineq
(** [neg_ineq cstr] returns [cstr] where its Ne.t is replaces by its opposite. *)
val opp_ineq : t -> t
val opp_ineq : ineq -> ineq
(** Pretty printing. *)
val to_string : t -> string
val ineq_to_string : ineq -> string
source/rnumsolver.ml
View file @ 3797df71
......@@ -50,7 +50,7 @@ type substl = Ne.subst list
formula cannot be solved with an interval based solver.
*)
type delay = Constraint.t list
type delay = Constraint.ineq list
......@@ -130,7 +130,7 @@ let (store_to_string : store -> string) =
and substl_str = ("\n*** Substitutions: \n" ^ Ne.substl_to_string s.substl)
and delay_str = ("\n*** Delayed constraints: \n" ^
List.fold_left
(fun acc d -> acc ^ (Constraint.to_string d))
(fun acc d -> acc ^ (Constraint.ineq_to_string d))
""
s.delay)
in
......@@ -150,7 +150,7 @@ let (div : int -> int -> int) =
int_of_float (floor (xf /.yf))
let (normalise : Constraint.t -> var_name * nac ) =
let (normalise : Constraint.ineq -> var_name * nac ) =
fun cstr ->
(* Transform atomic formula into a data type that is easier to
process.
......@@ -186,14 +186,9 @@ let (normalise : Constraint.t -> var_name * nac ) =
(* more than 1 var *)
| _ ->
assert false
(* failwith ("*** Can only solve numeric constraints " ^ *)
(* "over intervals, sorry.\n") *)
in
match cstr with
EqZ(ne) ->
assert false
| GZ(ne) ->
GZ(ne) ->
let (cst, coeff, vn) = get_vn_and_constant ne in
( match (cst, coeff) with
(I(i_cst), I(i_coeff)) ->
......@@ -238,7 +233,6 @@ let (normalise : Constraint.t -> var_name * nac ) =
| (I(_), F(_)) -> assert false
| (F(_), I(_)) -> assert false
)
| Bv(_) -> assert false
......@@ -304,9 +298,9 @@ let (make_subst : vn -> Value.num -> Ne.subst) =
(* exported *)
let rec (split_store : store -> Constraint.t -> store * store) =
let rec (split_store : store -> Constraint.ineq -> store * store) =
fun store cstr0 ->
let cstr = Constraint.apply_substl store.substl cstr0 in
let cstr = Constraint.apply_substl_ineq store.substl cstr0 in
(* let _ = *)
(* print_string "\n >>> " ; *)
(* print_string (Constraint.to_string cstr); *)
......@@ -319,11 +313,10 @@ let rec (split_store : store -> Constraint.t -> store * store) =
(* splitted in 2 func because split_store_eq calls it and already
applied store.substl to [cstr] *)
and (split_store_do : store -> Constraint.t -> store * store) =
and (split_store_do : store -> Constraint.ineq -> store * store) =
fun store cstr ->
let (var, sl, d) = (store.var, store.substl, store.delay) in
let dim = Constraint.dimension cstr in
let dim = Constraint.dimension_ineq cstr in
if
dim = 0
then
......@@ -336,7 +329,6 @@ and (split_store_do : store -> Constraint.t -> store * store) =
if Value.num_supeq_zero (Ne.find "" ne)
then store, store
else raise No_numeric_solution
| _ -> assert false
else if
dim > 1
then
......@@ -667,14 +659,14 @@ and (split_store_eq : store -> Ne.t -> store * store * store ) =
let (var, sl, d) = (store.var, store.substl, store.delay) in
let (vn_val_opt, ne_tail) = Ne.split ne in
match vn_val_opt with
None ->
None ->
raise No_numeric_solution
| Some (vn, nval0) ->
| Some (vn, nval0) ->
let nval = Value.neg nval0 in
let s = ((vn, nval), ne_tail) in
let d2 = List.map (Constraint.apply_subst s) d in
let d2 = List.map (Constraint.apply_subst_ineq s) d in
let (waked, new_d) = List.partition
(fun cstr -> Constraint.dimension cstr = 1)
(fun cstr -> Constraint.dimension_ineq cstr = 1)
d2
in
let new_sl = s::sl in
......
source/rnumsolver.mli
View file @ 3797df71
......@@ -22,13 +22,11 @@ val new_store : Formula.vnt list -> store
exception No_numeric_solution
val split_store : store -> Constraint.t -> store * store
val split_store : store -> Constraint.ineq -> store * store
(** If [c] is not an equality constraint, [split_store s c] returns
the store [s] with the numeric constraint [c] (resp [not c])
added in the lhs of the pair (resp rhs).
Fails if [c] is an equality constraint (for which [split_store_eq]
in made). *)
*)
val split_store_eq : store -> Ne.t -> store * store * store
(** [split_store_eq s e] returns the store [s] with the numeric
......
source/solver.ml
View file @ 3797df71
......@@ -303,7 +303,7 @@ and
else
Bdd.ithvar
(Env_state.bdd_manager ())
(Env_state.linear_constraint_to_index (GZ(nexpr)) dep)
(Env_state.linear_constraint_to_index (Ineq(GZ(nexpr))) dep)
in
(Bdd.dor (Bdd.dand c bdd) acc, new_dep)
)
......@@ -331,7 +331,7 @@ and
else
Bdd.ithvar
(Env_state.bdd_manager ())
(Env_state.linear_constraint_to_index (GeqZ(nexpr)) dep)
(Env_state.linear_constraint_to_index (Ineq(GeqZ(nexpr))) dep)
in
(Bdd.dor (Bdd.dand c bdd) acc, new_dep)
)
......@@ -637,17 +637,6 @@ let (toss_up_one_var_index: var -> subst option) =
| _ -> None
let (is_a_numeric_constraint : Constraint.t -> bool) =
fun cstr ->
match cstr with
Bv(_) -> false
| GZ(_) -> true
| GeqZ(_) -> true
| EqZ(_) -> true
let rec (draw_in_bdd: subst list * store -> Bdd.t -> Bdd.t ->
subst list * store) =
fun (sl, store) bdd comb ->
......@@ -679,8 +668,8 @@ let rec (draw_in_bdd: subst list * store -> Bdd.t -> Bdd.t ->
draw_in_bdd_bool var (sl, store) bdd comb
| EqZ(e) ->
draw_in_bdd_eq e (sl, store) bdd comb
| _ ->
draw_in_bdd_ineq cstr (sl, store) bdd comb
| Ineq(ineq) ->
draw_in_bdd_ineq ineq (sl, store) bdd comb
......@@ -755,7 +744,7 @@ and (draw_in_bdd_bool: string -> subst list * store -> Bdd.t -> Bdd.t ->
*)
else raise No_numeric_solution
and (draw_in_bdd_ineq: Constraint.t -> subst list * store -> Bdd.t -> Bdd.t ->
and (draw_in_bdd_ineq: Constraint.ineq -> subst list * store -> Bdd.t -> Bdd.t ->
subst list * store) =
fun cstr (sl, store) bdd comb ->
(*
......
test/time.exp
View file @ 3797df71
Command being timed: "./lurette 10000 1 1 tram.ima usager.ima porte.ima passerelle.ima -seed 1015403953 -ns2c --no-oracle"
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
User time (seconds): 10.79
System time (seconds): 0.10
Percent of CPU this job got: 92%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:11.74
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: 198
Minor (reclaiming a frame) page faults: 2454
Major (requiring I/O) page faults: 197
Minor (reclaiming a frame) page faults: 2455
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -23,18 +23,18 @@
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.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
User time (seconds): 23.25
System time (seconds): 0.35
Percent of CPU this job got: 92%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:25.44
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: 198
Minor (reclaiming a frame) page faults: 17335
Major (requiring I/O) page faults: 197
Minor (reclaiming a frame) page faults: 17336
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -47,18 +47,18 @@
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): 52.82
System time (seconds): 0.93
User time (seconds): 52.68
System time (seconds): 0.76
Percent of CPU this job got: 91%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:58.73
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:58.18
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: 198
Minor (reclaiming a frame) page faults: 38191
Major (requiring I/O) page faults: 197
Minor (reclaiming a frame) page faults: 38192
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -71,10 +71,10 @@
Exit status: 0
Command being timed: "./lurette 10000 1 1 temp_float.ima -seed 1015403953 -ns2c --no-oracle"
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
User time (seconds): 3.62
System time (seconds): 0.13
Percent of CPU this job got: 86%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.35
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
......@@ -82,7 +82,7 @@
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 2449
Minor (reclaiming a frame) page faults: 2450
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -95,10 +95,10 @@
Exit status: 0
Command being timed: "./lurette 10 100 100 temp_float.ima -seed 1015403953 -ns2c --no-oracle"
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
User time (seconds): 8.35
System time (seconds): 0.20
Percent of CPU this job got: 91%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:09.36
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
......@@ -106,7 +106,7 @@
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 7356
Minor (reclaiming a frame) page faults: 7335
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -120,9 +120,9 @@
Command being timed: "./lurette 10000 1 1 temp_int.ima -seed 1015403953 -ns2c --no-oracle"
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
System time (seconds): 0.08
Percent of CPU this job got: 88%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.44
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
......@@ -130,7 +130,7 @@
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 211
Minor (reclaiming a frame) page faults: 2449
Minor (reclaiming a frame) page faults: 2450
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -143,10 +143,10 @@
Exit status: 0
Command being timed: "./lurette 10 100 100 temp_int.ima -seed 1015403953 -ns2c --no-oracle"
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
User time (seconds): 9.77
System time (seconds): 0.21
Percent of CPU this job got: 91%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:10.88
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
......@@ -154,7 +154,7 @@
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 211
Minor (reclaiming a frame) page faults: 7612
Minor (reclaiming a frame) page faults: 7613
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......
test/time.res
View file @ 3797df71
Command being timed: "./lurette 10000 1 1 tram.ima usager.ima porte.ima passerelle.ima -seed 1015403953 -ns2c --no-oracle"
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
User time (seconds): 10.79
System time (seconds): 0.10
Percent of CPU this job got: 92%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:11.74
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: 198
Minor (reclaiming a frame) page faults: 2454
Major (requiring I/O) page faults: 197
Minor (reclaiming a frame) page faults: 2455
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -23,18 +23,18 @@
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.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
User time (seconds): 23.25
System time (seconds): 0.35
Percent of CPU this job got: 92%