More ontology cleanup

diff --git a/Ontology/src/1.0/AbstractEntityOntology-1.0.ttl b/Ontology/src/1.0/AbstractEntityOntology-1.0.ttl
index 83b78d8625fae4f78120954ae396e52c6c5ba0be..f68a9ac7487686c3784eebfe30f8583b4933f3d8 100644 (file)
--- a/Ontology/src/1.0/AbstractEntityOntology-1.0.ttl
+++ b/Ontology/src/1.0/AbstractEntityOntology-1.0.ttl
@@ -97,11 +97,19 @@ smartapi:ServiceSubscription a owl:Class ;
 
 # service providers
 
+smartapi:FacilityManagementEntity a owl:Class ;
+  rdfs:label "Facility management"@en ;
+  rdfs:label "Kiinteistöhuolto"@fi ;
+  rdfs:comment "Entity related to facility management"@en ;
+  vs:term_status "testing" ;
+  rdfs:subClassOf smartapi:Service;
+  rdfs:isDefinedBy smartapi:AbstractEntityOntology.
+  
 smartapi:ServiceProvider a owl:Class ;
   rdfs:label "Service provider"@en ;
   rdfs:label "Palveluntarjoaja"@fi ;
   rdfs:comment "The class of service providers."@en ;
-  rdfs:subClassOf smartapi:AbstractEntity  ;
+  rdfs:subClassOf smartapi:Organization  ;
   rdfs:isDefinedBy smartapi:AbstractEntityOntology ;
   vs:term_status "testing" .
   

diff --git a/Ontology/src/1.0/DataOntology-1.0.ttl b/Ontology/src/1.0/DataOntology-1.0.ttl
index 84b2671f115edeec15103517ef0313bb195956d9..e2fef2ae3d7eed83c767ac231ef9cbcba9ecf955 100644 (file)
--- a/Ontology/src/1.0/DataOntology-1.0.ttl
+++ b/Ontology/src/1.0/DataOntology-1.0.ttl
@@ -45,11 +45,9 @@ smartapi:DataOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <https://w3id.org/smartapi/> ;
-  owl:versionIRI <https://w3id.org/smartapi/DataOntology/1.0> ;
-  owl:versionInfo "v1.0" ;
-  owl:imports <http://purl.org/goodrelations/v1.owl> ;
-  owl:imports <http://data.qudt.org/qudt/owl/1.0.0/qudt.owl> .
+  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0> ;
+  owl:versionIRI <http://www.smart-api.io/ontology/DataOntology/1.0> ;
+  owl:versionInfo "v1.0" .
 
 # value object
 
@@ -470,10 +468,18 @@ smartapi:calculationMethod a owl:ObjectProperty ;
   rdfs:isDefinedBy smartapi:DataOntology ;
   vs:term_status "testing" .
 
+smartapi:Calculable a owl:Class ;
+  rdfs:label "Calculable" @en ;
+  rdfs:comment "An object that can be calculated on."@en ;
+  rdfs:isDefinedBy smartapi:DataOntology ;
+  rdfs:subClassOf smartapi:Object;
+  vs:term_status "testing". 
+  
 smartapi:CalculationMethod a owl:Class ;
   rdfs:label "Calculation method"@en ;
   rdfs:comment "A method, e.g. a given function or an algorithm used for the calculation."@en ;
   rdfs:isDefinedBy smartapi:DataOntology ;
+  rdfs:subClassOf smartapi:Calculable;
   vs:term_status "testing".  
 
 smartapi:LinearCalculation a owl:Class ;

diff --git a/Ontology/src/1.0/EntityOntology-1.0.ttl b/Ontology/src/1.0/EntityOntology-1.0.ttl
index f8588e35781c1518aee0dc3176ab9700c454a400..a5e1d2d7b145a59d094c4a5bb19746c1e67c516f 100644 (file)
--- a/Ontology/src/1.0/EntityOntology-1.0.ttl
+++ b/Ontology/src/1.0/EntityOntology-1.0.ttl
@@ -84,14 +84,6 @@ smartapi:AbstractEntity a owl:Class ;
   owl:disjointWith smartapi:PhysicalEntity;
   rdfs:isDefinedBy smartapi:EntityOntology.
 
-smartapi:FacilityManagementEntity a owl:Class ;
-  rdfs:label "Facility management"@en ;
-  rdfs:label "Kiinteistöhuolto"@fi ;
-  rdfs:comment "Entity related to facility management"@en ;
-  vs:term_status "testing" ;
-  rdfs:subClassOf smartapi:Entity;
-  rdfs:isDefinedBy smartapi:EntityOntology.
-
 #smartapi:Endurant a owl:Class;
 #  rdfs:label "Endurant"@en ;
 #  rdfs:comment """Also known as continuants, or in some cases as substance, endurants are those entities that can be observed-perceived as a complete concept, at no matter which given snapshot of time. Were we to freeze time we would still be able to perceive/conceive the entire endurant.
@@ -138,7 +130,7 @@ smartapi:hasCapability rdf:type owl:ObjectProperty ;
 smartapi:Optimizing a owl:Class ;
   rdfs:label "Optimizing"@en ;
   rdfs:label "Optimointi"@fi ;
-  rdfs:comment "Optimizing is a continuous task or process that an entity can be performing to optimize"@en ;
+  rdfs:comment "Optimizing is a continuous task or process that an entity can be performing to optimize the functioning of an entity"@en ;
   rdfs:subClassOf smartapi:Activity ;
   vs:term_status "testing" ;
   rdfs:isDefinedBy smartapi:EntityOntology .
@@ -146,11 +138,59 @@ smartapi:Optimizing a owl:Class ;
 smartapi:Forecasting a owl:Class ;
   rdfs:label "Forecasting"@en ;
   rdfs:label "Ennustaminen"@fi ;
-  rdfs:comment "Forecasting is a continuous task or process that an entity can be performing to forecast"@en ;
+  rdfs:comment "Forecasting is a continuous task or process that an entity can be performing to forecast the values of some property"@en ;
+  rdfs:subClassOf smartapi:Activity ;
+  vs:term_status "testing" ;
+  rdfs:isDefinedBy smartapi:EntityOntology .
+
+smartapi:Filtering a owl:Class ;
+  rdfs:label "Filtering"@en ;
+  rdfs:label "Suodattaminen"@fi ;
+  rdfs:comment "Filtering is a task performed to filter out values of properties to clean up data"@en ;
+  rdfs:subClassOf smartapi:Activity ;
+  vs:term_status "testing" ;
+  rdfs:isDefinedBy smartapi:EntityOntology .
+  
+smartapi:Analyzing a owl:Class ;
+  rdfs:label "Analyzing"@en ;
+  rdfs:label "Aalysointi"@fi ;
+  rdfs:comment "Analyzing is a task performed to perform a mathematical analysis or other calculation operation on a set of data"@en ;
+  rdfs:subClassOf smartapi:Activity ;
+  vs:term_status "testing" ;
+  rdfs:isDefinedBy smartapi:EntityOntology .
+  
+smartapi:Storing a owl:Class ;
+  rdfs:label "Storing"@en ;
+  rdfs:label "Tallennus"@fi ;
+  rdfs:comment "Storing is a task performed to store a set of data either temporarily or permanently"@en ;
+  rdfs:subClassOf smartapi:Activity ;
+  vs:term_status "testing" ;
+  rdfs:isDefinedBy smartapi:EntityOntology .
+  
+smartapi:Editing a owl:Class ;
+  rdfs:label "Editing"@en ;
+  rdfs:label "Muokkaus"@fi ;
+  rdfs:comment "Editing is a task performed to edit some set of data"@en ;
   rdfs:subClassOf smartapi:Activity ;
   vs:term_status "testing" ;
   rdfs:isDefinedBy smartapi:EntityOntology .
 
+smartapi:Capturing a owl:Class ;
+  rdfs:label "Capturing"@en ;
+  rdfs:label "Mittaus"@fi ;
+  rdfs:comment "Capturing is a task performed to capture (i.e. record) a set of data"@en ;
+  rdfs:subClassOf smartapi:Activity ;
+  vs:term_status "testing" ;
+  rdfs:isDefinedBy smartapi:EntityOntology .
+  
+smartapi:Controlling a owl:Class ;
+  rdfs:label "Controlling"@en ;
+  rdfs:label "Ohjaus"@fi ;
+  rdfs:comment "Controlling is a task performed to control the behavior of some entity"@en ;
+  rdfs:subClassOf smartapi:Activity ;
+  vs:term_status "testing" ;
+  rdfs:isDefinedBy smartapi:EntityOntology .
+  
 # links between entities
 
 smartapi:belongsTo rdf:type owl:ObjectProperty ;

diff --git a/Ontology/src/1.0/IndividualsOntology-1.0.ttl b/Ontology/src/1.0/IndividualsOntology-1.0.ttl
index 8e795fab96051be8c493f5b7a5318dba97fbfe7e..e4085de51d737a28b24fe3ef7b3546f1fe695933 100644 (file)
--- a/Ontology/src/1.0/IndividualsOntology-1.0.ttl
+++ b/Ontology/src/1.0/IndividualsOntology-1.0.ttl
@@ -45,8 +45,7 @@ smartapi:IndividualsOntology a owl:Ontology , voaf:Ontology ;
   vann:preferredNamespacePrefix "smartapi" ;
   vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
   owl:versionIRI <http://www.smart-api.io/ontology/1.0/IndividualsOntology/1.0> ;
-  owl:versionInfo "v1.0" ;
-  owl:imports <http://purl.org/goodrelations/v1.owl> .
+  owl:versionInfo "v1.0" .
 
 
 #Allows to express the category for data such as its intended role, can be extended on different domains

diff --git a/Ontology/src/1.0/NetworkingOntology-1.0.ttl b/Ontology/src/1.0/NetworkingOntology-1.0.ttl
index 2f8916cb3fb718fbfa05a2416d3003821c8e415f..198596601836e1a4906de6d2a90d16c3f147330b 100644 (file)
--- a/Ontology/src/1.0/NetworkingOntology-1.0.ttl
+++ b/Ontology/src/1.0/NetworkingOntology-1.0.ttl
@@ -276,6 +276,7 @@ smartapi:Error a owl:Class ;
   rdfs:label "Error"@en ;
   rdfs:comment "A class used to express an error."@en ;
   rdfs:isDefinedBy smartapi:NetworkingOntology ;
+  rdfs:subClassOf smartapi:Object;
   vs:term_status "testing" .
 
 smartapi:error a owl:ObjectProperty ;
@@ -362,6 +363,7 @@ smartapi:Status a owl:Class ;
   rdfs:label "Status"@en ;
   rdfs:comment "A status of the requested operation."@en ;
   rdfs:isDefinedBy smartapi:NetworkingOntology ;
+  rdfs:subClassOf smartapi:Object;
   vs:term_status "testing" .
 
 smartapi:statusCode a owl:DatatypeProperty ;
@@ -433,4 +435,4 @@ smartapi:total a owl:DatatypeProperty;
   rdfs:isDefinedBy smartapi:NetworkingOntology ;
   rdfs:range rdf:XMLLiteral ;
   vs:term_status "testing" .
-   
\ No newline at end of file
+   

diff --git a/Ontology/src/1.0/QuantityUnitOntology-1.0.ttl b/Ontology/src/1.0/QuantityUnitOntology-1.0.ttl
index 2365af6f6251352cd9b133efa664a2d5e2b8c8c4..4b0a8fea8cfce8f4e5b9ed8dc94b1031d6f832c9 100644 (file)
--- a/Ontology/src/1.0/QuantityUnitOntology-1.0.ttl
+++ b/Ontology/src/1.0/QuantityUnitOntology-1.0.ttl
@@ -45,13 +45,12 @@ smartapi:QuantityUnitOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Lynda TEMAL" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Hannu Järvinen" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
+  dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
   vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
   owl:versionIRI <http://www.smart-api.io/ontology/1.0/QuantityUnitOntology/1.0> ;
-  owl:versionInfo "v1.0" ;
-  owl:imports <http://data.qudt.org/qudt/owl/1.0.0/qudt.owl> ;
-  owl:imports <http://data.qudt.org/qudt/owl/1.0.0/quantity.owl> ;
-  owl:imports <http://data.qudt.org/qudt/owl/1.0.0/unit.owl> .
+  owl:versionInfo "v1.0" .
+
 
 # datatype property
 
@@ -1221,4 +1220,4 @@ smartapi:HomeAwayState a qudt:QuantityKind ;
   rdfs:subClassOf smartapi:EnumerationState;
   vs:term_status "testing" ;
   rdfs:isDefinedBy smartapi:QuantityUnitOntology.
-    
\ No newline at end of file
+    

diff --git a/Ontology/src/1.0/SecurityOntology-1.0.ttl b/Ontology/src/1.0/SecurityOntology-1.0.ttl
index 095e351a13574f47607d89d6091ed036f7adc71f..af8524f1fc6041bd5047ce7288633fbc6ec0ee23 100644 (file)
--- a/Ontology/src/1.0/SecurityOntology-1.0.ttl
+++ b/Ontology/src/1.0/SecurityOntology-1.0.ttl
@@ -45,8 +45,8 @@ smartapi:SecurityOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <https://w3id.org/smartapi/> ;
-  owl:versionIRI <https://w3id.org/smartapi/SecurityOntology/1.0> ;
+  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0> ;
+  owl:versionIRI <http://www.smart-api.io/ontology/SecurityOntology/1.0> ;
   owl:versionInfo "v1.0" .
 
 # security
@@ -147,6 +147,7 @@ smartapi:Authorization a owl:Class ;
   rdfs:label "Authorization"@en ;
   rdfs:comment "Resource describing an authorization object."@en ;
   rdfs:isDefinedBy smartapi:SecurityOntology ;
+  rdfs:subClassOf smartapi:Object;
   vs:term_status "testing".
 
 smartapi:authorization a owl:ObjectProperty ;

diff --git a/Ontology/src/1.0/TradingOntology-1.0.ttl b/Ontology/src/1.0/TradingOntology-1.0.ttl
index 7c76259935b00a8940e4a28a145aef4a92d6c06e..0a7e30d8a0b7d9c939675d2fb1c03164060a7d59 100644 (file)
--- a/Ontology/src/1.0/TradingOntology-1.0.ttl
+++ b/Ontology/src/1.0/TradingOntology-1.0.ttl
@@ -45,10 +45,9 @@ smartapi:TrandingOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <https://w3id.org/smartapi/> ;
-  owl:versionIRI <https://w3id.org/smartapi/TradingOntology/1.0> ;
-  owl:versionInfo "v1.0" ;
-  owl:imports <http://purl.org/goodrelations/v1.owl> .
+  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
+  owl:versionIRI <http://www.smart-api.io/ontology/TradingOntology/1.0> ;
+  owl:versionInfo "v1.0" .
 
 # boolean flags
     

diff --git a/Ontology/src/1.0/smartapi-1.0.ttl b/Ontology/src/1.0/smartapi-1.0.ttl
index c6185b353b7f7d66d460cf189a856f39088b9ee5..fed34907768017ad9ccac7375029d2c77d7862be 100644 (file)
--- a/Ontology/src/1.0/smartapi-1.0.ttl
+++ b/Ontology/src/1.0/smartapi-1.0.ttl
@@ -46,6 +46,10 @@
   vann:preferredNamespaceUri <https://www.smart-api.io/ontology/1.0/> ;
   owl:versionIRI <https://www.smart-api.io/ontology/1.0> ;
   owl:versionInfo "v1.0" ;
+  owl:imports <http://data.qudt.org/qudt/owl/1.0.0/qudt.owl> ;
+  owl:imports <http://data.qudt.org/qudt/owl/1.0.0/quantity.owl> ;
+  owl:imports <http://data.qudt.org/qudt/owl/1.0.0/unit.owl> ;
+  owl:imports <http://purl.org/goodrelations/v1.owl> ;
   owl:imports smartapi:AbstractEntityOntology-1.0.ttl ;
   owl:imports smartapi:CommonStructureOntology-1.0.ttl ;
   owl:imports smartapi:DataOntology-1.0.ttl ;

diff --git a/Ontology/src/1.0/smartapi_noexternals-1.0.ttl b/Ontology/src/1.0/smartapi_noexternals-1.0.ttl
new file mode 100644 (file)
index 0000000..c6185b3
--- /dev/null
+++ b/Ontology/src/1.0/smartapi_noexternals-1.0.ttl
@@ -0,0 +1,59 @@
+# Copyright 2016 ITEA 12004 SEAS Project.
+# Copyright 2016-2019 Asema Electronics Ltd.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
+@prefix cc: <http://creativecommons.org/ns#>. #Creative commons namespace
+@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
+@prefix void: <https://www.w3.org/TR/void/>. #Ontology of interelinked datasets
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .
+
+@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
+
+
+<http://www.smart-api.io/ontology/1.0/> rdf:type voaf:Ontology , owl:Ontology ;
+  dc:title "Smart API Ontology"@en ;
+  dc:description "The Smart API ontology, that glues together all of the Smart API vocabularies"@en ;
+  dc:creator <http://maxime-lefrancois.info/me#> ;
+  dc:contributor <http://www.vtt.fi/JarmoKalaoja> ;
+  dc:contributor <http://zimmer.aprilfoolsreview.com/antoine#me> ;
+  dc:contributor [a foaf:Person ; foaf:name "Erkki Siira" ] ;
+  dc:contributor [a foaf:Person ; foaf:name "Takoua Ghariani" ] ;
+  dc:contributor [a foaf:Person ; foaf:name "Marc Girod-Genet" ] ;
+  dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
+  dc:contributor [a foaf:Person ; foaf:name "Hannu Järvinen" ] ;
+  dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
+  dc:issued "2016-05-25"^^xsd:date ;
+  vann:preferredNamespacePrefix "smartapi" ;
+  vann:preferredNamespaceUri <https://www.smart-api.io/ontology/1.0/> ;
+  owl:versionIRI <https://www.smart-api.io/ontology/1.0> ;
+  owl:versionInfo "v1.0" ;
+  owl:imports smartapi:AbstractEntityOntology-1.0.ttl ;
+  owl:imports smartapi:CommonStructureOntology-1.0.ttl ;
+  owl:imports smartapi:DataOntology-1.0.ttl ;
+  owl:imports smartapi:EntityOntology-1.0.ttl ;
+  owl:imports smartapi:EnvironmentOntology-1.0.ttl ;
+  owl:imports smartapi:IndividualsOntology-1.0.ttl ;
+  owl:imports smartapi:NetworkingOntology-1.0.ttl ;
+  owl:imports smartapi:PhysicalEntityOntology-1.0.ttl ;
+  owl:imports smartapi:SecurityOntology-1.0.ttl ;
+  owl:imports smartapi:TradingOntology-1.0.ttl ;
+  owl:imports smartapi:QuantityUnitOntology-1.0.ttl .