Commit 3b8d4815 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Fix the message printed when an oracle is violated.

The lists of "true variables" and "true variables for the first time"
were interchanged.
parent 8c28596c
#FIG 3.2 Produced by xfig version 3.2.5b
Landscape
Center
Metric
A4
100.00
Single
-2
1200 2
6 1665 5445 2160 5895
2 2 0 1 0 7 30 -1 20 0.000 0 0 -1 0 0 5
1665 5445 2160 5445 2160 5895 1665 5895 1665 5445
4 0 0 29 -1 18 12 0.0000 4 150 405 1710 5715 PRE\001
-6
6 10665 6840 11745 8190
2 2 0 1 0 7 41 -1 20 0.000 0 0 -1 0 0 5
10665 6840 11745 6840 11745 8190 10665 8190 10665 6840
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 0 0 2
10665 7020 11745 7020
-6
6 5085 4995 6165 6306
6 5085 4995 6165 6306
2 2 0 1 0 7 40 -1 20 0.000 0 0 -1 0 0 5
5239 5149 6165 5149 6165 6306 5239 6306 5239 5149
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 0 0 2
5239 5303 6165 5303
2 2 0 1 0 7 41 -1 20 0.000 0 0 -1 0 0 5
5162 5072 6088 5072 6088 6229 5162 6229 5162 5072
2 1 0 1 0 7 41 -1 -1 0.000 0 0 -1 0 0 2
5162 5226 6088 5226
2 1 0 1 0 7 43 -1 20 0.000 0 0 -1 0 0 2
5085 5149 6011 5149
2 2 0 1 0 7 44 -1 20 0.000 0 0 -1 0 0 5
5085 4995 6011 4995 6011 6152 5085 6152 5085 4995
-6
-6
6 7785 4995 8865 6306
6 7785 4995 8865 6306
2 2 0 1 0 7 40 -1 20 0.000 0 0 -1 0 0 5
7939 5149 8865 5149 8865 6306 7939 6306 7939 5149
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 0 0 2
7939 5303 8865 5303
2 2 0 1 0 7 41 -1 20 0.000 0 0 -1 0 0 5
7862 5072 8788 5072 8788 6229 7862 6229 7862 5072
2 1 0 1 0 7 41 -1 -1 0.000 0 0 -1 0 0 2
7862 5226 8788 5226
2 1 0 1 0 7 43 -1 20 0.000 0 0 -1 0 0 2
7785 5149 8711 5149
2 2 0 1 0 7 44 -1 20 0.000 0 0 -1 0 0 5
7785 4995 8711 4995 8711 6152 7785 6152 7785 4995
-6
-6
6 10665 4995 11745 6306
6 10665 4995 11745 6306
2 2 0 1 0 7 40 -1 20 0.000 0 0 -1 0 0 5
10819 5149 11745 5149 11745 6306 10819 6306 10819 5149
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 0 0 2
10819 5303 11745 5303
2 2 0 1 0 7 41 -1 20 0.000 0 0 -1 0 0 5
10742 5072 11668 5072 11668 6229 10742 6229 10742 5072
2 1 0 1 0 7 41 -1 -1 0.000 0 0 -1 0 0 2
10742 5226 11668 5226
2 1 0 1 0 7 43 -1 20 0.000 0 0 -1 0 0 2
10665 5149 11591 5149
2 2 0 1 0 7 44 -1 20 0.000 0 0 -1 0 0 5
10665 4995 11591 4995 11591 6152 10665 6152 10665 4995
-6
-6
2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
1 1 3.10 75.00 135.00
3330 5715 4770 5715
2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 3
1 1 3.10 75.00 135.00
9810 5715 9810 7380 10665 7380
2 2 0 1 0 11 60 -1 20 0.000 0 0 -1 0 0 5
12060 8595 1215 8595 1215 3285 12060 3285 12060 8595
2 1 0 1 0 7 49 -1 -1 0.000 0 0 -1 1 0 2
1 1 3.10 75.00 135.00
8865 5715 10350 5715
2 4 0 2 0 31 50 -1 20 0.000 0 0 7 0 0 5
4095 6120 2655 6120 2655 5355 4095 5355 4095 6120
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 5
1 1 3.10 75.00 135.00
9675 5715 9675 3780 1350 3780 1350 5670 2655 5670
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 2
1 1 3.10 75.00 135.00
1350 5670 1665 5670
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 4
1 1 3.10 75.00 135.00
4095 5940 4410 5940 4410 7515 4770 7515
2 4 0 2 0 31 50 -1 20 0.000 0 0 7 0 0 5
6300 6615 4770 6615 4770 4680 6300 4680 6300 6615
2 4 0 2 0 31 50 -1 20 0.000 0 0 7 0 0 5
9000 6615 7470 6615 7470 4680 9000 4680 9000 6615
2 4 0 2 0 31 50 -1 20 0.000 0 0 7 0 0 5
11880 6615 10350 6615 10350 4680 11880 4680 11880 6615
2 1 0 1 0 7 49 -1 -1 0.000 0 0 -1 1 0 2
1 1 3.10 75.00 135.00
6165 5715 7470 5715
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 4
1 1 2.10 45.00 75.00
4770 5715 4905 5715 4905 5535 5085 5535
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 2
1 1 2.10 45.00 75.00
4905 5715 5175 5715
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 4
1 1 2.10 45.00 75.00
4770 5715 4905 5715 4905 5895 5248 5894
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 4
1 1 2.10 45.00 75.00
7470 5715 7605 5715 7605 5535 7785 5535
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 4
1 1 2.10 45.00 75.00
10350 5715 10485 5715 10485 5535 10665 5535
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 2
1 1 2.10 45.00 75.00
10485 5715 10755 5715
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 4
1 1 2.10 45.00 75.00
10350 5715 10485 5715 10485 5895 10827 5894
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 2
1 1 2.10 45.00 75.00
7605 5715 7875 5715
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 1 0 4
1 1 2.10 45.00 75.00
7470 5715 7605 5715 7605 5895 7947 5895
2 4 0 2 0 31 40 -1 20 0.000 0 0 7 0 0 5
6300 7920 4770 7920 4770 7335 6300 7335 6300 7920
2 1 0 1 0 7 40 -1 -1 0.000 0 0 -1 0 1 4
1 1 3.10 75.00 135.00
4770 7740 4410 7740 4410 8055 10665 8055
4 0 0 40 -1 12 10 0.0000 4 105 360 10935 6975 .rif\001
4 0 0 40 -1 18 10 0.0000 4 120 705 2970 5760 LUCIOLE \001
4 0 0 40 -1 18 10 0.0000 4 120 720 5085 7650 sim2chro \001
4 0 0 40 -1 12 10 0.0000 4 90 270 5490 5265 ENV\001
4 0 0 40 -1 12 10 0.0000 4 90 270 8190 5265 SUT\001
4 0 0 40 -1 12 10 0.0000 4 105 630 10980 5265 oracle \001
......@@ -90,9 +90,9 @@ let (dump_oracle_io : Data.subst list -> Data.subst list -> t -> string) =
fun inputs substs cov ->
let bools, nums = List.partition (fun (vn,vv) -> is_bool vv) substs in
let true_bools, false_bools = List.partition (fun (vn,vv) -> Data.B true = vv) bools in
let true_first, true_other =
let true_other, true_first =
List.partition
(fun (vn,vv) -> try StringMap.find vn cov.tab with _ -> false) true_bools
(fun (vn,vv) -> try StringMap.find vn cov.tab with _ -> true) true_bools
in
let pn (vn,_vv) = Printf.sprintf "%s" vn in
let pv (vn,vv) = Printf.sprintf "%s=%s" vn (Data.val_to_string vv) in
......
Supports Markdown
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