added caffe class in image registration

Author: akintsakis

knowrob_common/owl/knowrob.owl

@@ -100,6 +100,11 @@
         <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"/>

knowrob_common/owl/knowrob.owl~

@@ -100,6 +100,11 @@
         <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"/>

knowrob_common/prolog/knowrob_owl.pl

@@ -44,7 +44,7 @@
       cognitiveTestsOfType/6,
       createCognitiveTest/5,
       cognitiveTestPerformed/7,
-      createObjectAndRegisterImage/5
+      createObjectAndRegisterImage/6
     ]).
 
 :- use_module(library('crypt')).
@@ -73,7 +73,7 @@
 	    cognitiveTestsOfType(r,r,r,r,r,r),
             createCognitiveTest(r,r,r,r,r),
             cognitiveTestPerformed(r,r,r,r,r,r,r),
-	    createObjectAndRegisterImage(r,r,r,r,r),
+	    createObjectAndRegisterImage(r,r,r,r,r,r),
             create_timepoint(+,r),
             get_timepoint(r),
             get_timepoint(+,r),
@@ -412,9 +412,10 @@
 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):-
+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:imageCreationTimestamp,literal(type(xsd:string,Time))),
+rdf_assert(Object,knowrob:caffeClass,literal(type(xsd:string,CaffeClass))).

knowrob_common/prolog/knowrob_owl.pl~

@@ -412,9 +412,10 @@ 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,Patient,Time,Path):-
-rdf_has(Patient,rdf:type,knowrob:'Person'),
+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,Patient),
+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:imageCreationTimestamp,literal(type(xsd:string,Time))),
+rdf_assert(Object,knowrob:caffeClass,literal(type(xsd:string,CaffeClass))).