Merge branch 'issue-15' into 'master'

Closes issue #15

Closes #15 and #23

See merge request !30

examples/energymeter.ttl

@@ -13,6 +13,10 @@
   rdf:type owl:Ontology ;
   owl:imports <https://w3id.org/saref> ;
 .
+saref-em:MicroRenewable rdf:type owl:Class ;
+                     rdfs:subClassOf saref:FunctionRelated ;
+                     rdfs:comment "A device that generates renewable energy from natural resources such as the sun, wind and water.  A saref:MicroRenewable is typically used to accomplish saref:EnergyEfficiency."@en ;
+                     rdfs:label "Micro renewable"@en .
 saref-em:Efficiency
   rdf:type saref:Task ;
   rdfs:label "Efficiency"^^xsd:string ;

examples/lightswitch.ttl

@@ -14,6 +14,10 @@
   rdf:type owl:Ontology ;
   owl:imports <https://w3id.org/saref> ;
 .
+saref-ls:LightingDevice rdf:type owl:Class ;
+                     rdfs:subClassOf saref:FunctionRelated ;
+                     rdfs:comment "A device used for illumination, irradiation, signaling, or projection. A saref:LightingDevice is typically used to accomplish saref:Comfort."@en ;
+                     rdfs:label "Lighting device"@en .
 saref-ls:BuildingSpace_OfficeHall
   rdf:type saref:BuildingSpace ;
   rdfs:label "Office Hall"^^xsd:string ;

examples/multimedia.ttl

+@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix saref: <https://w3id.org/saref#> .
+@prefix saref-mm: <http://ontology.tno.nl/saref/multimedia#> .
+@prefix time: <http://www.w3.org/2006/time#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://ontology.tno.nl/saref/multimedia>
+  rdf:type owl:Ontology ;
+  owl:imports <https://w3id.org/saref> ;
+.
+
+saref-mm:Multimedia rdf:type owl:Class ;
+                 rdfs:subClassOf saref:FunctionRelated ;
+                 rdfs:comment "A device designed to display, store, record or play multimedia content such as audio, images, animation, video. A saref:Multimedia is typically used to accomplish saref:Entertainment."@en ;
+                 rdfs:label "Multimedia"@en .
+

examples/washingmachine.ttl

@@ -13,6 +13,26 @@
   rdf:type owl:Ontology ;
   owl:imports <https://w3id.org/saref> ;
 .
+
+saref-wm:WashingMachine rdf:type owl:Class ;
+                     rdfs:subClassOf saref:Appliance ,
+                                     saref:Load ,
+                                     [ rdf:type owl:Restriction ;
+                                       owl:onProperty saref:hasFunction ;
+                                       owl:someValuesFrom saref:StartStopFunction
+                                     ] ,
+                                     [ rdf:type owl:Restriction ;
+                                       owl:onProperty saref:hasProfile ;
+                                       owl:someValuesFrom saref:Profile
+                                     ] ,
+                                     [ rdf:type owl:Restriction ;
+                                       owl:onProperty saref:hasState ;
+                                       owl:someValuesFrom saref:StartStopState
+                                     ] ;
+                     rdfs:comment "A device of category saref:Appliance and saref:Load that performs an actuating function of type saref:StartStopFunction, can be found in the state saref:StartStopState, and can have a saref:Profile that characterizes its energy consumption. A saref:WashingMachine is typically used to saref:accomplish saref:Washing. "@en ;
+                     rdfs:label "Washing machine"@en .
+
+
 saref-wm:BuildingSpace_LaundryRoom
   rdf:type saref:BuildingSpace ;
   rdfs:label "Laundry room"^^xsd:string ;
@@ -100,7 +120,7 @@ saref-wm:StopState
   rdfs:label "Stop state"^^xsd:string ;
 .
 saref-wm:WashingMachine_WM802
-  rdf:type saref:WashingMachine ;
+  rdf:type saref-wm:WashingMachine ;
   rdfs:label "Washing machine WM802"^^xsd:string ;
   saref:accomplishes saref:Washing ;
   saref:hasCategory saref:Appliance ;