Skip to content

GitLab

Commit f2f1959a authored by Kai-Holger Brassel's avatar Kai-Holger Brassel
Browse files

Make constrained type Fraction and CO₂eq units work 

... even locally by building city units plug-in locally, since tycho
uses this instead of downloading it from from server.
parent 349d66bc
Expand all Hide whitespace changes
Inline Side-by-side
de.hftstuttgart.buildingphysics.viewmodel/viewmodels/Construction.view
View file @ f2f1959a
...@@ -28,8 +28,9 @@ ...@@ -28,8 +28,9 @@
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//Construction/layers"/> <domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//Construction/layers"/>
</domainModelReference> </domainModelReference>
</domainModelReference> </domainModelReference>
<columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_d7H2QL8HEeuIHZm4y-I19A" columnDomainReference="_QnRfELPZEeup29SeaUMpQQ" weight="20" minWidth="65"/> <columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_d7H2QL8HEeuIHZm4y-I19A" columnDomainReference="_QnRfELPZEeup29SeaUMpQQ" weight="25" minWidth="70"/>
<columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_-2jXEMHcEeuIHZm4y-I19A" columnDomainReference="_T27I4ME1EeuIHZm4y-I19A" weight="30" minWidth="80"/> <columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_4Wqa0MqVEeukSbPYqPhO9g" columnDomainReference="_BjnwoME1EeuIHZm4y-I19A" weight="50" minWidth="180"/>
<columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_2M1yIMqWEeukSbPYqPhO9g" columnDomainReference="_T27I4ME1EeuIHZm4y-I19A" weight="25" minWidth="70"/>
<columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:ReadOnlyColumnConfiguration" xmi:id="_ifhxAME1EeuIHZm4y-I19A" columnDomainReferences="_T27I4ME1EeuIHZm4y-I19A"/> <columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:ReadOnlyColumnConfiguration" xmi:id="_ifhxAME1EeuIHZm4y-I19A" columnDomainReferences="_T27I4ME1EeuIHZm4y-I19A"/>
</children> </children>
<ecorePaths>/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore</ecorePaths> <ecorePaths>/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore</ecorePaths>
......
de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowType.view
View file @ f2f1959a
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</domainModelReference> </domainModelReference>
</children> </children>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_7hPBXq21Eeup29SeaUMpQQ" name="Control embodiedCarbon"> <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_7hPBXq21Eeup29SeaUMpQQ" name="Control embodiedCarbon">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_7hPBX621Eeup29SeaUMpQQ"> <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_11eAsMg1EeuLhPP9_K73gQ">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/embodiedCarbon"/> <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/embodiedCarbon"/>
</domainModelReference> </domainModelReference>
</children> </children>
......
de.hftstuttgart.buildingphysics/catalogs/migrateFromSimStadt.xsl
View file @ f2f1959a
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
<xsl:attribute name="embodiedEnergy"><xsl:value-of select="embodiedEnergy" /> <xsl:attribute name="embodiedEnergy"><xsl:value-of select="embodiedEnergy" />
<xsl:value-of select="' kW·h/m²'" /></xsl:attribute> <xsl:value-of select="' kW·h/m²'" /></xsl:attribute>
<xsl:attribute name="embodiedCarbon"><xsl:value-of select="embodiedCarbon" /> <xsl:attribute name="embodiedCarbon"><xsl:value-of select="embodiedCarbon" />
<xsl:value-of select="' kg'" /></xsl:attribute> <xsl:value-of select="' kgCO₂eq/m²'" /></xsl:attribute>
<xsl:attribute name="constructionDescription"><xsl:value-of select="constructionDescription" /></xsl:attribute> <xsl:attribute name="constructionDescription"><xsl:value-of select="constructionDescription" /></xsl:attribute>
<xsl:attribute name="disposalEnergy"><xsl:value-of select="disposalEnergy" /> <xsl:attribute name="disposalEnergy"><xsl:value-of select="disposalEnergy" />
<xsl:value-of select="' kW·h/m²'" /></xsl:attribute> <xsl:value-of select="' kW·h/m²'" /></xsl:attribute>
<xsl:attribute name="disposalCarbon"><xsl:value-of select="disposalCarbon" /> <xsl:attribute name="disposalCarbon"><xsl:value-of select="disposalCarbon" />
<xsl:value-of select="' kg'" /></xsl:attribute> <xsl:value-of select="' kgCO₂eq/m²'" /></xsl:attribute>
<xsl:attribute name="disposalDescription"><xsl:value-of select="disposalDescription" /></xsl:attribute> <xsl:attribute name="disposalDescription"><xsl:value-of select="disposalDescription" /></xsl:attribute>
</xsl:element> </xsl:element>
</xsl:for-each> </xsl:for-each>
...@@ -63,12 +63,12 @@ ...@@ -63,12 +63,12 @@
<xsl:attribute name="embodiedEnergy"><xsl:value-of select="embodiedEnergy" /> <xsl:attribute name="embodiedEnergy"><xsl:value-of select="embodiedEnergy" />
<xsl:value-of select="' kW·h/kg'" /></xsl:attribute> <xsl:value-of select="' kW·h/kg'" /></xsl:attribute>
<xsl:attribute name="embodiedCarbon"><xsl:value-of select="embodiedCarbon" /> <xsl:attribute name="embodiedCarbon"><xsl:value-of select="embodiedCarbon" />
<xsl:value-of select="' kg'" /></xsl:attribute> <xsl:value-of select="' kgCO₂eq/kg'" /></xsl:attribute>
<xsl:attribute name="constructionDescription"><xsl:value-of select="constructionDescription" /></xsl:attribute> <xsl:attribute name="constructionDescription"><xsl:value-of select="constructionDescription" /></xsl:attribute>
<xsl:attribute name="disposalEnergy"><xsl:value-of select="disposalEnergy" /> <xsl:attribute name="disposalEnergy"><xsl:value-of select="disposalEnergy" />
<xsl:value-of select="' kW·h/kg'" /></xsl:attribute> <xsl:value-of select="' kW·h/kg'" /></xsl:attribute>
<xsl:attribute name="disposalCarbon"><xsl:value-of select="disposalCarbon" /> <xsl:attribute name="disposalCarbon"><xsl:value-of select="disposalCarbon" />
<xsl:value-of select="' kg'" /></xsl:attribute> <xsl:value-of select="' kgCO₂eq/kg'" /></xsl:attribute>
<xsl:attribute name="disposalDescription"><xsl:value-of select="disposalDescription" /></xsl:attribute> <xsl:attribute name="disposalDescription"><xsl:value-of select="disposalDescription" /></xsl:attribute>
</xsl:element> </xsl:element>
</xsl:template> </xsl:template>
......
de.hftstuttgart.buildingphysics/model/buildingphysics.ecore
View file @ f2f1959a
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
defaultValueLiteral="kW*h/m²"/> defaultValueLiteral="kW*h/m²"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="embodiedCarbon" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="embodiedCarbon" lowerBound="1"
eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble" eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
defaultValueLiteral="kg"/> defaultValueLiteral="kgCO₂eq/m²"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="constructionDescription" <eStructuralFeatures xsi:type="ecore:EAttribute" name="constructionDescription"
lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalEnergy" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalEnergy" lowerBound="1"
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
defaultValueLiteral="kW*h/m²"/> defaultValueLiteral="kW*h/m²"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalCarbon" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalCarbon" lowerBound="1"
eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble" eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
defaultValueLiteral="kg"/> defaultValueLiteral="kgCO₂eq/m²"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalDescription" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalDescription" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers> </eClassifiers>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
defaultValueLiteral="kW*h/kg"/> defaultValueLiteral="kW*h/kg"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="embodiedCarbon" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="embodiedCarbon" lowerBound="1"
eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble" eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
defaultValueLiteral="kg"/> defaultValueLiteral="kgCO₂eq/kg"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="constructionDescription" <eStructuralFeatures xsi:type="ecore:EAttribute" name="constructionDescription"
lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalEnergy" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalEnergy" lowerBound="1"
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
defaultValueLiteral="kW*h/kg"/> defaultValueLiteral="kW*h/kg"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalCarbon" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalCarbon" lowerBound="1"
eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble" eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
defaultValueLiteral="kg"/> defaultValueLiteral="kgCO₂eq/kg"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalDescription" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalDescription" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="category" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="category" ordered="false"
......
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Material.java
View file @ f2f1959a
...@@ -172,13 +172,13 @@ public interface Material extends EObject { ...@@ -172,13 +172,13 @@ public interface Material extends EObject {
/** /**
* Returns the value of the '<em><b>Embodied Carbon</b></em>' attribute. * Returns the value of the '<em><b>Embodied Carbon</b></em>' attribute.
* The default value is <code>"kg"</code>. * The default value is <code>"kgCO\u2082eq/kg"</code>.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Embodied Carbon</em>' attribute. * @return the value of the '<em>Embodied Carbon</em>' attribute.
* @see #setEmbodiedCarbon(NullableQuantity) * @see #setEmbodiedCarbon(NullableQuantity)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial_EmbodiedCarbon() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial_EmbodiedCarbon()
* @model default="kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true" * @model default="kgCO\u2082eq/kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
* @generated * @generated
*/ */
NullableQuantity getEmbodiedCarbon(); NullableQuantity getEmbodiedCarbon();
...@@ -240,13 +240,13 @@ public interface Material extends EObject { ...@@ -240,13 +240,13 @@ public interface Material extends EObject {
/** /**
* Returns the value of the '<em><b>Disposal Carbon</b></em>' attribute. * Returns the value of the '<em><b>Disposal Carbon</b></em>' attribute.
* The default value is <code>"kg"</code>. * The default value is <code>"kgCO\u2082eq/kg"</code>.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Disposal Carbon</em>' attribute. * @return the value of the '<em>Disposal Carbon</em>' attribute.
* @see #setDisposalCarbon(NullableQuantity) * @see #setDisposalCarbon(NullableQuantity)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial_DisposalCarbon() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial_DisposalCarbon()
* @model default="kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true" * @model default="kgCO\u2082eq/kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
* @generated * @generated
*/ */
NullableQuantity getDisposalCarbon(); NullableQuantity getDisposalCarbon();
......
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowType.java
View file @ f2f1959a
...@@ -199,13 +199,13 @@ public interface WindowType extends EObject { ...@@ -199,13 +199,13 @@ public interface WindowType extends EObject {
/** /**
* Returns the value of the '<em><b>Embodied Carbon</b></em>' attribute. * Returns the value of the '<em><b>Embodied Carbon</b></em>' attribute.
* The default value is <code>"kg"</code>. * The default value is <code>"kgCO\u2082eq/m\u00b2"</code>.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Embodied Carbon</em>' attribute. * @return the value of the '<em>Embodied Carbon</em>' attribute.
* @see #setEmbodiedCarbon(NullableQuantity) * @see #setEmbodiedCarbon(NullableQuantity)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_EmbodiedCarbon() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_EmbodiedCarbon()
* @model default="kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true" * @model default="kgCO\u2082eq/m\u00b2" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
* @generated * @generated
*/ */
NullableQuantity getEmbodiedCarbon(); NullableQuantity getEmbodiedCarbon();
...@@ -267,13 +267,13 @@ public interface WindowType extends EObject { ...@@ -267,13 +267,13 @@ public interface WindowType extends EObject {
/** /**
* Returns the value of the '<em><b>Disposal Carbon</b></em>' attribute. * Returns the value of the '<em><b>Disposal Carbon</b></em>' attribute.
* The default value is <code>"kg"</code>. * The default value is <code>"kgCO\u2082eq/m\u00b2"</code>.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Disposal Carbon</em>' attribute. * @return the value of the '<em>Disposal Carbon</em>' attribute.
* @see #setDisposalCarbon(NullableQuantity) * @see #setDisposalCarbon(NullableQuantity)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_DisposalCarbon() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_DisposalCarbon()
* @model default="kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true" * @model default="kgCO\u2082eq/m\u00b2" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
* @generated * @generated
*/ */
NullableQuantity getDisposalCarbon(); NullableQuantity getDisposalCarbon();
......
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
View file @ f2f1959a
...@@ -796,18 +796,18 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building ...@@ -796,18 +796,18 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
initEAttribute(getWindowType_EmbodiedEnergy(), theQuantitiesPackage.getQuantityDouble(), "embodiedEnergy", initEAttribute(getWindowType_EmbodiedEnergy(), theQuantitiesPackage.getQuantityDouble(), "embodiedEnergy",
"kW*h/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, "kW*h/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getWindowType_EmbodiedCarbon(), theQuantitiesPackage.getQuantityDouble(), "embodiedCarbon", "kg", initEAttribute(getWindowType_EmbodiedCarbon(), theQuantitiesPackage.getQuantityDouble(), "embodiedCarbon",
1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, "kgCO\u2082eq/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_DERIVED, IS_ORDERED); !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getWindowType_ConstructionDescription(), ecorePackage.getEString(), "constructionDescription", initEAttribute(getWindowType_ConstructionDescription(), ecorePackage.getEString(), "constructionDescription",
null, 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, null, 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED); IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getWindowType_DisposalEnergy(), theQuantitiesPackage.getQuantityDouble(), "disposalEnergy", initEAttribute(getWindowType_DisposalEnergy(), theQuantitiesPackage.getQuantityDouble(), "disposalEnergy",
"kW*h/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, "kW*h/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getWindowType_DisposalCarbon(), theQuantitiesPackage.getQuantityDouble(), "disposalCarbon", "kg", initEAttribute(getWindowType_DisposalCarbon(), theQuantitiesPackage.getQuantityDouble(), "disposalCarbon",
1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, "kgCO\u2082eq/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_DERIVED, IS_ORDERED); !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getWindowType_DisposalDescription(), ecorePackage.getEString(), "disposalDescription", null, 1, initEAttribute(getWindowType_DisposalDescription(), ecorePackage.getEString(), "disposalDescription", null, 1,
1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED); !IS_DERIVED, IS_ORDERED);
...@@ -845,18 +845,18 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building ...@@ -845,18 +845,18 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
initEAttribute(getMaterial_EmbodiedEnergy(), theQuantitiesPackage.getQuantityDouble(), "embodiedEnergy", initEAttribute(getMaterial_EmbodiedEnergy(), theQuantitiesPackage.getQuantityDouble(), "embodiedEnergy",
"kW*h/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, "kW*h/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED); IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getMaterial_EmbodiedCarbon(), theQuantitiesPackage.getQuantityDouble(), "embodiedCarbon", "kg", initEAttribute(getMaterial_EmbodiedCarbon(), theQuantitiesPackage.getQuantityDouble(), "embodiedCarbon",
1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, "kgCO\u2082eq/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_DERIVED, IS_ORDERED); !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getMaterial_ConstructionDescription(), ecorePackage.getEString(), "constructionDescription", initEAttribute(getMaterial_ConstructionDescription(), ecorePackage.getEString(), "constructionDescription",
null, 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, null, 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED); IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getMaterial_DisposalEnergy(), theQuantitiesPackage.getQuantityDouble(), "disposalEnergy", initEAttribute(getMaterial_DisposalEnergy(), theQuantitiesPackage.getQuantityDouble(), "disposalEnergy",
"kW*h/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, "kW*h/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED); IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getMaterial_DisposalCarbon(), theQuantitiesPackage.getQuantityDouble(), "disposalCarbon", "kg", initEAttribute(getMaterial_DisposalCarbon(), theQuantitiesPackage.getQuantityDouble(), "disposalCarbon",
1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, "kgCO\u2082eq/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_DERIVED, IS_ORDERED); !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getMaterial_DisposalDescription(), ecorePackage.getEString(), "disposalDescription", null, 1, 1, initEAttribute(getMaterial_DisposalDescription(), ecorePackage.getEString(), "disposalDescription", null, 1, 1,
Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED); !IS_DERIVED, IS_ORDERED);
......
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
View file @ f2f1959a
...@@ -180,7 +180,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi ...@@ -180,7 +180,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* @ordered * @ordered
*/ */
protected static final NullableQuantity EMBODIED_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE protected static final NullableQuantity EMBODIED_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg"); .createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kgCO\u2082eq/kg");
/** /**
* The cached value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute. * The cached value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute.
...@@ -242,7 +242,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi ...@@ -242,7 +242,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* @ordered * @ordered
*/ */
protected static final NullableQuantity DISPOSAL_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE protected static final NullableQuantity DISPOSAL_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg"); .createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kgCO\u2082eq/kg");
/** /**
* The cached value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute. * The cached value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute.
......
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java
View file @ f2f1959a
...@@ -193,7 +193,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind ...@@ -193,7 +193,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered * @ordered
*/ */
protected static final NullableQuantity EMBODIED_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE protected static final NullableQuantity EMBODIED_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg"); .createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kgCO\u2082eq/m\u00b2");
/** /**
* The cached value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute. * The cached value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute.
...@@ -255,7 +255,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind ...@@ -255,7 +255,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered * @ordered
*/ */
protected static final NullableQuantity DISPOSAL_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE protected static final NullableQuantity DISPOSAL_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg"); .createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kgCO\u2082eq/m\u00b2");
/** /**
* The cached value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute. * The cached value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute.
......
Markdown is supported
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