From 9227d86f1b961d07ca37cad65a149ec949c45f12 Mon Sep 17 00:00:00 2001
From: Maxime <maxime.lefrancois@emse.fr>
Date: Fri, 24 Jan 2025 15:17:40 +0100
Subject: [PATCH] closes #64

---
 examples/commodities.ttl | 36 ++++++++++++++++++++++++++++--------
 ontology/saref.ttl       | 38 --------------------------------------
 2 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/examples/commodities.ttl b/examples/commodities.ttl
index f473322..278b93c 100644
--- a/examples/commodities.ttl
+++ b/examples/commodities.ttl
@@ -16,18 +16,38 @@
     dcterms:title "Example commodities"@en ;
     dcterms:description "Example commodities"@en .
 
-ex:Electricity a saref:EnergyCommodity ;
-    rdfs:comment "A type of energy commodity"@en ;
+
+## Examples of commodity categories: energy commodities that groups electricity, gas, propane (narrower than gas), coal, and natural resource commodities.
+
+ex:EnergyCommodity a owl:Class ;
+    rdfs:subClassOf saref:Commodity ;
+    rdfs:label "Energy Commodity"@en ;
+    rdfs:comment "The class of energy commodities"@en .
+
+ex:NaturalResourceCommodity a owl:Class ;
+    rdfs:subClassOf saref:Commodity ;
+    rdfs:label "Natural Resource Commodity"@en ;
+    rdfs:comment "The class of natural resource commodities"@en .
+
+## Example commodities
+
+ex:Electricity a ex:EnergyCommodity ;
+    rdfs:comment "The electricity energy commodity"@en ;
     rdfs:label "Electricity"@en .
 
-ex:Gas a saref:EnergyCommodity , saref:NaturalResourceCommodity ;
-    rdfs:comment "A type of energy commodity"@en ;
+ex:Gas a ex:EnergyCommodity ;
+    rdfs:comment "The gas energy commodity"@en ;
     rdfs:label "Gas"@en .
 
-ex:Coal a saref:EnergyCommodity , saref:NaturalResourceCommodity ;
-    rdfs:comment "A type of commodity"@en ;
+ex:Propane a ex:EnergyCommodity ;
+    skos:broader ex:Gas ;
+    rdfs:comment "The propane energy commodity"@en ;
+    rdfs:label "Propane"@en .
+
+ex:Coal a ex:EnergyCommodity ;
+    rdfs:comment "The coal energy commodity"@en ;
     rdfs:label "Coal"@en .
 
-ex:Water a saref:NaturalResourceCommodity ;
-    rdfs:comment "A type of commodity"@en ;
+ex:Water a ex:NaturalResourceCommodity ;
+    rdfs:comment "The water natural resource commodity"@en ;
     rdfs:label "Water"@en .
diff --git a/ontology/saref.ttl b/ontology/saref.ttl
index 9e30418..a7817f6 100644
--- a/ontology/saref.ttl
+++ b/ontology/saref.ttl
@@ -529,44 +529,6 @@ saref:Commodity rdfs:subClassOf
             owl:onProperty skos:narrower ;
             owl:allValuesFrom saref:Commodity ] .
 
-
-## SAREF Core defines the category of energy commodities that groups electricity, gas, propane (narrower than gas), coal. It furthermore defines the category of natural resource commodity.
-
-saref:EnergyCommodity a owl:Class ;
-    rdfs:subClassOf saref:Commodity ;
-    rdfs:label "Energy Commodity"@en ;
-    rdfs:comment "The class of energy commodities"@en ;
-    skos:historyNote "V3.2.1: New category of commodities saref:EnergyCommodity"@en .
-
-saref:NaturalResourceCommodity a owl:Class ;
-    rdfs:subClassOf saref:Commodity ;
-    rdfs:label "Natural Resource Commodity"@en ;
-    rdfs:comment "The class of natural resource commodities"@en ;
-    skos:historyNote "V3.2.1: New category of commodities saref:NaturalResourceCommodity"@en .
-
-## the following entities will be introduced in the next major revision of SAREF
-
-saref:Electricity a saref:EnergyCommodity ;
-    rdfs:comment "The electricity energy commodity"@en ;
-    rdfs:label "Electricity"@en .
-
-saref:Gas a saref:EnergyCommodity ;
-    rdfs:comment "The gas energy commodity"@en ;
-    rdfs:label "Gas"@en .
-
-saref:Propane a saref:EnergyCommodity ;
-    skos:broader saref:Gas ;
-    rdfs:comment "The propane energy commodity"@en ;
-    rdfs:label "Propane"@en .
-
-saref:Coal a saref:EnergyCommodity ;
-    rdfs:comment "The coal energy commodity"@en ;
-    rdfs:label "Coal"@en .
-
-saref:Water a saref:NaturalResourceCommodity ;
-    rdfs:comment "The water natural resource commodity"@en ;
-    rdfs:label "Water"@en .
-
 ## isUsedFor
 
 saref:isUsedFor a owl:ObjectProperty ;
-- 
GitLab