Unverified Commit ffbb37c5 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

measurement -> observation

parent b22035af
Loading
Loading
Loading
Loading
Loading
+16 −16
Original line number Diff line number Diff line
@@ -53,18 +53,18 @@

:NumberRange_1
  a s4ener:NumberRange ;
  s4ener:endOfRange :Measurement_1 ; 
  s4ener:startOfRange :Measurement_2 ; 
  s4ener:endOfRange :Observation_1 ; 
  s4ener:startOfRange :Observation_2 ; 
  rdfs:label "Number range 1" ;
. 
:Measurement_1
  a saref:Measurement ;
:Observation_1
  a saref:Observation ;
  saref:hasValue "2500"^^xsd:decimal ;
  saref:relatesToProperty :Power_1 ;
  saref:isMeasuredIn om:kilowatt ; 
.
:Measurement_2
  a saref:Measurement ;
:Observation_2
  a saref:Observation ;
  saref:hasValue "2000"^^xsd:decimal ;
  saref:relatesToProperty :Power_1 ;
  saref:isMeasuredIn om:kilowatt ;
@@ -78,11 +78,11 @@
  rdfs:label "off" ;
  s4ener:hasPowerRange :PowerRange_1 ;
  s4ener:hasSupplyRange :NumberRange_2 ;
  s4ener:hasRunningCosts :Measurement_7 ;
  s4ener:hasRunningCosts :Observation_7 ;
  s4ener:abnormalConditionOnly "false"^^xsd:boolean ;
.

:Measurement_7 rdf:type saref:Measurement ;
:Observation_7 rdf:type saref:Observation ;
  saref:hasValue "0"^^xsd:decimal ;
  saref:relatesToProperty :Price_1 ;
  saref:isMeasuredIn <https://spec.edmcouncil.org/fibo/ontology/FND/Accounting/ISO4217-CurrencyCodes/EUR> ;
@@ -94,18 +94,18 @@
.

:NumberRange_3 rdf:type s4ener:NumberRange ;
  s4ener:endOfRange :Measurement_5 ;
  s4ener:startOfRange :Measurement_6 ;
  s4ener:endOfRange :Observation_5 ;
  s4ener:startOfRange :Observation_6 ;
  rdfs:label "Number range 3" ;
.

:Measurement_5 rdf:type saref:Measurement ;
:Observation_5 rdf:type saref:Observation ;
  saref:hasValue "0"^^xsd:decimal ;
  saref:relatesToProperty :Power_1 ;
  saref:isMeasuredIn om:kilowatt ; 
.

:Measurement_6 rdf:type saref:Measurement ;
:Observation_6 rdf:type saref:Observation ;
  saref:hasValue "0"^^xsd:decimal ;
  saref:relatesToProperty :Power_1 ;
  saref:isMeasuredIn om:kilowatt ; 
@@ -113,18 +113,18 @@

:NumberRange_2 rdf:type s4ener:NumberRange ;
  rdfs:label "Supply range";
  s4ener:endOfRange :Measurement_3 ; 
  s4ener:startOfRange :Measurement_4 ; 
  s4ener:endOfRange :Observation_3 ; 
  s4ener:startOfRange :Observation_4 ; 
  rdfs:label "Number range 2" ;
.

:Measurement_3 rdf:type saref:Measurement ;
:Observation_3 rdf:type saref:Observation ;
  saref:hasValue "0"^^xsd:decimal ;
  saref:relatesToProperty :Power_1 ;
  saref:isMeasuredIn om:kilowatt ; 
.

:Measurement_4 rdf:type saref:Measurement ;
:Observation_4 rdf:type saref:Observation ;
  saref:hasValue "0"^^xsd:decimal ;
  saref:relatesToProperty :Power_1 ;
  saref:isMeasuredIn om:kilowatt ; 
+15 −15
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@
.

:PresentFillLevel_1
  a saref:Measurement ;
  a saref:Observation ;
  saref:hasValue "60"^^xsd:decimal ;
  saref:isMeasuredIn unit:PERCENT ;
  saref:relatesToProperty :Energy_1 ;
@@ -85,49 +85,49 @@
:LeakageBehaviourElement_1
  a s4ener:LeakageBehaviourElement ;
  s4ener:hasFillLevelRange :NumberRange_1 ;
  s4ener:leakageRate :DataPoint_11 ; #"10"^^xsd:decimal ; # todo: make measurement
  s4ener:leakageRate :DataPoint_11 ; #"10"^^xsd:decimal ; # todo: make Observation
  rdfs:label "Leakage behaviour element 1" ;
.
:DataPoint_11 rdf:type s4ener:DataPoint . # todo: extend
:LeakageBehaviourElement_2
  a s4ener:LeakageBehaviourElement ;
  s4ener:hasFillLevelRange :NumberRange_2 ;
  s4ener:leakageRate :DataPoint_12 ; # "20"^^xsd:decimal ; # todo: make measurement
  s4ener:leakageRate :DataPoint_12 ; # "20"^^xsd:decimal ; # todo: make Observation
  rdfs:label "Leakage behaviour element 2" ;
.
:DataPoint_12 rdf:type s4ener:DataPoint .
:NumberRange_1
  a s4ener:NumberRange ;
  s4ener:endOfRange :Measurement_1 ; #"25"^^xsd:decimal ;
  s4ener:startOfRange :Measurement_2 ; #"15"^^xsd:decimal ;
  s4ener:endOfRange :Observation_1 ; #"25"^^xsd:decimal ;
  s4ener:startOfRange :Observation_2 ; #"15"^^xsd:decimal ;
  rdfs:label "Number range 1" ;
.
:Measurement_1
  a saref:Measurement ;
:Observation_1
  a saref:Observation ;
  saref:relatesToProperty :Energy_1 ;
  saref:hasValue "25"^^xsd:decimal ;
  saref:isMeasuredIn om:kilowatt ;
.
:Measurement_2
  a saref:Measurement ;
:Observation_2
  a saref:Observation ;
  saref:relatesToProperty :Energy_1 ;
  saref:hasValue "15"^^xsd:decimal ;
  saref:isMeasuredIn om:kilowatt ;
.
:NumberRange_2
  a s4ener:NumberRange ;
  s4ener:endOfRange :Measurement_3 ; #"35"^^xsd:decimal ;
  s4ener:startOfRange :Measurement_4 ; #"25"^^xsd:decimal ;
  s4ener:endOfRange :Observation_3 ; #"35"^^xsd:decimal ;
  s4ener:startOfRange :Observation_4 ; #"25"^^xsd:decimal ;
  rdfs:label "Number range 2" ;
.
:Measurement_3
  a saref:Measurement ;
:Observation_3
  a saref:Observation ;
  saref:relatesToProperty :Energy_1 ;
  saref:hasValue "35"^^xsd:decimal ;
  saref:isMeasuredIn om:kilowatt ;
.
:Measurement_4
  a saref:Measurement ;
:Observation_4
  a saref:Observation ;
  saref:relatesToProperty :Energy_1 ;
  saref:hasValue "25"^^xsd:decimal ;
  saref:isMeasuredIn om:kilowatt ;
+721 −0

File added.

Preview size limit exceeded, changes collapsed.

+9 −9
Original line number Diff line number Diff line
@@ -103,18 +103,18 @@ ex:HeatingSystem
  saref:accomplishes ex:Heating ;
  saref:hasDescription "Heating system HS0001 is an example of how to instantiate a heating system with hot water tank using SAREF4ENER"^^xsd:string ;
.
ex:Measurement_1
  rdf:type saref:Measurement ;
  rdfs:label "Measurement 1"^^xsd:string ;
ex:Observation_1
  rdf:type saref:Observation ;
  rdfs:label "Observation 1"^^xsd:string ;
  saref:hasValue "0.2"^^xsd:string ;
  saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/kilowatt_hour> ;
  saref:isMeasuredIn <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt_hour> ;
  saref:relatesToProperty ex:Energy_1 ;
.
ex:Measurement_2
  rdf:type saref:Measurement ;
  rdfs:label "Measurement 2"^^xsd:string ;
ex:Observation_2
  rdf:type saref:Observation ;
  rdfs:label "Observation 2"^^xsd:string ;
  saref:hasValue "0.2"^^xsd:string ;
  saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/kilowatt> ;
  saref:isMeasuredIn <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> ;
  saref:relatesToProperty ex:Power_1 ;
.
ex:PowerProfile-1-HS0001
@@ -168,7 +168,7 @@ ex:Slot-1-HS0001
  rdf:type s4ener:Slot ;
  rdfs:label "Slot 1 HS0001"^^xsd:string ;
  s4ener:belongsTo ex:PowerSequence-1-HS0001 ;
  s4ener:hasSlotValue ex:Measurement_1, ex:Measurement_2 ;
  s4ener:hasSlotValue ex:Observation_1, ex:Observation_2 ;
  s4ener:slotNumber "1"^^xsd:unsignedInt ;
.
ex:Slot-2-HS0001
+6 −6
Original line number Diff line number Diff line
@@ -153,42 +153,42 @@
  rdfs:label "Number range 3" ;
.
:StartOfRange_1 
  a saref:Measurement ;
  a saref:Observation ;
  saref:isMeasuredIn om:watt ;
  saref:relatesToProperty :Power_1 ;
  saref:hasValue "0"^^xsd:decimal ;
.

:StartOfRange_2 
  a saref:Measurement ;
  a saref:Observation ;
  saref:isMeasuredIn om:watt ;
  saref:relatesToProperty :Power_1 ;
  saref:hasValue "-3000"^^xsd:decimal ;
.

:StartOfRange_3 
  a saref:Measurement ;
  a saref:Observation ;
  saref:isMeasuredIn om:watt ;
  saref:relatesToProperty :Power_1 ;
  saref:hasValue "-2500"^^xsd:decimal ;
.

:EndOfRange_1
  a saref:Measurement ;
  a saref:Observation ;
  saref:isMeasuredIn om:watt ;
  saref:relatesToProperty :Power_1 ;
  saref:hasValue "0"^^xsd:decimal ;
.

:EndOfRange_2 
  a saref:Measurement ;
  a saref:Observation ;
  saref:isMeasuredIn om:watt ;
  saref:relatesToProperty :Power_1 ;
  saref:hasValue "-3000"^^xsd:decimal ;
.

:EndOfRange_3
  a saref:Measurement ;
  a saref:Observation ;
  saref:isMeasuredIn om:watt ;
  saref:relatesToProperty :Power_1 ;
  saref:hasValue "-1500"^^xsd:decimal ;
Loading