From 527b8c29812c30fff5ac57f1db72ffa783849d1c Mon Sep 17 00:00:00 2001
From: Kai Brassel <mail@khbrassel.de>
Date: Fri, 11 Jun 2021 09:22:40 +0200
Subject: [PATCH] Dimension for VolumetricFlowRate added plus some tests
---
README.md | 10 +++----
.../cityunits/model/UrbanSimulationUnits.java | 4 ++-
.../cityunits/tests/QuantityTest.java | 26 ++++++++++++++-----
3 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 904e85d..b1d8f58 100644
--- a/README.md
+++ b/README.md
@@ -66,11 +66,11 @@ Some derived units of special interest for urban simulation like kW·h (encodes
| W·h | [L]²·[M]/[T]²
| kW·h | [L]²·[M]/[T]²
| MW·h | [L]²·[M]/[T]²
-| m³/min | [L]³/[T]
-| m³/h | [L]³/[T]
-| m³/s | [L]³/[T]
-| m³/d | [L]³/[T]
-| l/min | [L]³/[T]
+| m³/min | [L]³/[T] VolumetricFlowRate
+| m³/h | [L]³/[T] VolumetricFlowRate
+| m³/s | [L]³/[T] VolumetricFlowRate
+| m³/d | [L]³/[T] VolumetricFlowRate
+| l/min | [L]³/[T] VolumetricFlowRate
Some units of special interest for urban simulation introduced with this plug-in:
diff --git a/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/UrbanSimulationUnits.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/UrbanSimulationUnits.java
index df6ace8..be0d4b9 100644
--- a/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/UrbanSimulationUnits.java
+++ b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/UrbanSimulationUnits.java
@@ -16,6 +16,7 @@ import tech.units.indriya.function.LogConverter;
import tech.units.indriya.function.MultiplyConverter;
import tech.units.indriya.unit.AlternateUnit;
import tech.units.indriya.unit.BaseUnit;
+import tech.units.indriya.unit.ProductUnit;
import tech.units.indriya.unit.TransformedUnit;
import tech.units.indriya.unit.UnitDimension;
import tech.units.indriya.unit.Units;
@@ -37,13 +38,14 @@ public class UrbanSimulationUnits extends AbstractSystemOfUnits {
AlternateUnit.of(Units.KILOGRAM, "kgCOâ‚‚eq").asType(CarbonEmission.class));
public static final Unit<CarbonEmission> GRAM_CO2_EQUIVALENT = addUnit(KILOGRAM_CO2_EQUIVALENT.divide(1000));
public static final Unit<CarbonEmission> TON_CO2_EQUIVALENT = addUnit(KILOGRAM_CO2_EQUIVALENT.multiply(1000));
-
public static final Unit<Dimensionless> PARTS_PER_MILLION = addUnit(new TransformedUnit<>(AbstractUnit.ONE,
MultiplyConverter.ofRational(BigInteger.ONE, BigInteger.valueOf(1000000))));
public static final Unit<Dimensionless> DECIBEL = addUnit(AbstractUnit.ONE.transform(
new LogConverter(10).inverse().concatenate(MultiplyConverter.ofRational(BigInteger.ONE, BigInteger.TEN))));
public static final Unit<Intensity> IRRADIANCE = addUnit(
new AlternateUnit<Intensity>(Units.WATT.divide(Units.SQUARE_METRE), "W/m²"));
+ public static final Unit<VolumetricFlowRate> VOLUMETRIC_FLOW = addUnit(
+ new ProductUnit<VolumetricFlowRate>(Units.CUBIC_METRE.divide(Units.SECOND))); // , "m³/s"
// To model costs I added monetary units quick and dirty as SI base units.
// According to JavaDoc of AbstractUnit, monetary units should rather be
diff --git a/de.hftstuttgart.cityunits.tests/src/de/hftstuttgart/cityunits/tests/QuantityTest.java b/de.hftstuttgart.cityunits.tests/src/de/hftstuttgart/cityunits/tests/QuantityTest.java
index 2cc46da..1e71c27 100644
--- a/de.hftstuttgart.cityunits.tests/src/de/hftstuttgart/cityunits/tests/QuantityTest.java
+++ b/de.hftstuttgart.cityunits.tests/src/de/hftstuttgart/cityunits/tests/QuantityTest.java
@@ -13,10 +13,13 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import de.hftstuttgart.cityunits.model.CarbonEmission;
+import de.hftstuttgart.cityunits.model.VolumetricFlowRate;
+import de.hftstuttgart.cityunits.model.Intensity;
import de.hftstuttgart.cityunits.model.UrbanSimulationUnits;
import tech.units.indriya.quantity.Quantities;
import tech.units.indriya.unit.Units;
+
// Quantities.getQuantity("1.50 €"); does not compile in Maven without cast to String ???
// mvn install won't run this tests, since tycho (?) handles tests as integration tests, thus, mvn verify is required
class QuantityTest {
@@ -68,14 +71,25 @@ class QuantityTest {
}
@Test
- void testCO2eq() {
- Quantity<CarbonEmission> q = Quantities.getQuantity((String) "5200.7 kgCOâ‚‚eq").asType(CarbonEmission.class);
- System.out.println(q);
+ void testIrradiance() {
+ Quantity<Intensity> q = Quantities.getQuantity("1000 W/m²").asType(Intensity.class);
+ assertEquals("[M]/[T]³", q.getUnit().getDimension().toString(), "Wrong dimension!");
+ }
+
+ @Test
+ void testVolumetricFlows() {
+ Quantity<VolumetricFlowRate> q = Quantities.getQuantity("10800000 l/h").asType(VolumetricFlowRate.class);
+ assertEquals("[L]³/[T]", q.getUnit().getDimension().toString(), "Wrong dimension!");
+ assertEquals("3 m³/s", q.toSystemUnit().toString());
+ }
+
+ @Test
+ void testCO2eq() {
+ Quantity<CarbonEmission> q = Quantities.getQuantity((String) "5200.7 kg COâ‚‚eq").asType(CarbonEmission.class);
assertEquals("[M]", q.getUnit().getDimension().toString(), "Wrong dimension!");
- assertTrue(q.isEquivalentTo(Quantities.getQuantity((String) "5.2007 tonCOâ‚‚eq").asType(CarbonEmission.class)),
- "Wrong conversion from kg of COâ‚‚eq to ton of COâ‚‚eq!");
assertTrue(q.isEquivalentTo(Quantities.getQuantity((String) "5200700 gCOâ‚‚eq").asType(CarbonEmission.class)),
"Wrong conversion from kg of COâ‚‚eq to gram of COâ‚‚eq!");
+ assertTrue(q.isEquivalentTo(Quantities.getQuantity((String) "5.2007 tonCOâ‚‚eq").asType(CarbonEmission.class)),
+ "Wrong conversion from kg of COâ‚‚eq to ton of COâ‚‚eq!");
}
-
}
--
GitLab