Replaced custom unit projects by external cityunits and indriya plugins

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/HeatPump.java

@@ -47,6 +47,28 @@ public interface HeatPump extends ThermalEnergyDevice {
 	 */
 	void setHeatSource(HeatSources value);
 
+	/**
+	 * Returns the value of the '<em><b>Coefficient Of Performance</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Coefficient Of Performance</em>' containment reference.
+	 * @see #setCoefficientOfPerformance(Characteristic)
+	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getHeatPump_CoefficientOfPerformance()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	Characteristic getCoefficientOfPerformance();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.energycomponents.HeatPump#getCoefficientOfPerformance <em>Coefficient Of Performance</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Coefficient Of Performance</em>' containment reference.
+	 * @see #getCoefficientOfPerformance()
+	 * @generated
+	 */
+	void setCoefficientOfPerformance(Characteristic value);
+
 	/**
 	 * Returns the value of the '<em><b>Power Input</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -91,26 +113,4 @@ public interface HeatPump extends ThermalEnergyDevice {
 	 */
 	void setHeatOutput(Characteristic value);
 
-	/**
-	 * Returns the value of the '<em><b>Coefficient Of Performance</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Coefficient Of Performance</em>' containment reference.
-	 * @see #setCoefficientOfPerformance(Characteristic)
-	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getHeatPump_CoefficientOfPerformance()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	Characteristic getCoefficientOfPerformance();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.energycomponents.HeatPump#getCoefficientOfPerformance <em>Coefficient Of Performance</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Coefficient Of Performance</em>' containment reference.
-	 * @see #getCoefficientOfPerformance()
-	 * @generated
-	 */
-	void setCoefficientOfPerformance(Characteristic value);
-
 } // HeatPump

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/Hydrocarbon.java

-/**
- */
-package de.hftstuttgart.energycomponents;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Hydrocarbon</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see de.hftstuttgart.energycomponents.EnCompPackage#getHydrocarbon()
- * @model
- * @generated
- */
-public interface Hydrocarbon extends Medium {
-} // Hydrocarbon

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/HydrogenCompressor.java

@@ -2,7 +2,7 @@
  */
 package de.hftstuttgart.energycomponents;
 
-import de.hftstuttgart.units.NullableQuantity;
+import de.hftstuttgart.cityunits.model.NullableQuantity;
 
 /**
  * <!-- begin-user-doc -->
@@ -84,7 +84,7 @@ public interface HydrogenCompressor extends EnergyComponent {
 	 * @return the value of the '<em>Max Pressure</em>' attribute.
 	 * @see #setMaxPressure(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getHydrogenCompressor_MaxPressure()
-	 * @model default="50 MPa" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
+	 * @model default="50 MPa" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
 	 * @generated
 	 */
 	NullableQuantity getMaxPressure();
@@ -110,7 +110,7 @@ public interface HydrogenCompressor extends EnergyComponent {
 	 * @return the value of the '<em>Max Delivery Rate</em>' attribute.
 	 * @see #setMaxDeliveryRate(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getHydrogenCompressor_MaxDeliveryRate()
-	 * @model default="9 kg/h" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
+	 * @model default="9 kg/h" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
 	 * @generated
 	 */
 	NullableQuantity getMaxDeliveryRate();

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/HydrogenStorage.java

@@ -2,7 +2,7 @@
  */
 package de.hftstuttgart.energycomponents;
 
-import de.hftstuttgart.units.NullableQuantity;
+import de.hftstuttgart.cityunits.model.NullableQuantity;
 
 /**
  * <!-- begin-user-doc -->
@@ -57,7 +57,7 @@ public interface HydrogenStorage extends EnergyComponent {
 	 * @return the value of the '<em>Cylinder Volume</em>' attribute.
 	 * @see #setCylinderVolume(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getHydrogenStorage_CylinderVolume()
-	 * @model default="1.5 m\u00b3" dataType="de.hftstuttgart.energycomponents.QuantityDouble" required="true"
+	 * @model default="1.5 m\u00b3" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getCylinderVolume();
@@ -80,7 +80,7 @@ public interface HydrogenStorage extends EnergyComponent {
 	 * @return the value of the '<em>Nominal Pressure</em>' attribute.
 	 * @see #setNominalPressure(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getHydrogenStorage_NominalPressure()
-	 * @model default="25 MPa" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
+	 * @model default="25 MPa" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
 	 * @generated
 	 */
 	NullableQuantity getNominalPressure();

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/InvestmentCost.java

-/**
- */
-package de.hftstuttgart.energycomponents;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Investment Cost</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.hftstuttgart.energycomponents.InvestmentCost#getOtherInvestmentCost <em>Other Investment Cost</em>}</li>
- *   <li>{@link de.hftstuttgart.energycomponents.InvestmentCost#getInvestmentCost <em>Investment Cost</em>}</li>
- * </ul>
- *
- * @see de.hftstuttgart.energycomponents.EnCompPackage#getInvestmentCost()
- * @model abstract="true"
- * @generated
- */
-public interface InvestmentCost extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Other Investment Cost</b></em>' attribute.
-	 * The default value is <code>"0"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Other Investment Cost</em>' attribute.
-	 * @see #setOtherInvestmentCost(double)
-	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getInvestmentCost_OtherInvestmentCost()
-	 * @model default="0"
-	 * @generated
-	 */
-	double getOtherInvestmentCost();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.energycomponents.InvestmentCost#getOtherInvestmentCost <em>Other Investment Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Other Investment Cost</em>' attribute.
-	 * @see #getOtherInvestmentCost()
-	 * @generated
-	 */
-	void setOtherInvestmentCost(double value);
-
-	/**
-	 * Returns the value of the '<em><b>Investment Cost</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Investment Cost</em>' containment reference.
-	 * @see #setInvestmentCost(Characteristic)
-	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getInvestmentCost_InvestmentCost()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	Characteristic getInvestmentCost();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.energycomponents.InvestmentCost#getInvestmentCost <em>Investment Cost</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Investment Cost</em>' containment reference.
-	 * @see #getInvestmentCost()
-	 * @generated
-	 */
-	void setInvestmentCost(Characteristic value);
-
-} // InvestmentCost

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/Material.java

@@ -2,7 +2,8 @@
  */
 package de.hftstuttgart.energycomponents;
 
-import de.hftstuttgart.units.NullableQuantity;
+import de.hftstuttgart.cityunits.model.NullableQuantity;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -34,7 +35,7 @@ public interface Material extends EObject {
 	 * @return the value of the '<em>Thermal Conductivity</em>' attribute.
 	 * @see #setThermalConductivity(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getMaterial_ThermalConductivity()
-	 * @model default=" W/(m*K)" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
+	 * @model default=" W/(m*K)" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
 	 * @generated
 	 */
 	NullableQuantity getThermalConductivity();

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/Medium.java

@@ -2,7 +2,7 @@
  */
 package de.hftstuttgart.energycomponents;
 
-import de.hftstuttgart.units.NullableQuantity;
+import de.hftstuttgart.cityunits.model.NullableQuantity;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -38,7 +38,7 @@ public interface Medium extends EObject {
 	 * @return the value of the '<em>Density</em>' attribute.
 	 * @see #setDensity(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getMedium_Density()
-	 * @model default="g/cm\u00b3" dataType="de.hftstuttgart.energycomponents.QuantityDouble" required="true"
+	 * @model default="g/cm\u00b3" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getDensity();
@@ -64,7 +64,7 @@ public interface Medium extends EObject {
 	 * @return the value of the '<em>Heat Capacity</em>' attribute.
 	 * @see #setHeatCapacity(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getMedium_HeatCapacity()
-	 * @model default="kJ/(kg*K)" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
+	 * @model default="kJ/(kg*K)" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
 	 * @generated
 	 */
 	NullableQuantity getHeatCapacity();
@@ -90,7 +90,7 @@ public interface Medium extends EObject {
 	 * @return the value of the '<em>Evaporation Temperature</em>' attribute.
 	 * @see #setEvaporationTemperature(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getMedium_EvaporationTemperature()
-	 * @model default="\u00b0C" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
+	 * @model default="\u00b0C" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
 	 * @generated
 	 */
 	NullableQuantity getEvaporationTemperature();
@@ -116,7 +116,7 @@ public interface Medium extends EObject {
 	 * @return the value of the '<em>Melting Temperature</em>' attribute.
 	 * @see #setMeltingTemperature(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getMedium_MeltingTemperature()
-	 * @model default="\u00b0C" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
+	 * @model default="\u00b0C" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
 	 * @generated
 	 */
 	NullableQuantity getMeltingTemperature();

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/NewEClass40.java

-/**
- */
-package de.hftstuttgart.energycomponents;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>New EClass40</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.hftstuttgart.energycomponents.NewEClass40#getOtherCost <em>Other Cost</em>}</li>
- *   <li>{@link de.hftstuttgart.energycomponents.NewEClass40#getMaintenanceCost <em>Maintenance Cost</em>}</li>
- *   <li>{@link de.hftstuttgart.energycomponents.NewEClass40#getInvestmentCost <em>Investment Cost</em>}</li>
- * </ul>
- *
- * @see de.hftstuttgart.energycomponents.EnCompPackage#getNewEClass40()
- * @model
- * @generated
- */
-public interface NewEClass40 extends EnergyComponentsCostCatalog {
-	/**
-	 * Returns the value of the '<em><b>Other Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Other Cost</em>' attribute.
-	 * @see #setOtherCost(double)
-	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getNewEClass40_OtherCost()
-	 * @model
-	 * @generated
-	 */
-	double getOtherCost();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.energycomponents.NewEClass40#getOtherCost <em>Other Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Other Cost</em>' attribute.
-	 * @see #getOtherCost()
-	 * @generated
-	 */
-	void setOtherCost(double value);
-
-	/**
-	 * Returns the value of the '<em><b>Maintenance Cost</b></em>' attribute.
-	 * The default value is <code>"0.015"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * percentage of total investment cost
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Maintenance Cost</em>' attribute.
-	 * @see #setMaintenanceCost(double)
-	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getNewEClass40_MaintenanceCost()
-	 * @model default="0.015"
-	 * @generated
-	 */
-	double getMaintenanceCost();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.energycomponents.NewEClass40#getMaintenanceCost <em>Maintenance Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Maintenance Cost</em>' attribute.
-	 * @see #getMaintenanceCost()
-	 * @generated
-	 */
-	void setMaintenanceCost(double value);
-
-	/**
-	 * Returns the value of the '<em><b>Investment Cost</b></em>' containment reference list.
-	 * The list contents are of type {@link de.hftstuttgart.energycomponents.Characteristic}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Investment Cost</em>' containment reference list.
-	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getNewEClass40_InvestmentCost()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Characteristic> getInvestmentCost();
-
-} // NewEClass40

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/PersonnelCost.java

-/**
- */
-package de.hftstuttgart.energycomponents;
-
-import de.hftstuttgart.units.NullableQuantity;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Personnel Cost</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.hftstuttgart.energycomponents.PersonnelCost#getPersonnelHours <em>Personnel Hours</em>}</li>
- *   <li>{@link de.hftstuttgart.energycomponents.PersonnelCost#getPersonnelCostShare <em>Personnel Cost Share</em>}</li>
- * </ul>
- *
- * @see de.hftstuttgart.energycomponents.EnCompPackage#getPersonnelCost()
- * @model abstract="true"
- * @generated
- */
-public interface PersonnelCost extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Personnel Hours</b></em>' attribute.
-	 * The default value is <code>"10 h"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Personnel Hours</em>' attribute.
-	 * @see #setPersonnelHours(NullableQuantity)
-	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getPersonnelCost_PersonnelHours()
-	 * @model default="10 h" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
-	 * @generated
-	 */
-	NullableQuantity getPersonnelHours();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.energycomponents.PersonnelCost#getPersonnelHours <em>Personnel Hours</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Personnel Hours</em>' attribute.
-	 * @see #getPersonnelHours()
-	 * @generated
-	 */
-	void setPersonnelHours(NullableQuantity value);
-
-	/**
-	 * Returns the value of the '<em><b>Personnel Cost Share</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Personnel Cost Share</em>' attribute.
-	 * @see #setPersonnelCostShare(double)
-	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getPersonnelCost_PersonnelCostShare()
-	 * @model
-	 * @generated
-	 */
-	double getPersonnelCostShare();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.energycomponents.PersonnelCost#getPersonnelCostShare <em>Personnel Cost Share</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Personnel Cost Share</em>' attribute.
-	 * @see #getPersonnelCostShare()
-	 * @generated
-	 */
-	void setPersonnelCostShare(double value);
-
-} // PersonnelCost

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/PhotovoltaicModule.java

@@ -2,7 +2,7 @@
  */
 package de.hftstuttgart.energycomponents;
 
-import de.hftstuttgart.units.NullableQuantity;
+import de.hftstuttgart.cityunits.model.NullableQuantity;
 
 import org.eclipse.emf.common.util.Enumerator;
 
@@ -61,7 +61,7 @@ public interface PhotovoltaicModule extends EnergyComponent {
 	 * @return the value of the '<em>Nominal Power</em>' attribute.
 	 * @see #setNominalPower(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getPhotovoltaicModule_NominalPower()
-	 * @model default="W" dataType="de.hftstuttgart.energycomponents.QuantityDouble" required="true"
+	 * @model default="W" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getNominalPower();
@@ -87,7 +87,7 @@ public interface PhotovoltaicModule extends EnergyComponent {
 	 * @return the value of the '<em>Mpp Voltage</em>' attribute.
 	 * @see #setMppVoltage(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getPhotovoltaicModule_MppVoltage()
-	 * @model default="V" dataType="de.hftstuttgart.energycomponents.QuantityDouble" required="true"
+	 * @model default="V" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getMppVoltage();
@@ -113,7 +113,7 @@ public interface PhotovoltaicModule extends EnergyComponent {
 	 * @return the value of the '<em>Mpp Current</em>' attribute.
 	 * @see #setMppCurrent(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getPhotovoltaicModule_MppCurrent()
-	 * @model default="A" dataType="de.hftstuttgart.energycomponents.QuantityDouble" required="true"
+	 * @model default="A" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getMppCurrent();
@@ -165,7 +165,7 @@ public interface PhotovoltaicModule extends EnergyComponent {
 	 * @return the value of the '<em>Module Area</em>' attribute.
 	 * @see #setModuleArea(NullableQuantity)
 	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getPhotovoltaicModule_ModuleArea()
-	 * @model default="m\u00b2" dataType="de.hftstuttgart.energycomponents.QuantityDouble" required="true"
+	 * @model default="m\u00b2" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getModuleArea();

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/PolynomialFunction.java

@@ -9,10 +9,6 @@ import org.eclipse.emf.ecore.EObject;
  * A representation of the model object '<em><b>Polynomial Function</b></em>'.
  * <!-- end-user-doc -->
  *
- * <!-- begin-model-doc -->
- * y = ParameterA * x^2 + ParameterB * x + ParameterC
- * <!-- end-model-doc -->
- *
  * <p>
  * The following features are supported:
  * </p>

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/RegularFuel.java

-/**
- */
-package de.hftstuttgart.energycomponents;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Regular Fuel</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see de.hftstuttgart.energycomponents.EnCompPackage#getRegularFuel()
- * @model abstract="true"
- * @generated
- */
-public interface RegularFuel extends Fuel {
-} // RegularFuel