X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Flibrary%2Fdemo%2Fpower_derivative.ma;h=e8ab55c3595108eb3e08a8d60c49819752831832;hb=0e9f9d6d7a0466ee132553fb7a983eac282fb12f;hp=0526a016342797139d3bc850eeb2311b923b54ca;hpb=4bb9fdc4df84b9659ef3850f09e53aa0284a3250;p=helm.git

diff --git a/helm/software/matita/library/demo/power_derivative.ma b/helm/software/matita/library/demo/power_derivative.ma
index 0526a0163..e8ab55c35 100644
--- a/helm/software/matita/library/demo/power_derivative.ma
+++ b/helm/software/matita/library/demo/power_derivative.ma
@@ -12,8 +12,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/demo/power_derivative".
-
 include "nat/plus.ma".
 include "nat/orders.ma".
 include "nat/compare.ma".
@@ -90,7 +88,7 @@ let rec inj (n:nat) on n : R ≝
       ]
   ].
 
-coercion cic:/matita/demo/power_derivative/inj.con.
+coercion inj.
 
 axiom Rplus_Rzero_x: ∀x:R.0+x=x.
 axiom Rplus_comm: symmetric ? Rplus.
@@ -110,7 +108,7 @@ definition monomio ≝
 definition costante : nat → R → R ≝
  λa:nat.λx:R.inj a.
 
-coercion cic:/matita/demo/power_derivative/costante.con 1.
+coercion costante with 1.
 
 axiom f_eq_extensional:
  ∀f,g:R→R.(∀x:R.f x = g x) → f=g.
@@ -256,7 +254,6 @@ theorem derivative_power: ∀n:nat. D[x \sup n] = n·x \sup (pred n).
  elim n 0.
  case O.
    the thesis becomes (D[x \sup 0] = 0·x \sup (pred 0)).
-   by _
   done.
  case S (m:nat).
   by induction hypothesis we know
@@ -265,25 +262,24 @@ theorem derivative_power: ∀n:nat. D[x \sup n] = n·x \sup (pred n).
    (D[x \sup (1+m)] = (1+m) · x \sup m).
   we need to prove
    (m · (x \sup (1+ pred m)) = m · x \sup m) (Ppred).
-   by _ we proved (0 < m ∨ 0=m) (cases).
+   we proved (0 < m ∨ 0=m) (cases).
    we proceed by induction on cases
    to prove (m · (x \sup (1+ pred m)) = m · x \sup m).
     case left.
       suppose (0 < m) (m_pos).
-      by (S_pred m m_pos) we proved (m = 1 + pred m) (H1).
-      by _
+      using (S_pred ? m_pos) we proved (m = 1 + pred m) (H1).
      done.
     case right.
-      suppose (0=m) (m_zero). by _ done.
+      suppose (0=m) (m_zero). 
+    done.
   conclude
      (D[x \sup (1+m)])
-   = (D[x · x \sup m]) by _.
-   = (D[x] · x \sup m + x · D[x \sup m]) by _.
-   = (x \sup m + x · (m · x \sup (pred m))) by _.
-clear H.
-   = (x \sup m + m · (x \sup (1 + pred m))) by _.
-   = (x \sup m + m · x \sup m) by _.
-   = ((1+m) · x \sup m) by _ (timeout=60)
+   = (D[x · x \sup m]).
+   = (D[x] · x \sup m + x · D[x \sup m]).
+   = (x \sup m + x · (m · x \sup (pred m))) timeout=30.
+   = (x \sup m + m · (x \sup (1 + pred m))).
+   = (x \sup m + m · x \sup m).
+   = ((1+m) · x \sup m) timeout=30 by Fmult_one_f, Fmult_commutative, Fmult_Fplus_distr, costante_sum
   done.
 qed.
 
@@ -298,8 +294,7 @@ interpretation "Rderivative" 'derivative \eta.f =
  (cic:/matita/demo/power_derivative/derivative.con f).
 *)
 
-notation "hvbox(\frac 'd' ('d' 'x') break p)"
-  right associative with precedence 90
+notation "hvbox(\frac 'd' ('d' 'x') break p)" with precedence 90
 for @{ 'derivative $p}.
 
 interpretation "Rderivative" 'derivative f =
@@ -311,7 +306,6 @@ theorem derivative_power': ∀n:nat. D[x \sup (1+n)] = (1+n) · x \sup n.
  (D[x \sup (1+n)] = (1+n) · x \sup n).*) elim n 0.
  case O.
    the thesis becomes (D[x \sup 1] = 1 · x \sup 0).
-   by _
   done.
  case S (m:nat).
   by induction hypothesis we know
@@ -320,11 +314,11 @@ theorem derivative_power': ∀n:nat. D[x \sup (1+n)] = (1+n) · x \sup n.
    (D[x \sup (2+m)] = (2+m) · x \sup (1+m)).
   conclude
      (D[x \sup (2+m)])
-   = (D[x · x \sup (1+m)]) by _.
-   = (D[x] · x \sup (1+m) + x · D[x \sup (1+m)]) by _.
-   = (x \sup (1+m) + x · (costante (1+m) · x \sup m)) by _.
-clear H.
-   = (x \sup (1+m) + costante (1+m) · x \sup (1+m)) by _.
-   = (x \sup (1+m) · (costante (2 + m))) by _
+   = (D[x · x \sup (1+m)]).
+   = (D[x] · x \sup (1+m) + x · D[x \sup (1+m)]).
+   = (x \sup (1+m) + x · (costante (1+m) · x \sup m)).
+   = (x \sup (1+m) + costante (1+m) · x \sup (1+m)).
+   = ((2+m) · x \sup (1+m)) timeout=30 by Fmult_one_f, Fmult_commutative,
+       Fmult_Fplus_distr, assoc_plus, plus_n_SO, costante_sum
   done.
-qed.
\ No newline at end of file
+qed.