X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fnlibrary%2Farithmetics%2Fnat.ma;h=120a0bb16199c888d16866c495c1fbc7a2f1579e;hb=603f2f6b596d8632b9bd53c73ae0b9c3575231e0;hp=a163960f7f9f88107cb4d80c5a6e0f5c177f54ba;hpb=825fcd9784570617b610d7cb0308984a19f7ba87;p=helm.git

diff --git a/helm/software/matita/nlibrary/arithmetics/nat.ma b/helm/software/matita/nlibrary/arithmetics/nat.ma
index a163960f7..120a0bb16 100644
--- a/helm/software/matita/nlibrary/arithmetics/nat.ma
+++ b/helm/software/matita/nlibrary/arithmetics/nat.ma
@@ -112,7 +112,7 @@ ntheorem plus_Sn_m1: ∀n,m:nat. S m + n = n + S m.
 #n; nelim n; nnormalize; //; nqed.
 *)
 
-(*
+(* deleterio 
 ntheorem plus_n_SO : ∀n:nat. S n = n+S O.
 //; nqed. *)
 
@@ -220,6 +220,9 @@ interpretation "natural 'less than'" 'lt x y = (lt x y).
 
 interpretation "natural 'not less than'" 'nless x y = (Not (lt x y)).
 
+(* nlemma eq_lt: ∀n,m. (n < m) = (S n ≤ m).
+//; nqed. *)
+
 ndefinition ge: nat \to nat \to Prop \def
 \lambda n,m:nat.m \leq n.
 
@@ -240,8 +243,9 @@ nqed.
 ntheorem trans_le: \forall n,m,p:nat. n \leq m \to m \leq p \to n \leq p
 \def transitive_le. *)
 
-ntheorem transitive_lt: transitive nat lt.
-#a; #b; #c; #ltab; #ltbc;nelim ltbc;/2/;nqed.
+
+naxiom transitive_lt: transitive nat lt.
+(* #a; #b; #c; #ltab; #ltbc;nelim ltbc;/2/;nqed.*)
 
 (*
 theorem trans_lt: \forall n,m,p:nat. lt n m \to lt m p \to lt n p
@@ -289,9 +293,11 @@ ntheorem not_le_to_not_le_S_S: ∀ n,m:nat. n ≰ m → S n ≰ S m.
 ntheorem not_le_S_S_to_not_le: ∀ n,m:nat. S n ≰ S m → n ≰ m.
 /3/; nqed.
 
+naxiom decidable_le: ∀n,m. decidable (n≤m).
+(*
 ntheorem decidable_le: ∀n,m. decidable (n≤m).
 napply nat_elim2; #n; /3/;
-#m; #dec; ncases dec;/4/; nqed.
+#m; #dec; ncases dec;/4/; nqed. *)
 
 ntheorem decidable_lt: ∀n,m. decidable (n < m).
 #n; #m; napply decidable_le ; nqed.
@@ -554,7 +560,7 @@ ntheorem le_plus_l: \forall p,n,m:nat. n \le m \to n + p \le m + p
 
 ntheorem le_plus: ∀n1,n2,m1,m2:nat. n1 ≤ n2  \to m1 ≤ m2 
 → n1 + m1 ≤ n2 + m2.
-#n1; #n2; #m1; #m2; #len; #lem; napply transitive_le;
+#n1; #n2; #m1; #m2; #len; #lem; napply (transitive_le ? (n1+m2));
 /2/; nqed.
 
 ntheorem le_plus_n :∀n,m:nat. m ≤ n + m.
@@ -567,7 +573,7 @@ ntheorem eq_plus_to_le: ∀n,m,p:nat.n=m+p → m ≤ n.
 //; nqed.
 
 ntheorem le_plus_to_le: ∀a,n,m. a + n ≤ a + m → n ≤ m.
-#a; nelim a; /3/; nqed. 
+#a; nelim a; nnormalize; /3/; nqed. 
 
 ntheorem le_plus_to_le_r: ∀a,n,m. n + a ≤ m +a → n ≤ m.
 /2/; nqed. 
@@ -635,7 +641,7 @@ napply transitive_le; (* /2/ slow *)
 nqed.
 
 ntheorem lt_times_n: ∀n,m:nat. O < n → m ≤ n*m.
-(* bello *)
+#n; #m; #H; napplyS monotonic_le_times_l;
 /2/; nqed.
 
 ntheorem le_times_to_le: 
@@ -651,9 +657,9 @@ ntheorem le_times_to_le:
   ##]
 nqed.
 
-ntheorem le_S_times_2: ∀n,m.O < m → n ≤ m → n < 2*m.
+ntheorem le_S_times_2: ∀n,m.O < m → n ≤ m → S n ≤ 2*m.
 #n; #m; #posm; #lenm; (* interessante *)
-nnormalize; napplyS (le_plus n); //; nqed.
+napplyS (le_plus n); //; nqed.
 
 (* times & lt *)
 (*