author | wenzelm |
Tue, 27 Oct 2009 22:56:14 +0100 | |
changeset 33245 | 65232054ffd0 |
parent 33042 | ddf1f03a9ad9 |
child 33317 | b4534348b8fd |
permissions | -rw-r--r-- |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
1 |
(* Title: Provers/Arith/fast_lin_arith.ML |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
2 |
ID: $Id$ |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
3 |
Author: Tobias Nipkow and Tjark Weber and Sascha Boehme |
6102 | 4 |
|
24076 | 5 |
A generic linear arithmetic package. It provides two tactics |
6 |
(cut_lin_arith_tac, lin_arith_tac) and a simplification procedure |
|
7 |
(lin_arith_simproc). |
|
6102 | 8 |
|
24076 | 9 |
Only take premises and conclusions into account that are already |
10 |
(negated) (in)equations. lin_arith_simproc tries to prove or disprove |
|
11 |
the term. |
|
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
12 |
*) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
13 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
14 |
(*** Data needed for setting up the linear arithmetic package ***) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
15 |
|
6102 | 16 |
signature LIN_ARITH_LOGIC = |
17 |
sig |
|
20276
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
18 |
val conjI : thm (* P ==> Q ==> P & Q *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
19 |
val ccontr : thm (* (~ P ==> False) ==> P *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
20 |
val notI : thm (* (P ==> False) ==> ~ P *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
21 |
val not_lessD : thm (* ~(m < n) ==> n <= m *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
22 |
val not_leD : thm (* ~(m <= n) ==> n < m *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
23 |
val sym : thm (* x = y ==> y = x *) |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
24 |
val trueI : thm (* True *) |
20276
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
25 |
val mk_Eq : thm -> thm |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
26 |
val atomize : thm -> thm list |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
27 |
val mk_Trueprop : term -> term |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
28 |
val neg_prop : term -> term |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
29 |
val is_False : thm -> bool |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
30 |
val is_nat : typ list * term -> bool |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
31 |
val mk_nat_thm : theory -> term -> thm |
6102 | 32 |
end; |
33 |
(* |
|
34 |
mk_Eq(~in) = `in == False' |
|
35 |
mk_Eq(in) = `in == True' |
|
36 |
where `in' is an (in)equality. |
|
37 |
||
23190 | 38 |
neg_prop(t) = neg if t is wrapped up in Trueprop and neg is the |
39 |
(logically) negated version of t (again wrapped up in Trueprop), |
|
40 |
where the negation of a negative term is the term itself (no |
|
41 |
double negation!); raises TERM ("neg_prop", [t]) if t is not of |
|
42 |
the form 'Trueprop $ _' |
|
6128 | 43 |
|
44 |
is_nat(parameter-types,t) = t:nat |
|
45 |
mk_nat_thm(t) = "0 <= t" |
|
6102 | 46 |
*) |
47 |
||
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
48 |
signature LIN_ARITH_DATA = |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
49 |
sig |
24076 | 50 |
(*internal representation of linear (in-)equations:*) |
26945 | 51 |
type decomp = (term * Rat.rat) list * Rat.rat * string * (term * Rat.rat) list * Rat.rat * bool |
52 |
val decomp: Proof.context -> term -> decomp option |
|
24076 | 53 |
val domain_is_nat: term -> bool |
54 |
||
55 |
(*preprocessing, performed on a representation of subgoals as list of premises:*) |
|
56 |
val pre_decomp: Proof.context -> typ list * term list -> (typ list * term list) list |
|
57 |
||
58 |
(*preprocessing, performed on the goal -- must do the same as 'pre_decomp':*) |
|
59 |
val pre_tac: Proof.context -> int -> tactic |
|
60 |
||
61 |
(*the limit on the number of ~= allowed; because each ~= is split |
|
62 |
into two cases, this can lead to an explosion*) |
|
24112 | 63 |
val fast_arith_neq_limit: int Config.T |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
64 |
end; |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
65 |
(* |
7551
8e934d1a9ac6
Now distinguishes discrete from non-distrete types.
nipkow
parents:
6128
diff
changeset
|
66 |
decomp(`x Rel y') should yield (p,i,Rel,q,j,d) |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
67 |
where Rel is one of "<", "~<", "<=", "~<=" and "=" and |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
68 |
p (q, respectively) is the decomposition of the sum term x |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
69 |
(y, respectively) into a list of summand * multiplicity |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
70 |
pairs and a constant summand and d indicates if the domain |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
71 |
is discrete. |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
72 |
|
20276
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
73 |
domain_is_nat(`x Rel y') t should yield true iff x is of type "nat". |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
74 |
|
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
75 |
The relationship between pre_decomp and pre_tac is somewhat tricky. The |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
76 |
internal representation of a subgoal and the corresponding theorem must |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
77 |
be modified by pre_decomp (pre_tac, resp.) in a corresponding way. See |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
78 |
the comment for split_items below. (This is even necessary for eta- and |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
79 |
beta-equivalent modifications, as some of the lin. arith. code is not |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
80 |
insensitive to them.) |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
81 |
|
9420 | 82 |
ss must reduce contradictory <= to False. |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
83 |
It should also cancel common summands to keep <= reduced; |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
84 |
otherwise <= can grow to massive proportions. |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
85 |
*) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
86 |
|
6062 | 87 |
signature FAST_LIN_ARITH = |
88 |
sig |
|
31102 | 89 |
val cut_lin_arith_tac: simpset -> int -> tactic |
90 |
val lin_arith_tac: Proof.context -> bool -> int -> tactic |
|
91 |
val lin_arith_simproc: simpset -> term -> thm option |
|
15184 | 92 |
val map_data: ({add_mono_thms: thm list, mult_mono_thms: thm list, inj_thms: thm list, |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
93 |
lessD: thm list, neqE: thm list, simpset: Simplifier.simpset, |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
94 |
number_of : serial * (theory -> typ -> int -> cterm)} |
15184 | 95 |
-> {add_mono_thms: thm list, mult_mono_thms: thm list, inj_thms: thm list, |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
96 |
lessD: thm list, neqE: thm list, simpset: Simplifier.simpset, |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
97 |
number_of : serial * (theory -> typ -> int -> cterm)}) |
24076 | 98 |
-> Context.generic -> Context.generic |
32740 | 99 |
val trace: bool Unsynchronized.ref |
100 |
val warning_count: int Unsynchronized.ref; |
|
6062 | 101 |
end; |
102 |
||
24076 | 103 |
functor Fast_Lin_Arith |
104 |
(structure LA_Logic: LIN_ARITH_LOGIC and LA_Data: LIN_ARITH_DATA): FAST_LIN_ARITH = |
|
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
105 |
struct |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
106 |
|
9420 | 107 |
|
108 |
(** theory data **) |
|
109 |
||
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
110 |
fun no_number_of _ _ _ = raise CTERM ("number_of", []) |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
111 |
|
24076 | 112 |
structure Data = GenericDataFun |
22846 | 113 |
( |
24076 | 114 |
type T = |
115 |
{add_mono_thms: thm list, |
|
116 |
mult_mono_thms: thm list, |
|
117 |
inj_thms: thm list, |
|
118 |
lessD: thm list, |
|
119 |
neqE: thm list, |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
120 |
simpset: Simplifier.simpset, |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
121 |
number_of : serial * (theory -> typ -> int -> cterm)}; |
9420 | 122 |
|
10691 | 123 |
val empty = {add_mono_thms = [], mult_mono_thms = [], inj_thms = [], |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
124 |
lessD = [], neqE = [], simpset = Simplifier.empty_ss, |
31638 | 125 |
number_of = (serial (), no_number_of) } : T; |
16458 | 126 |
val extend = I; |
127 |
fun merge _ |
|
128 |
({add_mono_thms= add_mono_thms1, mult_mono_thms= mult_mono_thms1, inj_thms= inj_thms1, |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
129 |
lessD = lessD1, neqE=neqE1, simpset = simpset1, |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
130 |
number_of = (number_of1 as (s1, _))}, |
16458 | 131 |
{add_mono_thms= add_mono_thms2, mult_mono_thms= mult_mono_thms2, inj_thms= inj_thms2, |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
132 |
lessD = lessD2, neqE=neqE2, simpset = simpset2, |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
133 |
number_of = (number_of2 as (s2, _))}) = |
24039
273698405054
renamed Drule.add/del/merge_rules to Thm.add/del/merge_thms;
wenzelm
parents:
23577
diff
changeset
|
134 |
{add_mono_thms = Thm.merge_thms (add_mono_thms1, add_mono_thms2), |
273698405054
renamed Drule.add/del/merge_rules to Thm.add/del/merge_thms;
wenzelm
parents:
23577
diff
changeset
|
135 |
mult_mono_thms = Thm.merge_thms (mult_mono_thms1, mult_mono_thms2), |
273698405054
renamed Drule.add/del/merge_rules to Thm.add/del/merge_thms;
wenzelm
parents:
23577
diff
changeset
|
136 |
inj_thms = Thm.merge_thms (inj_thms1, inj_thms2), |
273698405054
renamed Drule.add/del/merge_rules to Thm.add/del/merge_thms;
wenzelm
parents:
23577
diff
changeset
|
137 |
lessD = Thm.merge_thms (lessD1, lessD2), |
273698405054
renamed Drule.add/del/merge_rules to Thm.add/del/merge_thms;
wenzelm
parents:
23577
diff
changeset
|
138 |
neqE = Thm.merge_thms (neqE1, neqE2), |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
139 |
simpset = Simplifier.merge_ss (simpset1, simpset2), |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
140 |
number_of = if s1 > s2 then number_of1 else number_of2}; |
22846 | 141 |
); |
9420 | 142 |
|
143 |
val map_data = Data.map; |
|
24076 | 144 |
val get_data = Data.get o Context.Proof; |
9420 | 145 |
|
146 |
||
147 |
||
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
148 |
(*** A fast decision procedure ***) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
149 |
(*** Code ported from HOL Light ***) |
6056 | 150 |
(* possible optimizations: |
151 |
use (var,coeff) rep or vector rep tp save space; |
|
152 |
treat non-negative atoms separately rather than adding 0 <= atom |
|
153 |
*) |
|
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
154 |
|
32740 | 155 |
val trace = Unsynchronized.ref false; |
9073 | 156 |
|
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
157 |
datatype lineq_type = Eq | Le | Lt; |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
158 |
|
6056 | 159 |
datatype injust = Asm of int |
160 |
| Nat of int (* index of atom *) |
|
6128 | 161 |
| LessD of injust |
162 |
| NotLessD of injust |
|
163 |
| NotLeD of injust |
|
7551
8e934d1a9ac6
Now distinguishes discrete from non-distrete types.
nipkow
parents:
6128
diff
changeset
|
164 |
| NotLeDD of injust |
24630
351a308ab58d
simplified type int (eliminated IntInf.int, integer);
wenzelm
parents:
24112
diff
changeset
|
165 |
| Multiplied of int * injust |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
166 |
| Added of injust * injust; |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
167 |
|
24630
351a308ab58d
simplified type int (eliminated IntInf.int, integer);
wenzelm
parents:
24112
diff
changeset
|
168 |
datatype lineq = Lineq of int * lineq_type * int list * injust; |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
169 |
|
13498 | 170 |
(* ------------------------------------------------------------------------- *) |
171 |
(* Finding a (counter) example from the trace of a failed elimination *) |
|
172 |
(* ------------------------------------------------------------------------- *) |
|
173 |
(* Examples are represented as rational numbers, *) |
|
174 |
(* Dont blame John Harrison for this code - it is entirely mine. TN *) |
|
175 |
||
176 |
exception NoEx; |
|
177 |
||
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
178 |
(* Coding: (i,true,cs) means i <= cs and (i,false,cs) means i < cs. |
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
179 |
In general, true means the bound is included, false means it is excluded. |
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
180 |
Need to know if it is a lower or upper bound for unambiguous interpretation! |
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
181 |
*) |
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
182 |
|
22950 | 183 |
fun elim_eqns (Lineq (i, Le, cs, _)) = [(i, true, cs)] |
184 |
| elim_eqns (Lineq (i, Eq, cs, _)) = [(i, true, cs),(~i, true, map ~ cs)] |
|
185 |
| elim_eqns (Lineq (i, Lt, cs, _)) = [(i, false, cs)]; |
|
13498 | 186 |
|
187 |
(* PRE: ex[v] must be 0! *) |
|
24630
351a308ab58d
simplified type int (eliminated IntInf.int, integer);
wenzelm
parents:
24112
diff
changeset
|
188 |
fun eval ex v (a, le, cs) = |
22950 | 189 |
let |
190 |
val rs = map Rat.rat_of_int cs; |
|
191 |
val rsum = fold2 (Rat.add oo Rat.mult) rs ex Rat.zero; |
|
23063 | 192 |
in (Rat.mult (Rat.add (Rat.rat_of_int a) (Rat.neg rsum)) (Rat.inv (nth rs v)), le) end; |
193 |
(* If nth rs v < 0, le should be negated. |
|
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
194 |
Instead this swap is taken into account in ratrelmin2. |
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
195 |
*) |
13498 | 196 |
|
22950 | 197 |
fun ratrelmin2 (x as (r, ler), y as (s, les)) = |
23520 | 198 |
case Rat.ord (r, s) |
22950 | 199 |
of EQUAL => (r, (not ler) andalso (not les)) |
200 |
| LESS => x |
|
201 |
| GREATER => y; |
|
202 |
||
203 |
fun ratrelmax2 (x as (r, ler), y as (s, les)) = |
|
23520 | 204 |
case Rat.ord (r, s) |
22950 | 205 |
of EQUAL => (r, ler andalso les) |
206 |
| LESS => y |
|
207 |
| GREATER => x; |
|
13498 | 208 |
|
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
209 |
val ratrelmin = foldr1 ratrelmin2; |
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
210 |
val ratrelmax = foldr1 ratrelmax2; |
13498 | 211 |
|
22950 | 212 |
fun ratexact up (r, exact) = |
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
213 |
if exact then r else |
22950 | 214 |
let |
215 |
val (p, q) = Rat.quotient_of_rat r; |
|
216 |
val nth = Rat.inv (Rat.rat_of_int q); |
|
217 |
in Rat.add r (if up then nth else Rat.neg nth) end; |
|
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
218 |
|
22950 | 219 |
fun ratmiddle (r, s) = Rat.mult (Rat.add r s) (Rat.inv Rat.two); |
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
220 |
|
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
221 |
fun choose2 d ((lb, exactl), (ub, exactu)) = |
23520 | 222 |
let val ord = Rat.sign lb in |
22950 | 223 |
if (ord = LESS orelse exactl) andalso (ord = GREATER orelse exactu) |
224 |
then Rat.zero |
|
225 |
else if not d then |
|
226 |
if ord = GREATER |
|
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
227 |
then if exactl then lb else ratmiddle (lb, ub) |
22950 | 228 |
else if exactu then ub else ratmiddle (lb, ub) |
229 |
else (*discrete domain, both bounds must be exact*) |
|
23025 | 230 |
if ord = GREATER |
22950 | 231 |
then let val lb' = Rat.roundup lb in |
232 |
if Rat.le lb' ub then lb' else raise NoEx end |
|
233 |
else let val ub' = Rat.rounddown ub in |
|
234 |
if Rat.le lb ub' then ub' else raise NoEx end |
|
235 |
end; |
|
13498 | 236 |
|
22950 | 237 |
fun findex1 discr (v, lineqs) ex = |
238 |
let |
|
23063 | 239 |
val nz = filter (fn (Lineq (_, _, cs, _)) => nth cs v <> 0) lineqs; |
22950 | 240 |
val ineqs = maps elim_eqns nz; |
23063 | 241 |
val (ge, le) = List.partition (fn (_,_,cs) => nth cs v > 0) ineqs |
22950 | 242 |
val lb = ratrelmax (map (eval ex v) ge) |
243 |
val ub = ratrelmin (map (eval ex v) le) |
|
21109 | 244 |
in nth_map v (K (choose2 (nth discr v) (lb, ub))) ex end; |
13498 | 245 |
|
246 |
fun elim1 v x = |
|
23063 | 247 |
map (fn (a,le,bs) => (Rat.add a (Rat.neg (Rat.mult (nth bs v) x)), le, |
21109 | 248 |
nth_map v (K Rat.zero) bs)); |
13498 | 249 |
|
23520 | 250 |
fun single_var v (_, _, cs) = case filter_out (curry (op =) EQUAL o Rat.sign) cs |
23063 | 251 |
of [x] => x =/ nth cs v |
252 |
| _ => false; |
|
13498 | 253 |
|
254 |
(* The base case: |
|
255 |
all variables occur only with positive or only with negative coefficients *) |
|
256 |
fun pick_vars discr (ineqs,ex) = |
|
23520 | 257 |
let val nz = filter_out (fn (_,_,cs) => forall (curry (op =) EQUAL o Rat.sign) cs) ineqs |
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
258 |
in case nz of [] => ex |
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
259 |
| (_,_,cs) :: _ => |
23520 | 260 |
let val v = find_index (not o curry (op =) EQUAL o Rat.sign) cs |
22950 | 261 |
val d = nth discr v; |
23520 | 262 |
val pos = not (Rat.sign (nth cs v) = LESS); |
22950 | 263 |
val sv = filter (single_var v) nz; |
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
264 |
val minmax = |
17951 | 265 |
if pos then if d then Rat.roundup o fst o ratrelmax |
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
266 |
else ratexact true o ratrelmax |
17951 | 267 |
else if d then Rat.rounddown o fst o ratrelmin |
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
268 |
else ratexact false o ratrelmin |
23063 | 269 |
val bnds = map (fn (a,le,bs) => (Rat.mult a (Rat.inv (nth bs v)), le)) sv |
17951 | 270 |
val x = minmax((Rat.zero,if pos then true else false)::bnds) |
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
271 |
val ineqs' = elim1 v x nz |
21109 | 272 |
val ex' = nth_map v (K x) ex |
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
273 |
in pick_vars discr (ineqs',ex') end |
13498 | 274 |
end; |
275 |
||
276 |
fun findex0 discr n lineqs = |
|
22950 | 277 |
let val ineqs = maps elim_eqns lineqs |
278 |
val rineqs = map (fn (a,le,cs) => (Rat.rat_of_int a, le, map Rat.rat_of_int cs)) |
|
14372
51ddf8963c95
Finally fixed the counterexample finder. Can now deal with < on real.
nipkow
parents:
14360
diff
changeset
|
279 |
ineqs |
17951 | 280 |
in pick_vars discr (rineqs,replicate n Rat.zero) end; |
13498 | 281 |
|
282 |
(* ------------------------------------------------------------------------- *) |
|
23197 | 283 |
(* End of counterexample finder. The actual decision procedure starts here. *) |
13498 | 284 |
(* ------------------------------------------------------------------------- *) |
285 |
||
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
286 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
287 |
(* Calculate new (in)equality type after addition. *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
288 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
289 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
290 |
fun find_add_type(Eq,x) = x |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
291 |
| find_add_type(x,Eq) = x |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
292 |
| find_add_type(_,Lt) = Lt |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
293 |
| find_add_type(Lt,_) = Lt |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
294 |
| find_add_type(Le,Le) = Le; |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
295 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
296 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
297 |
(* Multiply out an (in)equation. *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
298 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
299 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
300 |
fun multiply_ineq n (i as Lineq(k,ty,l,just)) = |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
301 |
if n = 1 then i |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
302 |
else if n = 0 andalso ty = Lt then sys_error "multiply_ineq" |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
303 |
else if n < 0 andalso (ty=Le orelse ty=Lt) then sys_error "multiply_ineq" |
33002 | 304 |
else Lineq (n * k, ty, map (Integer.mult n) l, Multiplied (n, just)); |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
305 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
306 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
307 |
(* Add together (in)equations. *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
308 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
309 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
310 |
fun add_ineq (i1 as Lineq(k1,ty1,l1,just1)) (i2 as Lineq(k2,ty2,l2,just2)) = |
33002 | 311 |
let val l = map2 Integer.add l1 l2 |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
312 |
in Lineq(k1+k2,find_add_type(ty1,ty2),l,Added(just1,just2)) end; |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
313 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
314 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
315 |
(* Elimination of variable between a single pair of (in)equations. *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
316 |
(* If they're both inequalities, 1st coefficient must be +ve, 2nd -ve. *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
317 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
318 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
319 |
fun elim_var v (i1 as Lineq(k1,ty1,l1,just1)) (i2 as Lineq(k2,ty2,l2,just2)) = |
23063 | 320 |
let val c1 = nth l1 v and c2 = nth l2 v |
23261 | 321 |
val m = Integer.lcm (abs c1) (abs c2) |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
322 |
val m1 = m div (abs c1) and m2 = m div (abs c2) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
323 |
val (n1,n2) = |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
324 |
if (c1 >= 0) = (c2 >= 0) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
325 |
then if ty1 = Eq then (~m1,m2) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
326 |
else if ty2 = Eq then (m1,~m2) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
327 |
else sys_error "elim_var" |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
328 |
else (m1,m2) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
329 |
val (p1,p2) = if ty1=Eq andalso ty2=Eq andalso (n1 = ~1 orelse n2 = ~1) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
330 |
then (~n1,~n2) else (n1,n2) |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
331 |
in add_ineq (multiply_ineq p1 i1) (multiply_ineq p2 i2) end; |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
332 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
333 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
334 |
(* The main refutation-finding code. *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
335 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
336 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
337 |
fun is_trivial (Lineq(_,_,l,_)) = forall (fn i => i=0) l; |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
338 |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
339 |
fun is_contradictory (ans as Lineq(k,ty,l,_)) = |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
340 |
case ty of Eq => k <> 0 | Le => k > 0 | Lt => k >= 0; |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
341 |
|
24630
351a308ab58d
simplified type int (eliminated IntInf.int, integer);
wenzelm
parents:
24112
diff
changeset
|
342 |
fun calc_blowup l = |
17496 | 343 |
let val (p,n) = List.partition (curry (op <) 0) (List.filter (curry (op <>) 0) l) |
24630
351a308ab58d
simplified type int (eliminated IntInf.int, integer);
wenzelm
parents:
24112
diff
changeset
|
344 |
in length p * length n end; |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
345 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
346 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
347 |
(* Main elimination code: *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
348 |
(* *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
349 |
(* (1) Looks for immediate solutions (false assertions with no variables). *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
350 |
(* *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
351 |
(* (2) If there are any equations, picks a variable with the lowest absolute *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
352 |
(* coefficient in any of them, and uses it to eliminate. *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
353 |
(* *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
354 |
(* (3) Otherwise, chooses a variable in the inequality to minimize the *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
355 |
(* blowup (number of consequences generated) and eliminates it. *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
356 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
357 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
358 |
fun extract_first p = |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
359 |
let |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
360 |
fun extract xs (y::ys) = if p y then (y, xs @ ys) else extract (y::xs) ys |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
361 |
| extract xs [] = raise Empty |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
362 |
in extract [] end; |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
363 |
|
6056 | 364 |
fun print_ineqs ineqs = |
9073 | 365 |
if !trace then |
12262 | 366 |
tracing(cat_lines(""::map (fn Lineq(c,t,l,_) => |
24630
351a308ab58d
simplified type int (eliminated IntInf.int, integer);
wenzelm
parents:
24112
diff
changeset
|
367 |
string_of_int c ^ |
9073 | 368 |
(case t of Eq => " = " | Lt=> " < " | Le => " <= ") ^ |
24630
351a308ab58d
simplified type int (eliminated IntInf.int, integer);
wenzelm
parents:
24112
diff
changeset
|
369 |
commas(map string_of_int l)) ineqs)) |
9073 | 370 |
else (); |
6056 | 371 |
|
13498 | 372 |
type history = (int * lineq list) list; |
373 |
datatype result = Success of injust | Failure of history; |
|
374 |
||
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
375 |
fun elim (ineqs, hist) = |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
376 |
let val _ = print_ineqs ineqs |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
377 |
val (triv, nontriv) = List.partition is_trivial ineqs in |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
378 |
if not (null triv) |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
379 |
then case Library.find_first is_contradictory triv of |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
380 |
NONE => elim (nontriv, hist) |
15531 | 381 |
| SOME(Lineq(_,_,_,j)) => Success j |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
382 |
else |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
383 |
if null nontriv then Failure hist |
13498 | 384 |
else |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
385 |
let val (eqs, noneqs) = List.partition (fn (Lineq(_,ty,_,_)) => ty=Eq) nontriv in |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
386 |
if not (null eqs) then |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
387 |
let val c = |
33042 | 388 |
fold (fn Lineq(_,_,l,_) => fn cs => union (op =) l cs) eqs [] |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
389 |
|> filter (fn i => i <> 0) |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
390 |
|> sort (int_ord o pairself abs) |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
391 |
|> hd |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
392 |
val (eq as Lineq(_,_,ceq,_),othereqs) = |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
393 |
extract_first (fn Lineq(_,_,l,_) => c mem l) eqs |
31986 | 394 |
val v = find_index (fn v => v = c) ceq |
23063 | 395 |
val (ioth,roth) = List.partition (fn (Lineq(_,_,l,_)) => nth l v = 0) |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
396 |
(othereqs @ noneqs) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
397 |
val others = map (elim_var v eq) roth @ ioth |
13498 | 398 |
in elim(others,(v,nontriv)::hist) end |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
399 |
else |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
400 |
let val lists = map (fn (Lineq(_,_,l,_)) => l) noneqs |
23063 | 401 |
val numlist = 0 upto (length (hd lists) - 1) |
402 |
val coeffs = map (fn i => map (fn xs => nth xs i) lists) numlist |
|
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
403 |
val blows = map calc_blowup coeffs |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
404 |
val iblows = blows ~~ numlist |
23063 | 405 |
val nziblows = filter_out (fn (i, _) => i = 0) iblows |
13498 | 406 |
in if null nziblows then Failure((~1,nontriv)::hist) |
407 |
else |
|
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
408 |
let val (c,v) = hd(sort (fn (x,y) => int_ord(fst(x),fst(y))) nziblows) |
23063 | 409 |
val (no,yes) = List.partition (fn (Lineq(_,_,l,_)) => nth l v = 0) ineqs |
410 |
val (pos,neg) = List.partition(fn (Lineq(_,_,l,_)) => nth l v > 0) yes |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
411 |
in elim(no @ map_product (elim_var v) pos neg, (v,nontriv)::hist) end |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
412 |
end |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
413 |
end |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
414 |
end; |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
415 |
|
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
416 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
417 |
(* Translate back a proof. *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
418 |
(* ------------------------------------------------------------------------- *) |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
419 |
|
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
420 |
fun trace_thm ctxt msg th = |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
421 |
(if !trace then (tracing msg; tracing (Display.string_of_thm ctxt th)) else (); th); |
9073 | 422 |
|
24076 | 423 |
fun trace_term ctxt msg t = |
24920 | 424 |
(if !trace then tracing (cat_lines [msg, Syntax.string_of_term ctxt t]) else (); t) |
24076 | 425 |
|
426 |
fun trace_msg msg = |
|
427 |
if !trace then tracing msg else (); |
|
9073 | 428 |
|
32740 | 429 |
val warning_count = Unsynchronized.ref 0; |
27020
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
430 |
val warning_count_max = 10; |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
431 |
|
33042 | 432 |
val union_term = union Pattern.aeconv; |
433 |
val union_bterm = union (fn ((b:bool, t), (b', t')) => b = b' andalso Pattern.aeconv (t, t')); |
|
26835
404550067389
Lookup and union operations on terms are now modulo eta conversion.
berghofe
parents:
24920
diff
changeset
|
434 |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
435 |
fun add_atoms (lhs, _, _, rhs, _, _) = |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
436 |
union_term (map fst lhs) o union_term (map fst rhs); |
6056 | 437 |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
438 |
fun atoms_of ds = fold add_atoms ds []; |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
439 |
|
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
440 |
(* |
6056 | 441 |
Simplification may detect a contradiction 'prematurely' due to type |
442 |
information: n+1 <= 0 is simplified to False and does not need to be crossed |
|
443 |
with 0 <= n. |
|
444 |
*) |
|
445 |
local |
|
24076 | 446 |
exception FalseE of thm |
6056 | 447 |
in |
27020
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
448 |
|
24076 | 449 |
fun mkthm ss asms (just: injust) = |
450 |
let |
|
451 |
val ctxt = Simplifier.the_context ss; |
|
452 |
val thy = ProofContext.theory_of ctxt; |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
453 |
val {add_mono_thms, mult_mono_thms, inj_thms, lessD, simpset, |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
454 |
number_of = (_, num_of), ...} = get_data ctxt; |
24076 | 455 |
val simpset' = Simplifier.inherit_context ss simpset; |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
456 |
fun only_concl f thm = |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
457 |
if Thm.no_prems thm then f (Thm.concl_of thm) else NONE; |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
458 |
val atoms = atoms_of (map_filter (only_concl (LA_Data.decomp ctxt)) asms); |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
459 |
|
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
460 |
fun use_first rules thm = |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
461 |
get_first (fn th => SOME (thm RS th) handle THM _ => NONE) rules |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
462 |
|
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
463 |
fun add2 thm1 thm2 = |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
464 |
use_first add_mono_thms (thm1 RS (thm2 RS LA_Logic.conjI)); |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
465 |
fun try_add thms thm = get_first (fn th => add2 th thm) thms; |
6056 | 466 |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
467 |
fun add_thms thm1 thm2 = |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
468 |
(case add2 thm1 thm2 of |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
469 |
NONE => |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
470 |
(case try_add ([thm1] RL inj_thms) thm2 of |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
471 |
NONE => |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
472 |
(the (try_add ([thm2] RL inj_thms) thm1) |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
473 |
handle Option => |
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
474 |
(trace_thm ctxt "" thm1; trace_thm ctxt "" thm2; |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
475 |
sys_error "Linear arithmetic: failed to add thms")) |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
476 |
| SOME thm => thm) |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
477 |
| SOME thm => thm); |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
478 |
|
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
479 |
fun mult_by_add n thm = |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
480 |
let fun mul i th = if i = 1 then th else mul (i - 1) (add_thms thm th) |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
481 |
in mul n thm end; |
10575 | 482 |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
483 |
val rewr = Simplifier.rewrite simpset'; |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
484 |
val rewrite_concl = Conv.fconv_rule (Conv.concl_conv ~1 (Conv.arg_conv |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
485 |
(Conv.binop_conv rewr))); |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
486 |
fun discharge_prem thm = if Thm.nprems_of thm = 0 then thm else |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
487 |
let val cv = Conv.arg1_conv (Conv.arg_conv rewr) |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
488 |
in Thm.implies_elim (Conv.fconv_rule cv thm) LA_Logic.trueI end |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
489 |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
490 |
fun mult n thm = |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
491 |
(case use_first mult_mono_thms thm of |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
492 |
NONE => mult_by_add n thm |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
493 |
| SOME mth => |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
494 |
let |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
495 |
val cv = mth |> Thm.cprop_of |> Drule.strip_imp_concl |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
496 |
|> Thm.dest_arg |> Thm.dest_arg1 |> Thm.dest_arg1 |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
497 |
val T = #T (Thm.rep_cterm cv) |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
498 |
in |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
499 |
mth |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
500 |
|> Thm.instantiate ([], [(cv, num_of thy T n)]) |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
501 |
|> rewrite_concl |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
502 |
|> discharge_prem |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
503 |
handle CTERM _ => mult_by_add n thm |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
504 |
| THM _ => mult_by_add n thm |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
505 |
end); |
10691 | 506 |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
507 |
fun mult_thm (n, thm) = |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
508 |
if n = ~1 then thm RS LA_Logic.sym |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
509 |
else if n < 0 then mult (~n) thm RS LA_Logic.sym |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
510 |
else mult n thm; |
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
511 |
|
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
512 |
fun simp thm = |
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
513 |
let val thm' = trace_thm ctxt "Simplified:" (full_simplify simpset' thm) |
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
514 |
in if LA_Logic.is_False thm' then raise FalseE thm' else thm' end; |
6056 | 515 |
|
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
516 |
fun mk (Asm i) = trace_thm ctxt ("Asm " ^ string_of_int i) (nth asms i) |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
517 |
| mk (Nat i) = trace_thm ctxt ("Nat " ^ string_of_int i) (LA_Logic.mk_nat_thm thy (nth atoms i)) |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
518 |
| mk (LessD j) = trace_thm ctxt "L" (hd ([mk j] RL lessD)) |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
519 |
| mk (NotLeD j) = trace_thm ctxt "NLe" (mk j RS LA_Logic.not_leD) |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
520 |
| mk (NotLeDD j) = trace_thm ctxt "NLeD" (hd ([mk j RS LA_Logic.not_leD] RL lessD)) |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
521 |
| mk (NotLessD j) = trace_thm ctxt "NL" (mk j RS LA_Logic.not_lessD) |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
522 |
| mk (Added (j1, j2)) = simp (trace_thm ctxt "+" (add_thms (mk j1) (mk j2))) |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
523 |
| mk (Multiplied (n, j)) = |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
524 |
(trace_msg ("*" ^ string_of_int n); trace_thm ctxt "*" (mult_thm (n, mk j))) |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
525 |
|
27020
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
526 |
in |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
527 |
let |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
528 |
val _ = trace_msg "mkthm"; |
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
529 |
val thm = trace_thm ctxt "Final thm:" (mk just); |
27020
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
530 |
val fls = simplify simpset' thm; |
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
531 |
val _ = trace_thm ctxt "After simplification:" fls; |
27020
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
532 |
val _ = |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
533 |
if LA_Logic.is_False fls then () |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
534 |
else |
32740 | 535 |
let val count = CRITICAL (fn () => Unsynchronized.inc warning_count) in |
27020
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
536 |
if count > warning_count_max then () |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
537 |
else |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
538 |
(tracing (cat_lines |
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
539 |
(["Assumptions:"] @ map (Display.string_of_thm ctxt) asms @ [""] @ |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
540 |
["Proved:", Display.string_of_thm ctxt fls, ""] @ |
27020
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
541 |
(if count <> warning_count_max then [] |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
542 |
else ["\n(Reached maximal message count -- disabling future warnings)"]))); |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
543 |
warning "Linear arithmetic should have refuted the assumptions.\n\ |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
544 |
\Please inform Tobias Nipkow (nipkow@in.tum.de).") |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
545 |
end; |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
546 |
in fls end |
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
547 |
handle FalseE thm => trace_thm ctxt "False reached early:" thm |
27020
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
548 |
end; |
b5b8afc9fdcd
added warning_count for issued reconstruction failure messages (limit 10);
wenzelm
parents:
26945
diff
changeset
|
549 |
|
6056 | 550 |
end; |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
551 |
|
23261 | 552 |
fun coeff poly atom = |
26835
404550067389
Lookup and union operations on terms are now modulo eta conversion.
berghofe
parents:
24920
diff
changeset
|
553 |
AList.lookup Pattern.aeconv poly atom |> the_default 0; |
10691 | 554 |
|
555 |
fun integ(rlhs,r,rel,rrhs,s,d) = |
|
17951 | 556 |
let val (rn,rd) = Rat.quotient_of_rat r and (sn,sd) = Rat.quotient_of_rat s |
24630
351a308ab58d
simplified type int (eliminated IntInf.int, integer);
wenzelm
parents:
24112
diff
changeset
|
557 |
val m = Integer.lcms(map (abs o snd o Rat.quotient_of_rat) (r :: s :: map snd rlhs @ map snd rrhs)) |
22846 | 558 |
fun mult(t,r) = |
17951 | 559 |
let val (i,j) = Rat.quotient_of_rat r |
15965
f422f8283491
Use of IntInf.int instead of int in most numeric simprocs; avoids
paulson
parents:
15922
diff
changeset
|
560 |
in (t,i * (m div j)) end |
12932 | 561 |
in (m,(map mult rlhs, rn*(m div rd), rel, map mult rrhs, sn*(m div sd), d)) end |
10691 | 562 |
|
13498 | 563 |
fun mklineq n atoms = |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
564 |
fn (item, k) => |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
565 |
let val (m, (lhs,i,rel,rhs,j,discrete)) = integ item |
13498 | 566 |
val lhsa = map (coeff lhs) atoms |
567 |
and rhsa = map (coeff rhs) atoms |
|
18330 | 568 |
val diff = map2 (curry (op -)) rhsa lhsa |
13498 | 569 |
val c = i-j |
570 |
val just = Asm k |
|
31511 | 571 |
fun lineq(c,le,cs,j) = Lineq(c,le,cs, if m=1 then j else Multiplied(m,j)) |
13498 | 572 |
in case rel of |
573 |
"<=" => lineq(c,Le,diff,just) |
|
574 |
| "~<=" => if discrete |
|
575 |
then lineq(1-c,Le,map (op ~) diff,NotLeDD(just)) |
|
576 |
else lineq(~c,Lt,map (op ~) diff,NotLeD(just)) |
|
577 |
| "<" => if discrete |
|
578 |
then lineq(c+1,Le,diff,LessD(just)) |
|
579 |
else lineq(c,Lt,diff,just) |
|
580 |
| "~<" => lineq(~c,Le,map (op~) diff,NotLessD(just)) |
|
581 |
| "=" => lineq(c,Eq,diff,just) |
|
22846 | 582 |
| _ => sys_error("mklineq" ^ rel) |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
583 |
end; |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
584 |
|
13498 | 585 |
(* ------------------------------------------------------------------------- *) |
586 |
(* Print (counter) example *) |
|
587 |
(* ------------------------------------------------------------------------- *) |
|
588 |
||
589 |
fun print_atom((a,d),r) = |
|
17951 | 590 |
let val (p,q) = Rat.quotient_of_rat r |
24630
351a308ab58d
simplified type int (eliminated IntInf.int, integer);
wenzelm
parents:
24112
diff
changeset
|
591 |
val s = if d then string_of_int p else |
13498 | 592 |
if p = 0 then "0" |
24630
351a308ab58d
simplified type int (eliminated IntInf.int, integer);
wenzelm
parents:
24112
diff
changeset
|
593 |
else string_of_int p ^ "/" ^ string_of_int q |
13498 | 594 |
in a ^ " = " ^ s end; |
595 |
||
19049 | 596 |
fun produce_ex sds = |
17496 | 597 |
curry (op ~~) sds |
598 |
#> map print_atom |
|
599 |
#> commas |
|
23197 | 600 |
#> curry (op ^) "Counterexample (possibly spurious):\n"; |
13498 | 601 |
|
24076 | 602 |
fun trace_ex ctxt params atoms discr n (hist: history) = |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
603 |
case hist of |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
604 |
[] => () |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
605 |
| (v, lineqs) :: hist' => |
24076 | 606 |
let |
607 |
val frees = map Free params |
|
24920 | 608 |
fun show_term t = Syntax.string_of_term ctxt (subst_bounds (frees, t)) |
24076 | 609 |
val start = |
610 |
if v = ~1 then (hist', findex0 discr n lineqs) |
|
22950 | 611 |
else (hist, replicate n Rat.zero) |
24076 | 612 |
val ex = SOME (produce_ex (map show_term atoms ~~ discr) |
613 |
(uncurry (fold (findex1 discr)) start)) |
|
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
614 |
handle NoEx => NONE |
24076 | 615 |
in |
616 |
case ex of |
|
30687 | 617 |
SOME s => (warning "Linear arithmetic failed - see trace for a counterexample."; tracing s) |
618 |
| NONE => warning "Linear arithmetic failed" |
|
24076 | 619 |
end; |
13498 | 620 |
|
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
621 |
(* ------------------------------------------------------------------------- *) |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
622 |
|
20268 | 623 |
fun mknat (pTs : typ list) (ixs : int list) (atom : term, i : int) : lineq option = |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
624 |
if LA_Logic.is_nat (pTs, atom) |
6056 | 625 |
then let val l = map (fn j => if j=i then 1 else 0) ixs |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
626 |
in SOME (Lineq (0, Le, l, Nat i)) end |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
627 |
else NONE; |
6056 | 628 |
|
13186
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
629 |
(* This code is tricky. It takes a list of premises in the order they occur |
15531 | 630 |
in the subgoal. Numerical premises are coded as SOME(tuple), non-numerical |
631 |
ones as NONE. Going through the premises, each numeric one is converted into |
|
13186
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
632 |
a Lineq. The tricky bit is to convert ~= which is split into two cases < and |
13498 | 633 |
>. Thus split_items returns a list of equation systems. This may blow up if |
13186
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
634 |
there are many ~=, but in practice it does not seem to happen. The really |
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
635 |
tricky bit is to arrange the order of the cases such that they coincide with |
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
636 |
the order in which the cases are in the end generated by the tactic that |
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
637 |
applies the generated refutation thms (see function 'refute_tac'). |
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
638 |
|
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
639 |
For variables n of type nat, a constraint 0 <= n is added. |
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
640 |
*) |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
641 |
|
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
642 |
(* FIXME: To optimize, the splitting of cases and the search for refutations *) |
20276
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
643 |
(* could be intertwined: separate the first (fully split) case, *) |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
644 |
(* refute it, continue with splitting and refuting. Terminate with *) |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
645 |
(* failure as soon as a case could not be refuted; i.e. delay further *) |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
646 |
(* splitting until after a refutation for other cases has been found. *) |
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
647 |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
648 |
fun split_items ctxt do_pre split_neq (Ts, terms) : (typ list * (LA_Data.decomp * int) list) list = |
20276
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
649 |
let |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
650 |
(* splits inequalities '~=' into '<' and '>'; this corresponds to *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
651 |
(* 'REPEAT_DETERM (eresolve_tac neqE i)' at the theorem/tactic *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
652 |
(* level *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
653 |
(* FIXME: this is currently sensitive to the order of theorems in *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
654 |
(* neqE: The theorem for type "nat" must come first. A *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
655 |
(* better (i.e. less likely to break when neqE changes) *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
656 |
(* implementation should *test* which theorem from neqE *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
657 |
(* can be applied, and split the premise accordingly. *) |
26945 | 658 |
fun elim_neq (ineqs : (LA_Data.decomp option * bool) list) : |
659 |
(LA_Data.decomp option * bool) list list = |
|
20276
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
660 |
let |
26945 | 661 |
fun elim_neq' nat_only ([] : (LA_Data.decomp option * bool) list) : |
662 |
(LA_Data.decomp option * bool) list list = |
|
20276
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
663 |
[[]] |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
664 |
| elim_neq' nat_only ((NONE, is_nat) :: ineqs) = |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
665 |
map (cons (NONE, is_nat)) (elim_neq' nat_only ineqs) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
666 |
| elim_neq' nat_only ((ineq as (SOME (l, i, rel, r, j, d), is_nat)) :: ineqs) = |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
667 |
if rel = "~=" andalso (not nat_only orelse is_nat) then |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
668 |
(* [| ?l ~= ?r; ?l < ?r ==> ?R; ?r < ?l ==> ?R |] ==> ?R *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
669 |
elim_neq' nat_only (ineqs @ [(SOME (l, i, "<", r, j, d), is_nat)]) @ |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
670 |
elim_neq' nat_only (ineqs @ [(SOME (r, j, "<", l, i, d), is_nat)]) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
671 |
else |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
672 |
map (cons ineq) (elim_neq' nat_only ineqs) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
673 |
in |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
674 |
ineqs |> elim_neq' true |
26945 | 675 |
|> maps (elim_neq' false) |
20276
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
676 |
end |
13464 | 677 |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
678 |
fun ignore_neq (NONE, bool) = (NONE, bool) |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
679 |
| ignore_neq (ineq as SOME (_, _, rel, _, _, _), bool) = |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
680 |
if rel = "~=" then (NONE, bool) else (ineq, bool) |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
681 |
|
20276
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
682 |
fun number_hyps _ [] = [] |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
683 |
| number_hyps n (NONE::xs) = number_hyps (n+1) xs |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
684 |
| number_hyps n ((SOME x)::xs) = (x, n) :: number_hyps (n+1) xs |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
685 |
|
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
686 |
val result = (Ts, terms) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
687 |
|> (* user-defined preprocessing of the subgoal *) |
24076 | 688 |
(if do_pre then LA_Data.pre_decomp ctxt else Library.single) |
23195 | 689 |
|> tap (fn subgoals => trace_msg ("Preprocessing yields " ^ |
690 |
string_of_int (length subgoals) ^ " subgoal(s) total.")) |
|
22846 | 691 |
|> (* produce the internal encoding of (in-)equalities *) |
24076 | 692 |
map (apsnd (map (fn t => (LA_Data.decomp ctxt t, LA_Data.domain_is_nat t)))) |
20276
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
693 |
|> (* splitting of inequalities *) |
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
694 |
map (apsnd (if split_neq then elim_neq else |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
695 |
Library.single o map ignore_neq)) |
22846 | 696 |
|> maps (fn (Ts, subgoals) => map (pair Ts o map fst) subgoals) |
20276
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
697 |
|> (* numbering of hypotheses, ignoring irrelevant ones *) |
d94dc40673b1
possible disagreement between proof search and proof reconstruction when eliminating inequalities over different types fixed
webertj
parents:
20268
diff
changeset
|
698 |
map (apsnd (number_hyps 0)) |
23195 | 699 |
in |
700 |
trace_msg ("Splitting of inequalities yields " ^ |
|
701 |
string_of_int (length result) ^ " subgoal(s) total."); |
|
702 |
result |
|
703 |
end; |
|
13464 | 704 |
|
33245 | 705 |
fun add_datoms ((lhs,_,_,rhs,_,d) : LA_Data.decomp, _) (dats : (bool * term) list) = |
26835
404550067389
Lookup and union operations on terms are now modulo eta conversion.
berghofe
parents:
24920
diff
changeset
|
706 |
union_bterm (map (pair d o fst) lhs) (union_bterm (map (pair d o fst) rhs) dats); |
13498 | 707 |
|
26945 | 708 |
fun discr (initems : (LA_Data.decomp * int) list) : bool list = |
33245 | 709 |
map fst (fold add_datoms initems []); |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
710 |
|
24076 | 711 |
fun refutes ctxt params show_ex : |
26945 | 712 |
(typ list * (LA_Data.decomp * int) list) list -> injust list -> injust list option = |
713 |
let |
|
714 |
fun refute ((Ts, initems : (LA_Data.decomp * int) list) :: initemss) (js: injust list) = |
|
715 |
let |
|
31510
e0f2bb4b0021
fast_lin_arith uses proper multiplication instead of unfolding to additions
boehmes
parents:
31102
diff
changeset
|
716 |
val atoms = atoms_of (map fst initems) |
26945 | 717 |
val n = length atoms |
718 |
val mkleq = mklineq n atoms |
|
719 |
val ixs = 0 upto (n - 1) |
|
720 |
val iatoms = atoms ~~ ixs |
|
32952 | 721 |
val natlineqs = map_filter (mknat Ts ixs) iatoms |
26945 | 722 |
val ineqs = map mkleq initems @ natlineqs |
723 |
in case elim (ineqs, []) of |
|
724 |
Success j => |
|
725 |
(trace_msg ("Contradiction! (" ^ string_of_int (length js + 1) ^ ")"); |
|
726 |
refute initemss (js @ [j])) |
|
727 |
| Failure hist => |
|
728 |
(if not show_ex then () |
|
729 |
else |
|
730 |
let |
|
731 |
val (param_names, ctxt') = ctxt |> Variable.variant_fixes (map fst params) |
|
732 |
val (more_names, ctxt'') = ctxt' |> Variable.variant_fixes |
|
733 |
(Name.invents (Variable.names_of ctxt') Name.uu (length Ts - length params)) |
|
734 |
val params' = (more_names @ param_names) ~~ Ts |
|
735 |
in |
|
736 |
trace_ex ctxt'' params' atoms (discr initems) n hist |
|
737 |
end; NONE) |
|
738 |
end |
|
739 |
| refute [] js = SOME js |
|
740 |
in refute end; |
|
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
741 |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
742 |
fun refute ctxt params show_ex do_pre split_neq terms : injust list option = |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
743 |
refutes ctxt params show_ex (split_items ctxt do_pre split_neq |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
744 |
(map snd params, terms)) []; |
20254
58b71535ed00
lin_arith_prover splits certain operators (e.g. min, max, abs)
webertj
parents:
20217
diff
changeset
|
745 |
|
22950 | 746 |
fun count P xs = length (filter P xs); |
20254
58b71535ed00
lin_arith_prover splits certain operators (e.g. min, max, abs)
webertj
parents:
20217
diff
changeset
|
747 |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
748 |
fun prove ctxt params show_ex do_pre Hs concl : bool * injust list option = |
20254
58b71535ed00
lin_arith_prover splits certain operators (e.g. min, max, abs)
webertj
parents:
20217
diff
changeset
|
749 |
let |
23190 | 750 |
val _ = trace_msg "prove:" |
20254
58b71535ed00
lin_arith_prover splits certain operators (e.g. min, max, abs)
webertj
parents:
20217
diff
changeset
|
751 |
(* append the negated conclusion to 'Hs' -- this corresponds to *) |
58b71535ed00
lin_arith_prover splits certain operators (e.g. min, max, abs)
webertj
parents:
20217
diff
changeset
|
752 |
(* 'DETERM (resolve_tac [LA_Logic.notI, LA_Logic.ccontr] i)' at the *) |
58b71535ed00
lin_arith_prover splits certain operators (e.g. min, max, abs)
webertj
parents:
20217
diff
changeset
|
753 |
(* theorem/tactic level *) |
58b71535ed00
lin_arith_prover splits certain operators (e.g. min, max, abs)
webertj
parents:
20217
diff
changeset
|
754 |
val Hs' = Hs @ [LA_Logic.neg_prop concl] |
58b71535ed00
lin_arith_prover splits certain operators (e.g. min, max, abs)
webertj
parents:
20217
diff
changeset
|
755 |
fun is_neq NONE = false |
58b71535ed00
lin_arith_prover splits certain operators (e.g. min, max, abs)
webertj
parents:
20217
diff
changeset
|
756 |
| is_neq (SOME (_,_,r,_,_,_)) = (r = "~=") |
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
757 |
val neq_limit = Config.get ctxt LA_Data.fast_arith_neq_limit |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
758 |
val split_neq = count is_neq (map (LA_Data.decomp ctxt) Hs') <= neq_limit |
20254
58b71535ed00
lin_arith_prover splits certain operators (e.g. min, max, abs)
webertj
parents:
20217
diff
changeset
|
759 |
in |
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
760 |
if split_neq then () |
24076 | 761 |
else |
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
762 |
trace_msg ("fast_arith_neq_limit exceeded (current value is " ^ |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
763 |
string_of_int neq_limit ^ "), ignoring all inequalities"); |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
764 |
(split_neq, refute ctxt params show_ex do_pre split_neq Hs') |
23190 | 765 |
end handle TERM ("neg_prop", _) => |
766 |
(* since no meta-logic negation is available, we can only fail if *) |
|
767 |
(* the conclusion is not of the form 'Trueprop $ _' (simply *) |
|
768 |
(* dropping the conclusion doesn't work either, because even *) |
|
769 |
(* 'False' does not imply arbitrary 'concl::prop') *) |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
770 |
(trace_msg "prove failed (cannot negate conclusion)."; |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
771 |
(false, NONE)); |
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
772 |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
773 |
fun refute_tac ss (i, split_neq, justs) = |
6074 | 774 |
fn state => |
24076 | 775 |
let |
776 |
val ctxt = Simplifier.the_context ss; |
|
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
777 |
val _ = trace_thm ctxt |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
778 |
("refute_tac (on subgoal " ^ string_of_int i ^ ", with " ^ |
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
779 |
string_of_int (length justs) ^ " justification(s)):") state |
24076 | 780 |
val {neqE, ...} = get_data ctxt; |
781 |
fun just1 j = |
|
782 |
(* eliminate inequalities *) |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
783 |
(if split_neq then |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
784 |
REPEAT_DETERM (eresolve_tac neqE i) |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
785 |
else |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
786 |
all_tac) THEN |
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
787 |
PRIMITIVE (trace_thm ctxt "State after neqE:") THEN |
24076 | 788 |
(* use theorems generated from the actual justifications *) |
32283 | 789 |
Subgoal.FOCUS (fn {prems, ...} => rtac (mkthm ss prems j) 1) ctxt i |
24076 | 790 |
in |
791 |
(* rewrite "[| A1; ...; An |] ==> B" to "[| A1; ...; An; ~B |] ==> False" *) |
|
792 |
DETERM (resolve_tac [LA_Logic.notI, LA_Logic.ccontr] i) THEN |
|
793 |
(* user-defined preprocessing of the subgoal *) |
|
794 |
DETERM (LA_Data.pre_tac ctxt i) THEN |
|
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
795 |
PRIMITIVE (trace_thm ctxt "State after pre_tac:") THEN |
24076 | 796 |
(* prove every resulting subgoal, using its justification *) |
797 |
EVERY (map just1 justs) |
|
20217
25b068a99d2b
linear arithmetic splits certain operators (e.g. min, max, abs)
webertj
parents:
19618
diff
changeset
|
798 |
end state; |
6074 | 799 |
|
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
800 |
(* |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
801 |
Fast but very incomplete decider. Only premises and conclusions |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
802 |
that are already (negated) (in)equations are taken into account. |
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
803 |
*) |
24076 | 804 |
fun simpset_lin_arith_tac ss show_ex = SUBGOAL (fn (A, i) => |
805 |
let |
|
806 |
val ctxt = Simplifier.the_context ss |
|
807 |
val params = rev (Logic.strip_params A) |
|
808 |
val Hs = Logic.strip_assums_hyp A |
|
809 |
val concl = Logic.strip_assums_concl A |
|
810 |
val _ = trace_term ctxt ("Trying to refute subgoal " ^ string_of_int i) A |
|
811 |
in |
|
812 |
case prove ctxt params show_ex true Hs concl of |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
813 |
(_, NONE) => (trace_msg "Refutation failed."; no_tac) |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
814 |
| (split_neq, SOME js) => (trace_msg "Refutation succeeded."; |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
815 |
refute_tac ss (i, split_neq, js)) |
24076 | 816 |
end); |
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
817 |
|
24076 | 818 |
fun cut_lin_arith_tac ss = |
819 |
cut_facts_tac (Simplifier.prems_of_ss ss) THEN' |
|
820 |
simpset_lin_arith_tac ss false; |
|
17613 | 821 |
|
24076 | 822 |
fun lin_arith_tac ctxt = |
823 |
simpset_lin_arith_tac (Simplifier.context ctxt Simplifier.empty_ss); |
|
824 |
||
825 |
||
5982
aeb97860d352
Replaced the puny nat_transitive.ML by the general fast_lin_arith.ML.
nipkow
parents:
diff
changeset
|
826 |
|
13186
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
827 |
(** Forward proof from theorems **) |
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
828 |
|
20433
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
829 |
(* More tricky code. Needs to arrange the proofs of the multiple cases (due |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
830 |
to splits of ~= premises) such that it coincides with the order of the cases |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
831 |
generated by function split_items. *) |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
832 |
|
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
833 |
datatype splittree = Tip of thm list |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
834 |
| Spl of thm * cterm * splittree * cterm * splittree; |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
835 |
|
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
836 |
(* "(ct1 ==> ?R) ==> (ct2 ==> ?R) ==> ?R" is taken to (ct1, ct2) *) |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
837 |
|
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
838 |
fun extract (imp : cterm) : cterm * cterm = |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
839 |
let val (Il, r) = Thm.dest_comb imp |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
840 |
val (_, imp1) = Thm.dest_comb Il |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
841 |
val (Ict1, _) = Thm.dest_comb imp1 |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
842 |
val (_, ct1) = Thm.dest_comb Ict1 |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
843 |
val (Ir, _) = Thm.dest_comb r |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
844 |
val (_, Ict2r) = Thm.dest_comb Ir |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
845 |
val (Ict2, _) = Thm.dest_comb Ict2r |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
846 |
val (_, ct2) = Thm.dest_comb Ict2 |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
847 |
in (ct1, ct2) end; |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
848 |
|
24076 | 849 |
fun splitasms ctxt (asms : thm list) : splittree = |
850 |
let val {neqE, ...} = get_data ctxt |
|
20433
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
851 |
fun elim_neq (asms', []) = Tip (rev asms') |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
852 |
| elim_neq (asms', asm::asms) = |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
853 |
(case get_first (fn th => SOME (asm COMP th) handle THM _ => NONE) neqE of |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
854 |
SOME spl => |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
855 |
let val (ct1, ct2) = extract (cprop_of spl) |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
856 |
val thm1 = assume ct1 |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
857 |
val thm2 = assume ct2 |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
858 |
in Spl (spl, ct1, elim_neq (asms', asms@[thm1]), ct2, elim_neq (asms', asms@[thm2])) |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
859 |
end |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
860 |
| NONE => elim_neq (asm::asms', asms)) |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
861 |
in elim_neq ([], asms) end; |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
862 |
|
24076 | 863 |
fun fwdproof ss (Tip asms : splittree) (j::js : injust list) = (mkthm ss asms j, js) |
864 |
| fwdproof ss (Spl (thm, ct1, tree1, ct2, tree2)) js = |
|
865 |
let |
|
866 |
val (thm1, js1) = fwdproof ss tree1 js |
|
867 |
val (thm2, js2) = fwdproof ss tree2 js1 |
|
20433
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
868 |
val thm1' = implies_intr ct1 thm1 |
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
869 |
val thm2' = implies_intr ct2 thm2 |
24076 | 870 |
in (thm2' COMP (thm1' COMP thm), js2) end; |
871 |
(* FIXME needs handle THM _ => NONE ? *) |
|
20433
55471f940e5c
lin_arith_prover: splitting reverted because of performance loss
webertj
parents:
20280
diff
changeset
|
872 |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
873 |
fun prover ss thms Tconcl (js : injust list) split_neq pos : thm option = |
24076 | 874 |
let |
875 |
val ctxt = Simplifier.the_context ss |
|
876 |
val thy = ProofContext.theory_of ctxt |
|
877 |
val nTconcl = LA_Logic.neg_prop Tconcl |
|
878 |
val cnTconcl = cterm_of thy nTconcl |
|
879 |
val nTconclthm = assume cnTconcl |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
880 |
val tree = (if split_neq then splitasms ctxt else Tip) (thms @ [nTconclthm]) |
24076 | 881 |
val (Falsethm, _) = fwdproof ss tree js |
882 |
val contr = if pos then LA_Logic.ccontr else LA_Logic.notI |
|
883 |
val concl = implies_intr cnTconcl Falsethm COMP contr |
|
32091
30e2ffbba718
proper context for Display.pretty_thm etc. or old-style versions Display.pretty_thm_global, Display.pretty_thm_without_context etc.;
wenzelm
parents:
31986
diff
changeset
|
884 |
in SOME (trace_thm ctxt "Proved by lin. arith. prover:" (LA_Logic.mk_Eq concl)) end |
24076 | 885 |
(*in case concl contains ?-var, which makes assume fail:*) (* FIXME Variable.import_terms *) |
886 |
handle THM _ => NONE; |
|
13186
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
887 |
|
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
888 |
(* PRE: concl is not negated! |
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
889 |
This assumption is OK because |
24076 | 890 |
1. lin_arith_simproc tries both to prove and disprove concl and |
891 |
2. lin_arith_simproc is applied by the Simplifier which |
|
13186
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
892 |
dives into terms and will thus try the non-negated concl anyway. |
ef8ed6adcb38
Big update. Allows case splitting on ~= now (trying both < and >).
nipkow
parents:
13105
diff
changeset
|
893 |
*) |
24076 | 894 |
fun lin_arith_simproc ss concl = |
895 |
let |
|
896 |
val ctxt = Simplifier.the_context ss |
|
26945 | 897 |
val thms = maps LA_Logic.atomize (Simplifier.prems_of_ss ss) |
24076 | 898 |
val Hs = map Thm.prop_of thms |
6102 | 899 |
val Tconcl = LA_Logic.mk_Trueprop concl |
24076 | 900 |
in |
901 |
case prove ctxt [] false false Hs Tconcl of (* concl provable? *) |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
902 |
(split_neq, SOME js) => prover ss thms Tconcl js split_neq true |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
903 |
| (_, NONE) => |
24076 | 904 |
let val nTconcl = LA_Logic.neg_prop Tconcl in |
905 |
case prove ctxt [] false false Hs nTconcl of (* ~concl provable? *) |
|
30406
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
906 |
(split_neq, SOME js) => prover ss thms nTconcl js split_neq false |
15dc25f8a0e2
Instead of giving up entirely, arith now ignores all inequalities when there are too many.
webertj
parents:
27020
diff
changeset
|
907 |
| (_, NONE) => NONE |
24076 | 908 |
end |
909 |
end; |
|
6074 | 910 |
|
911 |
end; |