patched

diff --git a/matita/contribs/RELATIONAL-ARITHMETICS/add_gen.ma b/matita/contribs/RELATIONAL-ARITHMETICS/add_gen.ma
index 225580da543105e1bd38005888edffe5f602f945..8037f8ba7fce7ad98e8323cfff5cb719ff7952bc 100644 (file)
--- a/matita/contribs/RELATIONAL-ARITHMETICS/add_gen.ma
+++ b/matita/contribs/RELATIONAL-ARITHMETICS/add_gen.ma
@@ -74,7 +74,7 @@ theorem add_gen_S_3: \forall p,q,r. add p q (S r) \to
    rewrite > H0. clear H0. clear r.
  ]; apply ex_intro; [| auto || auto ] (**)
 qed.
-
+(*
 (* alternative proofs invoking add_gen_2 *)
 
 variant add_gen_O_3_alt: \forall p,q. add p q O \to p = O \land q = O.
@@ -102,3 +102,27 @@ variant add_gen_S_3_alt: \forall p,q,r. add p q (S r) \to
    rewrite > H0. clear H0. clear r.
  ]; apply ex_intro; [| auto || auto ]. (**)
 qed.
+*)
+(* other simplification lemmas *)
+
+theorem add_gen_eq_2_3: \forall p,q. add p q q \to p = O.
+ intros 2. elim q; clear q; intros;
+ [ lapply add_gen_O_2 to H as H0. clear H.
+   rewrite > H0. clear H0. clear p
+ | lapply add_gen_S_2 to H1 as H0. clear H1.
+   decompose H0.
+   lapply eq_gen_S_S to H2 as H0. clear H2.
+   rewrite < H0 in H3. clear H0. clear a
+ ]; auto.
+qed.
+
+theorem add_gen_eq_1_3: \forall p,q. add p q p \to q = O.
+ intros 1. elim p; clear p; intros;
+ [ lapply add_gen_O_1 to H as H0. clear H.
+   rewrite > H0. clear H0. clear q
+ | lapply add_gen_S_1 to H1 as H0. clear H1.
+   decompose H0.
+   lapply eq_gen_S_S to H2 as H0. clear H2.
+   rewrite < H0 in H3. clear H0. clear a
+ ]; auto.
+qed.

diff --git a/matita/contribs/RELATIONAL-ARITHMETICS/add_props.ma b/matita/contribs/RELATIONAL-ARITHMETICS/add_props.ma
index e04d8f616d2a26b30e8d7bda6cfa29d4e87407f7..6d2bef8232e910d91938fdea03fcde7d37812a3f 100644 (file)
--- a/matita/contribs/RELATIONAL-ARITHMETICS/add_props.ma
+++ b/matita/contribs/RELATIONAL-ARITHMETICS/add_props.ma
@@ -48,7 +48,6 @@ theorem add_shift_S_sx: \forall p,q,r. add p (S q) r \to add (S p) q r.
  auto.
 qed.
 
-
 theorem add_shift_S_dx: \forall p,q,r. add (S p) q r \to add p (S q) r.
  intros.
  lapply add_gen_S_1 to H as H0. clear H.
@@ -104,22 +103,3 @@ theorem add_conf: \forall p,q,r1. add p q r1 \to
    rewrite > H2. clear H2. clear r2.
  ]; auto.
 qed.
-
-
-
-theorem add_gen_eq_2_3: \forall p,q. add p q q \to p = O.
- intros 2. elim q; clear q; intros;
- [ lapply add_gen_O_2 to H as H0. clear H.
-   rewrite > H0. clear H0. clear p
- | lapply add_gen_S_2 to H1 as H0. clear H1.
-   decompose H0.
-   lapply eq_gen_S_S to H2 as H0. clear H2.
-   rewrite < H0 in H3. clear H0. clear a
- ]; auto.
-qed.
-
-theorem add_gen_eq_1_3: \forall p,q. add p q p \to q = O.
- intros. 
- lapply add_sym to H. clear H.
- auto.
-qed.

diff --git a/matita/contribs/RELATIONAL-ARITHMETICS/nat_fwd.ma b/matita/contribs/RELATIONAL-ARITHMETICS/nat_fwd.ma
new file mode 100644 (file)
index 0000000..de3eb44
--- /dev/null
+++ b/matita/contribs/RELATIONAL-ARITHMETICS/nat_fwd.ma
@@ -0,0 +1,30 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+set "baseuri" "cic:/matita/RELATIONAL-ARITHMETICS/nat_gen".
+
+include "library/logic/equality.ma".
+include "nat_defs.ma".
+
+theorem eq_gen_O_S: \forall (P:Prop). \forall m2. O = S m2 \to P.
+ intros. discriminate H.
+qed.
+
+theorem eq_gen_S_O: \forall (P:Prop). \forall m1. S m1 = O \to P.
+ intros. discriminate H.
+qed.
+
+theorem eq_gen_S_S: \forall m1,m2. S m1 = S m2 \to m1 = m2.
+ intros. injection H. assumption.
+qed.

diff --git a/matita/contribs/RELATIONAL-ARITHMETICS/nat_gen.ma b/matita/contribs/RELATIONAL-ARITHMETICS/nat_gen.ma
deleted file mode 100644 (file)
index de3eb44..0000000
--- a/matita/contribs/RELATIONAL-ARITHMETICS/nat_gen.ma
+++ /dev/null
@@ -1,30 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-set "baseuri" "cic:/matita/RELATIONAL-ARITHMETICS/nat_gen".
-
-include "library/logic/equality.ma".
-include "nat_defs.ma".
-
-theorem eq_gen_O_S: \forall (P:Prop). \forall m2. O = S m2 \to P.
- intros. discriminate H.
-qed.
-
-theorem eq_gen_S_O: \forall (P:Prop). \forall m1. S m1 = O \to P.
- intros. discriminate H.
-qed.
-
-theorem eq_gen_S_S: \forall m1,m2. S m1 = S m2 \to m1 = m2.
- intros. injection H. assumption.
-qed.