X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Flibrary%2Fnat%2Forders.ma;h=796567fa59ae31483de19312a03f49520b73e96c;hb=aeb7f0539398561dc84cadf38df14a051dd1ba75;hp=122aebcfa41c21cdb537cbf71a18c848c989835b;hpb=03fcee16d9c262aad38a47d0a409b684a965cc3f;p=helm.git diff --git a/helm/matita/library/nat/orders.ma b/helm/matita/library/nat/orders.ma index 122aebcfa..796567fa5 100644 --- a/helm/matita/library/nat/orders.ma +++ b/helm/matita/library/nat/orders.ma @@ -14,7 +14,7 @@ set "baseuri" "cic:/matita/nat/orders". -include "nat/plus.ma". +include "nat/nat.ma". include "higher_order_defs/ordering.ma". (* definitions *) @@ -24,12 +24,19 @@ inductive le (n:nat) : nat \to Prop \def (*CSC: the URI must disappear: there is a bug now *) interpretation "natural 'less or equal to'" 'leq x y = (cic:/matita/nat/orders/le.ind#xpointer(1/1) x y). +(*CSC: the URI must disappear: there is a bug now *) +interpretation "natural 'neither less nor equal to'" 'nleq x y = + (cic:/matita/logic/connectives/Not.con + (cic:/matita/nat/orders/le.ind#xpointer(1/1) x y)). definition lt: nat \to nat \to Prop \def \lambda n,m:nat.(S n) \leq m. (*CSC: the URI must disappear: there is a bug now *) interpretation "natural 'less than'" 'lt x y = (cic:/matita/nat/orders/lt.con x y). +(*CSC: the URI must disappear: there is a bug now *) +interpretation "natural 'not less than'" 'nless x y = + (cic:/matita/logic/connectives/Not.con (cic:/matita/nat/orders/lt.con x y)). definition ge: nat \to nat \to Prop \def \lambda n,m:nat.m \leq n. @@ -42,6 +49,9 @@ definition gt: nat \to nat \to Prop \def (*CSC: the URI must disappear: there is a bug now *) interpretation "natural 'greater than'" 'gt x y = (cic:/matita/nat/orders/gt.con x y). +(*CSC: the URI must disappear: there is a bug now *) +interpretation "natural 'not greater than'" 'ngtr x y = + (cic:/matita/logic/connectives/Not.con (cic:/matita/nat/orders/gt.con x y)). theorem transitive_le : transitive nat le. simplify.intros.elim H1. @@ -94,11 +104,11 @@ intros.elim H.exact I.exact I. qed. (* not le *) -theorem not_le_Sn_O: \forall n:nat. \lnot (S n \leq O). +theorem not_le_Sn_O: \forall n:nat. S n \nleq O. intros.simplify.intros.apply leS_to_not_zero ? ? H. qed. -theorem not_le_Sn_n: \forall n:nat. \lnot (S n \leq n). +theorem not_le_Sn_n: \forall n:nat. S n \nleq n. intros.elim n.apply not_le_Sn_O.simplify.intros.cut S n1 \leq n1. apply H.assumption. apply le_S_S_to_le.assumption. @@ -113,7 +123,7 @@ left.simplify.apply le_S_S.assumption. qed. (* not eq *) -theorem lt_to_not_eq : \forall n,m:nat. n H7. +apply H. +apply le_to_or_lt_eq.apply H6. +qed.