X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Flibrary%2Fnat%2Forders.ma;h=6ec0c9992a68b18e15976e96e74ef853c2fc04eb;hb=97c2d258a5c524eb5c4b85208899d80751a2c82f;hp=1939b3c13764e4c9937dbe5af73a3bd09abb0dc2;hpb=f263e4ec717d5ec2e7f9c057855f8223f81baae8;p=helm.git diff --git a/helm/matita/library/nat/orders.ma b/helm/matita/library/nat/orders.ma index 1939b3c13..6ec0c9992 100644 --- a/helm/matita/library/nat/orders.ma +++ b/helm/matita/library/nat/orders.ma @@ -14,10 +14,7 @@ set "baseuri" "cic:/matita/nat/orders". -include "logic/connectives.ma". -include "logic/equality.ma". include "nat/nat.ma". -include "nat/plus.ma". include "higher_order_defs/ordering.ma". (* definitions *) @@ -25,98 +22,162 @@ inductive le (n:nat) : nat \to Prop \def | le_n : le n n | le_S : \forall m:nat. le n m \to le n (S m). +(*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.le (S n) m. +\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.le m n. +\lambda n,m:nat.m \leq n. + +(*CSC: the URI must disappear: there is a bug now *) +interpretation "natural 'greater or equal to'" 'geq x y = (cic:/matita/nat/orders/ge.con x y). definition gt: nat \to nat \to Prop \def -\lambda n,m:nat.lt m n. +\lambda n,m:nat.m H7. +apply H. +apply le_to_or_lt_eq.apply H6. +qed.