X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Flibrary%2Fnat%2Fprimes.ma;h=67d8254641379f309669e8dc0fa3ee6e1001caea;hb=4dc47c9675ffd5fa50296ffaa9b5997501518c98;hp=ec7118980e1a82a53609a14bd76c0371e6a83585;hpb=6db38e3d8e4083765f2fce40c7845c9827b9afd0;p=helm.git

diff --git a/helm/software/matita/library/nat/primes.ma b/helm/software/matita/library/nat/primes.ma
index ec7118980..67d825464 100644
--- a/helm/software/matita/library/nat/primes.ma
+++ b/helm/software/matita/library/nat/primes.ma
@@ -12,8 +12,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/nat/primes".
-
 include "nat/div_and_mod.ma".
 include "nat/minimization.ma".
 include "nat/sigma_and_pi.ma".
@@ -22,9 +20,8 @@ include "nat/factorial.ma".
 inductive divides (n,m:nat) : Prop \def
 witness : \forall p:nat.m = times n p \to divides n m.
 
-interpretation "divides" 'divides n m = (cic:/matita/nat/primes/divides.ind#xpointer(1/1) n m).
-interpretation "not divides" 'ndivides n m =
- (cic:/matita/logic/connectives/Not.con (cic:/matita/nat/primes/divides.ind#xpointer(1/1) n m)).
+interpretation "divides" 'divides n m = (divides n m).
+interpretation "not divides" 'ndivides n m = (Not (divides n m)).
 
 theorem reflexive_divides : reflexive nat divides.
 unfold reflexive.
@@ -83,36 +80,36 @@ qed.
 theorem divides_plus: \forall n,p,q:nat. 
 n \divides p \to n \divides q \to n \divides p+q.
 intros.
-elim H.elim H1. apply (witness n (p+q) (n2+n1)).
+elim H.elim H1. apply (witness n (p+q) (n1+n2)).
 rewrite > H2.rewrite > H3.apply sym_eq.apply distr_times_plus.
 qed.
 
 theorem divides_minus: \forall n,p,q:nat. 
 divides n p \to divides n q \to divides n (p-q).
 intros.
-elim H.elim H1. apply (witness n (p-q) (n2-n1)).
+elim H.elim H1. apply (witness n (p-q) (n1-n2)).
 rewrite > H2.rewrite > H3.apply sym_eq.apply distr_times_minus.
 qed.
 
 theorem divides_times: \forall n,m,p,q:nat. 
 n \divides p \to m \divides q \to n*m \divides p*q.
 intros.
-elim H.elim H1. apply (witness (n*m) (p*q) (n2*n1)).
+elim H.elim H1. apply (witness (n*m) (p*q) (n1*n2)).
 rewrite > H2.rewrite > H3.
-apply (trans_eq nat ? (n*(m*(n2*n1)))).
-apply (trans_eq nat ? (n*(n2*(m*n1)))).
+apply (trans_eq nat ? (n*(m*(n1*n2)))).
+apply (trans_eq nat ? (n*(n1*(m*n2)))).
 apply assoc_times.
 apply eq_f.
-apply (trans_eq nat ? ((n2*m)*n1)).
+apply (trans_eq nat ? ((n1*m)*n2)).
 apply sym_eq. apply assoc_times.
-rewrite > (sym_times n2 m).apply assoc_times.
+rewrite > (sym_times n1 m).apply assoc_times.
 apply sym_eq. apply assoc_times.
 qed.
 
 theorem transitive_divides: transitive ? divides.
 unfold.
 intros.
-elim H.elim H1. apply (witness x z (n2*n)).
+elim H.elim H1. apply (witness x z (n1*n)).
 rewrite > H3.rewrite > H2.
 apply assoc_times.
 qed.
@@ -152,7 +149,7 @@ qed.
 
 theorem antisymmetric_divides: antisymmetric nat divides.
 unfold antisymmetric.intros.elim H. elim H1.
-apply (nat_case1 n2).intro.
+apply (nat_case1 n1).intro.
 rewrite > H3.rewrite > H2.rewrite > H4.
 rewrite < times_n_O.reflexivity.
 intros.
@@ -169,11 +166,11 @@ qed.
 
 (* divides le *)
 theorem divides_to_le : \forall n,m. O < m \to n \divides m \to n \le m.
-intros. elim H1.rewrite > H2.cut (O < n2).
-apply (lt_O_n_elim n2 Hcut).intro.rewrite < sym_times.
+intros. elim H1.rewrite > H2.cut (O < n1).
+apply (lt_O_n_elim n1 Hcut).intro.rewrite < sym_times.
 simplify.rewrite < sym_plus.
 apply le_plus_n.
-elim (le_to_or_lt_eq O n2).
+elim (le_to_or_lt_eq O n1).
 assumption.
 absurd (O<m).assumption.
 rewrite > H2.rewrite < H3.rewrite < times_n_O.
@@ -271,11 +268,11 @@ O \lt b \to c \divides b \to a * (b /c) = (a*b)/c.
 intros.
 elim H1.
 rewrite > H2.
-rewrite > (sym_times c n2).
+rewrite > (sym_times c n1).
 cut(O \lt c)
-[ rewrite > (lt_O_to_div_times n2 c)
+[ rewrite > (lt_O_to_div_times n1 c)
   [ rewrite < assoc_times.
-    rewrite > (lt_O_to_div_times (a *n2) c)
+    rewrite > (lt_O_to_div_times (a *n1) c)
     [ reflexivity
     | assumption
     ]
@@ -286,6 +283,28 @@ cut(O \lt c)
 ]
 qed.
 
+theorem eq_div_plus: \forall n,m,d. O < d \to
+divides d n \to divides d m \to
+(n + m ) / d = n/d + m/d.
+intros.
+elim H1.
+elim H2.
+rewrite > H3.rewrite > H4.
+rewrite < distr_times_plus.
+rewrite > sym_times.
+rewrite > sym_times in ⊢ (? ? ? (? (? % ?) ?)).
+rewrite > sym_times in ⊢ (? ? ? (? ? (? % ?))).
+rewrite > lt_O_to_div_times
+  [rewrite > lt_O_to_div_times
+    [rewrite > lt_O_to_div_times
+      [reflexivity
+      |assumption
+      ]
+    |assumption
+    ]
+  |assumption
+  ]
+qed.
 
 (* boolean divides *)
 definition divides_b : nat \to nat \to bool \def