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
Show whitespace changes
Inline Side-by-side
Showing
with 335 additions and 417 deletions
+335 -417
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/ElectricalStorageImpl.java
+ 11
- 9
View file @ 7ad4aed5
......@@ -2,13 +2,15 @@
*/
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.ElectricalStorage;
import de.hftstuttgart.energycomponents.ElectricalStorageTypes;
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.ecore.EClass;
......@@ -64,8 +66,8 @@ public class ElectricalStorageImpl extends EnergyComponentImpl implements Electr
* @generated
* @ordered
*/
protected static final NullableQuantity BATTERY_CAPACITY_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "A*h");
protected static final NullableQuantity BATTERY_CAPACITY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "A*h");
/**
* The cached value of the '{@link #getBatteryCapacity() <em>Battery Capacity</em>}' attribute.
......@@ -85,8 +87,8 @@ public class ElectricalStorageImpl extends EnergyComponentImpl implements Electr
* @generated
* @ordered
*/
protected static final NullableQuantity BATTERY_VOLTAGE_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "V");
protected static final NullableQuantity BATTERY_VOLTAGE_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "V");
/**
* The cached value of the '{@link #getBatteryVoltage() <em>Battery Voltage</em>}' attribute.
......@@ -186,8 +188,8 @@ public class ElectricalStorageImpl extends EnergyComponentImpl implements Electr
* @generated
* @ordered
*/
protected static final NullableQuantity ENERGY_CONTENT_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "5 kW*h");
protected static final NullableQuantity ENERGY_CONTENT_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "5 kW*h");
/**
* The cached value of the '{@link #getEnergyContent() <em>Energy Content</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/ElectricityImpl.java
+ 3
- 0
View file @ 7ad4aed5
......@@ -6,7 +6,9 @@ import de.hftstuttgart.energycomponents.Electricity;
import de.hftstuttgart.energycomponents.EnCompPackage;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
......@@ -32,6 +34,7 @@ public abstract class ElectricityImpl extends EnergyCarrierImpl implements Elect
* @ordered
*/
protected static final double RENEWABLE_SHARE_EDEFAULT = 0.0;
/**
* The cached value of the '{@link #getRenewableShare() <em>Renewable Share</em>}' attribute.
* <!-- begin-user-doc -->
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/ElectrolyzerImpl.java
+ 15
- 13
View file @ 7ad4aed5
......@@ -2,13 +2,15 @@
*/
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.Electrolyzer;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.cellTypesElectrolyzer;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
......@@ -63,8 +65,8 @@ public class ElectrolyzerImpl extends EnergyComponentImpl implements Electrolyze
* @generated
* @ordered
*/
protected static final NullableQuantity CELL_AREA_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "50 cm\u00b2");
protected static final NullableQuantity CELL_AREA_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "50 cm\u00b2");
/**
* The cached value of the '{@link #getCellArea() <em>Cell Area</em>}' attribute.
......@@ -104,8 +106,8 @@ public class ElectrolyzerImpl extends EnergyComponentImpl implements Electrolyze
* @generated
* @ordered
*/
protected static final NullableQuantity MAX_OPERATING_CURRENT_DENSITY_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "3 A/cm\u00b2");
protected static final NullableQuantity MAX_OPERATING_CURRENT_DENSITY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "3 A/cm\u00b2");
/**
* The cached value of the '{@link #getMaxOperatingCurrentDensity() <em>Max Operating Current Density</em>}' attribute.
......@@ -125,8 +127,8 @@ public class ElectrolyzerImpl extends EnergyComponentImpl implements Electrolyze
* @generated
* @ordered
*/
protected static final NullableQuantity MIN_OPERATING_CURRENT_DENSITY_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "0.3 A/cm\u00b2");
protected static final NullableQuantity MIN_OPERATING_CURRENT_DENSITY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "0.3 A/cm\u00b2");
/**
* The cached value of the '{@link #getMinOperatingCurrentDensity() <em>Min Operating Current Density</em>}' attribute.
......@@ -146,8 +148,8 @@ public class ElectrolyzerImpl extends EnergyComponentImpl implements Electrolyze
* @generated
* @ordered
*/
protected static final NullableQuantity OVERLOAD_CAPACITY_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "120 %");
protected static final NullableQuantity OVERLOAD_CAPACITY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "120 %");
/**
* The cached value of the '{@link #getOverloadCapacity() <em>Overload Capacity</em>}' attribute.
......@@ -167,8 +169,8 @@ public class ElectrolyzerImpl extends EnergyComponentImpl implements Electrolyze
* @generated
* @ordered
*/
protected static final NullableQuantity NOMINAL_CELL_VOLTAGE_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "1.94 V");
protected static final NullableQuantity NOMINAL_CELL_VOLTAGE_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "1.94 V");
/**
* The cached value of the '{@link #getNominalCellVoltage() <em>Nominal Cell Voltage</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/EnCompFactoryImpl.java
+ 9
- 91
View file @ 7ad4aed5
......@@ -4,8 +4,6 @@ package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.*;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
......@@ -158,10 +156,6 @@ public class EnCompFactoryImpl extends EFactoryImpl implements EnCompFactory {
return createFuelTypesFromString(eDataType, initialValue);
case EnCompPackage.TYPE_OF_HEAT_SOURCE:
return createTypeOfHeatSourceFromString(eDataType, initialValue);
case EnCompPackage.QUANTITY_DOUBLE:
return createQuantityDoubleFromString(eDataType, initialValue);
case EnCompPackage.QUANTITY_LONG:
return createQuantityLongFromString(eDataType, initialValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
......@@ -191,10 +185,6 @@ public class EnCompFactoryImpl extends EFactoryImpl implements EnCompFactory {
return convertFuelTypesToString(eDataType, instanceValue);
case EnCompPackage.TYPE_OF_HEAT_SOURCE:
return convertTypeOfHeatSourceToString(eDataType, instanceValue);
case EnCompPackage.QUANTITY_DOUBLE:
return convertQuantityDoubleToString(eDataType, instanceValue);
case EnCompPackage.QUANTITY_LONG:
return convertQuantityLongToString(eDataType, instanceValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
......@@ -700,8 +690,8 @@ public class EnCompFactoryImpl extends EFactoryImpl implements EnCompFactory {
* <!-- end-user-doc -->
* @generated
*/
public FuelTypes createFuelTypesFromString(EDataType eDataType, String initialValue) {
FuelTypes result = FuelTypes.get(initialValue);
public cellTypesElectrolyzer createcellTypesElectrolyzerFromString(EDataType eDataType, String initialValue) {
cellTypesElectrolyzer result = cellTypesElectrolyzer.get(initialValue);
if (result == null)
throw new IllegalArgumentException(
"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
......@@ -713,7 +703,7 @@ public class EnCompFactoryImpl extends EFactoryImpl implements EnCompFactory {
* <!-- end-user-doc -->
* @generated
*/
public String convertFuelTypesToString(EDataType eDataType, Object instanceValue) {
public String convertcellTypesElectrolyzerToString(EDataType eDataType, Object instanceValue) {
return instanceValue == null ? null : instanceValue.toString();
}
......@@ -722,8 +712,8 @@ public class EnCompFactoryImpl extends EFactoryImpl implements EnCompFactory {
* <!-- end-user-doc -->
* @generated
*/
public TypeOfHeatSource createTypeOfHeatSourceFromString(EDataType eDataType, String initialValue) {
TypeOfHeatSource result = TypeOfHeatSource.get(initialValue);
public FuelTypes createFuelTypesFromString(EDataType eDataType, String initialValue) {
FuelTypes result = FuelTypes.get(initialValue);
if (result == null)
throw new IllegalArgumentException(
"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
......@@ -735,7 +725,7 @@ public class EnCompFactoryImpl extends EFactoryImpl implements EnCompFactory {
* <!-- end-user-doc -->
* @generated
*/
public String convertTypeOfHeatSourceToString(EDataType eDataType, Object instanceValue) {
public String convertFuelTypesToString(EDataType eDataType, Object instanceValue) {
return instanceValue == null ? null : instanceValue.toString();
}
......@@ -744,8 +734,8 @@ public class EnCompFactoryImpl extends EFactoryImpl implements EnCompFactory {
* <!-- end-user-doc -->
* @generated
*/
public cellTypesElectrolyzer createcellTypesElectrolyzerFromString(EDataType eDataType, String initialValue) {
cellTypesElectrolyzer result = cellTypesElectrolyzer.get(initialValue);
public TypeOfHeatSource createTypeOfHeatSourceFromString(EDataType eDataType, String initialValue) {
TypeOfHeatSource result = TypeOfHeatSource.get(initialValue);
if (result == null)
throw new IllegalArgumentException(
"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
......@@ -757,82 +747,10 @@ public class EnCompFactoryImpl extends EFactoryImpl implements EnCompFactory {
* <!-- end-user-doc -->
* @generated
*/
public String convertcellTypesElectrolyzerToString(EDataType eDataType, Object instanceValue) {
public String convertTypeOfHeatSourceToString(EDataType eDataType, Object instanceValue) {
return instanceValue == null ? null : instanceValue.toString();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public NullableQuantity createQuantityDouble(final String it) {
return de.hftstuttgart.units.NullableQuantity.create(it);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public NullableQuantity createQuantityDoubleFromString(EDataType eDataType, String initialValue) {
return createQuantityDouble(initialValue);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public String convertQuantityDouble(final NullableQuantity it) {
return it == null ? null : it.toString();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public String convertQuantityDoubleToString(EDataType eDataType, Object instanceValue) {
return convertQuantityDouble((NullableQuantity) instanceValue);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public NullableQuantity createQuantityLong(final String it) {
return de.hftstuttgart.units.NullableQuantity.create(it);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public NullableQuantity createQuantityLongFromString(EDataType eDataType, String initialValue) {
return createQuantityLong(initialValue);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public String convertQuantityLong(final NullableQuantity it) {
return it == null ? null : it.toString();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public String convertQuantityLongToString(EDataType eDataType, Object instanceValue) {
return convertQuantityLong((NullableQuantity) instanceValue);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/EnCompPackageImpl.java
+ 136
- 174
View file @ 7ad4aed5
......@@ -2,6 +2,8 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.BioFuel;
import de.hftstuttgart.energycomponents.Boiler;
import de.hftstuttgart.energycomponents.BoilerTypes;
......@@ -53,11 +55,9 @@ import de.hftstuttgart.energycomponents.ThermalStorageTypes;
import de.hftstuttgart.energycomponents.TypeOfHeatSource;
import de.hftstuttgart.energycomponents.WindTurbine;
import de.hftstuttgart.energycomponents.cellTypesElectrolyzer;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EOperation;
import org.eclipse.emf.ecore.EPackage;
......@@ -396,20 +396,6 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
*/
private EEnum thermalStorageTypesEEnum = null;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
private EEnum fuelTypesEEnum = null;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
private EEnum typeOfHeatSourceEEnum = null;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -422,14 +408,14 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
* <!-- end-user-doc -->
* @generated
*/
private EDataType quantityDoubleEDataType = null;
private EEnum fuelTypesEEnum = null;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
private EDataType quantityLongEDataType = null;
private EEnum typeOfHeatSourceEEnum = null;
/**
* Creates an instance of the model <b>Package</b>, registered with
......@@ -482,6 +468,7 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
isInited = true;
// Initialize simple dependencies
QuantitiesPackage.eINSTANCE.eClass();
XMLTypePackage.eINSTANCE.eClass();
// Create package meta-data objects
......@@ -1074,8 +1061,8 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
* @generated
*/
@Override
public EReference getHeatPump_PowerInput() {
return (EReference) heatPumpEClass.getEStructuralFeatures().get(2);
public EReference getHeatPump_CoefficientOfPerformance() {
return (EReference) heatPumpEClass.getEStructuralFeatures().get(1);
}
/**
......@@ -1084,8 +1071,8 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
* @generated
*/
@Override
public EReference getHeatPump_HeatOutput() {
return (EReference) heatPumpEClass.getEStructuralFeatures().get(3);
public EReference getHeatPump_PowerInput() {
return (EReference) heatPumpEClass.getEStructuralFeatures().get(2);
}
/**
......@@ -1094,8 +1081,8 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
* @generated
*/
@Override
public EReference getHeatPump_CoefficientOfPerformance() {
return (EReference) heatPumpEClass.getEStructuralFeatures().get(1);
public EReference getHeatPump_HeatOutput() {
return (EReference) heatPumpEClass.getEStructuralFeatures().get(3);
}
/**
......@@ -2248,6 +2235,36 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
return costEClass;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public EAttribute getCost_ComponentName() {
return (EAttribute) costEClass.getEStructuralFeatures().get(0);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public EAttribute getCost_Description() {
return (EAttribute) costEClass.getEStructuralFeatures().get(1);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public EAttribute getCost_HeatSource() {
return (EAttribute) costEClass.getEStructuralFeatures().get(2);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -2388,36 +2405,6 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
return powerFunctionEClass.getEOperations().get(0);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public EAttribute getCost_ComponentName() {
return (EAttribute) costEClass.getEStructuralFeatures().get(0);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public EAttribute getCost_Description() {
return (EAttribute) costEClass.getEStructuralFeatures().get(1);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public EAttribute getCost_HeatSource() {
return (EAttribute) costEClass.getEStructuralFeatures().get(2);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -2468,26 +2455,6 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
return thermalStorageTypesEEnum;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public EEnum getFuelTypes() {
return fuelTypesEEnum;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public EEnum getTypeOfHeatSource() {
return typeOfHeatSourceEEnum;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -2504,8 +2471,8 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
* @generated
*/
@Override
public EDataType getQuantityDouble() {
return quantityDoubleEDataType;
public EEnum getFuelTypes() {
return fuelTypesEEnum;
}
/**
......@@ -2514,8 +2481,8 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
* @generated
*/
@Override
public EDataType getQuantityLong() {
return quantityLongEDataType;
public EEnum getTypeOfHeatSource() {
return typeOfHeatSourceEEnum;
}
/**
......@@ -2790,10 +2757,6 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
cellTypesElectrolyzerEEnum = createEEnum(CELL_TYPES_ELECTROLYZER);
fuelTypesEEnum = createEEnum(FUEL_TYPES);
typeOfHeatSourceEEnum = createEEnum(TYPE_OF_HEAT_SOURCE);
// Create data types
quantityDoubleEDataType = createEDataType(QUANTITY_DOUBLE);
quantityLongEDataType = createEDataType(QUANTITY_LONG);
}
/**
......@@ -2821,6 +2784,8 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
setNsURI(eNS_URI);
// Obtain other dependent packages
QuantitiesPackage theQuantitiesPackage = (QuantitiesPackage) EPackage.Registry.INSTANCE
.getEPackage(QuantitiesPackage.eNS_URI);
XMLTypePackage theXMLTypePackage = (XMLTypePackage) EPackage.Registry.INSTANCE
.getEPackage(XMLTypePackage.eNS_URI);
......@@ -2950,28 +2915,28 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
initEClass(thermalStorageEClass, ThermalStorage.class, "ThermalStorage", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getThermalStorage_Volume(), this.getQuantityDouble(), "volume", "5 m\u00b3", 0, 1,
ThermalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
initEAttribute(getThermalStorage_Volume(), theQuantitiesPackage.getQuantityDouble(), "volume", "5 m\u00b3", 0,
1, ThermalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getThermalStorage_ThermalStorageType(), this.getThermalStorageTypes(), "thermalStorageType",
null, 0, 1, ThermalStorage.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
!IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getThermalStorage_MaxTemp(), this.getQuantityDouble(), "maxTemp", "80 \u00b0C", 0, 1,
ThermalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getThermalStorage_TankThickness(), this.getQuantityDouble(), "tankThickness", "10 mm ", 0, 1,
ThermalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getThermalStorage_InsulationThickness(), this.getQuantityDouble(), "insulationThickness",
"100 mm", 0, 1, ThermalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
initEAttribute(getThermalStorage_MaxTemp(), theQuantitiesPackage.getQuantityDouble(), "maxTemp", "80 \u00b0C",
0, 1, ThermalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getThermalStorage_TankThickness(), theQuantitiesPackage.getQuantityDouble(), "tankThickness",
"10 mm ", 0, 1, ThermalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getThermalStorage_InsulationThickness(), theQuantitiesPackage.getQuantityDouble(),
"insulationThickness", "100 mm", 0, 1, ThermalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getThermalStorage_UsesMedium(), this.getMedium(), null, "usesMedium", null, 1, 1,
ThermalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getThermalStorage_InsulationMaterial(), this.getMaterial(), null, "insulationMaterial", null, 0,
1, ThermalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getThermalStorage_Height(), this.getQuantityDouble(), "height", "2 m", 0, 1,
initEAttribute(getThermalStorage_Height(), theQuantitiesPackage.getQuantityDouble(), "height", "2 m", 0, 1,
ThermalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEReference(getThermalStorage_TankMaterial(), this.getMaterial(), null, "tankMaterial", null, 0, 1,
......@@ -2983,12 +2948,12 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
initEAttribute(getElectricalStorage_ElectricalStorageType(), this.getElectricalStorageTypes(),
"electricalStorageType", null, 1, 1, ElectricalStorage.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getElectricalStorage_BatteryCapacity(), this.getQuantityDouble(), "batteryCapacity", "A*h", 1, 1,
ElectricalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getElectricalStorage_BatteryVoltage(), this.getQuantityDouble(), "batteryVoltage", "V", 0, 1,
ElectricalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getElectricalStorage_BatteryCapacity(), theQuantitiesPackage.getQuantityDouble(),
"batteryCapacity", "A*h", 1, 1, ElectricalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getElectricalStorage_BatteryVoltage(), theQuantitiesPackage.getQuantityDouble(),
"batteryVoltage", "V", 0, 1, ElectricalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getElectricalStorage_BatteryLifeCycle(), ecorePackage.getEDouble(), "batteryLifeCycle", "7000",
0, 1, ElectricalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
......@@ -3001,9 +2966,9 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
initEAttribute(getElectricalStorage_BatteryEffiency(), ecorePackage.getEDouble(), "batteryEffiency", "0.8", 0,
1, ElectricalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getElectricalStorage_EnergyContent(), this.getQuantityDouble(), "energyContent", "5 kW*h", 1, 1,
ElectricalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getElectricalStorage_EnergyContent(), theQuantitiesPackage.getQuantityDouble(), "energyContent",
"5 kW*h", 1, 1, ElectricalStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(combinedHeatPowerEClass, CombinedHeatPower.class, "CombinedHeatPower", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
......@@ -3013,7 +2978,7 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
initEAttribute(getCombinedHeatPower_ElectricalEfficiency(), ecorePackage.getEDouble(), "electricalEfficiency",
"0.4", 1, 1, CombinedHeatPower.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getCombinedHeatPower_InstalledElectricalPower(), this.getQuantityDouble(),
initEAttribute(getCombinedHeatPower_InstalledElectricalPower(), theQuantitiesPackage.getQuantityDouble(),
"installedElectricalPower", "kW", 1, 1, CombinedHeatPower.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getCombinedHeatPower_ElectricalEfficiencyPartLoad(), this.getCharacteristic(), null,
......@@ -3049,9 +3014,9 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
initEAttribute(getSolarThermalCollector_CollectorType(), this.getCollectorTypes(), "collectorType", null, 1, 1,
SolarThermalCollector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSolarThermalCollector_ApertureArea(), this.getQuantityDouble(), "apertureArea", "m\u00b2", 1,
1, SolarThermalCollector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSolarThermalCollector_ApertureArea(), theQuantitiesPackage.getQuantityDouble(),
"apertureArea", "m\u00b2", 1, 1, SolarThermalCollector.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSolarThermalCollector_OpticalEfficiency(), ecorePackage.getEDouble(), "opticalEfficiency",
"0.77", 0, 1, SolarThermalCollector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
......@@ -3067,28 +3032,28 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
initEAttribute(getElectrolyzer_CellType(), this.getcellTypesElectrolyzer(), "cellType", null, 0, 1,
Electrolyzer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getElectrolyzer_CellArea(), this.getQuantityDouble(), "cellArea", "50 cm\u00b2", 1, 1,
Electrolyzer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
initEAttribute(getElectrolyzer_CellArea(), theQuantitiesPackage.getQuantityDouble(), "cellArea", "50 cm\u00b2",
1, 1, Electrolyzer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getElectrolyzer_NumberOfCells(), ecorePackage.getEDouble(), "numberOfCells", "5", 1, 1,
Electrolyzer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getElectrolyzer_MaxOperatingCurrentDensity(), this.getQuantityDouble(),
initEAttribute(getElectrolyzer_MaxOperatingCurrentDensity(), theQuantitiesPackage.getQuantityDouble(),
"maxOperatingCurrentDensity", "3 A/cm\u00b2", 0, 1, Electrolyzer.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getElectrolyzer_MinOperatingCurrentDensity(), this.getQuantityDouble(),
initEAttribute(getElectrolyzer_MinOperatingCurrentDensity(), theQuantitiesPackage.getQuantityDouble(),
"minOperatingCurrentDensity", "0.3 A/cm\u00b2", 0, 1, Electrolyzer.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getElectrolyzer_OverloadCapacity(), this.getQuantityDouble(), "overloadCapacity", "120 %", 0, 1,
Electrolyzer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getElectrolyzer_NominalCellVoltage(), this.getQuantityDouble(), "nominalCellVoltage", "1.94 V",
0, 1, Electrolyzer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getElectrolyzer_OverloadCapacity(), theQuantitiesPackage.getQuantityDouble(), "overloadCapacity",
"120 %", 0, 1, Electrolyzer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getElectrolyzer_NominalCellVoltage(), theQuantitiesPackage.getQuantityDouble(),
"nominalCellVoltage", "1.94 V", 0, 1, Electrolyzer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(thermalEnergyDeviceEClass, ThermalEnergyDevice.class, "ThermalEnergyDevice", IS_ABSTRACT,
!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getThermalEnergyDevice_InstalledThermalPower(), this.getQuantityDouble(),
initEAttribute(getThermalEnergyDevice_InstalledThermalPower(), theQuantitiesPackage.getQuantityDouble(),
"installedThermalPower", "kW", 1, 1, ThermalEnergyDevice.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getThermalEnergyDevice_ModulationRange(), ecorePackage.getEDouble(), "modulationRange", "0.5", 0,
......@@ -3106,33 +3071,33 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
initEAttribute(getHydrogenCompressor_ThermodynamicMode(), ecorePackage.getEInt(), "thermodynamicMode", "0", 0,
1, HydrogenCompressor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getHydrogenCompressor_MaxPressure(), this.getQuantityDouble(), "maxPressure", "50 MPa", 0, 1,
HydrogenCompressor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getHydrogenCompressor_MaxDeliveryRate(), this.getQuantityDouble(), "maxDeliveryRate", "9 kg/h",
0, 1, HydrogenCompressor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getHydrogenCompressor_MaxPressure(), theQuantitiesPackage.getQuantityDouble(), "maxPressure",
"50 MPa", 0, 1, HydrogenCompressor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getHydrogenCompressor_MaxDeliveryRate(), theQuantitiesPackage.getQuantityDouble(),
"maxDeliveryRate", "9 kg/h", 0, 1, HydrogenCompressor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(hydrogenStorageEClass, HydrogenStorage.class, "HydrogenStorage", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getHydrogenStorage_NumberOfCylinders(), ecorePackage.getEInt(), "numberOfCylinders", "1", 1, 1,
HydrogenStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getHydrogenStorage_CylinderVolume(), this.getQuantityDouble(), "cylinderVolume", "1.5 m\u00b3",
1, 1, HydrogenStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getHydrogenStorage_NominalPressure(), this.getQuantityDouble(), "nominalPressure", "25 MPa", 0,
1, HydrogenStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getHydrogenStorage_CylinderVolume(), theQuantitiesPackage.getQuantityDouble(), "cylinderVolume",
"1.5 m\u00b3", 1, 1, HydrogenStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getHydrogenStorage_NominalPressure(), theQuantitiesPackage.getQuantityDouble(),
"nominalPressure", "25 MPa", 0, 1, HydrogenStorage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(fuelCellEClass, FuelCell.class, "FuelCell", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEClass(energyCarrierEClass, EnergyCarrier.class, "EnergyCarrier", IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getEnergyCarrier_Co2EmissionsFactor(), this.getQuantityDouble(), "co2EmissionsFactor", "t/MW*h",
1, 1, EnergyCarrier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getEnergyCarrier_Co2EmissionsFactor(), theQuantitiesPackage.getQuantityDouble(),
"co2EmissionsFactor", "t/MW*h", 1, 1, EnergyCarrier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getEnergyCarrier_PrimaryEnergyFactor(), ecorePackage.getEDouble(), "primaryEnergyFactor", null,
1, 1, EnergyCarrier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
......@@ -3169,14 +3134,15 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(fuelEClass, Fuel.class, "Fuel", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getFuel_NetCalorificValue(), this.getQuantityDouble(), "netCalorificValue", "(kW*h)/m\u00b3", 1,
1, Fuel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getFuel_GrossCalorificValue(), this.getQuantityDouble(), "grossCalorificValue", "(kW*h)/m\u00b3",
1, 1, Fuel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getFuel_Density(), this.getQuantityDouble(), "density", "kg/m\u00b3", 1, 1, Fuel.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getFuel_NetCalorificValue(), theQuantitiesPackage.getQuantityDouble(), "netCalorificValue",
"(kW*h)/m\u00b3", 1, 1, Fuel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getFuel_GrossCalorificValue(), theQuantitiesPackage.getQuantityDouble(), "grossCalorificValue",
"(kW*h)/m\u00b3", 1, 1, Fuel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getFuel_Density(), theQuantitiesPackage.getQuantityDouble(), "density", "kg/m\u00b3", 1, 1,
Fuel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEAttribute(getFuel_FuelType(), this.getFuelTypes(), "fuelType", null, 1, 1, Fuel.class, !IS_TRANSIENT,
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
......@@ -3188,21 +3154,21 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
initEAttribute(getPhotovoltaicModule_CellType(), ecorePackage.getEEnumerator(), "cellType", null, 1, 1,
PhotovoltaicModule.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getPhotovoltaicModule_NominalPower(), this.getQuantityDouble(), "nominalPower", "W", 1, 1,
PhotovoltaicModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getPhotovoltaicModule_MppVoltage(), this.getQuantityDouble(), "mppVoltage", "V", 1, 1,
PhotovoltaicModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getPhotovoltaicModule_MppCurrent(), this.getQuantityDouble(), "mppCurrent", "A", 1, 1,
PhotovoltaicModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getPhotovoltaicModule_NominalPower(), theQuantitiesPackage.getQuantityDouble(), "nominalPower",
"W", 1, 1, PhotovoltaicModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getPhotovoltaicModule_MppVoltage(), theQuantitiesPackage.getQuantityDouble(), "mppVoltage", "V",
1, 1, PhotovoltaicModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getPhotovoltaicModule_MppCurrent(), theQuantitiesPackage.getQuantityDouble(), "mppCurrent", "A",
1, 1, PhotovoltaicModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getPhotovoltaicModule_NominalEfficiency(), ecorePackage.getEDouble(), "nominalEfficiency",
"0.18", 1, 1, PhotovoltaicModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getPhotovoltaicModule_ModuleArea(), this.getQuantityDouble(), "moduleArea", "m\u00b2", 1, 1,
PhotovoltaicModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getPhotovoltaicModule_ModuleArea(), theQuantitiesPackage.getQuantityDouble(), "moduleArea",
"m\u00b2", 1, 1, PhotovoltaicModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(inverterEClass, Inverter.class, "Inverter", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
......@@ -3212,28 +3178,29 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
initEAttribute(getHeatExchanger_HeatRecoveryEfficiency(), ecorePackage.getEDouble(), "heatRecoveryEfficiency",
"0.8", 0, 1, HeatExchanger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getHeatExchanger_NominalElectricityConsumption(), this.getQuantityDouble(),
initEAttribute(getHeatExchanger_NominalElectricityConsumption(), theQuantitiesPackage.getQuantityDouble(),
"nominalElectricityConsumption", "W", 1, 1, HeatExchanger.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(geothermalHeatExchangerEClass, GeothermalHeatExchanger.class, "GeothermalHeatExchanger",
!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getGeothermalHeatExchanger_PipeDiameter(), this.getQuantityDouble(), "pipeDiameter", "1 cm", 0,
1, GeothermalHeatExchanger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getGeothermalHeatExchanger_PipeDiameter(), theQuantitiesPackage.getQuantityDouble(),
"pipeDiameter", "1 cm", 0, 1, GeothermalHeatExchanger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(mediumEClass, Medium.class, "Medium", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getMedium_Density(), this.getQuantityDouble(), "density", "g/cm\u00b3", 1, 1, Medium.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getMedium_HeatCapacity(), this.getQuantityDouble(), "heatCapacity", "kJ/(kg*K)", 0, 1,
initEAttribute(getMedium_Density(), theQuantitiesPackage.getQuantityDouble(), "density", "g/cm\u00b3", 1, 1,
Medium.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getMedium_EvaporationTemperature(), this.getQuantityDouble(), "evaporationTemperature",
initEAttribute(getMedium_HeatCapacity(), theQuantitiesPackage.getQuantityDouble(), "heatCapacity", "kJ/(kg*K)",
0, 1, Medium.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getMedium_EvaporationTemperature(), theQuantitiesPackage.getQuantityDouble(),
"evaporationTemperature", "\u00b0C", 0, 1, Medium.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getMedium_MeltingTemperature(), theQuantitiesPackage.getQuantityDouble(), "meltingTemperature",
"\u00b0C", 0, 1, Medium.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getMedium_MeltingTemperature(), this.getQuantityDouble(), "meltingTemperature", "\u00b0C", 0, 1,
Medium.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getMedium_Name(), ecorePackage.getEString(), "name", null, 1, 1, Medium.class, !IS_TRANSIENT,
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
......@@ -3342,9 +3309,9 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
initEClass(materialEClass, Material.class, "Material", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getMaterial_ThermalConductivity(), this.getQuantityDouble(), "thermalConductivity", " W/(m*K)",
0, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getMaterial_ThermalConductivity(), theQuantitiesPackage.getQuantityDouble(),
"thermalConductivity", " W/(m*K)", 0, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getMaterial_Name(), ecorePackage.getEString(), "name", null, 1, 1, Material.class, !IS_TRANSIENT,
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
......@@ -3378,8 +3345,9 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
initEAttribute(getCost_OtherInvestmentCost(), ecorePackage.getEDouble(), "otherInvestmentCost", "0", 0, 1,
Cost.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEAttribute(getCost_PersonnelHours(), this.getQuantityDouble(), "personnelHours", "10 h", 0, 1, Cost.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getCost_PersonnelHours(), theQuantitiesPackage.getQuantityDouble(), "personnelHours", "10 h", 0,
1, Cost.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getCost_PersonnelCostShare(), ecorePackage.getEDouble(), "personnelCostShare", null, 0, 1,
Cost.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
......@@ -3465,12 +3433,6 @@ public class EnCompPackageImpl extends EPackageImpl implements EnCompPackage {
addEEnumLiteral(typeOfHeatSourceEEnum, TypeOfHeatSource.SOIL);
addEEnumLiteral(typeOfHeatSourceEEnum, TypeOfHeatSource.NONE);
// Initialize data types
initEDataType(quantityDoubleEDataType, NullableQuantity.class, "QuantityDouble", IS_SERIALIZABLE,
!IS_GENERATED_INSTANCE_CLASS);
initEDataType(quantityLongEDataType, NullableQuantity.class, "QuantityLong", IS_SERIALIZABLE,
!IS_GENERATED_INSTANCE_CLASS);
// Create resource
createResource(eNS_URI);
}
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/EnergyCarrierImpl.java
+ 7
- 5
View file @ 7ad4aed5
......@@ -2,12 +2,14 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.EnergyCarrier;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
......@@ -40,8 +42,8 @@ public abstract class EnergyCarrierImpl extends MinimalEObjectImpl.Container imp
* @generated
* @ordered
*/
protected static final NullableQuantity CO2_EMISSIONS_FACTOR_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "t/MW*h");
protected static final NullableQuantity CO2_EMISSIONS_FACTOR_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "t/MW*h");
/**
* The cached value of the '{@link #getCo2EmissionsFactor() <em>Co2 Emissions Factor</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/EnergyComponentImpl.java
+ 2
- 2
View file @ 7ad4aed5
......@@ -4,13 +4,13 @@ package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.EnergyComponent;
import de.hftstuttgart.energycomponents.Manufacturer;
import org.eclipse.emf.common.notify.Notification;
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;
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/EnergyComponentsCostCatalogImpl.java
+ 2
- 0
View file @ 7ad4aed5
......@@ -5,6 +5,7 @@ package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.Cost;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.EnergyComponentsCostCatalog;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
......@@ -17,6 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/FossilFuelImpl.java
+ 1
- 0
View file @ 7ad4aed5
......@@ -4,6 +4,7 @@ package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.FossilFuel;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/FuelImpl.java
+ 11
- 9
View file @ 7ad4aed5
......@@ -2,12 +2,14 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.Fuel;
import de.hftstuttgart.energycomponents.FuelTypes;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
......@@ -40,8 +42,8 @@ public abstract class FuelImpl extends EnergyCarrierImpl implements Fuel {
* @generated
* @ordered
*/
protected static final NullableQuantity NET_CALORIFIC_VALUE_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "(kW*h)/m\u00b3");
protected static final NullableQuantity NET_CALORIFIC_VALUE_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "(kW*h)/m\u00b3");
/**
* The cached value of the '{@link #getNetCalorificValue() <em>Net Calorific Value</em>}' attribute.
......@@ -61,8 +63,8 @@ public abstract class FuelImpl extends EnergyCarrierImpl implements Fuel {
* @generated
* @ordered
*/
protected static final NullableQuantity GROSS_CALORIFIC_VALUE_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "(kW*h)/m\u00b3");
protected static final NullableQuantity GROSS_CALORIFIC_VALUE_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "(kW*h)/m\u00b3");
/**
* The cached value of the '{@link #getGrossCalorificValue() <em>Gross Calorific Value</em>}' attribute.
......@@ -82,8 +84,8 @@ public abstract class FuelImpl extends EnergyCarrierImpl implements Fuel {
* @generated
* @ordered
*/
protected static final NullableQuantity DENSITY_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "kg/m\u00b3");
protected static final NullableQuantity DENSITY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg/m\u00b3");
/**
* The cached value of the '{@link #getDensity() <em>Density</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/GeothermalHeatExchangerImpl.java
+ 7
- 5
View file @ 7ad4aed5
......@@ -2,12 +2,14 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.GeothermalHeatExchanger;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
......@@ -36,8 +38,8 @@ public class GeothermalHeatExchangerImpl extends EnergyComponentImpl implements
* @generated
* @ordered
*/
protected static final NullableQuantity PIPE_DIAMETER_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "1 cm");
protected static final NullableQuantity PIPE_DIAMETER_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "1 cm");
/**
* The cached value of the '{@link #getPipeDiameter() <em>Pipe Diameter</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/HeatExchangerImpl.java
+ 7
- 5
View file @ 7ad4aed5
......@@ -2,12 +2,14 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.HeatExchanger;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
......@@ -57,8 +59,8 @@ public class HeatExchangerImpl extends EnergyComponentImpl implements HeatExchan
* @generated
* @ordered
*/
protected static final NullableQuantity NOMINAL_ELECTRICITY_CONSUMPTION_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "W");
protected static final NullableQuantity NOMINAL_ELECTRICITY_CONSUMPTION_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "W");
/**
* The cached value of the '{@link #getNominalElectricityConsumption() <em>Nominal Electricity Consumption</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/HeatPumpImpl.java
+ 55
- 54
View file @ 7ad4aed5
......@@ -6,8 +6,10 @@ import de.hftstuttgart.energycomponents.Characteristic;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.HeatPump;
import de.hftstuttgart.energycomponents.HeatSources;
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;
......@@ -129,8 +131,8 @@ public class HeatPumpImpl extends ThermalEnergyDeviceImpl implements HeatPump {
* @generated
*/
@Override
public Characteristic getPowerInput() {
return powerInput;
public Characteristic getCoefficientOfPerformance() {
return coefficientOfPerformance;
}
/**
......@@ -138,12 +140,14 @@ public class HeatPumpImpl extends ThermalEnergyDeviceImpl implements HeatPump {
* <!-- end-user-doc -->
* @generated
*/
public NotificationChain basicSetPowerInput(Characteristic newPowerInput, NotificationChain msgs) {
Characteristic oldPowerInput = powerInput;
powerInput = newPowerInput;
public NotificationChain basicSetCoefficientOfPerformance(Characteristic newCoefficientOfPerformance,
NotificationChain msgs) {
Characteristic oldCoefficientOfPerformance = coefficientOfPerformance;
coefficientOfPerformance = newCoefficientOfPerformance;
if (eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
EnCompPackage.HEAT_PUMP__POWER_INPUT, oldPowerInput, newPowerInput);
EnCompPackage.HEAT_PUMP__COEFFICIENT_OF_PERFORMANCE, oldCoefficientOfPerformance,
newCoefficientOfPerformance);
if (msgs == null)
msgs = notification;
else
......@@ -158,21 +162,21 @@ public class HeatPumpImpl extends ThermalEnergyDeviceImpl implements HeatPump {
* @generated
*/
@Override
public void setPowerInput(Characteristic newPowerInput) {
if (newPowerInput != powerInput) {
public void setCoefficientOfPerformance(Characteristic newCoefficientOfPerformance) {
if (newCoefficientOfPerformance != coefficientOfPerformance) {
NotificationChain msgs = null;
if (powerInput != null)
msgs = ((InternalEObject) powerInput).eInverseRemove(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__POWER_INPUT, null, msgs);
if (newPowerInput != null)
msgs = ((InternalEObject) newPowerInput).eInverseAdd(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__POWER_INPUT, null, msgs);
msgs = basicSetPowerInput(newPowerInput, msgs);
if (coefficientOfPerformance != null)
msgs = ((InternalEObject) coefficientOfPerformance).eInverseRemove(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__COEFFICIENT_OF_PERFORMANCE, null, msgs);
if (newCoefficientOfPerformance != null)
msgs = ((InternalEObject) newCoefficientOfPerformance).eInverseAdd(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__COEFFICIENT_OF_PERFORMANCE, null, msgs);
msgs = basicSetCoefficientOfPerformance(newCoefficientOfPerformance, msgs);
if (msgs != null)
msgs.dispatch();
} else if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.HEAT_PUMP__POWER_INPUT, newPowerInput,
newPowerInput));
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.HEAT_PUMP__COEFFICIENT_OF_PERFORMANCE,
newCoefficientOfPerformance, newCoefficientOfPerformance));
}
/**
......@@ -181,8 +185,8 @@ public class HeatPumpImpl extends ThermalEnergyDeviceImpl implements HeatPump {
* @generated
*/
@Override
public Characteristic getHeatOutput() {
return heatOutput;
public Characteristic getPowerInput() {
return powerInput;
}
/**
......@@ -190,12 +194,12 @@ public class HeatPumpImpl extends ThermalEnergyDeviceImpl implements HeatPump {
* <!-- end-user-doc -->
* @generated
*/
public NotificationChain basicSetHeatOutput(Characteristic newHeatOutput, NotificationChain msgs) {
Characteristic oldHeatOutput = heatOutput;
heatOutput = newHeatOutput;
public NotificationChain basicSetPowerInput(Characteristic newPowerInput, NotificationChain msgs) {
Characteristic oldPowerInput = powerInput;
powerInput = newPowerInput;
if (eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
EnCompPackage.HEAT_PUMP__HEAT_OUTPUT, oldHeatOutput, newHeatOutput);
EnCompPackage.HEAT_PUMP__POWER_INPUT, oldPowerInput, newPowerInput);
if (msgs == null)
msgs = notification;
else
......@@ -210,21 +214,21 @@ public class HeatPumpImpl extends ThermalEnergyDeviceImpl implements HeatPump {
* @generated
*/
@Override
public void setHeatOutput(Characteristic newHeatOutput) {
if (newHeatOutput != heatOutput) {
public void setPowerInput(Characteristic newPowerInput) {
if (newPowerInput != powerInput) {
NotificationChain msgs = null;
if (heatOutput != null)
msgs = ((InternalEObject) heatOutput).eInverseRemove(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__HEAT_OUTPUT, null, msgs);
if (newHeatOutput != null)
msgs = ((InternalEObject) newHeatOutput).eInverseAdd(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__HEAT_OUTPUT, null, msgs);
msgs = basicSetHeatOutput(newHeatOutput, msgs);
if (powerInput != null)
msgs = ((InternalEObject) powerInput).eInverseRemove(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__POWER_INPUT, null, msgs);
if (newPowerInput != null)
msgs = ((InternalEObject) newPowerInput).eInverseAdd(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__POWER_INPUT, null, msgs);
msgs = basicSetPowerInput(newPowerInput, msgs);
if (msgs != null)
msgs.dispatch();
} else if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.HEAT_PUMP__HEAT_OUTPUT, newHeatOutput,
newHeatOutput));
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.HEAT_PUMP__POWER_INPUT, newPowerInput,
newPowerInput));
}
/**
......@@ -233,8 +237,8 @@ public class HeatPumpImpl extends ThermalEnergyDeviceImpl implements HeatPump {
* @generated
*/
@Override
public Characteristic getCoefficientOfPerformance() {
return coefficientOfPerformance;
public Characteristic getHeatOutput() {
return heatOutput;
}
/**
......@@ -242,14 +246,12 @@ public class HeatPumpImpl extends ThermalEnergyDeviceImpl implements HeatPump {
* <!-- end-user-doc -->
* @generated
*/
public NotificationChain basicSetCoefficientOfPerformance(Characteristic newCoefficientOfPerformance,
NotificationChain msgs) {
Characteristic oldCoefficientOfPerformance = coefficientOfPerformance;
coefficientOfPerformance = newCoefficientOfPerformance;
public NotificationChain basicSetHeatOutput(Characteristic newHeatOutput, NotificationChain msgs) {
Characteristic oldHeatOutput = heatOutput;
heatOutput = newHeatOutput;
if (eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
EnCompPackage.HEAT_PUMP__COEFFICIENT_OF_PERFORMANCE, oldCoefficientOfPerformance,
newCoefficientOfPerformance);
EnCompPackage.HEAT_PUMP__HEAT_OUTPUT, oldHeatOutput, newHeatOutput);
if (msgs == null)
msgs = notification;
else
......@@ -264,21 +266,21 @@ public class HeatPumpImpl extends ThermalEnergyDeviceImpl implements HeatPump {
* @generated
*/
@Override
public void setCoefficientOfPerformance(Characteristic newCoefficientOfPerformance) {
if (newCoefficientOfPerformance != coefficientOfPerformance) {
public void setHeatOutput(Characteristic newHeatOutput) {
if (newHeatOutput != heatOutput) {
NotificationChain msgs = null;
if (coefficientOfPerformance != null)
msgs = ((InternalEObject) coefficientOfPerformance).eInverseRemove(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__COEFFICIENT_OF_PERFORMANCE, null, msgs);
if (newCoefficientOfPerformance != null)
msgs = ((InternalEObject) newCoefficientOfPerformance).eInverseAdd(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__COEFFICIENT_OF_PERFORMANCE, null, msgs);
msgs = basicSetCoefficientOfPerformance(newCoefficientOfPerformance, msgs);
if (heatOutput != null)
msgs = ((InternalEObject) heatOutput).eInverseRemove(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__HEAT_OUTPUT, null, msgs);
if (newHeatOutput != null)
msgs = ((InternalEObject) newHeatOutput).eInverseAdd(this,
EOPPOSITE_FEATURE_BASE - EnCompPackage.HEAT_PUMP__HEAT_OUTPUT, null, msgs);
msgs = basicSetHeatOutput(newHeatOutput, msgs);
if (msgs != null)
msgs.dispatch();
} else if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.HEAT_PUMP__COEFFICIENT_OF_PERFORMANCE,
newCoefficientOfPerformance, newCoefficientOfPerformance));
eNotify(new ENotificationImpl(this, Notification.SET, EnCompPackage.HEAT_PUMP__HEAT_OUTPUT, newHeatOutput,
newHeatOutput));
}
/**
......@@ -324,7 +326,6 @@ public class HeatPumpImpl extends ThermalEnergyDeviceImpl implements HeatPump {
* <!-- end-user-doc -->
* @generated
*/
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/HydrogenCompressorImpl.java
+ 9
- 7
View file @ 7ad4aed5
......@@ -2,12 +2,14 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.HydrogenCompressor;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
......@@ -79,8 +81,8 @@ public class HydrogenCompressorImpl extends EnergyComponentImpl implements Hydro
* @generated
* @ordered
*/
protected static final NullableQuantity MAX_PRESSURE_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "50 MPa");
protected static final NullableQuantity MAX_PRESSURE_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "50 MPa");
/**
* The cached value of the '{@link #getMaxPressure() <em>Max Pressure</em>}' attribute.
......@@ -100,8 +102,8 @@ public class HydrogenCompressorImpl extends EnergyComponentImpl implements Hydro
* @generated
* @ordered
*/
protected static final NullableQuantity MAX_DELIVERY_RATE_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "9 kg/h");
protected static final NullableQuantity MAX_DELIVERY_RATE_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "9 kg/h");
/**
* The cached value of the '{@link #getMaxDeliveryRate() <em>Max Delivery Rate</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/HydrogenStorageImpl.java
+ 9
- 7
View file @ 7ad4aed5
......@@ -2,12 +2,14 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.HydrogenStorage;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
......@@ -58,8 +60,8 @@ public class HydrogenStorageImpl extends EnergyComponentImpl implements Hydrogen
* @generated
* @ordered
*/
protected static final NullableQuantity CYLINDER_VOLUME_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "1.5 m\u00b3");
protected static final NullableQuantity CYLINDER_VOLUME_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "1.5 m\u00b3");
/**
* The cached value of the '{@link #getCylinderVolume() <em>Cylinder Volume</em>}' attribute.
......@@ -79,8 +81,8 @@ public class HydrogenStorageImpl extends EnergyComponentImpl implements Hydrogen
* @generated
* @ordered
*/
protected static final NullableQuantity NOMINAL_PRESSURE_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "25 MPa");
protected static final NullableQuantity NOMINAL_PRESSURE_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "25 MPa");
/**
* The cached value of the '{@link #getNominalPressure() <em>Nominal Pressure</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/MaterialImpl.java
+ 9
- 5
View file @ 7ad4aed5
......@@ -2,11 +2,16 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.Material;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
......@@ -35,8 +40,8 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* @generated
* @ordered
*/
protected static final NullableQuantity THERMAL_CONDUCTIVITY_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), " W/(m*K)");
protected static final NullableQuantity THERMAL_CONDUCTIVITY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), " W/(m*K)");
/**
* The cached value of the '{@link #getThermalConductivity() <em>Thermal Conductivity</em>}' attribute.
......@@ -155,7 +160,6 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* <!-- end-user-doc -->
* @generated
*/
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/MediumImpl.java
+ 14
- 10
View file @ 7ad4aed5
......@@ -2,14 +2,18 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.Medium;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
......@@ -39,8 +43,8 @@ public class MediumImpl extends MinimalEObjectImpl.Container implements Medium {
* @generated
* @ordered
*/
protected static final NullableQuantity DENSITY_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "g/cm\u00b3");
protected static final NullableQuantity DENSITY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "g/cm\u00b3");
/**
* The cached value of the '{@link #getDensity() <em>Density</em>}' attribute.
......@@ -60,8 +64,8 @@ public class MediumImpl extends MinimalEObjectImpl.Container implements Medium {
* @generated
* @ordered
*/
protected static final NullableQuantity HEAT_CAPACITY_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "kJ/(kg*K)");
protected static final NullableQuantity HEAT_CAPACITY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kJ/(kg*K)");
/**
* The cached value of the '{@link #getHeatCapacity() <em>Heat Capacity</em>}' attribute.
......@@ -81,8 +85,8 @@ public class MediumImpl extends MinimalEObjectImpl.Container implements Medium {
* @generated
* @ordered
*/
protected static final NullableQuantity EVAPORATION_TEMPERATURE_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "\u00b0C");
protected static final NullableQuantity EVAPORATION_TEMPERATURE_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "\u00b0C");
/**
* The cached value of the '{@link #getEvaporationTemperature() <em>Evaporation Temperature</em>}' attribute.
......@@ -102,8 +106,8 @@ public class MediumImpl extends MinimalEObjectImpl.Container implements Medium {
* @generated
* @ordered
*/
protected static final NullableQuantity MELTING_TEMPERATURE_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "\u00b0C");
protected static final NullableQuantity MELTING_TEMPERATURE_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "\u00b0C");
/**
* The cached value of the '{@link #getMeltingTemperature() <em>Melting Temperature</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/PhotovoltaicModuleImpl.java
+ 13
- 11
View file @ 7ad4aed5
......@@ -2,12 +2,14 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.PhotovoltaicModule;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.Enumerator;
......@@ -63,8 +65,8 @@ public class PhotovoltaicModuleImpl extends EnergyComponentImpl implements Photo
* @generated
* @ordered
*/
protected static final NullableQuantity NOMINAL_POWER_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "W");
protected static final NullableQuantity NOMINAL_POWER_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "W");
/**
* The cached value of the '{@link #getNominalPower() <em>Nominal Power</em>}' attribute.
......@@ -84,8 +86,8 @@ public class PhotovoltaicModuleImpl extends EnergyComponentImpl implements Photo
* @generated
* @ordered
*/
protected static final NullableQuantity MPP_VOLTAGE_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "V");
protected static final NullableQuantity MPP_VOLTAGE_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "V");
/**
* The cached value of the '{@link #getMppVoltage() <em>Mpp Voltage</em>}' attribute.
......@@ -105,8 +107,8 @@ public class PhotovoltaicModuleImpl extends EnergyComponentImpl implements Photo
* @generated
* @ordered
*/
protected static final NullableQuantity MPP_CURRENT_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "A");
protected static final NullableQuantity MPP_CURRENT_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "A");
/**
* The cached value of the '{@link #getMppCurrent() <em>Mpp Current</em>}' attribute.
......@@ -146,8 +148,8 @@ public class PhotovoltaicModuleImpl extends EnergyComponentImpl implements Photo
* @generated
* @ordered
*/
protected static final NullableQuantity MODULE_AREA_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "m\u00b2");
protected static final NullableQuantity MODULE_AREA_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "m\u00b2");
/**
* The cached value of the '{@link #getModuleArea() <em>Module Area</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/SolarThermalCollectorImpl.java
+ 7
- 5
View file @ 7ad4aed5
......@@ -2,13 +2,15 @@
*/
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.CollectorTypes;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.SolarThermalCollector;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
......@@ -61,8 +63,8 @@ public class SolarThermalCollectorImpl extends EnergyComponentImpl implements So
* @generated
* @ordered
*/
protected static final NullableQuantity APERTURE_AREA_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "m\u00b2");
protected static final NullableQuantity APERTURE_AREA_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "m\u00b2");
/**
* The cached value of the '{@link #getApertureArea() <em>Aperture Area</em>}' attribute.
......
de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/ThermalEnergyDeviceImpl.java
+ 8
- 5
View file @ 7ad4aed5
......@@ -2,16 +2,19 @@
*/
package de.hftstuttgart.energycomponents.impl;
import de.hftstuttgart.energycomponents.EnCompFactory;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import de.hftstuttgart.energycomponents.EnCompPackage;
import de.hftstuttgart.energycomponents.FuelTypes;
import de.hftstuttgart.energycomponents.ThermalEnergyDevice;
import de.hftstuttgart.units.NullableQuantity;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
......@@ -38,8 +41,8 @@ public abstract class ThermalEnergyDeviceImpl extends EnergyComponentImpl implem
* @generated
* @ordered
*/
protected static final NullableQuantity INSTALLED_THERMAL_POWER_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "kW");
protected static final NullableQuantity INSTALLED_THERMAL_POWER_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kW");
/**
* The cached value of the '{@link #getInstalledThermalPower() <em>Installed Thermal Power</em>}' attribute.
......
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