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:
 

de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/NullableQuantity.java

@@ -4,17 +4,11 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.Locale;
 import java.util.Optional;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.measure.Quantity;
 import javax.measure.Unit;
 
-import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkUtil;
-import org.eclipse.core.runtime.Status;
 
 import tech.units.indriya.format.SimpleQuantityFormat;
 import tech.units.indriya.quantity.Quantities;
@@ -27,8 +21,6 @@ import tech.units.indriya.quantity.Quantities;
  * of the quantity is always defined.
  */
 public class NullableQuantity {
-	   private static final Bundle BUNDLE = FrameworkUtil.getBundle(NullableQuantity.class);
-	   private static final ILog LOGGER = Platform.getLog(BUNDLE);
 	
 	static {
 		// TODO Implement specific QuantityFormat to enable custom number format?
@@ -43,22 +35,17 @@ public class NullableQuantity {
 	public static NullableQuantity create(String str) {
 		NullableQuantity newNullableQuantity = null;
 		try {
-			LOGGER.log(new Status(Status.INFO, BUNDLE.getSymbolicName(), "Create Quantity from " + str));
 			NumberFormat.getInstance().parse(str);
 			newNullableQuantity = new NullableQuantity(str);
 		} catch (final ParseException ex) { // no number value present: create NullQuantity just with unit
 			try {
 				NullableQuantity dummy = new NullableQuantity("1 " + str); //$NON-NLS-1$
-				LOGGER.log(new Status(Status.INFO, BUNDLE.getSymbolicName(),
-						"Create Quantity just with unit from " + str));
 				newNullableQuantity = new NullQuantity(dummy.getUnit());
 			} catch (final IllegalArgumentException ex1) { // Unit could not be parsed
-				LOGGER.log(new Status(Status.WARNING, BUNDLE.getSymbolicName(),
-						"Unit '" + str + "'  could not be parsed!", ex));
+				Platform.getLog(NullableQuantity.class).warn("Unit '" + str + "'  could not be parsed!", ex);
 			}
 		} catch (final IllegalArgumentException ex) { // Quantity could not be parsed
-			LOGGER.log(new Status(Status.WARNING, BUNDLE.getSymbolicName(),
-					"Quantity '" + str + "'  could not be parsed!", ex));
+			Platform.getLog(NullableQuantity.class).warn("Quantity '" + str + "'  could not be parsed!", ex);
 		}
 		return newNullableQuantity;
 	}

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

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!");
 	}
-
 }