X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Flibrary%2Fnat%2Fprimes.ma;h=0186d4324e3890666660282de63d5dc619a83520;hb=10f29fdd78ee089a9a94446207b543d33d6c851c;hp=6885a98474089bee8c3c83336afcde7fd3228356;hpb=5f6a2cf7134fda213ffc721ee7eebf5be30d7800;p=helm.git

diff --git a/helm/software/matita/library/nat/primes.ma b/helm/software/matita/library/nat/primes.ma
index 6885a9847..0186d4324 100644
--- a/helm/software/matita/library/nat/primes.ma
+++ b/helm/software/matita/library/nat/primes.ma
@@ -190,8 +190,33 @@ rewrite > H2.rewrite < H3.
 simplify.exact (not_le_Sn_n O).
 qed.
 
-
-(*divides and div*)
+(*a variant of or_div_mod *)
+theorem or_div_mod1: \forall n,q. O < q \to
+(divides q (S n)) \land S n = (S (div n q)) * q \lor
+(\lnot (divides q (S n)) \land S n= (div n q) * q + S (n\mod q)).
+intros.elim (or_div_mod n q H);elim H1
+  [left.split
+    [apply (witness ? ? (S (n/q))).
+     rewrite > sym_times.assumption
+    |assumption
+    ]
+  |right.split
+    [intro.
+     apply (not_eq_O_S (n \mod q)).
+     (* come faccio a fare unfold nelleipotesi ? *)
+     cut ((S n) \mod q = O)
+      [rewrite < Hcut.
+       apply (div_mod_spec_to_eq2 (S n) q (div (S n) q) (mod (S n) q) (div n q) (S (mod n q)))
+        [apply div_mod_spec_div_mod.
+         assumption
+        |apply div_mod_spec_intro;assumption
+        ]
+      |apply divides_to_mod_O;assumption
+      ]
+    |assumption
+    ]
+  ]
+qed.
 
 theorem divides_to_div: \forall n,m.divides n m \to m/n*n = m.
 intro.
@@ -261,6 +286,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
@@ -490,6 +537,11 @@ theorem prime_to_lt_O: \forall p. prime p \to O < p.
 intros.elim H.apply lt_to_le.assumption.
 qed.
 
+theorem prime_to_lt_SO: \forall p. prime p \to S O < p.
+intros.elim H.
+assumption.
+qed.
+
 (* smallest factor *)
 definition smallest_factor : nat \to nat \def
 \lambda n:nat.