Skip to content
GitLab
Commit 7ad4aed5 authored by Kai-Holger Brassel's avatar Kai-Holger Brassel
Browse files

Replaced custom unit projects by external cityunits and indriya plugins

parent 01673354
master
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 151 additions and 645 deletions
+151 -645
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/HeatPump.java
+ 22
- 22
View file @ 7ad4aed5
......@@ -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 deleted 100644 → 0
+ 0
- 16
View file @ 01673354
/**
*/
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
+ 3
- 3
View file @ 7ad4aed5
......@@ -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
+ 3
- 3
View file @ 7ad4aed5
......@@ -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 deleted 100644 → 0
+ 0
- 70
View file @ 01673354
/**
*/
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
+ 3
- 2
View file @ 7ad4aed5
......@@ -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
+ 5
- 5
View file @ 7ad4aed5
......@@ -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 deleted 100644 → 0
+ 0
- 86
View file @ 01673354
/**
*/
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 deleted 100644 → 0
+ 0
- 71
View file @ 01673354
/**
*/
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
+ 5
- 5
View file @ 7ad4aed5
......@@ -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
+ 0
- 4
View file @ 7ad4aed5
......@@ -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/PowerSources.java deleted 100644 → 0
+ 0
- 207
View file @ 01673354
/**
*/
package de.hftstuttgart.energycomponents;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.eclipse.emf.common.util.Enumerator;
/**
* <!-- begin-user-doc -->
* A representation of the literals of the enumeration '<em><b>Power Sources</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
* @see de.hftstuttgart.energycomponents.EnCompPackage#getPowerSources()
* @model
* @generated
*/
public enum PowerSources implements Enumerator {
/**
* The '<em><b>Electricity</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #ELECTRICITY_VALUE
* @generated
* @ordered
*/
ELECTRICITY(0, "electricity", "electricity"),
/**
* The '<em><b>Gas</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #GAS_VALUE
* @generated
* @ordered
*/
GAS(1, "gas", "gas");
/**
* The '<em><b>Electricity</b></em>' literal value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #ELECTRICITY
* @model name="electricity"
* @generated
* @ordered
*/
public static final int ELECTRICITY_VALUE = 0;
/**
* The '<em><b>Gas</b></em>' literal value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #GAS
* @model name="gas"
* @generated
* @ordered
*/
public static final int GAS_VALUE = 1;
/**
* An array of all the '<em><b>Power Sources</b></em>' enumerators.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
private static final PowerSources[] VALUES_ARRAY = new PowerSources[] { ELECTRICITY, GAS, };
/**
* A public read-only list of all the '<em><b>Power Sources</b></em>' enumerators.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public static final List<PowerSources> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
/**
* Returns the '<em><b>Power Sources</b></em>' literal with the specified literal value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param literal the literal.
* @return the matching enumerator or <code>null</code>.
* @generated
*/
public static PowerSources get(String literal) {
for (int i = 0; i < VALUES_ARRAY.length; ++i) {
PowerSources result = VALUES_ARRAY[i];
if (result.toString().equals(literal)) {
return result;
}
}
return null;
}
/**
* Returns the '<em><b>Power Sources</b></em>' literal with the specified name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param name the name.
* @return the matching enumerator or <code>null</code>.
* @generated
*/
public static PowerSources getByName(String name) {
for (int i = 0; i < VALUES_ARRAY.length; ++i) {
PowerSources result = VALUES_ARRAY[i];
if (result.getName().equals(name)) {
return result;
}
}
return null;
}
/**
* Returns the '<em><b>Power Sources</b></em>' literal with the specified integer value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the integer value.
* @return the matching enumerator or <code>null</code>.
* @generated
*/
public static PowerSources get(int value) {
switch (value) {
case ELECTRICITY_VALUE:
return ELECTRICITY;
case GAS_VALUE:
return GAS;
}
return null;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
private final int value;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
private final String name;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
private final String literal;
/**
* Only this class can construct instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
private PowerSources(int value, String name, String literal) {
this.value = value;
this.name = name;
this.literal = literal;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public int getValue() {
return value;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public String getName() {
return name;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public String getLiteral() {
return literal;
}
/**
* Returns the literal value of the enumerator, which is its string representation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public String toString() {
return literal;
}
} //PowerSources
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/RegularFuel.java deleted 100644 → 0
+ 0
- 16
View file @ 01673354
/**
*/
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
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/SaltHydrate.java deleted 100644 → 0
+ 0
- 16
View file @ 01673354
/**
*/
package de.hftstuttgart.energycomponents;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Salt Hydrate</b></em>'.
* <!-- end-user-doc -->
*
*
* @see de.hftstuttgart.energycomponents.EnCompPackage#getSaltHydrate()
* @model
* @generated
*/
public interface SaltHydrate extends Medium {
} // SaltHydrate
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/SolarThermalCollector.java
+ 2
- 2
View file @ 7ad4aed5
......@@ -2,7 +2,7 @@
*/
package de.hftstuttgart.energycomponents;
import de.hftstuttgart.units.NullableQuantity;
import de.hftstuttgart.cityunits.model.NullableQuantity;
/**
* <!-- begin-user-doc -->
......@@ -61,7 +61,7 @@ public interface SolarThermalCollector extends EnergyComponent {
* @return the value of the '<em>Aperture Area</em>' attribute.
* @see #setApertureArea(NullableQuantity)
* @see de.hftstuttgart.energycomponents.EnCompPackage#getSolarThermalCollector_ApertureArea()
* @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 getApertureArea();
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ThermalEnergyDevice.java
+ 2
- 2
View file @ 7ad4aed5
......@@ -2,7 +2,7 @@
*/
package de.hftstuttgart.energycomponents;
import de.hftstuttgart.units.NullableQuantity;
import de.hftstuttgart.cityunits.model.NullableQuantity;
/**
* <!-- begin-user-doc -->
......@@ -34,7 +34,7 @@ public interface ThermalEnergyDevice extends EnergyComponent {
* @return the value of the '<em>Installed Thermal Power</em>' attribute.
* @see #setInstalledThermalPower(NullableQuantity)
* @see de.hftstuttgart.energycomponents.EnCompPackage#getThermalEnergyDevice_InstalledThermalPower()
* @model default="kW" dataType="de.hftstuttgart.energycomponents.QuantityDouble" required="true"
* @model default="kW" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
* @generated
*/
NullableQuantity getInstalledThermalPower();
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ThermalStorage.java
+ 6
- 6
View file @ 7ad4aed5
......@@ -2,7 +2,7 @@
*/
package de.hftstuttgart.energycomponents;
import de.hftstuttgart.units.NullableQuantity;
import de.hftstuttgart.cityunits.model.NullableQuantity;
/**
* <!-- begin-user-doc -->
......@@ -40,7 +40,7 @@ public interface ThermalStorage extends EnergyComponent {
* @return the value of the '<em>Volume</em>' attribute.
* @see #setVolume(NullableQuantity)
* @see de.hftstuttgart.energycomponents.EnCompPackage#getThermalStorage_Volume()
* @model default="5 m\u00b3" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
* @model default="5 m\u00b3" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
* @generated
*/
NullableQuantity getVolume();
......@@ -91,7 +91,7 @@ public interface ThermalStorage extends EnergyComponent {
* @return the value of the '<em>Max Temp</em>' attribute.
* @see #setMaxTemp(NullableQuantity)
* @see de.hftstuttgart.energycomponents.EnCompPackage#getThermalStorage_MaxTemp()
* @model default="80 \u00b0C" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
* @model default="80 \u00b0C" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
* @generated
*/
NullableQuantity getMaxTemp();
......@@ -114,7 +114,7 @@ public interface ThermalStorage extends EnergyComponent {
* @return the value of the '<em>Tank Thickness</em>' attribute.
* @see #setTankThickness(NullableQuantity)
* @see de.hftstuttgart.energycomponents.EnCompPackage#getThermalStorage_TankThickness()
* @model default="10 mm " dataType="de.hftstuttgart.energycomponents.QuantityDouble"
* @model default="10 mm " dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
* @generated
*/
NullableQuantity getTankThickness();
......@@ -137,7 +137,7 @@ public interface ThermalStorage extends EnergyComponent {
* @return the value of the '<em>Insulation Thickness</em>' attribute.
* @see #setInsulationThickness(NullableQuantity)
* @see de.hftstuttgart.energycomponents.EnCompPackage#getThermalStorage_InsulationThickness()
* @model default="100 mm" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
* @model default="100 mm" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
* @generated
*/
NullableQuantity getInsulationThickness();
......@@ -204,7 +204,7 @@ public interface ThermalStorage extends EnergyComponent {
* @return the value of the '<em>Height</em>' attribute.
* @see #setHeight(NullableQuantity)
* @see de.hftstuttgart.energycomponents.EnCompPackage#getThermalStorage_Height()
* @model default="2 m" dataType="de.hftstuttgart.energycomponents.QuantityDouble"
* @model default="2 m" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble"
* @generated
*/
NullableQuantity getHeight();
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/Water.java deleted 100644 → 0
+ 0
- 16
View file @ 01673354
/**
*/
package de.hftstuttgart.energycomponents;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Water</b></em>'.
* <!-- end-user-doc -->
*
*
* @see de.hftstuttgart.energycomponents.EnCompPackage#getWater()
* @model
* @generated
*/
public interface Water extends Medium {
} // Water
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/CombinedHeatPowerImpl.java
+ 9
- 7
View file @ 7ad4aed5
......@@ -2,19 +2,21 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.Characteristic;
import de.hftstuttgart.energycomponents.CombinedHeatPower;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
......@@ -83,8 +85,8 @@ public class CombinedHeatPowerImpl extends ThermalEnergyDeviceImpl implements Co
* @generated
* @ordered
*/
protected static final NullableQuantity INSTALLED_ELECTRICAL_POWER_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "kW");
protected static final NullableQuantity INSTALLED_ELECTRICAL_POWER_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kW");
/**
* The cached value of the '{@link #getInstalledElectricalPower() <em>Installed Electrical Power</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/CostImpl.java
+ 91
- 86
View file @ 7ad4aed5
......@@ -2,16 +2,22 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.Characteristic;
import de.hftstuttgart.energycomponents.Cost;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.TypeOfHeatSource;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
......@@ -156,8 +162,8 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
* @ordered
*/
protected static final NullableQuantity PERSONNEL_HOURS_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "10 h");
protected static final NullableQuantity PERSONNEL_HOURS_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "10 h");
/**
* The cached value of the '{@link #getPersonnelHours() <em>Personnel Hours</em>}' attribute.
......@@ -254,32 +260,8 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public NullableQuantity getPersonnelHours() {
return personnelHours;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public void setPersonnelHours(NullableQuantity newPersonnelHours) {
NullableQuantity oldPersonnelHours = personnelHours;
personnelHours = newPersonnelHours;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__PERSONNEL_HOURS,
oldPersonnelHours, personnelHours));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public double getPersonnelCostShare() {
return personnelCostShare;
public String getComponentName() {
return componentName;
}
/**
......@@ -288,12 +270,12 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public void setPersonnelCostShare(double newPersonnelCostShare) {
double oldPersonnelCostShare = personnelCostShare;
personnelCostShare = newPersonnelCostShare;
public void setComponentName(String newComponentName) {
String oldComponentName = componentName;
componentName = newComponentName;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__PERSONNEL_COST_SHARE,
oldPersonnelCostShare, personnelCostShare));
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__COMPONENT_NAME, oldComponentName,
componentName));
}
/**
......@@ -302,8 +284,8 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public double getAdministrationAndOtherCostShare() {
return administrationAndOtherCostShare;
public String getDescription() {
return description;
}
/**
......@@ -312,13 +294,12 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public void setAdministrationAndOtherCostShare(double newAdministrationAndOtherCostShare) {
double oldAdministrationAndOtherCostShare = administrationAndOtherCostShare;
administrationAndOtherCostShare = newAdministrationAndOtherCostShare;
public void setDescription(String newDescription) {
String oldDescription = description;
description = newDescription;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET,
EnCompPackage.COST__ADMINISTRATION_AND_OTHER_COST_SHARE, oldAdministrationAndOtherCostShare,
administrationAndOtherCostShare));
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__DESCRIPTION, oldDescription,
description));
}
/**
......@@ -327,8 +308,8 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public double getMaintenanceCostShare() {
return maintenanceCostShare;
public TypeOfHeatSource getHeatSource() {
return heatSource;
}
/**
......@@ -337,26 +318,12 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public void setMaintenanceCostShare(double newMaintenanceCostShare) {
double oldMaintenanceCostShare = maintenanceCostShare;
maintenanceCostShare = newMaintenanceCostShare;
public void setHeatSource(TypeOfHeatSource newHeatSource) {
TypeOfHeatSource oldHeatSource = heatSource;
heatSource = newHeatSource == null ? HEAT_SOURCE_EDEFAULT : newHeatSource;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__MAINTENANCE_COST_SHARE,
oldMaintenanceCostShare, maintenanceCostShare));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case EnCompPackage.COST__INVESTMENT_COST:
return basicSetInvestmentCost(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__HEAT_SOURCE, oldHeatSource,
heatSource));
}
/**
......@@ -465,8 +432,8 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public String getComponentName() {
return componentName;
public NullableQuantity getPersonnelHours() {
return personnelHours;
}
/**
......@@ -475,12 +442,12 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public void setComponentName(String newComponentName) {
String oldComponentName = componentName;
componentName = newComponentName;
public void setPersonnelHours(NullableQuantity newPersonnelHours) {
NullableQuantity oldPersonnelHours = personnelHours;
personnelHours = newPersonnelHours;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__COMPONENT_NAME, oldComponentName,
componentName));
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__PERSONNEL_HOURS,
oldPersonnelHours, personnelHours));
}
/**
......@@ -489,8 +456,8 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public String getDescription() {
return description;
public double getPersonnelCostShare() {
return personnelCostShare;
}
/**
......@@ -499,12 +466,12 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public void setDescription(String newDescription) {
String oldDescription = description;
description = newDescription;
public void setPersonnelCostShare(double newPersonnelCostShare) {
double oldPersonnelCostShare = personnelCostShare;
personnelCostShare = newPersonnelCostShare;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__DESCRIPTION, oldDescription,
description));
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__PERSONNEL_COST_SHARE,
oldPersonnelCostShare, personnelCostShare));
}
/**
......@@ -513,8 +480,8 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public TypeOfHeatSource getHeatSource() {
return heatSource;
public double getAdministrationAndOtherCostShare() {
return administrationAndOtherCostShare;
}
/**
......@@ -523,12 +490,51 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* @generated
*/
@Override
public void setHeatSource(TypeOfHeatSource newHeatSource) {
TypeOfHeatSource oldHeatSource = heatSource;
heatSource = newHeatSource == null ? HEAT_SOURCE_EDEFAULT : newHeatSource;
public void setAdministrationAndOtherCostShare(double newAdministrationAndOtherCostShare) {
double oldAdministrationAndOtherCostShare = administrationAndOtherCostShare;
administrationAndOtherCostShare = newAdministrationAndOtherCostShare;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__HEAT_SOURCE, oldHeatSource,
heatSource));
eNotify(new ENotificationImpl(this, Notification.SET,
EnCompPackage.COST__ADMINISTRATION_AND_OTHER_COST_SHARE, oldAdministrationAndOtherCostShare,
administrationAndOtherCostShare));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public double getMaintenanceCostShare() {
return maintenanceCostShare;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public void setMaintenanceCostShare(double newMaintenanceCostShare) {
double oldMaintenanceCostShare = maintenanceCostShare;
maintenanceCostShare = newMaintenanceCostShare;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.COST__MAINTENANCE_COST_SHARE,
oldMaintenanceCostShare, maintenanceCostShare));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case EnCompPackage.COST__INVESTMENT_COST:
return basicSetInvestmentCost(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
/**
......@@ -568,7 +574,6 @@ public class CostImpl extends MinimalEObjectImpl.Container implements Cost {
* <!-- end-user-doc -->
* @generated
*/
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal