2: Integrate Health with the SPI to demonstrate how to add a new system

Task-Url: unitsofmeasurement/uom-domain#2
unitsofmeasurement · Jul 18, 2020 · 0e214a3 · 0e214a3
1 parent 6073423
commit 0e214a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/domain/energy/src/main/java/tech/uom/demo/energy/CO2CarDemo.java b/domain/energy/src/main/java/tech/uom/demo/energy/CO2CarDemo.java
@@ -53,9 +53,15 @@ public static void main(String[] args) {
 		} else {
 			System.out.println(String.format("Car: %s", args[0]));
 			FuelType fuelType = FuelType.valueOf(args[1]);
-			Quantity<Length> km100 = Quantities.getQuantity(100, KILO(METRE));
+			final Quantity<Length> km100 = Quantities.getQuantity(100, KILO(METRE));
 			Quantity<Volume> fuel = Quantities.getQuantity(Double.valueOf(args[2]), LITRE);
-			Quantity<FuelConsumption> fuelConsumption = fuel.divide(km100).multiply(100).asType(FuelConsumption.class);
+
+			// Debug outputs, TODO could be removed later
+			//System.out.println(km100);
+			//System.out.println(fuel);
+			//System.out.println(fuel.to(fuel.getUnit().getSystemUnit()));
+
+			Quantity<FuelConsumption> fuelConsumption = fuel.to(fuel.getUnit().getSystemUnit()).divide(km100).multiply(100).asType(FuelConsumption.class);
 			SimpleUnitFormat.getInstance().label(fuelConsumption.getUnit(), "l/100 km");
 			System.out.println(fuelConsumption);
 			Quantity<CarbonFootprint> carbon100 = fuelConsumption.multiply(fuelType.getFactor()).asType(CarbonFootprint.class);

diff --git a/domain/energy/src/main/java/tech/uom/demo/energy/HeatRequirementDemo.java b/domain/energy/src/main/java/tech/uom/demo/energy/HeatRequirementDemo.java
@@ -47,11 +47,11 @@
 
 /**
  * 
- * @author Werner
+ * @author Werner Keil
  * @author Andi Huber
  * @see <a href="http://www.dagego.de/info_waermebedarf.html">Dageto
  *      Wärmebedarfsermittlung (DE)</a>
- * @version 0.9
+ * @version 1.0
  */
 public class HeatRequirementDemo {
 

diff --git a/src/etc/CO2CarDemo (Ferrari Enzo 6 DAV-STO).launch b/src/etc/CO2CarDemo (Ferrari Enzo 6 DAV-STO).launch
@@ -12,6 +12,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="tech.uom.demo.energy.CO2CarDemo"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="uom-energy-demos"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="Ferrari-Enzo6 PETROL 23 1888.9"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="uom-energy-demos"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>