Changeset 12764

Timestamp:

30.10.2009 18:15:26 (3 weeks ago)

Author:

maeder

Message:

implemented views

Location:

trunk/OWL

Files:

• Logic_OWL.hs (modified) (2 diffs)
• Morphism.hs (modified) (5 diffs)
• StaticAnalysis.hs (modified) (6 diffs)

trunk/OWL/Logic_OWL.hs

@@ -67 +67 @@
           if isAxiom namedSen then empty else space <> text "%implied"
     sym_of OWL = symOf
+    symmap_of OWL = symMapOf
 
 instance StaticAnalysis OWL OntologyFile Axiom
@@ -85 +86 @@
       symbol_to_raw OWL = ASymbol
       induced_from_morphism OWL = inducedFromMor
+      induced_from_to_morphism OWL = inducedFromToMor
       cogenerated_sign OWL = cogeneratedSign
       generated_sign OWL = fail "cogenerated_sign OWL nyi"

trunk/OWL/Morphism.hs

@@ -23 +23 @@
   , statSymbMapItems
   , inducedFromMor
+  , inducedFromToMor
+  , symMapOf
   , mapSen
   ) where
@@ -33 +35 @@
 import Common.DocUtils
 import Common.Doc
+import Common.ExtSign
 import Common.Result
 import Common.Lib.State (execState)
+import Common.Lib.Rel (setToMap)
 
 import Control.Monad
@@ -56 +60 @@
 isOWLInclusion m = Map.null (mmaps m) && isSubSign (osource m) (otarget m)
 
+symMap :: Map.Map Entity URI -> Map.Map Entity Entity
+symMap = Map.mapWithKey (\ (Entity ty _) -> Entity ty)
+
 inducedElems :: Map.Map Entity URI -> [Entity]
-inducedElems = Map.elems . Map.mapWithKey (\ (Entity ty _) u -> Entity ty u)
+inducedElems = Map.elems . symMap
 
 inducedSign :: Map.Map Entity URI -> Sign -> Sign
@@ -82 +89 @@
     , mmaps = mm }
 
+inducedFromToMor :: Map.Map RawSymb RawSymb -> ExtSign Sign Entity
+                 -> ExtSign Sign Entity -> Result OWLMorphism
+inducedFromToMor rm (ExtSign sig _) (ExtSign tar _) = do
+  mor <- inducedFromMor rm sig
+  if isSubSign (otarget mor) tar
+    then return mor { otarget = tar }
+    else fail "OWL.inducedFromToMor"
+
+symMapOf :: OWLMorphism -> Map.Map Entity Entity
+symMapOf mor = Map.union (symMap $ mmaps mor) $ setToMap $ symOf $ osource mor
+
 instance Pretty OWLMorphism where
   pretty m = let
@@ -148 +166 @@
              ++ showDoc u " and " ++ showDoc t "")
   Map.empty
-  . (concatMap
-    $ \ (SymbMapItems m us) ->
+  . concatMap (\ (SymbMapItems m us) ->
       let ps = map (\ (u, v) -> (u, fromMaybe u v)) us in
       case m of

trunk/OWL/StaticAnalysis.hs

@@ -70 +70 @@
   DatatypeRestriction r fcs -> do
     anaDataRange r
-    mapM_ anaConstant $ map snd fcs
+    mapM_ (anaConstant . snd) fcs
 
 anaDescription :: Description -> State Sign ()
@@ -165 +165 @@
             integrateNamespaces (namespaceMap inSign) ns
         ofile' = renameNamespace transMap ofile
+        syms = Set.difference (symOf accSign) $ symOf inSign
         (sens, accSign) = runState
           (mapM anaAxiom $ axiomsList $ ontology ofile')
           inSign {namespaceMap = integNamespace
-                 ,ontologyID   = uri $ ontology $ ofile'
+                 ,ontologyID   = uri $ ontology ofile'
                  }
-    in Result diags1 $ Just (ofile', mkExtSign accSign, concat sens)
+    in Result diags1
+           $ Just (ofile', ExtSign accSign syms, concat sens)
     where
         oName = uri $ ontology ofile
@@ -178 +180 @@
           if null iuri then []
             else
-             let uri' = take ((length iuri) -1) iuri
-             in  if uri' `elem` importList
+             let uri' = take (length iuri - 1) iuri
+             in  if elem uri' importList
                   then []
                   else
@@ -186 +188 @@
                         ("\"" ++ uri' ++ "\"" ++
                                   " is not imported in ontology: " ++
-                                  (show $ localPart oName))
+                                  show (localPart oName))
                         ()]
-        importList = (localPart oName):
-                        (map localPart (importsList $ ontology ofile))
+        importList = localPart oName
+          : map localPart (importsList $ ontology ofile)
 
         removeDefault :: Namespace -> Namespace
-        removeDefault namespace =
-            Map.delete "owl11" (Map.delete "owl" (Map.delete "xsd"
-               (Map.delete "rdf" (Map.delete "rdfs"
-                  (Map.delete "xml" namespace)))))
+        removeDefault =
+            Map.delete "owl11" . Map.delete "owl" . Map.delete "xsd"
+               . Map.delete "rdf" . Map.delete "rdfs"
+                  . Map.delete "xml"
 
 getObjRoleFromExpression :: ObjectPropertyExpression -> IndividualRoleURI
@@ -207 +209 @@
 getObjRoleFromSubExpression sopExp =
     case sopExp of
-      OPExpression opExp -> (getObjRoleFromExpression opExp):[]
+      OPExpression opExp -> [getObjRoleFromExpression opExp]
       SubObjectPropertyChain expList ->
           map getObjRoleFromExpression expList
@@ -224 +226 @@
     case anno of
       ExplicitAnnotation auri (Constant value (Typed _)) ->
-          if localPart auri == "Implied" then
-             if value == "true" then
-                 True
-               else False
+          if localPart auri == "Implied" then value == "true"
             else isToProve r
       _ -> isToProve r