Skip to content

Commit c2d1246

Browse files
committed
owl and prolog changes for image registration
1 parent 0349432 commit c2d1246

File tree

4 files changed

+34
-42
lines changed

4 files changed

+34
-42
lines changed

knowrob_common/owl/knowrob.owl

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,19 @@
8686
///////////////////////////////////////////////////////////////////////////////////////
8787
-->
8888

89-
<!-- http://knowrob.org/kb/knowrob.owl#belongsToUser -->
90-
9189
<owl:ObjectProperty rdf:about="&knowrob;belongsToUser">
9290
<rdfs:range rdf:resource="&knowrob;Person"/>
93-
<rdfs:domain rdf:resource="&knowrob;SpatialThing-Localized"/>
91+
<rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
9492
</owl:ObjectProperty>
9593

9694
<owl:ObjectProperty rdf:about="&knowrob;imageFilePath">
9795
<rdfs:range rdf:resource="&xsd;string"/>
98-
<rdfs:domain rdf:resource="&knowrob;SpatialThing-Localized"/>
96+
<rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
9997
</owl:ObjectProperty>
10098

10199
<owl:ObjectProperty rdf:about="&knowrob;imageCreationTimestamp">
102100
<rdfs:range rdf:resource="&xsd;int"/>
103-
<rdfs:domain rdf:resource="&knowrob;SpatialThing-Localized"/>
101+
<rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
104102
</owl:ObjectProperty>
105103

106104
<owl:ObjectProperty rdf:about="&knowrob;hasFallen">
@@ -120,9 +118,6 @@
120118
<rdfs:domain rdf:resource="&knowrob;Agent-Generic"/>
121119
</owl:ObjectProperty>
122120

123-
124-
125-
126121
<owl:ObjectProperty rdf:about="&knowrob;cognitiveTestVariation">
127122
<rdfs:range rdf:resource="&xsd;int"/>
128123
<rdfs:domain rdf:resource="&knowrob;CognitiveTests"/>
@@ -138,9 +133,6 @@
138133
<rdfs:domain rdf:resource="&knowrob;CognitiveTests"/>
139134
</owl:ObjectProperty>
140135

141-
<!--warning, I did not create a cognitiveTestSubType attribute -->
142-
143-
144136
<owl:ObjectProperty rdf:about="&knowrob;cognitiveTestPerformedPatient">
145137
<rdfs:range rdf:resource="&knowrob;Person"/>
146138
<rdfs:domain rdf:resource="&knowrob;CognitiveTestPerformed"/>
@@ -161,12 +153,6 @@
161153
<rdfs:domain rdf:resource="&knowrob;CognitiveTestPerformed"/>
162154
</owl:ObjectProperty>
163155

164-
165-
166-
167-
168-
169-
170156
<!--
171157
///////////////////////////////////////////////////////////////////////////////////////
172158
//
@@ -9855,6 +9841,16 @@ Note that a fictional or imaginary object (such as Frodo, Captain Queeg, or HAL9
98559841
</owl:Class>
98569842

98579843

9844+
<!-- http://knowrob.org/kb/knowrob.owl#SpatialThing-Localized -->
9845+
9846+
<owl:Class rdf:about="&knowrob;SpatialThing-Localized-Unspecified">
9847+
<rdfs:subClassOf rdf:resource="&knowrob;SpatialThing"/>
9848+
<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.
9849+
9850+
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).
9851+
9852+
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>
9853+
</owl:Class>
98589854

98599855
<!-- http://knowrob.org/kb/knowrob.owl#SpatialThingTypeByShape -->
98609856

knowrob_common/owl/knowrob.owl~

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -86,26 +86,24 @@
8686
///////////////////////////////////////////////////////////////////////////////////////
8787
-->
8888

89-
<!-- http://knowrob.org/kb/knowrob.owl#belongsToUser -->
90-
9189
<owl:ObjectProperty rdf:about="&knowrob;belongsToUser">
92-
<rdfs:range rdf:resource="&knowrob;Thing"/>
93-
<rdfs:domain rdf:resource="&knowrob;SpatialThing-Localized"/>
90+
<rdfs:range rdf:resource="&knowrob;Person"/>
91+
<rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
9492
</owl:ObjectProperty>
9593

9694
<owl:ObjectProperty rdf:about="&knowrob;imageFilePath">
9795
<rdfs:range rdf:resource="&xsd;string"/>
98-
<rdfs:domain rdf:resource="&knowrob;SpatialThing-Localized"/>
96+
<rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
9997
</owl:ObjectProperty>
10098

10199
<owl:ObjectProperty rdf:about="&knowrob;imageCreationTimestamp">
102100
<rdfs:range rdf:resource="&xsd;int"/>
103-
<rdfs:domain rdf:resource="&knowrob;SpatialThing-Localized"/>
101+
<rdfs:domain rdf:resource="&knowrob;SpatialThing"/>
104102
</owl:ObjectProperty>
105103

106104
<owl:ObjectProperty rdf:about="&knowrob;hasFallen">
107105
<rdfs:range rdf:resource="&knowrob;Fall"/>
108-
<rdfs:domain rdf:resource="&knowrob;Patient"/>
106+
<rdfs:domain rdf:resource="&knowrob;Person"/>
109107
</owl:ObjectProperty>
110108

111109
<owl:ObjectProperty rdf:about="&knowrob;humanMessageType">
@@ -120,9 +118,6 @@
120118
<rdfs:domain rdf:resource="&knowrob;Agent-Generic"/>
121119
</owl:ObjectProperty>
122120

123-
124-
125-
126121
<owl:ObjectProperty rdf:about="&knowrob;cognitiveTestVariation">
127122
<rdfs:range rdf:resource="&xsd;int"/>
128123
<rdfs:domain rdf:resource="&knowrob;CognitiveTests"/>
@@ -138,11 +133,8 @@
138133
<rdfs:domain rdf:resource="&knowrob;CognitiveTests"/>
139134
</owl:ObjectProperty>
140135

141-
<!--warning, I did not create a cognitiveTestSubType attribute -->
142-
143-
144136
<owl:ObjectProperty rdf:about="&knowrob;cognitiveTestPerformedPatient">
145-
<rdfs:range rdf:resource="&knowrob;Patient"/>
137+
<rdfs:range rdf:resource="&knowrob;Person"/>
146138
<rdfs:domain rdf:resource="&knowrob;CognitiveTestPerformed"/>
147139
</owl:ObjectProperty>
148140

@@ -161,12 +153,6 @@
161153
<rdfs:domain rdf:resource="&knowrob;CognitiveTestPerformed"/>
162154
</owl:ObjectProperty>
163155

164-
165-
166-
167-
168-
169-
170156
<!--
171157
///////////////////////////////////////////////////////////////////////////////////////
172158
//
@@ -9855,6 +9841,16 @@ Note that a fictional or imaginary object (such as Frodo, Captain Queeg, or HAL9
98559841
</owl:Class>
98569842

98579843

9844+
<!-- http://knowrob.org/kb/knowrob.owl#SpatialThing-Localized -->
9845+
9846+
<owl:Class rdf:about="&knowrob;SpatialThing-Localized-Unspecified">
9847+
<rdfs:subClassOf rdf:resource="&knowrob;SpatialThing"/>
9848+
<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.
9849+
9850+
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).
9851+
9852+
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>
9853+
</owl:Class>
98589854

98599855
<!-- http://knowrob.org/kb/knowrob.owl#SpatialThingTypeByShape -->
98609856

knowrob_common/prolog/knowrob_owl.pl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,9 @@
412412
rdf_assert(B,knowrob:cognitiveTestPerformedTimestamp,literal(type(xsd:string,Time))),
413413
rdf_assert(B,knowrob:cognitiveTestPerformedScore,literal(type(xsd:string,Score))).
414414

415-
createObjectAndRegisterImage(Object,ObjectClass,Patient,Time,Path):-
416-
rdf_has(Patient,rdf:type,knowrob:'Person'),
415+
createObjectAndRegisterImage(Object,ObjectClass,Person,Time,Path):-
416+
rdf_has(Person,rdf:type,knowrob:'Person'),
417417
rdf_instance_from_class(ObjectClass,Object),
418-
rdf_assert(Object,knowrob:belongsToUser,Patient),
418+
rdf_assert(Object,knowrob:belongsToUser,Person),
419419
rdf_assert(Object,knowrob:imageFilePath,literal(type(xsd:string,Path))),
420-
rdf_assert(Object,knowrob:imageCreationTimestamp,literal(type(xsd:string,Time)))
420+
rdf_assert(Object,knowrob:imageCreationTimestamp,literal(type(xsd:string,Time))).

knowrob_common/prolog/knowrob_owl.pl~

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,4 +417,4 @@ rdf_has(Patient,rdf:type,knowrob:'Person'),
417417
rdf_instance_from_class(ObjectClass,Object),
418418
rdf_assert(Object,knowrob:belongsToUser,Patient),
419419
rdf_assert(Object,knowrob:imageFilePath,literal(type(xsd:string,Path))),
420-
rdf_assert(Object,knowrob:imageCreationTimestamp,literal(type(xsd:string,Time)))
420+
rdf_assert(Object,knowrob:imageCreationTimestamp,literal(type(xsd:string,Time))).

0 commit comments

Comments
 (0)