Some more re-organization.

[helm.git] / helm / software / matita / contribs / formal_topology / overlap / o-formal_topologies.ma

diff --git a/helm/software/matita/contribs/formal_topology/overlap/o-formal_topologies.ma b/helm/software/matita/contribs/formal_topology/overlap/o-formal_topologies.ma
index 1693b55f61eb62677243c92d2e0a61380477adac..e136821af74f5a5c025ce0923e9f39deb3116880 100644 (file)
--- a/helm/software/matita/contribs/formal_topology/overlap/o-formal_topologies.ma
+++ b/helm/software/matita/contribs/formal_topology/overlap/o-formal_topologies.ma
@@ -12,13 +12,13 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include "o-concrete_spaces.ma".
-
-definition btop_carr: BTop → Type ≝ λo:BTop. carr (carrbt o).
+include "o-basic_topologies.ma".
 
+definition btop_carr: BTop → Type ≝ λo:BTop. carr1 (oa_P (carrbt o)).
 coercion btop_carr.
 
-definition btop_carr': BTop → setoid ≝ λo:BTop. carrbt o.
+(*
+definition btop_carr': BTop → setoid1 ≝ λo:BTop. carrbt o.
 
 coercion btop_carr'.
 
@@ -40,12 +40,14 @@ definition ffintersects: ∀S:BTop. binary_morphism1 (Ω \sup S) (Ω \sup S) (Ω
 qed.
 
 interpretation "ffintersects" 'fintersects U V = (fun1 ___ (ffintersects _) U V).
+*)
 
 record formal_topology: Type ≝
  { bt:> BTop;
-   converges: ∀U,V: Ω \sup bt. A ? (U ↓ V) = A ? U ∩ A ? V
+   converges: ∀U,V: bt. A ? (U ↓ V) = (A ? U ∧ A ? V)
  }.
 
+(*
 definition bt': formal_topology → basic_topology ≝ λo:formal_topology.bt o.
 
 coercion bt'.
@@ -57,7 +59,7 @@ definition ffintersects': ∀S:BTop. binary_morphism1 S S (Ω \sup S).
 qed.
 
 interpretation "ffintersects'" 'fintersects U V = (fun1 ___ (ffintersects' _) U V).
-
+*)
 record formal_map (S,T: formal_topology) : Type ≝
  { cr:> continuous_relation_setoid S T;
    C1: ∀b,c. extS ?? cr (b ↓ c) = ext ?? cr b ↓ ext ?? cr c;