diff --git a/CHANGELOG.md b/CHANGELOG.md index 92198a1..5ec2b68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Bump QUDT version to [2.1.37](https://github.com/qudt/qudt-public-repo/releases/tag/v2.1.37) + ## [6.5.0] - 2024-03-17 ### Added diff --git a/pom.xml b/pom.xml index d0bc2bb..1c935fc 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 11 11 UTF-8 - v2.1.35 + v2.1.37 1.9 diff --git a/qudtlib-data-gen/src/main/resources/add-to-quantitykinds.ttl b/qudtlib-data-gen/src/main/resources/add-to-quantitykinds.ttl index e3e5b24..a821a60 100644 --- a/qudtlib-data-gen/src/main/resources/add-to-quantitykinds.ttl +++ b/qudtlib-data-gen/src/main/resources/add-to-quantitykinds.ttl @@ -7,28 +7,3 @@ @prefix dcterms: . @prefix xsd: . @prefix skos: . - - -quantitykind:WaterVaporDiffusionCoefficient a qudt:QuantityKind; - rdfs:isDefinedBy ; - qudt:hasDimensionVector ; - rdfs:label "Wasserdampfdiffusionsleitkoeffizient"@de, "Water vapour diffusion coefficient"@en; - qudt:informativeReference "https://www.wufi-wiki.com/mediawiki/index.php/Details:WaterVaporDiffusion"^^; - qudt:plainTextDescription "The Water vapour diffusion coefficient describes how easy vapor diffusion happens in a given material." ; - qudt:applicableUnit unit:KiloGM-PER-PA-SEC-M . - -quantitykind:ThermalInsulance qudt:applicableUnit unit:M2-K-PER-W . - -quantitykind:Area qudt:applicableUnit unit:KiloM2 . - -quantitykind:SecondMomentOfArea qudt:applicableUnit unit:CentiM4 . - -quantitykind:SecondPolarMomentOfArea qudt:applicableUnit unit:CentiM4 . - -quantitykind:SecondAxialMomentOfArea qudt:applicableUnit unit:CentiM4 . - -quantitykind:Viscosity qudt:applicableUnit unit:DecaPOISE . - -quantitykind:DynamicViscosity qudt:applicableUnit unit:DecaPOISE . - -quantitykind:SpecificHeatCapacity qudt:applicableUnit unit:KiloJ-PER-KiloGM-K . \ No newline at end of file diff --git a/qudtlib-data-gen/src/main/resources/add-to-units.ttl b/qudtlib-data-gen/src/main/resources/add-to-units.ttl index 1321a71..0f3af9b 100644 --- a/qudtlib-data-gen/src/main/resources/add-to-units.ttl +++ b/qudtlib-data-gen/src/main/resources/add-to-units.ttl @@ -4,73 +4,3 @@ @prefix rdfs: . @prefix quantitykind: . @prefix prefix: . - - -unit:KiloGM-PER-PA-SEC-M a qudt:Unit; - rdfs:isDefinedBy ; - qudt:applicableSystem sou:SI; - qudt:hasQuantityKind quantitykind:WaterVaporDiffusionCoefficient; - qudt:conversionMultiplier 1.0; - qudt:hasDimensionVector ; - qudt:symbol "kg/(Pa⋅s⋅m)"; - qudt:ucumCode "kg.Pa-1.s-1.m-1"^^qudt:UCUMcs; - rdfs:label "kilogramo porpascal segundo metro"@es, "chilogrammo al pascal per secondo per metro"@it, - "килограмм на паскаль-секунда-метр"@ru, "kilogramme par pascal-seconde-mètre"@fr, - "quilograma por pascal segundo metro"@pt, "kilogram na paskalosekundaometr"@pl, "kilogram per pascal saat meter"@ms, - "Kilogramm je Pascal Sekunde Meter"@de, "kilogram na pascal sekunda meter"@sl, "kilogram pe pascal-secundă-metru"@ro, - "kilogram na pascal sekunda metr"@cs, "kilogram per pascal saniye metre"@tr, "kilogram per pascal second metre"@en; - qudt:plainTextDescription "Common unit for the Water vapour diffusion coefficient" . - -unit:M2-K-PER-W a qudt:Unit; - rdfs:isDefinedBy ; - qudt:applicableSystem sou:SI; - qudt:hasQuantityKind quantitykind:ThermalInsulance; - qudt:conversionMultiplier 1.0; - qudt:hasDimensionVector ; - qudt:symbol "m²⋅K/W"; - qudt:ucumCode "m2.K.W-1"^^qudt:UCUMcs; - rdfs:label "metro quadrato per kelvin al watt"@it, "čtvereční metr kelvin na watt"@cs, - "square metre kelvin per watt"@en, "metrekare kelvin per watt"@tr, "metro cuadrado kelvin porvatio"@es, - "metru pătrat-kelvin pe watt"@ro, "meter persegi kelvin per watt"@ms, "Quadratmeter Kelvin je Watt"@de, - "kvadratni meter kelvin na watt"@sl, "metro quadrado kelvin por watt"@pt, "mètre carré-kelvin par watt"@fr, - "метрквадратный -кельвин на ватт"@ru, " kwadratowymetrokelwin na wat"@pl; - qudt:informativeReference "https://en.wikipedia.org/wiki/R-value_(insulation)"^^; - qudt:plainTextDescription "Common unit for the R-Value. In the context of construction, the R-value is a measure of how well a two-dimensional barrier, such as a layer of insulation, a window or a complete wall or ceiling, resists the conductive flow of heat." . - - -unit:KiloM2 a qudt:Unit; - rdfs:isDefinedBy ; - qudt:applicableSystem sou:SI; - qudt:hasQuantityKind quantitykind:Area; - qudt:conversionMultiplier 1000000.0; - qudt:hasDimensionVector ; - qudt:symbol "km²"; - qudt:ucumCode "km2"^^qudt:UCUMcs; - rdfs:label "square Kilometre"@en; - qudt:prefix prefix:Kilo; - qudt:plainTextDescription "A unit of area equal to that of a square of sides 1000 m." . - -unit:CentiM4 a qudt:Unit; - rdfs:isDefinedBy ; - qudt:applicableSystem sou:SI; - qudt:hasQuantityKind quantitykind:SecondMomentOfArea, quantitykind:SecondPolarMomentOfArea, - quantitykind:SecondAxialMomentOfArea; - qudt:conversionMultiplier 0.00000001; - qudt:hasDimensionVector ; - qudt:symbol "cm⁴"; - qudt:ucumCode "cm4"^^qudt:UCUMcs; - rdfs:label "quartic Centimetre"@en; - qudt:prefix prefix:Centi; - qudt:plainTextDescription "0.01-fold of the SI base unit metre with the exponent 4" . - -unit:DecaPOISE a qudt:Unit; - rdfs:isDefinedBy ; - qudt:applicableSystem sou:CGS-GAUSS, sou:CGS; - qudt:hasQuantityKind quantitykind:Viscosity, quantitykind:DynamicViscosity; - qudt:conversionMultiplier 1.0; - qudt:hasDimensionVector ; - qudt:symbol "daP"; - qudt:ucumCode "daP"^^qudt:UCUMcs; - rdfs:label "Decapoise"@en, "Dekapoise"@de; - qudt:prefix prefix:Deca; - qudt:plainTextDescription "10-fold of the CGS unit of the dynamic viscosity poise" . \ No newline at end of file diff --git a/qudtlib-js b/qudtlib-js index 264f17c..ecc88a4 160000 --- a/qudtlib-js +++ b/qudtlib-js @@ -1 +1 @@ -Subproject commit 264f17cd15f3faa2860aaa48443b088d01f2e9c1 +Subproject commit ecc88a4fe9c3fbec7d9ef5930bfb6ecee9f945dd diff --git a/qudtlib-model/src/main/java/io/github/qudtlib/model/FactorUnits.java b/qudtlib-model/src/main/java/io/github/qudtlib/model/FactorUnits.java index 99bd077..52059d1 100644 --- a/qudtlib-model/src/main/java/io/github/qudtlib/model/FactorUnits.java +++ b/qudtlib-model/src/main/java/io/github/qudtlib/model/FactorUnits.java @@ -510,7 +510,7 @@ public Optional getSymbol() { if (fu.exponent > 0) { String symbol = fu.unit.getSymbol().orElse(null); if (symbol == null) return Optional.empty(); - sb.append(symbol).append(getExponentString(fu.exponent)).append("⋅"); + sb.append(symbol).append(getExponentString(fu.exponent)).append("·"); } else { hasDenominator = true; } @@ -527,7 +527,7 @@ public Optional getSymbol() { if (symbol == null) return Optional.empty(); sbDenom.append(symbol); sbDenom.append(getExponentString(fu.exponent)); - sbDenom.append("⋅"); + sbDenom.append("·"); cnt++; } } diff --git a/qudtlib-test/src/test/java/io/github/qudtlib/QudtTests.java b/qudtlib-test/src/test/java/io/github/qudtlib/QudtTests.java index 73cce0d..f93dcc1 100644 --- a/qudtlib-test/src/test/java/io/github/qudtlib/QudtTests.java +++ b/qudtlib-test/src/test/java/io/github/qudtlib/QudtTests.java @@ -875,7 +875,7 @@ public Object aggregateArguments(ArgumentsAccessor accessor, ParameterContext co public void testSymbol() { Unit u = Qudt.Units.TONNE__PER__M3; Assertions.assertEquals("t/m³", u.getSymbol().get()); - Assertions.assertEquals("J/(kg⋅K)", J__PER__KiloGM__K.getSymbol().get()); + Assertions.assertEquals("J/(kg·K)", J__PER__KiloGM__K.getSymbol().get()); } @Test