X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fnlibrary%2Fsets%2Fsetoids1.ma;h=90be6bc94be18f5758c7ce8b8fb5ee8c2d63c5a4;hb=e880d6eab5e1700f4a625ddcd7d0fa8f0cce2dcc;hp=48b7d3fccc7709c6996014ec1ccf27aa82bb5776;hpb=90ff94e74ceed0954b8599bff55d5c84f15c1b9f;p=helm.git diff --git a/helm/software/matita/nlibrary/sets/setoids1.ma b/helm/software/matita/nlibrary/sets/setoids1.ma index 48b7d3fcc..90be6bc94 100644 --- a/helm/software/matita/nlibrary/sets/setoids1.ma +++ b/helm/software/matita/nlibrary/sets/setoids1.ma @@ -35,12 +35,19 @@ ndefinition setoid1_of_setoid: setoid → setoid1. #s; @ (carr s); @ (eq0…) (refl…) (sym…) (trans…); nqed. - +alias symbol "hint_decl" = "hint_decl_CProp2". alias symbol "hint_decl" (instance 1) = "hint_decl_Type2". -unification hint 0 ≔ A,x,y +unification hint 0 ≔ A,x,y; + T ≟ carr A, + R ≟ setoid1_of_setoid A, + T1 ≟ carr1 R +(*-----------------------------------------------*) ⊢ + eq_rel T (eq0 A) x y ≡ eq_rel1 T1 (eq1 R) x y. + +unification hint 0 ≔ A; + R ≟ setoid1_of_setoid A (*-----------------------------------------------*) ⊢ - eq_rel ? (eq0 A) x y ≡ eq_rel1 ? (eq1 (setoid1_of_setoid A)) x y. -(* XXX capire come mai questa hint non funziona se porto su (setoid1_of_setoid A) *) + carr A ≡ carr1 R. interpretation "setoid1 eq" 'eq t x y = (eq_rel1 ? (eq1 t) x y). interpretation "setoid eq" 'eq t x y = (eq_rel ? (eq0 t) x y). @@ -84,7 +91,7 @@ nqed. unification hint 0 ≔ S, T ; R ≟ (unary_morphism1_setoid1 S T) (* --------------------------------- *) ⊢ - carr1 R ≡ S ⇒_1 T. + carr1 R ≡ unary_morphism1 S T. notation "l ╪_1 r" with precedence 89 for @{'prop2_x1 $l $r }. interpretation "prop21" 'prop2 l r = (prop11 ? (unary_morphism1_setoid1 ??) ? ?? l ?? r). @@ -113,10 +120,10 @@ ndefinition comp1_unary_morphisms: nqed. unification hint 0 ≔ o1,o2,o3:setoid1,f:o2 ⇒_1 o3,g:o1 ⇒_1 o2; - R ≟ (mk_unary_morphism1 ?? (composition1 ??? f g) + R ≟ (mk_unary_morphism1 ?? (composition1 ??? (fun11 ?? f) (fun11 ?? g)) (prop11 ?? (comp1_unary_morphisms o1 o2 o3 f g))) (* -------------------------------------------------------------------- *) ⊢ - fun11 ?? R ≡ (composition1 ??? f g). + fun11 o1 o3 R ≡ composition1 ??? (fun11 ?? f) (fun11 ?? g). ndefinition comp1_binary_morphisms: ∀o1,o2,o3. (o2 ⇒_1 o3) ⇒_1 ((o1 ⇒_1 o2) ⇒_1 (o1 ⇒_1 o3)).