Skip to content

Commit

Permalink
Removed all deprecated entities (#1122)
Browse files Browse the repository at this point in the history 
* Removed all deprecated entities

* Reverted quantity kinds file for testing

* Fixed typo in validation rule

* Updated references to deprecated entities

* Updated references to deprecated entities

* Deactivated the check on use of deprecated entities

* Resolved merge conflicts with branch 1119-...

* Serialized

* Update user shacl tests and include in shacl-validate execution

* Repaired the deprecated property check, removed remaining deprecated entities

* Removed filter on the deprecated object query

* Removed redundant variable in query

* Remove unnecessary qsh prefix declaration

(leftover from a failed attempt to use shacl functions earlier in this PR - nvm)...

* Change deprecation checking shapes

* In COLLECTION_QUDT_USER_TESTS.ttl
references to deprecated properties/concepts cause a sh:Warning Report.

* In COLLECTION_QUDT_QA_TESTS_ALL.ttl
existence of deprecated properties/concepts cause a sh:Info Report.

---------

Co-authored-by: Florian Kleedorfer <[email protected]>
  • Loading branch information
@steveraysteveray @fkleedorfer
steveraysteveray and fkleedorfer authored Feb 12, 2025
1 parent 500d22b commit 7d1c34f
Show file tree
Hide file tree
Showing 14 changed files with 154 additions and 1,383 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ and this project is in the process of adopting [Semantic Versioning](https://sem
- Corrected the language tag `@en-us` to `@en-US`
- Corrected a small number of conversion multipliers

### Deprecated

- Removed all previously deprecated entities, to begin a new cycle of deprecation when needed.

## [2.1.47] - 2025-01-28

### Added
Expand Down
7 changes: 4 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,10 @@
<!--skip>true</skip-->
<shapes>
<include>
target/dist/validation/COLLECTION_QUDT_QA_TESTS_ALL.ttl
target/dist/schema/shacl/SCHEMA_QUDT_NoOWL.ttl
target/dist/schema/shacl/SCHEMA_QUDT-DATATYPES_NoOWL.ttl
src/main/rdf/validation/COLLECTION_QUDT_QA_TESTS_ALL.ttl
src/main/rdf/validation/COLLECTION_QUDT_USER_TESTS.ttl
src/main/rdf/schema/shacl/SCHEMA_QUDT_NoOWL.ttl
src/main/rdf/schema/shacl/SCHEMA_QUDT-DATATYPES_NoOWL.ttl
</include>
</shapes>
<data>
Expand Down
9 changes: 0 additions & 9 deletions src/main/rdf/schema/SCHEMA_QUDT-DATATYPE.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3205,15 +3205,6 @@ qudt:bounded
rdfs:label "bounded" ;
rdfs:range xsd:boolean .

qudt:byRow
a owl:DatatypeProperty ;
dcterms:description "A boolean to specify whether an array is presented row by row or column by column." ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/datatype> ;
rdfs:label "by row" ;
rdfs:range xsd:boolean ;
vaem:rationale "Replaced with an enumeration. See type:ArrayDataOrderType" .

qudt:bytes
a owl:DatatypeProperty ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/datatype> ;
Expand Down
136 changes: 1 addition & 135 deletions src/main/rdf/schema/SCHEMA_QUDT.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1713,16 +1713,6 @@ dcterms:isReplacedBy
a owl:ObjectProperty ;
rdfs:label "is replaced by" .

qudt:allowedUnitOfSystem
a owl:ObjectProperty ;
dcterms:description "This property relates a unit of measure with a unit system that does not define the unit, but allows its use within the system. An allowed unit must be convertible to some dimensionally eqiuvalent unit that is defined by the system."^^rdf:HTML ;
dcterms:isReplacedBy qudt:applicableSystem ;
owl:inverseOf qudt:hasAllowedUnit ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "allowed unit of system" ;
rdfs:subPropertyOf qudt:isUnitOfSystem .

qudt:applicableCGSUnit
a owl:ObjectProperty ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
Expand Down Expand Up @@ -1833,27 +1823,6 @@ qudt:categorizedAs
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "categorized as" .

qudt:coherentUnitOfSystem
a owl:ObjectProperty ;
dcterms:description """
A coherent unit of measurement for a unit system is a defined unit that may be expressed as a product of powers of the system's base units with the proportionality factor of one.
A system of units is coherent with respect to a system of quantities and equations if the system of units is chosen in such a way
that the equations between numerical values have exactly the same form (including the numerical factors) as the corresponding equations between the quantities.
For example, the 'newton' and the 'joule'.
These two are, respectively, the force that causes one kilogram to be accelerated at 1 metre per second per second,
and the work done by 1 newton acting over 1 metre.
Being coherent refers to this consistent use of 1.
In the old c.g.s. system , with its base units the centimetre and the gram, the corresponding coherent units were the dyne and the erg,
respectively the force that causes 1 gram to be accelerated at 1 centimetre per second per second, and the work done by 1 dyne acting over 1 centimetre.
So $1 newton = 10^5\\,dyne$, $1 joule = 10^7\\,erg$, making each of the four compatible in a decimal sense within its respective other system, but not coherent therein.
"""^^qudt:LatexString ;
owl:inverseOf qudt:hasCoherentUnit ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "is coherent unit of system" ;
rdfs:range qudt:SystemOfUnits ;
rdfs:subPropertyOf qudt:definedUnitOfSystem .

qudt:coherentUnitSystem
a owl:ObjectProperty, owl:FunctionalProperty ;
dcterms:description """
Expand Down Expand Up @@ -1921,12 +1890,6 @@ qudt:derivedNonCoherentUnitOfSystem
rdfs:range qudt:SystemOfUnits ;
rdfs:subPropertyOf qudt:derivedUnitOfSystem .

qudt:derivedQuantityKindOfSystem
a owl:ObjectProperty ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "derived quantity kind of system" .

qudt:derivedUnitOfSystem
a owl:ObjectProperty ;
dcterms:description "This property relates a unit of measure to the system of units in which it is defined as a derived unit. That is, the derived unit is defined as a product of the base units for the system raised to some rational power."^^rdf:HTML ;
Expand Down Expand Up @@ -1985,15 +1948,6 @@ qudt:figure
rdfs:label "figure" ;
rdfs:range qudt:Figure .

qudt:generalization
a owl:ObjectProperty ;
dcterms:description "This deprecated property was intended to relate a quantity kind to its generalization."^^rdf:HTML ;
dcterms:isReplacedBy skos:broader ;
owl:inverseOf qudt:specialization ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "generalization" .

qudt:hasAllowedUnit
a owl:ObjectProperty ;
dcterms:description "This property relates a unit system with a unit of measure that is not defined by or part of the system, but is allowed for use within the system. An allowed unit must be convertible to some dimensionally eqiuvalent unit that is defined by the system."^^rdf:HTML ;
Expand Down Expand Up @@ -2073,15 +2027,6 @@ qudt:hasDimensionVector
rdfs:label "has dimension vector" ;
rdfs:range qudt:QuantityKindDimensionVector .

qudt:hasNonCoherentUnit
a owl:ObjectProperty ;
dcterms:description "A coherent unit of measurement for a unit system is a defined unit that may be expressed as a product of powers of the system's base units with the proportionality factor of one."^^rdf:HTML ;
owl:inverseOf qudt:coherentUnitOfSystem ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "has non-coherent unit" ;
rdfs:subPropertyOf qudt:hasDefinedUnit .

qudt:hasNumeratorPart
a owl:ObjectProperty ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
Expand Down Expand Up @@ -2133,24 +2078,11 @@ qudt:hasVocabulary
rdfs:label "has vocabulary" ;
rdfs:range owl:Ontology .

qudt:isBaseQuantityKindOfSystem
a owl:ObjectProperty ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "is base quantity kind of system" .

qudt:isDimensionInSystem
a owl:ObjectProperty ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "is dimension in system" .

qudt:isQuantityKindOf
a owl:ObjectProperty ;
dcterms:description "`qudt:isQuantityKindOf` was a strict inverse of `qudt:hasQuantityKind` but is now deprecated."^^rdf:HTML ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "is quantity kind of" .

qudt:isUnitOfSystem
a owl:ObjectProperty ;
dcterms:description "This property relates a unit of measure with a system of units that either a) defines the unit or b) allows the unit to be used within the system."^^rdf:HTML ;
Expand Down Expand Up @@ -2255,14 +2187,6 @@ qudt:siExactMatch
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "Individual from SI Reference Point" .

qudt:specialization
a owl:ObjectProperty ;
dcterms:description "This deprecated property originally related a quantity kind to its specialization(s). For example, linear velocity and angular velocity are both specializations of velocity."^^rdf:HTML ;
owl:inverseOf qudt:generalization ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "specialization" .

qudt:systemDefinition
a owl:ObjectProperty, owl:TransitiveProperty ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
Expand All @@ -2279,19 +2203,9 @@ qudt:systemDimension
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "system dimension" .

qudt:unit
a owl:ObjectProperty ;
dcterms:description "A reference to the unit of measure of a quantity (variable or constant) of interest."^^rdf:HTML ;
dcterms:isReplacedBy qudt:hasUnit ;
owl:inverseOf qudt:unitFor ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "unit" ;
rdfs:range qudt:Unit .

qudt:unitFor
a owl:ObjectProperty ;
owl:inverseOf qudt:unit ;
owl:inverseOf qudt:hasUnit ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "unit for" .

Expand Down Expand Up @@ -2347,14 +2261,6 @@ qudt:bounded
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "bounded" .

qudt:code
a owl:DatatypeProperty ;
dcterms:description "A code is a string that uniquely identifies a QUDT concept. The use of this property has been deprecated."^^rdf:HTML ;
qudt:deprecated true ;
rdfs:domain qudt:Concept ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "code" .

qudt:conversionMultiplier
a owl:DatatypeProperty, owl:FunctionalProperty ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
Expand Down Expand Up @@ -2888,22 +2794,6 @@ qudt:informativeReference
rdfs:label "informative reference" ;
rdfs:range xsd:anyURI .

qudt:ucumCaseInsensitiveCode
a owl:AnnotationProperty ;
dcterms:description "<em>ucumCode</em> associates a QUDT unit with a UCUM case-insensitive code."^^rdf:HTML ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "ucum case-insensitive code" ;
rdfs:subPropertyOf qudt:ucumCode .

qudt:ucumCaseSensitiveCode
a owl:AnnotationProperty ;
dcterms:description "<em>ucumCode</em> associates a QUDT unit with with a UCUM case-sensitive code."^^rdf:HTML ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "ucum case-sensitive code" ;
rdfs:subPropertyOf qudt:ucumCode .

<http://www.linkedmodel.org/schema/dtype>
vaem:namespace "http://www.linkedmodel.org/schema/dtype#"^^xsd:anyURI ;
vaem:namespacePrefix "dtype" .
Expand Down Expand Up @@ -3071,30 +2961,6 @@ qudt:TotallyOrdered
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "Totally Ordered" .

qudt:UCUMci
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:withRestrictions ( [
xsd:pattern "[\\x21-\\x60,\\x7b-\\x7e]+" ;
] ) ;
qudt:deprecated true ;
rdfs:comment "Lexical pattern for the case-insensitive version of UCUM code" ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "case-insensitive UCUM code" ;
rdfs:subClassOf rdfs:Resource .

qudt:UCUMci-term
a rdfs:Datatype ;
owl:onDatatype xsd:string ;
owl:withRestrictions ( [
xsd:pattern "[\\x21,\\x23-\\x27,\\x2a,\\x2c,\\x30-\\x3c,\\x3e-\\x5a,\\x5c,\\x5e-\\x60,\\x7c,\\x7e]+" ;
] ) ;
qudt:deprecated true ;
rdfs:comment "Lexical pattern for the terminal symbols in the case-insensitive version of UCUM code" ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/qudt> ;
rdfs:label "case-insensitive UCUM term" ;
rdfs:subClassOf rdfs:Resource .

qudt:UCUMcs
a rdfs:Datatype ;
dcterms:source "https://ucum.org/ucum.html"^^xsd:anyURI ;
Expand Down
8 changes: 0 additions & 8 deletions src/main/rdf/schema/shacl/SCHEMA_QUDT-DATATYPES_NoOWL.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2321,14 +2321,6 @@ qudt:bounded
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/shacl/datatype> ;
rdfs:label "bounded" .

qudt:byRow
a rdf:Property ;
dcterms:description "A boolean to specify whether an array is presented row by row or column by column." ;
qudt:deprecated true ;
rdfs:isDefinedBy <http://qudt.org/$$QUDT_VERSION$$/schema/shacl/datatype> ;
rdfs:label "by row" ;
vaem:rationale "Replaced with an enumeration. See type:MatrixElementOrder" .

qudt:byteOrder
a rdf:Property ;
dcterms:description "Byte order is an enumeration of two values: 'Big Endian' and 'Little Endian' and is used to denote whether the most signiticant byte is either first or last, respectively." ;
Expand Down
Loading

0 comments on commit 7d1c34f

Please sign in to comment.