X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2Flibrary%2Fnat%2Fdiv_and_mod.ma;h=520e99ea8f1e7a7d58f0a964fdd9021076b17938;hb=b901834518d8c78b432c3c22ce40ab39722d5cae;hp=e4645c3071a78903a14039be49d0ff504e7c62e7;hpb=da83446deba30fbe32b9bf617d83bd22cc9c9770;p=helm.git

diff --git a/helm/matita/library/nat/div_and_mod.ma b/helm/matita/library/nat/div_and_mod.ma
index e4645c307..520e99ea8 100644
--- a/helm/matita/library/nat/div_and_mod.ma
+++ b/helm/matita/library/nat/div_and_mod.ma
@@ -1,5 +1,5 @@
 (**************************************************************************)
-(*       ___	                                                            *)
+(*       ___	                                                          *)
 (*      ||M||                                                             *)
 (*      ||A||       A project by Andrea Asperti                           *)
 (*      ||T||                                                             *)
@@ -15,8 +15,6 @@
 set "baseuri" "cic:/matita/nat/div_and_mod".
 
 include "nat/minus.ma".
-include "nat/le_arith.ma".
-include "nat/compare.ma".
 
 let rec mod_aux p m n: nat \def
 match (leb m n) with
@@ -32,6 +30,9 @@ match m with
 [O \Rightarrow m
 | (S p) \Rightarrow mod_aux n n p]. 
 
+interpretation "natural remainder" 'module x y =
+  (cic:/matita/nat/div_and_mod/mod.con x y).
+
 let rec div_aux p m n : nat \def
 match (leb m n) with
 [ true \Rightarrow O
@@ -46,6 +47,9 @@ match m with
 [O \Rightarrow S n
 | (S p) \Rightarrow div_aux n n p]. 
 
+interpretation "natural divide" 'divide x y =
+  (cic:/matita/nat/div_and_mod/div.con x y).
+
 theorem le_mod_aux_m_m: 
 \forall p,n,m. n \leq p \to (mod_aux p n m) \leq m.
 intro.elim p.
@@ -63,7 +67,7 @@ simplify.apply trans_le ? n2 n.
 apply le_minus_m.apply le_S_S_to_le.assumption.
 qed.
 
-theorem lt_mod_m_m: \forall n,m. O < m \to (mod n m) < m.
+theorem lt_mod_m_m: \forall n,m. O < m \to (n \mod m) < m.
 intros 2.elim m.apply False_ind.
 apply not_le_Sn_O O H.
 simplify.apply le_S_S.apply le_mod_aux_m_m.
@@ -89,7 +93,7 @@ change with m < n1.
 apply not_le_to_lt.exact H1.
 qed.
 
-theorem div_mod: \forall n,m:nat. O < m \to n=(div n m)*m+(mod n m).
+theorem div_mod: \forall n,m:nat. O < m \to n=(n / m)*m+(n \mod m).
 intros 2.elim m.elim (not_le_Sn_O O H).
 simplify.
 apply div_aux_mod_aux.
@@ -103,14 +107,14 @@ definition div_mod_spec : nat \to nat \to nat \to nat \to Prop \def
 \lambda n,m,q,r:nat.r < m \land n=q*m+r).
 *)
 
-theorem div_mod_spec_to_not_eq_O: \forall n,m,q,r.(div_mod_spec n m q r) \to \lnot m=O.
+theorem div_mod_spec_to_not_eq_O: \forall n,m,q,r.(div_mod_spec n m q r) \to m \neq O.
 intros 4.simplify.intros.elim H.absurd le (S r) O.
 rewrite < H1.assumption.
 exact not_le_Sn_O r.
 qed.
 
 theorem div_mod_spec_div_mod: 
-\forall n,m. O < m \to (div_mod_spec n m (div n m) (mod n m)).
+\forall n,m. O < m \to (div_mod_spec n m (n / m) (n \mod m)).
 intros.
 apply div_mod_spec_intro.
 apply lt_mod_m_m.assumption.
@@ -128,15 +132,14 @@ cut b \leq (q1-q)*b+r1.
 cut b \leq r.
 apply lt_to_not_le r b H2 Hcut2.
 elim Hcut.assumption.
-apply trans_le ? ((q1-q)*b) ?.
+apply trans_le ? ((q1-q)*b).
 apply le_times_n.
 apply le_SO_minus.exact H6.
 rewrite < sym_plus.
 apply le_plus_n.
 rewrite < sym_times.
 rewrite > distr_times_minus.
-(* ATTENZIONE ALL' ORDINAMENTO DEI GOALS *)
-rewrite > plus_minus ? ? ? ?.
+rewrite > plus_minus.
 rewrite > sym_times.
 rewrite < H5.
 rewrite < sym_times.
@@ -156,14 +159,14 @@ cut b \leq (q-q1)*b+r.
 cut b \leq r1.
 apply lt_to_not_le r1 b H4 Hcut2.
 elim Hcut.assumption.
-apply trans_le ? ((q-q1)*b) ?.
+apply trans_le ? ((q-q1)*b).
 apply le_times_n.
 apply le_SO_minus.exact H6.
 rewrite < sym_plus.
 apply le_plus_n.
 rewrite < sym_times.
 rewrite > distr_times_minus.
-rewrite > plus_minus ? ? ? ?.
+rewrite > plus_minus.
 rewrite > sym_times.
 rewrite < H3.
 rewrite < sym_times.
@@ -192,34 +195,35 @@ rewrite < plus_n_O.rewrite < sym_times.reflexivity.
 qed.
 
 (* some properties of div and mod *)
-theorem div_times: \forall n,m:nat. div ((S n)*m) (S n) = m.
+theorem div_times: \forall n,m:nat. ((S n)*m) / (S n) = m.
 intros.
 apply div_mod_spec_to_eq ((S n)*m) (S n) ? ? ? O.
+goal 15. (* ?11 is closed with the following tactics *)
 apply div_mod_spec_div_mod.
 simplify.apply le_S_S.apply le_O_n.
 apply div_mod_spec_times.
 qed.
 
-theorem div_n_n: \forall n:nat. O < n \to div n n = S O.
+theorem div_n_n: \forall n:nat. O < n \to n / n = S O.
 intros.
-apply div_mod_spec_to_eq n n (div n n) (mod n n) (S O) O.
+apply div_mod_spec_to_eq n n (n / n) (n \mod n) (S O) O.
 apply div_mod_spec_div_mod.assumption.
 constructor 1.assumption.
 rewrite < plus_n_O.simplify.rewrite < plus_n_O.reflexivity.
 qed.
 
-theorem mod_n_n: \forall n:nat. O < n \to mod n n = O.
+theorem mod_n_n: \forall n:nat. O < n \to n \mod n = O.
 intros.
-apply div_mod_spec_to_eq2 n n (div n n) (mod n n) (S O) O.
+apply div_mod_spec_to_eq2 n n (n / n) (n \mod n) (S O) O.
 apply div_mod_spec_div_mod.assumption.
 constructor 1.assumption.
 rewrite < plus_n_O.simplify.rewrite < plus_n_O.reflexivity.
 qed.
 
-theorem mod_S: \forall n,m:nat. O < m \to S (mod n m) < m \to 
-(mod (S n) m) = S (mod n m).
+theorem mod_S: \forall n,m:nat. O < m \to S (n \mod m) < m \to 
+((S n) \mod m) = S (n \mod m).
 intros.
-apply div_mod_spec_to_eq2 (S n) m (div (S n) m) (mod (S n) m) (div n m) (S (mod n m)).
+apply div_mod_spec_to_eq2 (S n) m ((S n) / m) ((S n) \mod m) (n / m) (S (n \mod m)).
 apply div_mod_spec_div_mod.assumption.
 constructor 1.assumption.rewrite < plus_n_Sm.
 apply eq_f.
@@ -227,7 +231,7 @@ apply div_mod.
 assumption.
 qed.
 
-theorem mod_O_n: \forall n:nat.mod O n = O.
+theorem mod_O_n: \forall n:nat.O \mod n = O.
 intro.elim n.simplify.reflexivity.
 simplify.reflexivity.
 qed.
@@ -276,4 +280,4 @@ apply inj_times_l m.assumption.
 qed.
 
 variant inj_times_l1:\forall n. O < n \to \forall p,q:nat.p*n = q*n \to p=q
-\def lt_O_to_injective_times_l.
\ No newline at end of file
+\def lt_O_to_injective_times_l.