Merge remote-tracking branch 'origin/devel' into indigo-devel

klpanagi · klpanagi · commit e66c6fd091ed · 2016-07-01T20:17:39.000+03:00
diff --git a/knowrob_common/owl/knowrob.owl b/knowrob_common/owl/knowrob.owl
@@ -86,16 +86,29 @@
     ///////////////////////////////////////////////////////////////////////////////////////
      -->
 
-    <!-- http://knowrob.org/kb/knowrob.owl#belongsToUser -->
-
     <owl:ObjectProperty rdf:about="&knowrob;belongsToUser">
-        <rdfs:range rdf:resource="&knowrob;Thing"/>
-        <rdfs:domain rdf:resource="&knowrob;Person"/>
+        <rdfs:range rdf:resource="&knowrob;Person"/>
+        <rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
+    </owl:ObjectProperty>
+
+    <owl:ObjectProperty rdf:about="&knowrob;imageFilePath">
+        <rdfs:range rdf:resource="&xsd;string"/> 
+        <rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
+    </owl:ObjectProperty>
+
+    <owl:ObjectProperty rdf:about="&knowrob;imageCreationTimestamp">
+        <rdfs:range rdf:resource="&xsd;int"/>
+        <rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
+    </owl:ObjectProperty>
+
+    <owl:ObjectProperty rdf:about="&knowrob;caffeClass">
+        <rdfs:range rdf:resource="&xsd;string"/> 
+        <rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
     </owl:ObjectProperty>
     
     <owl:ObjectProperty rdf:about="&knowrob;hasFallen">
         <rdfs:range rdf:resource="&knowrob;Fall"/>
-        <rdfs:domain rdf:resource="&knowrob;Patient"/>
+        <rdfs:domain rdf:resource="&knowrob;Person"/>
     </owl:ObjectProperty>
     
     <owl:ObjectProperty rdf:about="&knowrob;humanMessageType">
@@ -110,9 +123,6 @@
         <rdfs:domain rdf:resource="&knowrob;Agent-Generic"/>
     </owl:ObjectProperty>
 
-
-
-
     <owl:ObjectProperty rdf:about="&knowrob;cognitiveTestVariation">
         <rdfs:range rdf:resource="&xsd;int"/> 
         <rdfs:domain rdf:resource="&knowrob;CognitiveTests"/>
@@ -128,11 +138,8 @@
         <rdfs:domain rdf:resource="&knowrob;CognitiveTests"/>
     </owl:ObjectProperty>
 
- <!--warning, I did not create a cognitiveTestSubType attribute -->
-
-
     <owl:ObjectProperty rdf:about="&knowrob;cognitiveTestPerformedPatient">
-        <rdfs:range rdf:resource="&knowrob;Patient"/>  
+        <rdfs:range rdf:resource="&knowrob;Person"/>  
         <rdfs:domain rdf:resource="&knowrob;CognitiveTestPerformed"/>
     </owl:ObjectProperty>
 
@@ -151,12 +158,6 @@
         <rdfs:domain rdf:resource="&knowrob;CognitiveTestPerformed"/>
     </owl:ObjectProperty>
 
-
-
-
-
-
-
     <!-- 
     ///////////////////////////////////////////////////////////////////////////////////////
     //
@@ -9845,6 +9846,16 @@ Note that a fictional or imaginary object (such as Frodo, Captain Queeg, or HAL9
     </owl:Class>
     
 
+    <!-- http://knowrob.org/kb/knowrob.owl#SpatialThing-Localized -->
+
+    <owl:Class rdf:about="&knowrob;SpatialThing-Localized-Unspecified">
+        <rdfs:subClassOf rdf:resource="&knowrob;SpatialThing"/>
+        <rdfs:comment rdf:datatype="&xsd;string">A specialization of both SpatialThing and TemporalThing. This is the collection of all spatial things, tangible or intangible, that can meaningfully be said to have location or position in the empirical universe.
+
+Examples of spatially-localized things include all PartiallyTangible things, such as trees and ships, as well as certain Intangible spatial things, like the EarthsEquator. Also included are those events that can be pinned-down to specific places (see Event-Localized), and thus all PhysicalEvents. Excluded from this collection are any SpatialThings that are not localized, such as -- arguably -- purely abstract geometrical figures (e.g. a Platonic sphere).
+
+Note that a fictional or imaginary object (such as Frodo, Captain Queeg, or HAL9000-TheComputer) is typically localized with respect to the universe of the fictional/imagnary context in which it is found, and so is an instance of SpatialThing-Localized with respect to that context.</rdfs:comment>
+    </owl:Class>
 
     <!-- http://knowrob.org/kb/knowrob.owl#SpatialThingTypeByShape -->
 
diff --git a/knowrob_common/owl/knowrob.owl~ b/knowrob_common/owl/knowrob.owl~
@@ -86,16 +86,29 @@
     ///////////////////////////////////////////////////////////////////////////////////////
      -->
 
-    <!-- http://knowrob.org/kb/knowrob.owl#belongsToUser -->
-
     <owl:ObjectProperty rdf:about="&knowrob;belongsToUser">
-        <rdfs:range rdf:resource="&knowrob;Thing"/>
-        <rdfs:domain rdf:resource="&knowrob;Person"/>
+        <rdfs:range rdf:resource="&knowrob;Person"/>
+        <rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
+    </owl:ObjectProperty>
+
+    <owl:ObjectProperty rdf:about="&knowrob;imageFilePath">
+        <rdfs:range rdf:resource="&xsd;string"/> 
+        <rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
+    </owl:ObjectProperty>
+
+    <owl:ObjectProperty rdf:about="&knowrob;imageCreationTimestamp">
+        <rdfs:range rdf:resource="&xsd;int"/>
+        <rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
+    </owl:ObjectProperty>
+
+    <owl:ObjectProperty rdf:about="&knowrob;caffeClass">
+        <rdfs:range rdf:resource="&xsd;string"/> 
+        <rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
     </owl:ObjectProperty>
     
     <owl:ObjectProperty rdf:about="&knowrob;hasFallen">
         <rdfs:range rdf:resource="&knowrob;Fall"/>
-        <rdfs:domain rdf:resource="&knowrob;Patient"/>
+        <rdfs:domain rdf:resource="&knowrob;Person"/>
     </owl:ObjectProperty>
     
     <owl:ObjectProperty rdf:about="&knowrob;humanMessageType">
@@ -105,14 +118,11 @@
     </owl:ObjectProperty>
     
     <owl:ObjectProperty rdf:about="&knowrob;speaksLanguage">
-        <rdfs:range rdf:resource="&knowrob;English"/>
-        <rdfs:range rdf:resource="&knowrob;Greek"/>
+        <rdfs:range rdf:resource="&knowrob;en"/>
+        <rdfs:range rdf:resource="&knowrob;el"/>
         <rdfs:domain rdf:resource="&knowrob;Agent-Generic"/>
     </owl:ObjectProperty>
 
-
-
-
     <owl:ObjectProperty rdf:about="&knowrob;cognitiveTestVariation">
         <rdfs:range rdf:resource="&xsd;int"/> 
         <rdfs:domain rdf:resource="&knowrob;CognitiveTests"/>
@@ -128,11 +138,8 @@
         <rdfs:domain rdf:resource="&knowrob;CognitiveTests"/>
     </owl:ObjectProperty>
 
- <!--warning, I did not create a cognitiveTestSubType attribute -->
-
-
     <owl:ObjectProperty rdf:about="&knowrob;cognitiveTestPerformedPatient">
-        <rdfs:range rdf:resource="&knowrob;Patient"/>  
+        <rdfs:range rdf:resource="&knowrob;Person"/>  
         <rdfs:domain rdf:resource="&knowrob;CognitiveTestPerformed"/>
     </owl:ObjectProperty>
 
@@ -151,12 +158,6 @@
         <rdfs:domain rdf:resource="&knowrob;CognitiveTestPerformed"/>
     </owl:ObjectProperty>
 
-
-
-
-
-
-
     <!-- 
     ///////////////////////////////////////////////////////////////////////////////////////
     //
@@ -8074,11 +8075,11 @@ For predicates that relate things to measurable quantities that characterize the
         <rdfs:subClassOf rdf:resource="&knowrob;SocialConcepts"/>
     </owl:Class>
     
-    <owl:Class rdf:about="&knowrob;English">
+    <owl:Class rdf:about="&knowrob;en">
         <rdfs:subClassOf rdf:resource="&knowrob;HumanLanguage"/>
     </owl:Class>
     
-    <owl:Class rdf:about="&knowrob;Greek">
+    <owl:Class rdf:about="&knowrob;el">
         <rdfs:subClassOf rdf:resource="&knowrob;HumanLanguage"/>
     </owl:Class>
     
@@ -9845,6 +9846,16 @@ Note that a fictional or imaginary object (such as Frodo, Captain Queeg, or HAL9
     </owl:Class>
     
 
+    <!-- http://knowrob.org/kb/knowrob.owl#SpatialThing-Localized -->
+
+    <owl:Class rdf:about="&knowrob;SpatialThing-Localized-Unspecified">
+        <rdfs:subClassOf rdf:resource="&knowrob;SpatialThing"/>
+        <rdfs:comment rdf:datatype="&xsd;string">A specialization of both SpatialThing and TemporalThing. This is the collection of all spatial things, tangible or intangible, that can meaningfully be said to have location or position in the empirical universe.
+
+Examples of spatially-localized things include all PartiallyTangible things, such as trees and ships, as well as certain Intangible spatial things, like the EarthsEquator. Also included are those events that can be pinned-down to specific places (see Event-Localized), and thus all PhysicalEvents. Excluded from this collection are any SpatialThings that are not localized, such as -- arguably -- purely abstract geometrical figures (e.g. a Platonic sphere).
+
+Note that a fictional or imaginary object (such as Frodo, Captain Queeg, or HAL9000-TheComputer) is typically localized with respect to the universe of the fictional/imagnary context in which it is found, and so is an instance of SpatialThing-Localized with respect to that context.</rdfs:comment>
+    </owl:Class>
 
     <!-- http://knowrob.org/kb/knowrob.owl#SpatialThingTypeByShape -->
 
diff --git a/knowrob_common/prolog/knowrob_owl.pl b/knowrob_common/prolog/knowrob_owl.pl
@@ -40,10 +40,11 @@
       direct_subclassesOf_withCheck/2,
       direct_superclassesOf_withCheck/2,
       valueToAttribute_withCheck/3,
-      userCognitiveTestPerformance/7,
-      cognitiveTestsOfType/6,
-      createCognitiveTest/5,
-      cognitiveTestPerformed/7
+      userCognitiveTestPerformance/8,
+      cognitiveTestsOfType/7,
+      createCognitiveTest/6,
+      cognitiveTestPerformed/7,
+      createObjectAndRegisterImage/6
     ]).
 
 :- use_module(library('crypt')).
@@ -68,10 +69,11 @@
             direct_subclassesOf_withCheck(r,r),
             direct_superclassesOf_withCheck(r,r),
             valueToAttribute_withCheck(r,r,r),
-            userCognitiveTestPerformance(r,r,r,r,r,r,r),
-	    cognitiveTestsOfType(r,r,r,r,r,r),
-            createCognitiveTest(r,r,r,r,r),
+            userCognitiveTestPerformance(r,r,r,r,r,r,r,r),
+	    cognitiveTestsOfType(r,r,r,r,r,r,r),
+            createCognitiveTest(r,r,r,r,r,r),
             cognitiveTestPerformed(r,r,r,r,r,r,r),
+	    createObjectAndRegisterImage(r,r,r,r,r,r),
             create_timepoint(+,r),
             get_timepoint(r),
             get_timepoint(+,r),
@@ -378,35 +380,45 @@
 	 rdf_has(A,rdfs:range,Cclass),
 	 rdf_assert(B,A,C).
 
-userCognitiveTestPerformance(A,C,B,Dif,Timestamp,SC,P):-
+userCognitiveTestPerformance(A,C,B,Dif,Timestamp,SC,P,SubType):-
+rdf_has(A,rdf:type,knowrob:'Person'),
 rdf_has(P,knowrob:cognitiveTestPerformedPatient,A),
-rdf_has(P,knowrob:cognitiveTestPerformedTestType,B),
+rdf_has(P,knowrob:cognitiveTestPerformedTestName,B),
 rdf_has(B,rdf:type,C),
+rdf_has(B,knowrob:cognitiveTestSubType,SubType),
 rdf_has(B,knowrob:cognitiveTestDifficulty,literal(type(_, Dif))),
 rdf_has(P,knowrob:cognitiveTestPerformedTimestamp,literal(type(_, Timestamp))),
 rdf_has(P,knowrob:cognitiveTestPerformedScore,literal(type(_, SC))).
 
-cognitiveTestsOfType(A,B,Path,Dif,Sub,Language):-
+cognitiveTestsOfType(A,B,Path,Dif,Sub,Language,Id):-
 rdf_has(B,rdf:type,A),
 rdf_has(B,knowrob:supportedLanguages,Language),
 rdf_has(B,knowrob:cognitiveTestFilePath,literal(type(_, Path))),
 rdf_has(B,knowrob:cognitiveTestDifficulty,literal(type(_, Dif))),
-rdf_has(B,knowrob:cognitiveTestSubType,Sub).
+rdf_has(B,knowrob:cognitiveTestSubType,Sub),
+rdf_has(B,knowrob:cognitiveTestId,literal(type(_, Id))).
 
-createCognitiveTest(A,B,D,E,F):-
+createCognitiveTest(A,B,D,E,F,G):-
 owl_subclass_of(F,A),
 rdf_instance_from_class(A,B),
 rdf_assert(B,knowrob:cognitiveTestDifficulty,literal(type(xsd:string,D))),
 rdf_assert(B,knowrob:cognitiveTestFilePath,literal(type(xsd:string,E))),
-rdf_assert(B,knowrob:cognitiveTestSubType,F).
+rdf_assert(B,knowrob:cognitiveTestSubType,F),
+rdf_assert(B,knowrob:cognitiveTestId,literal(type(xsd:string,G))).
 
 cognitiveTestPerformed(B,Patient,Test,Time,Score,C,D):-
-rdf_has(Patient,rdf:type,C),
+rdf_has(Patient,rdf:type,knowrob:'Person'),
 rdf_instance_from_class(D,B),
 rdf_has(Test,knowrob:cognitiveTestSubType,L),
 rdf_assert(B,knowrob:cognitiveTestPerformedPatient,Patient),
-rdf_assert(B,knowrob:cognitiveTestPerformedTestType,Test),
+rdf_assert(B,knowrob:cognitiveTestPerformedTestName,Test),
 rdf_assert(B,knowrob:cognitiveTestPerformedTimestamp,literal(type(xsd:string,Time))),
 rdf_assert(B,knowrob:cognitiveTestPerformedScore,literal(type(xsd:string,Score))).
 
-
+createObjectAndRegisterImage(Object,ObjectClass,Person,Time,Path,CaffeClass):-
+rdf_has(Person,rdf:type,knowrob:'Person'),
+rdf_instance_from_class(ObjectClass,Object),
+rdf_assert(Object,knowrob:belongsToUser,Person),
+rdf_assert(Object,knowrob:imageFilePath,literal(type(xsd:string,Path))),
+rdf_assert(Object,knowrob:imageCreationTimestamp,literal(type(xsd:string,Time))),
+rdf_assert(Object,knowrob:caffeClass,literal(type(xsd:string,CaffeClass))).
diff --git a/knowrob_common/prolog/knowrob_owl.pl~ b/knowrob_common/prolog/knowrob_owl.pl~
@@ -41,9 +41,10 @@
       direct_superclassesOf_withCheck/2,
       valueToAttribute_withCheck/3,
       userCognitiveTestPerformance/8,
-      cognitiveTestsOfType/6,
-      createCognitiveTest/5,
-      cognitiveTestPerformed/7
+      cognitiveTestsOfType/7,
+      createCognitiveTest/6,
+      cognitiveTestPerformed/7,
+      createObjectAndRegisterImage/6
     ]).
 
 :- use_module(library('crypt')).
@@ -69,9 +70,10 @@
             direct_superclassesOf_withCheck(r,r),
             valueToAttribute_withCheck(r,r,r),
             userCognitiveTestPerformance(r,r,r,r,r,r,r,r),
-	    cognitiveTestsOfType(r,r,r,r,r,r),
-            createCognitiveTest(r,r,r,r,r),
+	    cognitiveTestsOfType(r,r,r,r,r,r,r),
+            createCognitiveTest(r,r,r,r,r,r),
             cognitiveTestPerformed(r,r,r,r,r,r,r),
+	    createObjectAndRegisterImage(r,r,r,r,r,r),
             create_timepoint(+,r),
             get_timepoint(r),
             get_timepoint(+,r),
@@ -378,35 +380,44 @@ valueToAttribute_withCheck(A,B,C):-
 	 rdf_has(A,rdfs:range,Cclass),
 	 rdf_assert(B,A,C).
 
-userCognitiveTestPerformance(A,C,B,Var,Dif,Timestamp,SC,P):-
+userCognitiveTestPerformance(A,C,B,Dif,Timestamp,SC,P,SubType):-
 rdf_has(P,knowrob:cognitiveTestPerformedPatient,A),
-rdf_has(P,knowrob:cognitiveTestPerformedTestType,B),
+rdf_has(P,knowrob:cognitiveTestPerformedTestName,B),
 rdf_has(B,rdf:type,C),
+rdf_has(B,knowrob:cognitiveTestSubType,SubType),
 rdf_has(B,knowrob:cognitiveTestDifficulty,literal(type(_, Dif))),
 rdf_has(P,knowrob:cognitiveTestPerformedTimestamp,literal(type(_, Timestamp))),
 rdf_has(P,knowrob:cognitiveTestPerformedScore,literal(type(_, SC))).
 
-cognitiveTestsOfType(A,B,Path,Dif,Sub,Language):-
+cognitiveTestsOfType(A,B,Path,Dif,Sub,Language,Id):-
 rdf_has(B,rdf:type,A),
 rdf_has(B,knowrob:supportedLanguages,Language),
 rdf_has(B,knowrob:cognitiveTestFilePath,literal(type(_, Path))),
 rdf_has(B,knowrob:cognitiveTestDifficulty,literal(type(_, Dif))),
-rdf_has(B,knowrob:cognitiveTestSubType,Sub).
+rdf_has(B,knowrob:cognitiveTestSubType,Sub),
+rdf_has(B,knowrob:cognitiveTestId,literal(type(_, Id))).
 
-createCognitiveTest(A,B,D,E,F):-
+createCognitiveTest(A,B,D,E,F,G):-
 owl_subclass_of(F,A),
 rdf_instance_from_class(A,B),
 rdf_assert(B,knowrob:cognitiveTestDifficulty,literal(type(xsd:string,D))),
 rdf_assert(B,knowrob:cognitiveTestFilePath,literal(type(xsd:string,E))),
-rdf_assert(B,knowrob:cognitiveTestSubType,F).
+rdf_assert(B,knowrob:cognitiveTestSubType,F),
+rdf_assert(B,knowrob:cognitiveTestId,literal(type(xsd:string,G))).
 
 cognitiveTestPerformed(B,Patient,Test,Time,Score,C,D):-
-rdf_has(Patient,rdf:type,C),
+rdf_has(Patient,rdf:type,knowrob:'Person'),
 rdf_instance_from_class(D,B),
 rdf_has(Test,knowrob:cognitiveTestSubType,L),
 rdf_assert(B,knowrob:cognitiveTestPerformedPatient,Patient),
-rdf_assert(B,knowrob:cognitiveTestPerformedTestType,Test),
+rdf_assert(B,knowrob:cognitiveTestPerformedTestName,Test),
 rdf_assert(B,knowrob:cognitiveTestPerformedTimestamp,literal(type(xsd:string,Time))),
 rdf_assert(B,knowrob:cognitiveTestPerformedScore,literal(type(xsd:string,Score))).
 
-
+createObjectAndRegisterImage(Object,ObjectClass,Person,Time,Path,CaffeClass):-
+rdf_has(Person,rdf:type,knowrob:'Person'),
+rdf_instance_from_class(ObjectClass,Object),
+rdf_assert(Object,knowrob:belongsToUser,Person),
+rdf_assert(Object,knowrob:imageFilePath,literal(type(xsd:string,Path))),
+rdf_assert(Object,knowrob:imageCreationTimestamp,literal(type(xsd:string,Time))),
+rdf_assert(Object,knowrob:caffeClass,literal(type(xsd:string,CaffeClass))).
