X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Flibrary%2Fdemo%2Fpower_derivative.ma;h=adf85249967c8fe1c402b82dcabbb4839679a44c;hb=c99a38b6539be1eb667cced1eed2db3fc75e3162;hp=590c5c07ee71f3f21b8b4473c0ce9a0e2189bab6;hpb=fd93fa0155994b70482e0f07d8e45c238cce835d;p=helm.git

diff --git a/helm/software/matita/library/demo/power_derivative.ma b/helm/software/matita/library/demo/power_derivative.ma
index 590c5c07e..adf852499 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".
@@ -42,11 +40,7 @@ interpretation "None" 'one =
 interpretation "Rplus" 'plus x y =
  (cic:/matita/demo/power_derivative/Rplus.con x y).
 
-notation "hvbox(a break \middot b)" 
-  left associative with precedence 55
-for @{ 'times $a $b }.
-
-interpretation "Rmult" 'times x y =
+interpretation "Rmult" 'middot x y =
  (cic:/matita/demo/power_derivative/Rmult.con x y).
 
 definition Fplus ≝
@@ -57,7 +51,7 @@ definition Fmult ≝
 
 interpretation "Fplus" 'plus x y =
  (cic:/matita/demo/power_derivative/Fplus.con x y).
-interpretation "Fmult" 'times x y =
+interpretation "Fmult" 'middot x y =
  (cic:/matita/demo/power_derivative/Fmult.con x y).
 
 notation "2" with precedence 89
@@ -90,18 +84,18 @@ 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.
 axiom Rplus_assoc: associative ? Rplus.
-axiom Rmult_Rone_x: ∀x:R.1*x=x.
-axiom Rmult_Rzero_x: ∀x:R.0*x=0.
+axiom Rmult_Rone_x: ∀x:R.1 · x=x.
+axiom Rmult_Rzero_x: ∀x:R.0 · x=0.
 axiom Rmult_assoc: associative ? Rmult.
 axiom Rmult_comm: symmetric ? Rmult.
 axiom Rmult_Rplus_distr: distributive ? Rmult Rplus.
 
-alias symbol "times" = "Rmult".
+alias symbol "middot" = "Rmult".
 alias symbol "plus" = "natural plus".
 
 definition monomio ≝
@@ -110,7 +104,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.
@@ -247,7 +241,7 @@ axiom derivative_x0: D[x \sup 0] = 0.
 axiom derivative_x1: D[x] = 1.
 axiom derivative_mult: ∀f,g:R→R. D[f·g] = D[f]·g + f·D[g].
 
-alias symbol "times" = "Fmult".
+alias symbol "middot" = "Fmult".
 
 theorem derivative_power: ∀n:nat. D[x \sup n] = n·x \sup (pred n).
  assume n:nat.
@@ -270,10 +264,10 @@ theorem derivative_power: ∀n:nat. D[x \sup n] = n·x \sup (pred n).
     case left.
       suppose (0 < m) (m_pos).
       using (S_pred ? m_pos) we proved (m = 1 + pred m) (H1).
-     done.
+     by H1 done.
     case right.
       suppose (0=m) (m_zero). 
-    done.
+    by m_zero, Fmult_zero_f done.
   conclude
      (D[x \sup (1+m)])
    = (D[x · x \sup m]).
@@ -296,8 +290,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 =