Commit 19ef78a7 authored by María's avatar María
Browse files

Disjoints 

Added disjoints

hasFrequencyMeasurment renamed

diagrams updated and examples updated
parent 39e6f9de

SAREF4BLD/BLDG.graffle

+22 −21
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
	<key>MasterSheets</key>

	<array/>

	<key>ModificationDate</key>

	<string>2016-11-03 09:22:51 +0000</string>

	<string>2016-11-07 14:55:56 +0000</string>

	<key>Modifier</key>

	<string>María Poveda</string>

	<key>NotesVisible</key>
@@ -1414,7 +1414,7 @@ hasTimeStamp:: dateTime (F)\ 
				</dict>

				<dict>

					<key>Bounds</key>

					<string>{{611.02036085796578, 920.93953172076135}, {117.36001245975518, 14.40000057220459}}</string>

					<string>{{607.8894752388079, 921.13225483168617}, {117.36001245975518, 14.40000057220459}}</string>

					<key>Class</key>

					<string>ShapedGraphic</string>

					<key>FontInfo</key>
@@ -1444,7 +1444,7 @@ hasTimeStamp:: dateTime (F)\ 
						<key>Offset</key>

						<real>-1.3729002475738525</real>

						<key>Position</key>

						<real>0.52853047847747803</real>

						<real>0.51653310188691937</real>

						<key>RotationType</key>

						<integer>0</integer>

					</dict>
@@ -1534,7 +1534,7 @@ hasTimeStamp:: dateTime (F)\ 
						<key>ID</key>

						<integer>34662</integer>

						<key>Position</key>

						<real>0.77529799938201904</real>

						<real>0.78182001842403537</real>

					</dict>

					<key>ID</key>

					<integer>34666</integer>
@@ -1543,13 +1543,13 @@ hasTimeStamp:: dateTime (F)\ 
					<key>OrthogonalBarPoint</key>

					<string>{0, 0}</string>

					<key>OrthogonalBarPosition</key>

					<real>13.903972436604022</real>

					<real>7.9539724366040332</real>

					<key>Points</key>

					<array>

						<string>{590.19085573449388, 966.47457663249781}</string>

						<string>{600.07664285931412, 926.76663175928979}</string>

						<string>{711.54949777438355, 928.43329835972918}</string>

						<string>{746.42887526460731, 900.48191598007554}</string>

						<string>{729.89030145338882, 927.14287293200618}</string>

						<string>{748.5714413195243, 900.48191598007554}</string>

					</array>

					<key>Style</key>

					<dict>
@@ -16363,8 +16363,9 @@ Class}</string> 
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural









\f0\b\fs24 \cf2 Legend:\









\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural

















\b0 \









\b0 \cf2 \









\









}</string>









					</dict>








@@ -16434,7 +16435,7 @@ Class}</string>







			<key>BackgroundGraphic</key>









			<dict>









				<key>Bounds</key>









				<string>{{0, 0}, {1502.3565573770493, 1075}}</string>









				<string>{{0, 0}, {1311.4412568306011, 1075}}</string>









				<key>Class</key>









				<string>SolidGraphic</string>









				<key>ID</key>








@@ -16453,7 +16454,7 @@ Class}</string>







			<key>CanvasOrigin</key>









			<string>{0, 0}</string>









			<key>CanvasSize</key>









			<string>{1502.3565573770493, 1075}</string>









			<string>{1311.4412568306011, 1075}</string>









			<key>ColumnAlign</key>









			<integer>1</integer>









			<key>ColumnSpacing</key>








@@ -23204,7 +23205,7 @@ Measurement}</string>







						<key>ID</key>









						<integer>34875</integer>









						<key>Position</key>









						<real>0.50033481303870464</real>









						<real>0.50033479928970337</real>









						<key>RotationType</key>









						<integer>0</integer>









					</dict>








@@ -23372,7 +23373,7 @@ Measurement}</string>







						<key>ID</key>









						<integer>34859</integer>









						<key>Position</key>









						<real>0.58895390246303647</real>









						<real>0.58895391225814819</real>









						<key>RotationType</key>









						<integer>0</integer>









					</dict>








@@ -26408,7 +26409,7 @@ Measurement}</string>







						<key>ID</key>









						<integer>34831</integer>









						<key>Position</key>









						<real>0.76996552184027789</real>









						<real>0.7699655294418335</real>









						<key>RotationType</key>









						<integer>0</integer>









					</dict>








@@ -37337,8 +37338,9 @@ Class}</string>







\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural

















\f0\b\fs24 \cf2 Legend:\









\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural

















\b0 \









\b0 \cf2 \









\









}</string>









					</dict>








@@ -53385,8 +53387,9 @@ Class}</string>







\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural

















\f0\b\fs24 \cf2 Legend:\









\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural

















\b0 \









\b0 \cf2 \









\









}</string>









					</dict>








@@ -53460,13 +53463,11 @@ Class}</string>







		<key>BottomSlabHeight</key>









		<real>199</real>









		<key>CurrentSheet</key>









		<integer>1</integer>









		<integer>0</integer>









		<key>Expanded_Canvases</key>









		<array/>









		<key>FitInWindow</key>









		<true/>









		<key>Frame</key>









		<string>{{98, -900}, {1570, 877}}</string>









		<string>{{73, -900}, {1440, 877}}</string>









		<key>ShowInfo</key>









		<true/>









		<key>ShowRuler</key>








@@ -53476,9 +53477,9 @@ Class}</string>







		<key>SidebarWidth</key>









		<integer>230</integer>









		<key>VisibleRegion</key>









		<string>{{0, 0}, {1502.3565573770491, 1075}}</string>









		<string>{{0, 179.28571733893185}, {1275.7143074395708, 1045.7143035226943}}</string>









		<key>Zoom</key>









		<real>0.68093023255813956</real>









		<real>0.69999998807907104</real>









		<key>ZoomValues</key>









		<array>









			<array>

























SAREF4BLD/ontology/saref4bldg.ttl



+6
−0






























Original line number
Diff line number
Diff line







@@ -3045,6 +3045,9 @@ bldg:Measurement rdf:type owl:Class ;







                                   owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;









                                   owl:onDataRange xsd:float









                                 ] ;









                 owl:disjointWith bldg:Property ,









                                  <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> ,









                                  saref:UnitOfMeasure ;









                 rdfs:comment "Represents the measured value made over a property. It is also linked to the unit of measure in which the value is expressed and the timestamp of the measurement."@en ;









                 rdfs:label "Measurement"@en .


















@@ -3104,6 +3107,8 @@ bldg:PhysicalObject rdf:type owl:Class ;

















###  http://saref.linkeddata.es/def/bldg#Property









bldg:Property rdf:type owl:Class ;









              owl:disjointWith <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> ,









                               saref:UnitOfMeasure ;









              rdfs:comment "An aspect of an entity that can be observable by a sensor."@en ;









              rdfs:label "Property"@en .


















@@ -3657,6 +3662,7 @@ bldg:VibrationIsolator rdf:type owl:Class ;

















###  http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing









<http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> rdf:type owl:Class ;









                                                       owl:disjointWith saref:UnitOfMeasure ;









                                                       rdfs:comment "Anything with spatial extent, i.e. size, shape, or position. e.g. people, places, bowling balls, as well as abstract areas like cubes."@en ;









                                                       rdfs:isDefinedBy <http://www.w3.org/2003/01/geo/wgs84_pos#> ;









                                                       rdfs:label "Spatial thing"@en .
































SAREF4ENV/ENV.graffle



+12
−15






























Original line number
Diff line number
Diff line







@@ -26,7 +26,7 @@







	<key>MasterSheets</key>









	<array/>









	<key>ModificationDate</key>









	<string>2016-11-03 09:14:46 +0000</string>









	<string>2016-11-07 15:06:54 +0000</string>









	<key>Modifier</key>









	<string>María Poveda</string>









	<key>NotesVisible</key>








@@ -85,7 +85,7 @@







			<key>BackgroundGraphic</key>









			<dict>









				<key>Bounds</key>









				<string>{{0, 0}, {1173, 1381}}</string>









				<string>{{0, 0}, {1805.6774566473989, 1381}}</string>









				<key>Class</key>









				<string>SolidGraphic</string>









				<key>ID</key>








@@ -104,7 +104,7 @@







			<key>CanvasOrigin</key>









			<string>{0, 0}</string>









			<key>CanvasSize</key>









			<string>{1173, 1381}</string>









			<string>{1805.6774566473989, 1381}</string>









			<key>ColumnAlign</key>









			<integer>1</integer>









			<key>ColumnSpacing</key>








@@ -3407,7 +3407,6 @@ base (saref4env): http://saref.linkeddata.es/def/env#







\b \cf2                 









\b0 \cf0 rdfs: http://www.w3.org/2000/01/rdf-schema#









\b \cf2           \









\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural

















\b0 \cf0 owl: http://www.w3.org/2002/07/owl#                                                     time:http://www.w3.org/2006/time#\cf2 \









\








@@ -9858,7 +9857,8 @@ FrequencyUnit}</string>







{\colortbl;\red255\green255\blue255;\red27\green27\blue27;}









\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc

















\f0\fs26 \cf2 hasMeasurementFrequency}</string>









\f0\fs26 \cf2 hasFrequency\cf2 \expnd0\expndtw0\kerning0









Measurement}</string>









					</dict>









					<key>VFlip</key>









					<string>YES</string>








@@ -16477,7 +16477,7 @@ Class}</string>







				<string>YES</string>









			</dict>









			<key>HPages</key>









			<integer>3</integer>









			<integer>4</integer>









			<key>KeepToScale</key>









			<false/>









			<key>Layers</key>








@@ -22248,7 +22248,7 @@ relatesToProperty}</string>







\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc

















\f0\fs26 \cf2 \expnd0\expndtw0\kerning0









hasMeasurementFrequency}</string>









hasFrequencyMeasurement}</string>









					</dict>









					<key>VFlip</key>









					<string>YES</string>








@@ -42983,7 +42983,7 @@ FrequencyUnit}</string>







{\colortbl;\red255\green255\blue255;\red27\green27\blue27;}









\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc

















\f0\fs26 \cf2 hasMeasurementFrequency}</string>









\f0\fs26 \cf2 hasFrequencyMeasurement}</string>









					</dict>









					<key>VFlip</key>









					<string>YES</string>








@@ -44398,7 +44398,6 @@ base (saref4env): http://saref.linkeddata.es/def/env#







\b                









\b0 geo:http://www.w3.org/2003/01/geo/wgs84_pos#









\b \









\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural

















\b0 \cf0 rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#









\b \cf2                          








@@ -146351,11 +146350,9 @@ Unit}</string>







		<key>BottomSlabHeight</key>









		<real>332</real>









		<key>CurrentSheet</key>









		<integer>1</integer>









		<integer>2</integer>









		<key>Expanded_Canvases</key>









		<array/>









		<key>FitInWindow</key>









		<true/>









		<key>Frame</key>









		<string>{{-0, 4}, {1678, 1010}}</string>









		<key>ShowInfo</key>








@@ -146367,15 +146364,15 @@ Unit}</string>







		<key>SidebarWidth</key>









		<integer>230</integer>









		<key>VisibleRegion</key>









		<string>{{0, 0}, {1131, 865}}</string>









		<string>{{0, 2.8571429057997109}, {1615.7143132297365, 1235.714306758375}}</string>









		<key>Zoom</key>









		<real>1</real>









		<real>0.69999998807907104</real>









		<key>ZoomValues</key>









		<array>









			<array>









				<string>ENV</string>









				<real>1.2000000476837158</real>









				<real>0.0</real>









				<real>1</real>









			</array>









			<array>









				<string>WoT 2</string>

























SAREF4ENV/examples/example1ENVI.ttl



+48
−48






























Original line number
Diff line number
Diff line







@@ -67,8 +67,8 @@ xsd:duration rdf:type rdfs:Datatype .







               rdfs:label "is contained in"@en .





























###  http://saref.linkeddata.es/def/envi#hasMeasurementFrequency









<http://saref.linkeddata.es/def/envi#hasMeasurementFrequency> rdf:type owl:ObjectProperty .









###  http://saref.linkeddata.es/def/envi#hasFrequencyMeasurement









<http://saref.linkeddata.es/def/envi#hasFrequencyMeasurement> rdf:type owl:ObjectProperty .





























###  http://saref.linkeddata.es/def/envi#hasTransmissionPeriod








@@ -221,6 +221,21 @@ saref:UnitOfMeasure rdf:type owl:Class ;







#    Individuals









#################################################################



















###  http://saref.linkeddata.es/def/bldg#Bluettothv2.1









:Bluettothv2.1 rdf:type owl:NamedIndividual ,









                        <http://saref.linkeddata.es/def/envi#CommunicationInterface> ;









               <http://saref.linkeddata.es/def/envi#hasVersion> "v2.1"^^xsd:string ;









               rdfs:label "Bluettoth v2.1"@en .





























###  http://saref.linkeddata.es/def/bldg#FequencyMeasurementTESS005-UCM









:FequencyMeasurementTESS005-UCM rdf:type owl:NamedIndividual ,









                                         <http://saref.linkeddata.es/def/envi#FrequencyMeasurement> ;









                                saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_second-time> ;









                                saref:hasValue "10.0"^^xsd:float ;









                                rdfs:label "FequencyMeasurementTESS005-UCM"@en .





























###  http://saref.linkeddata.es/def/bldg#LocationTESS005-UCM









:LocationTESS005-UCM rdf:type owl:NamedIndividual ,









                              <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> ;








@@ -229,6 +244,20 @@ saref:UnitOfMeasure rdf:type owl:Class ;







                     rdfs:label "Location of photometer TESS stars5"@en .





























###  http://saref.linkeddata.es/def/bldg#MQTT-Broker









:MQTT-Broker rdf:type owl:NamedIndividual ,









                      <http://saref.linkeddata.es/def/envi#CommunicationProtocol> ;









             rdfs:label "MQTT-Broker"@en .





























###  http://saref.linkeddata.es/def/bldg#PeriodMeasurementTESS005-UCM









:PeriodMeasurementTESS005-UCM rdf:type owl:NamedIndividual ,









                                       <http://saref.linkeddata.es/def/envi#PeriodMeasurement> ;









                              saref:isMeasuredIn <http://www.w3.org/2006/time#unitSecond> ;









                              saref:hasValue "30.0"^^xsd:float ;









                              rdfs:label "PeriodMeasurementTESS005-UCM"@en .





























###  http://saref.linkeddata.es/def/bldg#PowerProfileTESS005-UCM









:PowerProfileTESS005-UCM rdf:type owl:NamedIndividual ,









                                  <https://w3id.org/saref4ee#PowerProfile> ;








@@ -244,10 +273,17 @@ saref:UnitOfMeasure rdf:type owl:Class ;







                  rdfs:label "Power of photometer TESS stars5"@en .





























###  http://saref.linkeddata.es/def/bldg#RS232v24









:RS232v24 rdf:type owl:NamedIndividual ,









                   <http://saref.linkeddata.es/def/envi#CommunicationInterface> ;









          <http://saref.linkeddata.es/def/envi#hasVersion> "v24"^^xsd:string ;









          rdfs:label "RS232 v24"@en .





























###  http://saref.linkeddata.es/def/bldg#TESS005-UCM









:TESS005-UCM rdf:type owl:NamedIndividual ,









                      <http://saref.linkeddata.es/def/envi#TESS> ;









             <http://saref.linkeddata.es/def/envi#hasMeasurementFrequency> :FequencyMeasurementTESS005-UCM ;









             <http://saref.linkeddata.es/def/envi#hasFrequencyMeasurement> :FequencyMeasurementTESS005-UCM ;









             <http://saref.linkeddata.es/def/envi#hasTransmissionPeriod> :PeriodMeasurementTESS005-UCM ;









             <http://saref.linkeddata.es/def/envi#makesMeasurement> :Measurement2016-10-05T08:15:30TESS005-UCM ,









                                                                    :Measurement2016-10-05T08:15:40TESS005-UCM ;








@@ -264,61 +300,20 @@ saref:UnitOfMeasure rdf:type owl:Class ;







             rdfs:label "TESS photometer stars5"@en .





























###  http://saref.linkeddata.es/def/envi#LightMagnitude









<http://saref.linkeddata.es/def/envi#LightMagnitude> rdf:type owl:NamedIndividual ,









                                                              <http://saref.linkeddata.es/def/envi#LightProperty> .





























###  http://saref.linkeddata.es/def/envi/example1#Bluettothv2.1









:Bluettothv2.1 rdf:type owl:NamedIndividual ,









                        <http://saref.linkeddata.es/def/envi#CommunicationInterface> ;









               <http://saref.linkeddata.es/def/envi#hasVersion> "v2.1"^^xsd:string ;









               rdfs:label "Bluettoth v2.1"@en .





























###  http://saref.linkeddata.es/def/envi/example1#FequencyMeasurementTESS005-UCM









:FequencyMeasurementTESS005-UCM rdf:type owl:NamedIndividual ,









                                         <http://saref.linkeddata.es/def/envi#FrequencyMeasurement> ;









                                saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_second-time> ;









                                saref:hasValue "10.0"^^xsd:float ;









                                rdfs:label "FequencyMeasurementTESS005-UCM"@en .





























###  http://saref.linkeddata.es/def/envi/example1#MQTT-Broker









:MQTT-Broker rdf:type owl:NamedIndividual ,









                      <http://saref.linkeddata.es/def/envi#CommunicationProtocol> ;









             rdfs:label "MQTT-Broker"@en .





























###  http://saref.linkeddata.es/def/envi/example1#PeriodMeasurementTESS005-UCM









:PeriodMeasurementTESS005-UCM rdf:type owl:NamedIndividual ,









                                       <http://saref.linkeddata.es/def/envi#PeriodMeasurement> ;









                              saref:isMeasuredIn <http://www.w3.org/2006/time#unitSecond> ;









                              saref:hasValue "30.0"^^xsd:float ;









                              rdfs:label "PeriodMeasurementTESS005-UCM"@en .





























###  http://saref.linkeddata.es/def/envi/example1#RS232v24









:RS232v24 rdf:type owl:NamedIndividual ,









                   <http://saref.linkeddata.es/def/envi#CommunicationInterface> ;









          <http://saref.linkeddata.es/def/envi#hasVersion> "v24"^^xsd:string ;









          rdfs:label "RS232 v24"@en .





























###  http://saref.linkeddata.es/def/envi/example1#Wi-Fiv802.11ah









###  http://saref.linkeddata.es/def/bldg#Wi-Fiv802.11ah









:Wi-Fiv802.11ah rdf:type owl:NamedIndividual ,









                         <http://saref.linkeddata.es/def/envi#CommunicationInterface> ;









                <http://saref.linkeddata.es/def/envi#hasVersion> "802.11ah"^^xsd:string ;









                rdfs:label "Wi-Fi v802.11ah"@en .





























###  http://saref.linkeddata.es/def/envi/example1#mgPerarcsec2









###  http://saref.linkeddata.es/def/bldg#mgPerarcsec2









:mgPerarcsec2 rdf:type owl:NamedIndividual ,









                       saref:UnitOfMeasure ;









              rdfs:label "mgPerarcsec2"@en .





























###  http://saref.linkeddata.es/def/envi/example1#Measurement2016-10-05T08:15:30TESS005-UCM









###  http://saref.linkeddata.es/def/bldg#Measurement2016-10-05T08:15:30TESS005-UCM









:Measurement2016-10-05T08:15:30TESS005-UCM rdf:type owl:NamedIndividual ,









                                                    <http://saref.linkeddata.es/def/envi#Measurement> ;









                                           <http://saref.linkeddata.es/def/envi#relatesToProperty> <http://saref.linkeddata.es/def/envi#LightMagnitude> ;








@@ -328,7 +323,7 @@ saref:UnitOfMeasure rdf:type owl:Class ;







                                           rdfs:label "Measurement 2016-10-05T08:15:30 TESS005-UCM"@en .





























###  http://saref.linkeddata.es/def/envi/example1#Measurement2016-10-05T08:15:40TESS005-UCM









###  http://saref.linkeddata.es/def/bldg#Measurement2016-10-05T08:15:40TESS005-UCM









:Measurement2016-10-05T08:15:40TESS005-UCM rdf:type owl:NamedIndividual ,









                                                    <http://saref.linkeddata.es/def/envi#Measurement> ;









                                           <http://saref.linkeddata.es/def/envi#relatesToProperty> <http://saref.linkeddata.es/def/envi#LightMagnitude> ;








@@ -338,6 +333,11 @@ saref:UnitOfMeasure rdf:type owl:Class ;







                                           rdfs:label "Measurement 2016-10-05T08:15:40 TESS005-UCM"@en .





























###  http://saref.linkeddata.es/def/envi#LightMagnitude









<http://saref.linkeddata.es/def/envi#LightMagnitude> rdf:type owl:NamedIndividual ,









                                                              <http://saref.linkeddata.es/def/envi#LightProperty> .





























###  http://www.w3.org/2006/time#unitSecond









<http://www.w3.org/2006/time#unitSecond> rdf:type owl:NamedIndividual ,









                                                  <http://www.w3.org/2006/time#TemporalUnit> .
































SAREF4ENV/ontology/saref4envi.ttl



+66
−7




























File changed.
Preview size limit exceeded, changes collapsed.