X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Flibrary%2Fnat%2Fdiv_and_mod.ma;h=73344c7c46b0cf1466b0aea949755ced792fc13a;hb=ab44166935d77276c04fcce50aa8281292776e29;hp=73f90e55371c3440aad9bd8e51a116f4bd1b7b7c;hpb=78044035b4419e569df0d7f6a7f96fa32d21a19d;p=helm.git diff --git a/helm/matita/library/nat/div_and_mod.ma b/helm/matita/library/nat/div_and_mod.ma index 73f90e553..73344c7c4 100644 --- a/helm/matita/library/nat/div_and_mod.ma +++ b/helm/matita/library/nat/div_and_mod.ma @@ -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 @@ -128,15 +126,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 +153,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. @@ -277,4 +274,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.