Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
why3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
119
Issues
119
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Why3
why3
Commits
b3ac0b23
Commit
b3ac0b23
authored
Aug 27, 2010
by
MARCHE Claude
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
timelimit et nb process configurables dans l IDE
parent
8967561c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
10 deletions
+41
-10
src/ide/gconfig.ml
src/ide/gconfig.ml
+27
-6
src/ide/gconfig.mli
src/ide/gconfig.mli
+3
-1
src/ide/gmain.ml
src/ide/gmain.ml
+11
-3
No files found.
src/ide/gconfig.ml
View file @
b3ac0b23
...
...
@@ -7,6 +7,8 @@ type t =
mutable
window_height
:
int
;
mutable
tree_width
:
int
;
mutable
task_height
:
int
;
mutable
time_limit
:
int
;
mutable
max_running_processes
:
int
;
}
let
default
=
...
...
@@ -14,6 +16,8 @@ let default =
window_height
=
768
;
tree_width
=
512
;
task_height
=
384
;
time_limit
=
2
;
max_running_processes
=
2
;
}
let
conf_file
=
Filename
.
concat
(
Rc
.
get_home_dir
()
)
".whyide.conf"
...
...
@@ -26,6 +30,8 @@ let save_config config =
fprintf
fmt
"height = %d@
\n
"
config
.
window_height
;
fprintf
fmt
"tree_width = %d@
\n
"
config
.
tree_width
;
fprintf
fmt
"task_height = %d@
\n
"
config
.
task_height
;
fprintf
fmt
"time_limit = %d@
\n
"
config
.
time_limit
;
fprintf
fmt
"max_processes = %d@
\n
"
config
.
max_running_processes
;
fprintf
fmt
"@."
;
close_out
ch
...
...
@@ -35,6 +41,8 @@ let load_main c (key, value) =
|
"height"
->
c
.
window_height
<-
Rc
.
int
value
|
"tree_width"
->
c
.
tree_width
<-
Rc
.
int
value
|
"task_height"
->
c
.
task_height
<-
Rc
.
int
value
|
"time_limit"
->
c
.
time_limit
<-
Rc
.
int
value
|
"max_processes"
->
c
.
max_running_processes
<-
Rc
.
int
value
|
s
->
eprintf
"Warning: ignore unknown key [%s] in whyide config file@."
s
...
...
@@ -185,38 +193,51 @@ let show_about_window () =
let
(
_
:
GWindow
.
Buttons
.
about
)
=
about_dialog
#
run
()
in
about_dialog
#
destroy
()
let
nb_processes
=
ref
2
let
preferences
()
=
let
preferences
c
=
let
dialog
=
GWindow
.
dialog
~
title
:
"Why: preferences"
()
in
let
vbox
=
dialog
#
vbox
in
let
notebook
=
GPack
.
notebook
~
packing
:
vbox
#
add
()
in
(** page 1 **)
let
label1
=
GMisc
.
label
~
text
:
"Provers"
()
in
let
page1
=
GPack
.
vbox
~
homogeneous
:
false
~
packing
:
(
fun
w
->
ignore
(
notebook
#
append_page
~
tab_label
:
label1
#
coerce
w
))
()
in
(* debug mode ? *)
let
_debugmode
=
GButton
.
check_button
~
label
:
"debug"
~
packing
:
page1
#
add
()
in
(* timelimit ? *)
let
hb
=
GPack
.
hbox
~
homogeneous
:
false
~
packing
:
page1
#
add
()
in
let
_
=
GMisc
.
label
~
text
:
"Time limit"
~
packing
:
hb
#
add
()
in
let
timelimit_spin
=
GEdit
.
spin_button
~
digits
:
0
~
packing
:
hb
#
add
()
in
timelimit_spin
#
adjustment
#
set_bounds
~
lower
:
2
.
~
upper
:
300
.
~
step_incr
:
1
.
()
;
timelimit_spin
#
adjustment
#
set_value
(
float_of_int
c
.
time_limit
);
let
(
_
:
GtkSignal
.
id
)
=
timelimit_spin
#
connect
#
value_changed
~
callback
:
(
fun
()
->
c
.
time_limit
<-
timelimit_spin
#
value_as_int
)
in
(* nb of processes ? *)
let
hb
=
GPack
.
hbox
~
homogeneous
:
false
~
packing
:
page1
#
add
()
in
let
_
=
GMisc
.
label
~
text
:
"Nb of processes"
~
packing
:
hb
#
add
()
in
let
nb_processes_spin
=
GEdit
.
spin_button
~
digits
:
0
~
packing
:
hb
#
add
()
in
nb_processes_spin
#
adjustment
#
set_bounds
~
lower
:
1
.
~
upper
:
16
.
~
step_incr
:
1
.
()
;
nb_processes_spin
#
adjustment
#
set_value
(
float_of_int
!
nb
_processes
);
nb_processes_spin
#
adjustment
#
set_value
(
float_of_int
c
.
max_running
_processes
);
let
(
_
:
GtkSignal
.
id
)
=
nb_processes_spin
#
connect
#
value_changed
~
callback
:
(
fun
()
->
nb_processes
:=
nb_processes_spin
#
value_as_int
)
(
fun
()
->
c
.
max_running_processes
<-
nb_processes_spin
#
value_as_int
)
in
(** page 2 **)
let
label2
=
GMisc
.
label
~
text
:
"Misc"
()
in
let
_page2
=
GMisc
.
label
~
text
:
"contents of page 2"
~
packing
:
(
fun
w
->
ignore
(
notebook
#
append_page
~
tab_label
:
label2
#
coerce
w
))
()
in
(*
let (_ : GtkSignal.id) =
notebook#connect#switch_page
~callback:(fun i -> prerr_endline ("Page switch to " ^ string_of_int i))
in
*)
dialog
#
add_button
"Close"
`CLOSE
;
let
(
_
:
GWindow
.
Buttons
.
about
)
=
dialog
#
run
()
in
dialog
#
destroy
()
...
...
src/ide/gconfig.mli
View file @
b3ac0b23
...
...
@@ -5,6 +5,8 @@ type t =
mutable
window_height
:
int
;
mutable
tree_width
:
int
;
mutable
task_height
:
int
;
mutable
time_limit
:
int
;
mutable
max_running_processes
:
int
;
}
val
read_config
:
unit
->
t
...
...
@@ -37,7 +39,7 @@ val image_failure : GdkPixbuf.pixbuf ref
val
show_legend_window
:
unit
->
unit
val
show_about_window
:
unit
->
unit
val
preferences
:
uni
t
->
unit
val
preferences
:
t
->
unit
(*
Local Variables:
...
...
src/ide/gmain.ml
View file @
b3ac0b23
...
...
@@ -44,10 +44,12 @@ let config =
let
()
=
eprintf
"%s Load path is: %a@."
pname
(
Pp
.
print_list
Pp
.
comma
Pp
.
string
)
config
.
loadpath
(*
let timelimit =
match config.timelimit with
| None -> 2
| Some n -> n
*)
(********************************)
...
...
@@ -446,10 +448,13 @@ let image_of_result = function
let
()
=
begin
Scheduler
.
async
:=
GtkThread
.
async
;
(*
match config.running_provers_max with
| None -> ()
| Some n ->
if n >= 1 then Scheduler.maximum_running_proofs := n
*)
Scheduler
.
maximum_running_proofs
:=
gconfig
.
max_running_processes
end
(*****************************************************)
...
...
@@ -474,7 +479,7 @@ let rec prover_on_goal p g =
in
callback
Scheduler
.
Scheduled
0
.
0
;
Scheduler
.
schedule_proof_attempt
~
debug
:
false
~
timelimit
~
memlimit
:
0
~
debug
:
false
~
timelimit
:
gconfig
.
time_limit
~
memlimit
:
0
~
prover
:
p
.
prover
~
command
:
p
.
command
~
driver
:
p
.
driver
~
callback
g
.
Model
.
task
;
...
...
@@ -561,8 +566,11 @@ let file_menu = factory#add_submenu "_File"
let
file_factory
=
new
GMenu
.
factory
file_menu
~
accel_group
let
(
_
:
GMenu
.
image_menu_item
)
=
file_factory
#
add_image_item
~
label
:
"_Preferences"
~
callback
:
Gconfig
.
preferences
()
file_factory
#
add_image_item
~
label
:
"_Preferences"
~
callback
:
(
fun
()
->
Gconfig
.
preferences
gconfig
;
Scheduler
.
maximum_running_proofs
:=
gconfig
.
max_running_processes
)
()
let
(
_
:
GMenu
.
image_menu_item
)
=
file_factory
#
add_image_item
~
key
:
GdkKeysyms
.
_Q
~
label
:
"_Quit"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment