aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorfbesson2008-07-07 15:36:09 +0000
committerfbesson2008-07-07 15:36:09 +0000
commitd8d585d692880cfb1a9af7245346dc43d515319d (patch)
tree897531d87362d68f417772ad868676199fa22686 /contrib
parentcf69befd5678b6827126ef0a2b89218ea7b02c89 (diff)
Micromega: doc + test-suite update
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11211 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'contrib')
-rw-r--r--contrib/micromega/Psatz.v29
1 files changed, 3 insertions, 26 deletions
diff --git a/contrib/micromega/Psatz.v b/contrib/micromega/Psatz.v
index bad0542d85..b2dd99100c 100644
--- a/contrib/micromega/Psatz.v
+++ b/contrib/micromega/Psatz.v
@@ -26,18 +26,17 @@ Require Tauto.
Ltac xpsatz dom d :=
let tac := lazymatch dom with
| Z =>
- psatz_Z d ;
+ (sos_Z || psatz_Z d) ;
intros __wit __varmap __ff ;
change (Tauto.eval_f (Zeval_formula (@find Z Z0 __varmap)) __ff) ;
apply (ZTautoChecker_sound __ff __wit); vm_compute ; reflexivity
| R =>
- psatz_R d ;
+ (sos_R || psatz_R d) ;
intros __wit __varmap __ff ;
change (Tauto.eval_f (Reval_formula (@find R 0%R __varmap)) __ff) ;
apply (RTautoChecker_sound __ff __wit); vm_compute ; reflexivity
| Q =>
- cbv beta in *;
- psatz_Q d ;
+ (sos_Q || psatz_Q d) ;
intros __wit __varmap __ff ;
change (Tauto.eval_f (Qeval_formula (@find Q 0%Q __varmap)) __ff) ;
apply (QTautoChecker_sound __ff __wit); vm_compute ; reflexivity
@@ -55,7 +54,6 @@ Ltac psatzl dom :=
change (Tauto.eval_f (Zeval_formula (@find Z Z0 __varmap)) __ff) ;
apply (ZTautoChecker_sound __ff __wit); vm_compute ; reflexivity
| Q =>
- cbv beta in *;
psatzl_Q ;
intros __wit __varmap __ff ;
change (Tauto.eval_f (Qeval_formula (@find Q 0%Q __varmap)) __ff) ;
@@ -69,27 +67,6 @@ Ltac psatzl dom :=
end in tac.
-Ltac sos dom :=
- let tac := lazymatch dom with
- | Z =>
- sos_Z ;
- intros __wit __varmap __ff ;
- change (Tauto.eval_f (Zeval_formula (@find Z Z0 __varmap)) __ff) ;
- apply (ZTautoChecker_sound __ff __wit); vm_compute ; reflexivity
- | Q =>
- cbv beta in *;
- sos_Q ;
- intros __wit __varmap __ff ;
- change (Tauto.eval_f (Qeval_formula (@find Q 0%Q __varmap)) __ff) ;
- apply (QTautoChecker_sound __ff __wit); vm_compute ; reflexivity
- | R =>
- sos_R ;
- intros __wit __varmap __ff ;
- change (Tauto.eval_f (Reval_formula (@find R 0%R __varmap)) __ff) ;
- apply (RTautoChecker_sound __ff __wit); vm_compute ; reflexivity
- | _ => fail "Unsupported domain"
- end in tac.
-
Ltac lia :=
xlia ;