Merge branch 'issue-4' into 'develop-v1.1.2'

closes #4

Closes #4

See merge request !5

examples/heatingsystem.ttl

@@ -70,143 +70,143 @@ time:PowerSequence-HS0001_morning
   time:hasBeginning time:Beginning_PowerSequence-HS0001_morning ;
   time:hasEnd time:End_PowerSequence-HS0001_morning ;
 .
-s4ener:AlternativesGroup-1-HS0001
+ex:AlternativesGroup-1-HS0001
   rdf:type s4ener:AlternativesGroup ;
   rdfs:label "Alternatives group-1-HS0001"^^xsd:string ;
-  saref:consistsOf s4ener:PowerSequence-1-HS0001 ;
+  saref:consistsOf ex:PowerSequence-1-HS0001 ;
   s4ener:alternativesGroupID 1 ;
-  s4ener:belongsTo s4ener:PowerProfile-1-HS0001 ;
+  s4ener:belongsTo ex:PowerProfile-1-HS0001 ;
 .
-s4ener:AlternativesGroup-2-HS0001
+ex:AlternativesGroup-2-HS0001
   rdf:type s4ener:AlternativesGroup ;
   rdfs:label "Alternatives group-2-HS0001"^^xsd:string ;
-  saref:consistsOf s4ener:PowerSequence-2-HS0001 ;
-  saref:consistsOf s4ener:PowerSequence-3-HS0001 ;
+  saref:consistsOf ex:PowerSequence-2-HS0001 ;
+  saref:consistsOf ex:PowerSequence-3-HS0001 ;
   s4ener:alternativesGroupID 2 ;
-  s4ener:belongsTo s4ener:PowerProfile-1-HS0001 ;
+  s4ener:belongsTo ex:PowerProfile-1-HS0001 ;
 .
-s4ener:EndTimeDurationDescription_PS-1-HS0001
+ex:EndTimeDurationDescription_PS-1-HS0001
   rdf:type s4ener:EndTimeDurationDescription ;
   rdfs:label "End time duration description PS-1-HS0001"^^xsd:string ;
 .
-s4ener:EndTime_PS-1-HS0001
+ex:EndTime_PS-1-HS0001
   rdf:type s4ener:EndTime ;
   rdfs:label "End time PS-1-HS0001"^^xsd:string ;
 .
-s4ener:Energy_1
+ex:Energy_1
   rdf:type s4ener:Energy ;
   rdfs:label "Energy 1"^^xsd:string ;
-  saref:isMeasuredByDevice s4ener:HeatingSystem ;
+  saref:isMeasuredByDevice ex:HeatingSystem ;
 .
-s4ener:Heating
+ex:Heating
   rdf:type saref:Task ;
   rdfs:label "Heating"^^xsd:string ;
 .
-s4ener:HeatingSystem
+ex:HeatingSystem
   rdf:type s4ener:Device ;
   rdfs:label "Heating system"^^xsd:string ;
   saref:accomplishes saref:EnergyEfficiency ;
-  saref:accomplishes s4ener:Heating ;
+  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 ;
 .
-s4ener:Measurement_1
+ex:Measurement_1
   rdf:type saref:Measurement ;
   rdfs:label "Measurement 1"^^xsd:string ;
   saref:hasValue "0.2"^^xsd:string ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/kilowatt_hour> ;
-  saref:relatesToProperty s4ener:Energy_1 ;
+  saref:relatesToProperty ex:Energy_1 ;
 .
-s4ener:Measurement_2
+ex:Measurement_2
   rdf:type saref:Measurement ;
   rdfs:label "Measurement 2"^^xsd:string ;
   saref:hasValue "0.2"^^xsd:string ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/kilowatt> ;
-  saref:relatesToProperty s4ener:Power_1 ;
+  saref:relatesToProperty ex:Power_1 ;
 .
-s4ener:PowerProfile-1-HS0001
+ex:PowerProfile-1-HS0001
   rdf:type s4ener:PowerProfile ;
   rdfs:label "Power profile-1-HS0001"^^xsd:string ;
-  saref:consistsOf s4ener:AlternativesGroup-1-HS0001 ;
-  saref:consistsOf s4ener:AlternativesGroup-2-HS0001 ;
-  saref:hasTime s4ener:Time_PowerProfile-1-HS0001 ;
-  saref:isAbout s4ener:Energy_1 ;
-  saref:isAbout s4ener:Power_1 ;
+  saref:consistsOf ex:AlternativesGroup-1-HS0001 ;
+  saref:consistsOf ex:AlternativesGroup-2-HS0001 ;
+  saref:hasTime ex:Time_PowerProfile-1-HS0001 ;
+  saref:isAbout ex:Energy_1 ;
+  saref:isAbout ex:Power_1 ;
   s4ener:alternativesCount 2 ;
-  s4ener:belongsTo s4ener:HeatingSystem ;
+  s4ener:belongsTo ex:HeatingSystem ;
   s4ener:nodeRemoteControllable "true"^^xsd:boolean ;
   s4ener:supportsReselection "true"^^xsd:boolean ;
   s4ener:supportsSingleSlotSchedulingOnly "true"^^xsd:boolean ;
   s4ener:totalSequencesCountMax "1"^^xsd:unsignedInt ;
 .
-s4ener:PowerSequence-1-HS0001
+ex:PowerSequence-1-HS0001
   rdf:type s4ener:PowerSequence ;
   rdfs:label "Power sequence-1-HS0001"^^xsd:string ;
-  saref:consistsOf s4ener:Slot-1-HS0001 ;
+  saref:consistsOf ex:Slot-1-HS0001 ;
   saref:hasTime time:PowerSequence-HS0001_morning ;
-  saref:hasTime s4ener:StartTime_1 ;
-  s4ener:belongsTo s4ener:AlternativesGroup-1-HS0001 ;
+  saref:hasTime ex:StartTime_1 ;
+  s4ener:belongsTo ex:AlternativesGroup-1-HS0001 ;
   s4ener:isPausable "false"^^xsd:boolean ;
   s4ener:isStoppable "false"^^xsd:boolean ;
 .
-s4ener:PowerSequence-2-HS0001
+ex:PowerSequence-2-HS0001
   rdf:type s4ener:PowerSequence ;
   rdfs:label "Power sequence-2-HS0001"^^xsd:string ;
-  saref:consistsOf s4ener:Slot-2-HS0001 ;
+  saref:consistsOf ex:Slot-2-HS0001 ;
   saref:hasTime time:PowerSequence-HS0001_afternoon ;
-  saref:hasTime s4ener:StartTime_1 ;
-  s4ener:belongsTo s4ener:AlternativesGroup-2-HS0001 ;
+  saref:hasTime ex:StartTime_1 ;
+  s4ener:belongsTo ex:AlternativesGroup-2-HS0001 ;
   s4ener:greenest "true"^^xsd:boolean ;
   s4ener:isPausable "false"^^xsd:boolean ;
   s4ener:isStoppable "false"^^xsd:boolean ;
 .
-s4ener:PowerSequence-3-HS0001
+ex:PowerSequence-3-HS0001
   rdf:type s4ener:PowerSequence ;
   rdfs:label "Power sequence-3-HS0001"^^xsd:string ;
-  saref:consistsOf s4ener:Slot-3-HS0001 ;
+  saref:consistsOf ex:Slot-3-HS0001 ;
   saref:hasTime time:PowerSequence-HS0001_afternoon ;
-  saref:hasTime s4ener:StartTime_1 ;
-  s4ener:belongsTo s4ener:AlternativesGroup-2-HS0001 ;
+  saref:hasTime ex:StartTime_1 ;
+  s4ener:belongsTo ex:AlternativesGroup-2-HS0001 ;
   s4ener:cheapest "true"^^xsd:boolean ;
   s4ener:isPausable "false"^^xsd:boolean ;
   s4ener:isStoppable "false"^^xsd:boolean ;
 .
-s4ener:Power_1
+ex:Power_1
   rdf:type s4ener:Power ;
   rdfs:label "Power 1"^^xsd:string ;
-  saref:isMeasuredByDevice s4ener:HeatingSystem ;
-  saref:relatesToMeasurement s4ener:Measurement_2 ;
+  saref:isMeasuredByDevice ex:HeatingSystem ;
+  saref:relatesToMeasurement ex:Measurement_2 ;
 .
-s4ener:Slot-1-HS0001
+ex:Slot-1-HS0001
   rdf:type s4ener:Slot ;
   rdfs:label "Slot 1 HS0001"^^xsd:string ;
-  s4ener:belongsTo s4ener:PowerSequence-1-HS0001 ;
-  s4ener:hasEnergyValueType s4ener:Energy_1 ;
-  s4ener:hasPowerValueType s4ener:Power_1 ;
+  s4ener:belongsTo ex:PowerSequence-1-HS0001 ;
+  s4ener:hasEnergyValueType ex:Energy_1 ;
+  s4ener:hasPowerValueType ex:Power_1 ;
   s4ener:slotNumber "1"^^xsd:unsignedInt ;
 .
-s4ener:Slot-2-HS0001
+ex:Slot-2-HS0001
   rdf:type s4ener:Slot ;
   rdfs:label "Slot 2 HS0001"^^xsd:string ;
-  s4ener:belongsTo s4ener:PowerSequence-2-HS0001 ;
+  s4ener:belongsTo ex:PowerSequence-2-HS0001 ;
   s4ener:slotNumber "2"^^xsd:unsignedInt ;
 .
-s4ener:Slot-3-HS0001
+ex:Slot-3-HS0001
   rdf:type s4ener:Slot ;
   rdfs:label "Slot 3 HS0001"^^xsd:string ;
-  s4ener:belongsTo s4ener:PowerSequence-3-HS0001 ;
+  s4ener:belongsTo ex:PowerSequence-3-HS0001 ;
   s4ener:slotNumber "3"^^xsd:unsignedInt ;
 .
-s4ener:StartTimeDurationDescription_1
+ex:StartTimeDurationDescription_1
   rdf:type s4ener:StartTimeDurationDescription ;
   rdfs:label "Start time duration description 1"^^xsd:string ;
   s4ener:xsdDuration "PT0H5M" ;
 .
-s4ener:StartTime_1
+ex:StartTime_1
   rdf:type s4ener:StartTime ;
   rdfs:label "Start time 1"^^xsd:string ;
-  time:hasDurationDescription s4ener:StartTimeDurationDescription_1 ;
+  time:hasDurationDescription ex:StartTimeDurationDescription_1 ;
 .
-s4ener:Time_PowerProfile-1-HS0001
+ex:Time_PowerProfile-1-HS0001
   rdf:type saref:Time ;
   rdfs:label "Time Power profile-1-HS0001"^^xsd:string ;
   saref:consistsOf time:DateTimeInterval_PowerProfile-1-HS0001 ;