Added constructor for comp in U

diff --git a/CTT.hs b/CTT.hs
index 717f5be165feaf675844dd32de5c0e1892557189..9bcc3ae1403cfca34419638b2c56d036e1054201 100644 (file)
--- a/CTT.hs
+++ b/CTT.hs
@@ -154,6 +154,9 @@ data Val = VU
          | VGlue Val (System Val)
          | VGlueElem Val (System Val)
 
+           -- Composition in the universe (for now)
+         | VCompU Val (System Val)
+
            -- GlueLine values
          -- | VGlueLine Val Formula Formula
          -- | VGlueLineElem Val Formula Formula
@@ -216,6 +219,7 @@ isNeutralPath _ = True
 -- -- TODO: case for VGLueLine
 -- isNeutralTrans u _ = isNeutral u
 
+-- TODO: fix
 isNeutralComp :: Val -> Val -> System Val -> Bool
 isNeutralComp (VPath i a) u ts = isNeutralComp' i a u ts
   where isNeutralComp' i a u ts | isNeutral a = True
@@ -225,7 +229,7 @@ isNeutralComp (VPath i a) u ts = isNeutralComp' i a u ts
             where shas = shape as `face` (i ~> 0)
                   testFace beta _ = let shasBeta = shas `face` beta
                                     in shasBeta /= Map.empty && eps `Map.member` shasBeta
---        isNeutralComp' _ _ _ _ = isNeutral u
+        isNeutralComp' _ _ _ _ = False
 isNeutralComp _ u _ = isNeutral u
 
 -- -- TODO: adapt for non-regular setting
@@ -238,7 +242,7 @@ isNeutralComp _ u _ = isNeutral u
 --         testFace beta _ = let shasBeta = shas `face` beta
 --                           in not (Map.null shasBeta || eps `Map.member` shasBeta)
 
-        
+
 -- TODO
 -- isNeutralComp (VGlueLine _ phi psi) u ts =
 --   isNeutral u || isNeutralSystem (filterWithKey (not . test) ts) || and (elems ws)
@@ -458,6 +462,7 @@ showVal v = case v of
   -- VTrans v0 v1      -> text "trans" <+> showVals [v0,v1]
   VGlue a ts        -> text "glue" <+> showVal1 a <+> text (showSystem ts)
   VGlueElem a ts    -> text "glueElem" <+> showVal1 a <+> text (showSystem ts)
+  VCompU a ts       -> text "compU" <+> showVal1 a <+> text (showSystem ts)
   -- VGlueLine a phi psi     -> text "glueLine" <+> showFormula phi
   --                            <+> showFormula psi  <+> showVal1 a
   -- VGlueLineElem a phi psi -> text "glueLineElem" <+> showFormula phi

diff --git a/Eval.hs b/Eval.hs
index d187eb2c07ffdb7c02fa1eb6c8695d2a183265ea..1529d15b6b2429d825340042950dd1a48d336a00 100644 (file)
--- a/Eval.hs
+++ b/Eval.hs
@@ -75,6 +75,7 @@ instance Nominal Val where
     VSplit u v              -> support (u,v)
     VGlue a ts              -> support (a,ts)
     VGlueElem a ts          -> support (a,ts)
+    VCompU a ts             -> support (a,ts)
     -- VGlueLine a phi psi     -> support (a,phi,psi)
     -- VGlueLineElem a phi psi -> support (a,phi,psi)
     -- VCompElem a es u us     -> support (a,es,u,us)
@@ -109,6 +110,7 @@ instance Nominal Val where
          VSplit u v              -> app (acti u) (acti v)
          VGlue a ts              -> glue (acti a) (acti ts)
          VGlueElem a ts          -> glueElem (acti a) (acti ts)
+         VCompU a ts             -> compUniv (acti a) (acti ts)
          -- VGlueLine a phi psi     -> glueLine (acti a) (acti phi) (acti psi)
          -- VGlueLineElem a phi psi -> glueLineElem (acti a) (acti phi) (acti psi)
          -- VCompElem a es u us     -> compElem (acti a) (acti es) (acti u) (acti us)
@@ -139,6 +141,7 @@ instance Nominal Val where
          VSplit u v              -> VSplit (sw u) (sw v)
          VGlue a ts              -> VGlue (sw a) (sw ts)
          VGlueElem a ts          -> VGlueElem (sw a) (sw ts)
+         VCompU a ts             -> VCompU (sw a) (sw ts)
          -- VGlueLine a phi psi     -> VGlueLine (sw a) (sw phi) (sw psi)
          -- VGlueLineElem a phi psi -> VGlueLineElem (sw a) (sw phi) (sw psi)
          -- VCompElem a es u us     -> VCompElem (sw a) (sw es) (sw u) (sw us)
@@ -431,11 +434,11 @@ comp i a u ts = case a of
           ui1        = comp i a u1 t1s
           comp_u2    = comp i (app f fill_u1) u2 t2s
   VPi{} -> VComp (VPath i a) u (Map.map (VPath i) ts)
-  VU -> VComp (VPath i VU) u (Map.map (VPath i) ts)
+  VU -> compUniv u (Map.map (VPath i) ts)
     -- VGlue u (Map.map (eqToIso i) ts)
   _ | isNeutral w -> w
     where w = VComp (VPath i a) u (Map.map (VPath i) ts)
-  VComp (VPath _ VU) a es -> compU i a es u ts
+  VCompU a es   -> compU i a es u ts
   VGlue b hisos -> compGlue i b hisos u ts
   -- VGlueLine b phi psi -> compGlueLine i b phi psi u ts
   Ter (Sum _ _ nass) env -> case u of
@@ -452,7 +455,7 @@ comp i a u ts = case a of
     -- VElimComp _ _ u1    -> comp i a u1 ts
     _ -> error $ "comp ter sum" ++ show u
   _ -> error $ "comp: case missing for " ++ show i ++ " " ++ show a ++ " " ++ show u ++ " " ++ showSystem ts
-  
+
 compNeg :: Name -> Val -> Val -> System Val -> Val
 compNeg i a u ts = comp i (a `sym` i) u (ts `sym` i)
 
@@ -760,8 +763,7 @@ gradLemma b hiso@(VPair a (VPair f (VPair g (VPair s t)))) us v =
 
 
 -------------------------------------------------------------------------------
--- | Composition in the Universe
-
+-- | Composition in the Universe (to be replaced as glue)
 
 unGlueU :: System Val -> Val -> Val
 unGlueU es w
@@ -771,6 +773,12 @@ unGlueU es w
        VGlueElem v us   -> v
        _ -> error $ "unGlueU: " ++ show w ++ " should be neutral!"
 
+compUniv :: Val -> System Val -> Val
+compUniv b es | Map.null es         = b
+              | eps `Map.member` es = (es ! eps) @@ One
+              | otherwise           = VCompU b es
+
+
 compU :: Name -> Val -> System Val -> Val -> System Val -> Val
 compU i b es wi0 ws = glueElem vi1'' usi1''
   where bi1 = b `face` (i ~> 1)
@@ -1111,6 +1119,7 @@ instance Normal Val where
     -- VTrans u v          -> transLine (normal ns u) (normal ns v)
     VGlue u hisos       -> glue (normal ns u) (normal ns hisos)
     VGlueElem u us      -> glueElem (normal ns u) (normal ns us)
+    VCompU u es         -> compUniv (normal ns u) (normal ns es)
     -- VCompElem a es u us -> compElem (normal ns a) (normal ns es) (normal ns u) (normal ns us)
     -- VElimComp a es u    -> elimComp (normal ns a) (normal ns es) (normal ns u)
     VVar x t            -> VVar x t -- (normal ns t)