de.hftstuttgart.buildingphysics/catalogs/2020 German Buildings IWUMounting.xmi

+<?xml version="1.0" encoding="UTF-8"?>
+<buildphys:BuildingPhysicsCatalog xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:buildphys="http://www.hftstuttgart.de/buildingphysics" author="Verena Weiler, HfT Stuttgart">
+  <windowCatalog name="German Building Typology Library IWU" description="Window catalog from German Building Typology Library IWU" source="http://www.iwu.de">
+    <windowTypes windowTypeId="window_0" name="Double-glazed window with old wooden/aluminum frame" uValue="3.2 W/(m²·K)" gValue="0.76" glazingNumber="2" frameRatio="0.3" embodiedEnergy="809.02 kW·h/m²" embodiedCarbon="143.4 kg" constructionDescription="double glazing with old wooden/aluminum frame, produced in Germany, transportation 50 km " disposalEnergy="5.16 kW·h/m²" disposalCarbon="1.5 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_1" name="Double-glazed window with plastic frame" uValue="2.57 W/(m²·K)" gValue="0.76" glazingNumber="2" frameRatio="0.3" embodiedEnergy="577.53 kW·h/m²" embodiedCarbon="106.92 kg" constructionDescription="double glazing with plastic frame, produced in Germany, transportation 50 km " disposalEnergy="4.48 kW·h/m²" disposalCarbon="2.26 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_2" name="Low-E double-glazed window" uValue="1.6 W/(m²·K)" gValue="0.63" glazingNumber="2" frameRatio="0.3" embodiedEnergy="628.89 kW·h/m²" embodiedCarbon="81.57 kg" constructionDescription="double glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="3.97 kW·h/m²" disposalCarbon="4.48 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_3" name="Low-E double-glazed window EnEV2016" uValue="1.3 W/(m²·K)" gValue="0.6" glazingNumber="2" frameRatio="0.3" embodiedEnergy="628.89 kW·h/m²" embodiedCarbon="81.57 kg" constructionDescription="double glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="3.97 kW·h/m²" disposalCarbon="4.48 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_4" name="Low-E triple-glazed window" uValue="1.05 W/(m²·K)" gValue="0.5" glazingNumber="3" frameRatio="0.3" embodiedEnergy="694.42 kW·h/m²" embodiedCarbon="98.5 kg" constructionDescription="triple glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="4.56 kW·h/m²" disposalCarbon="4.93 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_5" name="Low-E triple-glazed window KfW 40" uValue="0.91 W/(m²·K)" gValue="0.5" glazingNumber="3" frameRatio="0.3" embodiedEnergy="694.42 kW·h/m²" embodiedCarbon="98.5 kg" constructionDescription="triple glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="4.56 kW·h/m²" disposalCarbon="4.93 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_6" name="Low-E triple-glazed window KfW 55" uValue="0.91 W/(m²·K)" gValue="0.5" glazingNumber="3" frameRatio="0.3" embodiedEnergy="694.42 kW·h/m²" embodiedCarbon="98.5 kg" constructionDescription="triple glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="4.56 kW·h/m²" disposalCarbon="4.93 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_7" name="Single-glazed window" uValue="5 W/(m²·K)" gValue="0.86" frameRatio="0.3" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+  </windowCatalog>
+  <materialCatalog name="German Building Typology Library IWU" description="Construction catalog from German Building Typology Library IWU" source="http://www.iwu.de">
+    <materialCategories name="Brick">
+      <materials materialId="material_0" name="Solid brick" density="2000 kg/m³" heatCapacity="840 J/K" conductivity="0.96 W/(m·K)" embodiedEnergy="0.8 kW·h/kg" embodiedCarbon="0.25 kg" constructionDescription="solid brick made of clay, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_1" name="Cored brick" density="1500 kg/m³" heatCapacity="920 J/K" conductivity="0.71 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_2" name="Honeycomb brick" density="1120 kg/m³" heatCapacity="790 J/K" conductivity="0.3 W/(m·K)" embodiedEnergy="0.77 kW·h/kg" embodiedCarbon="0.14 kg" constructionDescription="light clay brick, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_3" name="Inner leaf brick" density="1800 kg/m³" heatCapacity="840 J/K" conductivity="0.62 W/(m·K)" embodiedEnergy="1.1 kW·h/kg" embodiedCarbon="0.95 kg" constructionDescription="made of portland clinker, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_4" name="Outer leaf brick" density="2000 kg/m³" heatCapacity="650 J/K" conductivity="0.96 W/(m·K)" embodiedEnergy="1.1 kW·h/kg" embodiedCarbon="0.95 kg" constructionDescription="made of portland clinker, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_5" name="Vermiculite insulated brick" density="700 kg/m³" heatCapacity="840 J/K" conductivity="0.27 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+    </materialCategories>
+    <materialCategories name="Concrete">
+      <materials materialId="material_6" name="Breeze block" density="1500 kg/m³" heatCapacity="650 J/K" conductivity="0.44 W/(m·K)" embodiedEnergy="0.3 kW·h/kg" embodiedCarbon="0.12 kg" constructionDescription="concrete block, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_7" name="Concrete dense" density="2000 kg/m³" heatCapacity="1014 J/K" conductivity="1.13 W/(m·K)" embodiedEnergy="0.3 kW·h/kg" embodiedCarbon="0.16 kg" constructionDescription="concrete 50MPa, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_8" name="Concrete lightweight" density="1200 kg/m³" heatCapacity="1014 J/K" conductivity="0.38 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_9" name="Aerated concrete block" density="500 kg/m³" heatCapacity="840 J/K" conductivity="0.16 W/(m·K)" embodiedEnergy="1.01 kW·h/kg" embodiedCarbon="0.48 kg" constructionDescription="autoclaved aerated concrete, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_10" name="Foamed slag concrete" density="1040 kg/m³" heatCapacity="960 J/K" conductivity="0.25 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_11" name="Vermiculite aggregate concrete" density="450 kg/m³" heatCapacity="833 J/K" conductivity="0.17 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_12" name="No fines concrete" density="1800 kg/m³" heatCapacity="840 J/K" conductivity="0.96 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_13" name="Glass reinforced concrete" density="1950 kg/m³" heatCapacity="840 J/K" conductivity="0.9 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_14" name="Reinforced concrete" density="2240 kg/m³" heatCapacity="900 J/K" conductivity="1.95 W/(m·K)" embodiedEnergy="0.46 kW·h/kg" embodiedCarbon="0.18 kg" constructionDescription="concrete 25 MPa, steel low alloyed, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    </materialCategories>
+    <materialCategories name="Ground covering">
+      <materials materialId="material_15" name="Infusorial (9% mc)" density="480 kg/m³" heatCapacity="180 J/K" conductivity="0.09 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_16" name="Gravel based" density="2050 kg/m³" heatCapacity="184 J/K" conductivity="0.52 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_17" name="Common earth" density="1460 kg/m³" heatCapacity="879 J/K" conductivity="1.28 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+    </materialCategories>
+    <materialCategories name="Insulation">
+      <materials materialId="material_18" name="Asbestos insulation" density="577 kg/m³" heatCapacity="833 J/K" conductivity="0.16 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_19" name="Cork insulation" density="105 kg/m³" heatCapacity="1810 J/K" conductivity="0.045 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_20" name="Woodwool" density="500 kg/m³" heatCapacity="1014 J/K" conductivity="0.1 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_21" name="Glasswool" density="250 kg/m³" heatCapacity="840 J/K" conductivity="0.04 W/(m·K)" embodiedEnergy="2.98 kW·h/kg" embodiedCarbon="0.54 kg" constructionDescription="glaswool mat for insulation, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_22" name="Sheeps wool" density="198 kg/m³" heatCapacity="1360 J/K" conductivity="0.06 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_23" name="Mineral fibre" density="105 kg/m³" heatCapacity="1800 J/K" conductivity="0.045 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_24" name="Urea formaldehyde foam (UFFI)" density="30 kg/m³" heatCapacity="1764 J/K" conductivity="0.03 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_25" name="Polyurethane (PUR)" density="30 kg/m³" heatCapacity="837 J/K" conductivity="0.025 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_26" name="Foamed glass" density="125 kg/m³" heatCapacity="833 J/K" conductivity="0.05 W/(m·K)" embodiedEnergy="9.04 kW·h/kg" embodiedCarbon="2.04 kg" constructionDescription="foamed glass, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_27" name="Cellulose (loose fill)" density="300 kg/m³" heatCapacity="1000 J/K" conductivity="0.037 W/(m·K)" embodiedEnergy="2.98 kW·h/kg" embodiedCarbon="0.54 kg" constructionDescription="cellulose loose fill including blow in, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_28" name="Extruded polystyrene (XPS 030)" density="32 kg/m³" heatCapacity="1412 J/K" conductivity="0.03 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_29" name="Expanded polystyrene (EPS 040)" density="25 kg/m³" heatCapacity="1014 J/K" conductivity="0.04 W/(m·K)" embodiedEnergy="27.2 kW·h/kg" embodiedCarbon="3.83 kg" constructionDescription="polystyrene, CO2 blown, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.13 kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
+      <materials materialId="material_30" name="Expanded polystyrene (EPS 035)" density="25 kg/m³" heatCapacity="1014 J/K" conductivity="0.035 W/(m·K)" embodiedEnergy="27.2 kW·h/kg" embodiedCarbon="3.83 kg" constructionDescription="polystyrene, CO2 blown, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.13 kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
+      <materials materialId="material_31" name="Expanded PVC" density="55 kg/m³" heatCapacity="1014 J/K" conductivity="0.04 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_32" name="Silicon" density="700 kg/m³" heatCapacity="1004 J/K" conductivity="0.18 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_33" name="Wool felt underlay" density="160 kg/m³" heatCapacity="1360 J/K" conductivity="0.04 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_34" name="Cellular rubber underlay" density="400 kg/m³" heatCapacity="1360 J/K" conductivity="0.1 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_35" name="Synthetic carpet" density="160 kg/m³" heatCapacity="2500 J/K" conductivity="0.06 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+    </materialCategories>
+    <materialCategories name="Metal">
+      <materials materialId="material_36" name="Copper" density="8900 kg/m³" heatCapacity="434 J/K" conductivity="200 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_37" name="Steel" density="7800 kg/m³" heatCapacity="507 J/K" conductivity="50 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_38" name="Aluminium" density="2800 kg/m³" heatCapacity="905 J/K" conductivity="160 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+    </materialCategories>
+    <materialCategories name="Plaster">
+      <materials materialId="material_39" name="Dense plaster" density="1300 kg/m³" heatCapacity="1000 J/K" conductivity="0.5 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_40" name="Light plaster" density="600 kg/m³" heatCapacity="1000 J/K" conductivity="0.16 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_41" name="Gypsum plasterboard" density="950 kg/m³" heatCapacity="833 J/K" conductivity="0.16 W/(m·K)" embodiedEnergy="1.61 kW·h/kg" embodiedCarbon="0.43 kg" constructionDescription="produced from 100% natural gypsum, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_42" name="Perlite plasterboard" density="800 kg/m³" heatCapacity="833 J/K" conductivity="0.18 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_43" name="Gypsum plastering" density="1200 kg/m³" heatCapacity="833 J/K" conductivity="0.42 W/(m·K)" embodiedEnergy="0.3 kW·h/kg" embodiedCarbon="0.07 kg" constructionDescription="gypsum plastering made of gypsum, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_44" name="Perlite plastering" density="400 kg/m³" heatCapacity="833 J/K" conductivity="0.08 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_45" name="Vermiculite plastering" density="720 kg/m³" heatCapacity="833 J/K" conductivity="0.2 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+    </materialCategories>
+    <materialCategories name="Stone">
+      <materials materialId="material_46" name="Sandstone" density="2000 kg/m³" heatCapacity="724 J/K" conductivity="1.3 W/(m·K)" embodiedEnergy="0.45 kW·h/kg" embodiedCarbon="0.17 kg" constructionDescription="sand-lime brick, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_47" name="Granite" density="2600 kg/m³" heatCapacity="905 J/K" conductivity="2.5 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_48" name="Marble" density="2500 kg/m³" heatCapacity="796 J/K" conductivity="2 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_49" name="Limestone" density="2180 kg/m³" heatCapacity="724 J/K" conductivity="1.5 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_50" name="Slate" density="2700 kg/m³" heatCapacity="760 J/K" conductivity="2 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_51" name="Gravel" density="1840 kg/m³" heatCapacity="833 J/K" conductivity="0.36 W/(m·K)" embodiedEnergy="0.08 kW·h/kg" embodiedCarbon="0.02 kg" constructionDescription="gravel, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_52" name="Chippings" density="1800 kg/m³" heatCapacity="1000 J/K" conductivity="0.96 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_53" name="Pumice stone" density="1280 kg/m³" heatCapacity="840 J/K" conductivity="0.53 W/(m·K)" embodiedEnergy="0.44 kW·h/kg" embodiedCarbon="0.24 kg" constructionDescription="light weight concrete block - pumice, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_54" name="Sand" density="1500 kg/m³" heatCapacity="830 J/K" conductivity="0.2 W/(m·K)" embodiedEnergy="0.05 kW·h/kg" embodiedCarbon="0.01 kg" constructionDescription="sand, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_55" name="Cinder aggregate" density="1000 kg/m³" heatCapacity="800 J/K" conductivity="0.4 W/(m·K)" embodiedEnergy="0.04 kW·h/kg" embodiedCarbon="0.01 kg" constructionDescription="ground granulated plast furnace slag, produced in Germany, transportation 50 km" disposalEnergy="0.07 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    </materialCategories>
+    <materialCategories name="Tile">
+      <materials materialId="material_56" name="Concrete lightweight screed" density="1200 kg/m³" heatCapacity="833 J/K" conductivity="0.41 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_57" name="Concrete screed" density="2100 kg/m³" heatCapacity="1014 J/K" conductivity="1.28 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_58" name="Granolithic screed" density="2085 kg/m³" heatCapacity="833 J/K" conductivity="0.87 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_59" name="Cement screed" density="2100 kg/m³" heatCapacity="650 J/K" conductivity="1.4 W/(m·K)" embodiedEnergy="0.36 kW·h/kg" embodiedCarbon="0.2 kg" constructionDescription=" cement is portland cement, strength class Z 42.5, produced in Germany, transportation 50 km" disposalEnergy="0.12 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to material landfill, transportation 50 km"/>
+      <materials materialId="material_60" name="Rendering dry" density="1300 kg/m³" heatCapacity="1014 J/K" conductivity="0.5 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_61" name="Rendering (1% mc)" density="1431 kg/m³" heatCapacity="1014 J/K" conductivity="1.13 W/(m·K)" embodiedEnergy="0.21 kW·h/kg" embodiedCarbon="0.06 kg" constructionDescription="clay plaster (sand: 0.55kg, clay: 0.25kg, water: 0.2kg), produced in Germany, transportation 50 km" disposalEnergy="0.1 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_62" name="Rendering (8% mc)" density="1329 kg/m³" heatCapacity="1014 J/K" conductivity="0.79 W/(m·K)" embodiedEnergy="0.21 kW·h/kg" embodiedCarbon="0.06 kg" constructionDescription="clay plaster (sand: 0.55kg, clay: 0.25kg, water: 0.2kg), produced in Germany, transportation 50 km" disposalEnergy="0.1 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_63" name="Aged rendering" density="1329 kg/m³" heatCapacity="1000 J/K" conductivity="0.79 W/(m·K)" embodiedEnergy="0.21 kW·h/kg" embodiedCarbon="0.06 kg" constructionDescription="clay plaster (sand: 0.55kg, clay: 0.25kg, water: 0.2kg), produced in Germany, transportation 50 km" disposalEnergy="0.1 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_64" name="Clay tile" density="1900 kg/m³" heatCapacity="837 J/K" conductivity="0.85 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_65" name="Concrete tile" density="2100 kg/m³" heatCapacity="837 J/K" conductivity="1.1 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_66" name="Slate tile" density="2700 kg/m³" heatCapacity="760 J/K" conductivity="2 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_67" name="Plastic tile" density="1050 kg/m³" heatCapacity="837 J/K" conductivity="0.5 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_68" name="Rubber tile" density="1600 kg/m³" heatCapacity="2000 J/K" conductivity="0.3 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_69" name="Cork tile" density="530 kg/m³" heatCapacity="1800 J/K" conductivity="0.08 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_70" name="Asphalt/asbestos roof" density="1900 kg/m³" heatCapacity="833 J/K" conductivity="0.55 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_71" name="P.V.C./asbestos roof" density="2000 kg/m³" heatCapacity="833 J/K" conductivity="0.85 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_72" name="Straw thatch" density="240 kg/m³" heatCapacity="180 J/K" conductivity="0.07 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_73" name="Ceiling (mineral)" density="290 kg/m³" heatCapacity="2000 J/K" conductivity="0.03 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_74" name="Ceiling (plaster)" density="1120 kg/m³" heatCapacity="840 J/K" conductivity="0.38 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_75" name="Bitumen felt" density="1700 kg/m³" heatCapacity="1000 J/K" conductivity="0.5 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_76" name="Roofing felt" density="960 kg/m³" heatCapacity="837 J/K" conductivity="0.19 W/(m·K)" embodiedEnergy="12.41 kW·h/kg" embodiedCarbon="0.85 kg" constructionDescription="plastic liner consisting of polymer EP4 flame retardant and bitumen seal, produced in Germany, transportation 50 km" disposalEnergy="0.12 kW·h/kg" disposalCarbon="0.11 kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
+      <materials materialId="material_77" name="Asphalt mastic roofing" density="2325 kg/m³" heatCapacity="837 J/K" conductivity="1.15 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_78" name="Asphalt" density="1907 kg/m³" heatCapacity="833 J/K" conductivity="0.62 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_79" name="Asbestos cement" density="1500 kg/m³" heatCapacity="1000 J/K" conductivity="0.36 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_80" name="Cement sheet" density="700 kg/m³" heatCapacity="1050 J/K" conductivity="0.36 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+    </materialCategories>
+    <materialCategories name="Wood">
+      <materials materialId="material_81" name="Wood block" density="800 kg/m³" heatCapacity="2093 J/K" conductivity="0.16 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_82" name="Hardboard medium" density="600 kg/m³" heatCapacity="2027 J/K" conductivity="0.08 W/(m·K)" embodiedEnergy="13.13 kW·h/kg" embodiedCarbon="1.3 kg" constructionDescription="fibreboard hard, produced in Germany, transportation 50 km" disposalEnergy="0.12 kW·h/kg" disposalCarbon="0.08 kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
+      <materials materialId="material_83" name="Hardboard standard" density="900 kg/m³" heatCapacity="2027 J/K" conductivity="0.13 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_84" name="Timber flooring" density="650 kg/m³" heatCapacity="1195 J/K" conductivity="0.14 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_85" name="Corkboard" density="160 kg/m³" heatCapacity="1888 J/K" conductivity="0.04 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_86" name="Chipboard" density="800 kg/m³" heatCapacity="2093 J/K" conductivity="0.15 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_87" name="Softboard" density="350 kg/m³" heatCapacity="1000 J/K" conductivity="0.56 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_88" name="Weatherboard" density="650 kg/m³" heatCapacity="2000 J/K" conductivity="0.14 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_89" name="Hardwood (oak, mapple, walnut...)" density="700 kg/m³" heatCapacity="1412 J/K" conductivity="0.15 W/(m·K)" embodiedEnergy="1.59 kW·h/kg" embodiedCarbon="0.03 kg" constructionDescription="sawing of hardwood, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.08 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_90" name="Softwood (pine, spruce...)" density="630 kg/m³" heatCapacity="2760 J/K" conductivity="0.13 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_91" name="Plywood" density="560 kg/m³" heatCapacity="2500 J/K" conductivity="0.15 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription=""/>
+      <materials materialId="material_92" name="Fibreboard" density="300 kg/m³" heatCapacity="1000 J/K" conductivity="0.06 W/(m·K)" embodiedEnergy="5.23 kW·h/kg" embodiedCarbon="1.2 kg" constructionDescription="fibreboard soft without adhesives, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.08 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    </materialCategories>
+    <materialCategories name="Others">
+      <materials materialId="material_93" name="Loam" density="1280 kg/m³" heatCapacity="1000 J/K" conductivity="0.55 W/(m·K)" embodiedEnergy="0.06 kW·h/kg" embodiedCarbon="0.01 kg" constructionDescription="market for clay, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+      <materials materialId="material_94" name="Air layer (horizontal 10cm)" density="1.2 kg/m³" heatCapacity="1400 J/K" conductivity="0.45 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="air layer inbetween different construction types" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription="no disposal for air layer"/>
+      <materials materialId="material_95" name="Air layer (vertical 10cm)" density="1.2 kg/m³" heatCapacity="1400 J/K" conductivity="0.55 W/(m·K)" embodiedEnergy="&lt;unknown> one" embodiedCarbon="&lt;unknown> one" constructionDescription="air layer inbetween different construction types" disposalEnergy="&lt;unknown> one" disposalCarbon="&lt;unknown> one" disposalDescription="no disposal for air layer"/>
+      <materials materialId="material_96" name="Rafters with glasswool insulation" density="288 kg/m³" heatCapacity="1032 J/K" conductivity="0.05 W/(m·K)" embodiedEnergy="15.18 kW·h/kg" embodiedCarbon="0.71 kg" constructionDescription="ratio 80/20 Vol.-% (glasswool/rafters), glued laminated timber used as rafters, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.06 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    </materialCategories>
+    <constructionCategories name="outWall">
+      <mountings mountingId="mounting_0" name="Aerated concrete-25cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_9" thickness="0.25 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_1" name="Aerated concrete-25cm_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.08 m"/>
+        <layers material="material_9" thickness="0.25 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_2" name="Aerated concrete-25cm_RefAdv">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_9" thickness="0.25 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_3" name="Aerated concrete-25cm_RefMed">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_9" thickness="0.25 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_4" name="Aerated concrete-30cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_9" thickness="0.3 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_5" name="Aerated concrete-30cm_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.075 m"/>
+        <layers material="material_9" thickness="0.3 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_6" name="Aerated concrete-30cm_RefAdv">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_61" thickness="0.01 m"/>
+        <layers material="material_9" thickness="0.3 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_7" name="Aerated concrete-30cm_RefMed">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_61" thickness="0.01 m"/>
+        <layers material="material_9" thickness="0.3 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_8" name="Aerated concrete-50cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_9" thickness="0.5 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_9" name="Aerated concrete-50cm_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.03 m"/>
+        <layers material="material_9" thickness="0.5 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_24" name="Breeze block-28cm">
+        <layers material="material_63" thickness="0.01 m"/>
+        <layers material="material_6" thickness="0.27 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_25" name="Breeze block-28cm_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_63" thickness="0.01 m"/>
+        <layers material="material_6" thickness="0.27 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_26" name="Breeze block-28cm_RefAdv">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_63" thickness="0.01 m"/>
+        <layers material="material_6" thickness="0.27 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_27" name="Breeze block-28cm_RefMed">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_63" thickness="0.01 m"/>
+        <layers material="material_6" thickness="0.27 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_28" name="Cavity wall">
+        <layers material="material_4" thickness="0.12 m"/>
+        <layers material="material_95" thickness="0.1 m"/>
+        <layers material="material_3" thickness="0.17 m"/>
+      </mountings>
+      <mountings mountingId="mounting_29" name="Cavity wall_EnEV2016">
+        <layers material="material_4" thickness="0.12 m"/>
+        <layers material="material_27" thickness="0.1 m"/>
+        <layers material="material_3" thickness="0.17 m"/>
+        <layers material="material_30" thickness="0.03 m"/>
+      </mountings>
+      <mountings mountingId="mounting_30" name="Cavity wall_RefAdv">
+        <layers material="material_4" thickness="0.12 m"/>
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_3" thickness="0.17 m"/>
+      </mountings>
+      <mountings mountingId="mounting_31" name="Cavity wall_RefMed">
+        <layers material="material_4" thickness="0.12 m"/>
+        <layers material="material_27" thickness="0.06 m"/>
+        <layers material="material_3" thickness="0.17 m"/>
+      </mountings>
+      <mountings mountingId="mounting_75" name="Concrete sandwich wall_1970s">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.03 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_76" name="Concrete sandwich wall_1970s_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.11 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.03 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_77" name="Concrete sandwich wall_1970s_RefAdv">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.03 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_78" name="Concrete sandwich wall_1970s_RefMed">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.03 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_79" name="Concrete sandwich wall_1980s">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.04 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_80" name="Concrete sandwich wall_1980s_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.105 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.04 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_81" name="Concrete sandwich wall_1980s_RefAdv">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.04 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_82" name="Concrete sandwich wall_1980s_RefMed">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.04 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_83" name="Concrete sandwich wall_1990s">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.07 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_84" name="Concrete sandwich wall_1990s_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.085 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.07 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_85" name="Concrete sandwich wall_1990s_RefAdv">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.07 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_86" name="Concrete sandwich wall_1990s_RefMed">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_14" thickness="0.05 m"/>
+        <layers material="material_26" thickness="0.07 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_118" name="Dense brickwork-32cm">
+        <layers material="material_63" thickness="0.01 m"/>
+        <layers material="material_0" thickness="0.32 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_119" name="Dense brickwork-32cm_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.125 m"/>
+        <layers material="material_0" thickness="0.32 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_120" name="Dense brickwork-32cm_RefAdv">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_63" thickness="0.01 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_0" thickness="0.32 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_121" name="Dense brickwork-32cm_RefMed">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_63" thickness="0.01 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_0" thickness="0.32 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_122" name="Honeycomb brick insul-10cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_29" thickness="0.1 m"/>
+        <layers material="material_2" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_123" name="Honeycomb brick insul-10cm_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_29" thickness="0.125 m"/>
+        <layers material="material_2" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_124" name="Honeycomb brick insul-12cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_29" thickness="0.12 m"/>
+        <layers material="material_2" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_125" name="Honeycomb brick insul-12cm_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_29" thickness="0.125 m"/>
+        <layers material="material_2" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_126" name="Honeycomb brick insul-13cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_29" thickness="0.13 m"/>
+        <layers material="material_2" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_127" name="Honeycomb brick insul-16cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_29" thickness="0.16 m"/>
+        <layers material="material_2" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_128" name="Honeycomb brick insul-22cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_29" thickness="0.22 m"/>
+        <layers material="material_2" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_129" name="Honeycomb brick insul-6cm">
+        <layers material="material_43" thickness="0.01 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_29" thickness="0.06 m"/>
+        <layers material="material_2" thickness="0.24 m"/>
+      </mountings>
+      <mountings mountingId="mounting_130" name="Honeycomb brick insul-6cm-EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.06 m"/>
+        <layers material="material_29" thickness="0.06 m"/>
+        <layers material="material_2" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_131" name="Honeycomb brick-22cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_2" thickness="0.22 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_132" name="Honeycomb brick-22cm_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.11 m"/>
+        <layers material="material_2" thickness="0.22 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_133" name="Honeycomb brick-22cm_RefAdv">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_2" thickness="0.22 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_134" name="Honeycomb brick-22cm_RefMed">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_2" thickness="0.22 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_135" name="Honeycomb brick-30cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_2" thickness="0.3 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_136" name="Honeycomb brick-30cm_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.105 m"/>
+        <layers material="material_2" thickness="0.3 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_137" name="Honeycomb brick-30cm_RefAdv">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_61" thickness="0.01 m"/>
+        <layers material="material_2" thickness="0.3 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_138" name="Honeycomb brick-30cm_RefMed">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_61" thickness="0.01 m"/>
+        <layers material="material_2" thickness="0.3 m"/>
+        <layers material="material_43" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_139" name="Loam-timber-frames">
+        <layers material="material_93" thickness="0.2 m"/>
+      </mountings>
+      <mountings mountingId="mounting_140" name="Loam-timber-frames_ EnEV2016">
+        <layers material="material_93" thickness="0.2 m"/>
+        <layers material="material_30" thickness="0.125 m"/>
+      </mountings>
+      <mountings mountingId="mounting_141" name="Loam-timber-frames_ ref adv">
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_93" thickness="0.2 m"/>
+      </mountings>
+      <mountings mountingId="mounting_142" name="Loam-timber-frames_ ref med">
+        <layers material="material_93" thickness="0.2 m"/>
+        <layers material="material_21" thickness="0.1 m"/>
+      </mountings>
+      <mountings mountingId="mounting_143" name="Reinforced concrete insul-11cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.11 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_144" name="Reinforced concrete insul-11cm_EnEV2016">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.025 m"/>
+        <layers material="material_30" thickness="0.11 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_145" name="Reinforced concrete insul-14cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.14 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_146" name="Reinforced concrete insul-16cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.16 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_147" name="Reinforced concrete insul-22cm">
+        <layers material="material_62" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.22 m"/>
+        <layers material="material_14" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.01 m"/>
+      </mountings>
+    </constructionCategories>
+    <constructionCategories name="groundShell">
+      <mountings mountingId="mounting_87" name="Concrete slab insul-10cm">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_29" thickness="0.1 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_88" name="Concrete slab insul-10cm_EnEV2016">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_29" thickness="0.12 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_89" name="Concrete slab insul-12cm">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_29" thickness="0.12 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_90" name="Concrete slab insul-14cm">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.14 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_91" name="Concrete slab insul-16cm">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.16 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_92" name="Concrete slab insul-1cm">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.01 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_93" name="Concrete slab insul-1cm_EnEV2016">
+        <layers material="material_30" thickness="0.095 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.01 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_94" name="Concrete slab insul-1cm_RefAdv">
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.01 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_95" name="Concrete slab insul-1cm_RefMed">
+        <layers material="material_30" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.01 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_96" name="Concrete slab insul-2.5cm">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.025 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_97" name="Concrete slab insul-2.5cm_EnEV2016">
+        <layers material="material_30" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.025 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_98" name="Concrete slab insul-2.5cm_RefAdv">
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.025 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_99" name="Concrete slab insul-2.5cm_RefMed">
+        <layers material="material_30" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.025 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_100" name="Concrete slab insul-3cm">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.03 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_101" name="Concrete slab insul-3cm_EnEV2016">
+        <layers material="material_30" thickness="0.075 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.03 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_102" name="Concrete slab insul-3cm_RefAdv">
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.03 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_103" name="Concrete slab insul-3cm_RefMed">
+        <layers material="material_30" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.03 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_104" name="Concrete slab insul-4.5cm">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.045 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_105" name="Concrete slab insul-4.5cm_EnEV2016">
+        <layers material="material_30" thickness="0.06 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.045 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_106" name="Concrete slab insul-4.5cm_RefAdv">
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.045 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_107" name="Concrete slab insul-4.5cm_RefMed">
+        <layers material="material_30" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.045 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_108" name="Concrete slab insul-4cm">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.04 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_109" name="Concrete slab insul-4cm_EnEV2016">
+        <layers material="material_30" thickness="0.065 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.04 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_110" name="Concrete slab insul-4cm_RefAdv">
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.04 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_111" name="Concrete slab insul-4cm_RefMed">
+        <layers material="material_30" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.04 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_112" name="Concrete slab insul-6cm">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.06 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_113" name="Concrete slab insul-6cm_EnEV2016">
+        <layers material="material_30" thickness="0.045 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.06 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_114" name="Concrete slab insul-6cm_RefAdv">
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.06 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_115" name="Concrete slab insul-6cm_RefMed">
+        <layers material="material_30" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.06 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_116" name="Concrete slab insul-7cm">
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.07 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_117" name="Concrete slab insul-7cm_EnEV2016">
+        <layers material="material_30" thickness="0.035 m"/>
+        <layers material="material_14" thickness="0.16 m"/>
+        <layers material="material_30" thickness="0.07 m"/>
+        <layers material="material_59" thickness="0.04 m"/>
+      </mountings>
+      <mountings mountingId="mounting_148" name="Sand stone on sand">
+        <layers material="material_54" thickness="0.01 m"/>
+        <layers material="material_46" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_149" name="Sand stone on sand_EnEV2016">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.095 m"/>
+        <layers material="material_54" thickness="0.035 m"/>
+        <layers material="material_46" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_150" name="Sand stone on sand_RefAdv">
+        <layers material="material_54" thickness="0.01 m"/>
+        <layers material="material_46" thickness="0.15 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+      </mountings>
+      <mountings mountingId="mounting_151" name="Sand stone on sand_RefMed">
+        <layers material="material_54" thickness="0.01 m"/>
+        <layers material="material_46" thickness="0.15 m"/>
+        <layers material="material_30" thickness="0.06 m"/>
+      </mountings>
+      <mountings mountingId="mounting_180" name="Wooden floor infill cinder aggregate">
+        <layers material="material_7" thickness="0.18 m"/>
+        <layers material="material_55" thickness="0.1 m"/>
+        <layers material="material_82" thickness="0.03 m"/>
+      </mountings>
+      <mountings mountingId="mounting_181" name="Wooden floor infill cinder aggregate_EnEV2016">
+        <layers material="material_30" thickness="0.084 m"/>
+        <layers material="material_7" thickness="0.18 m"/>
+        <layers material="material_55" thickness="0.1 m"/>
+        <layers material="material_82" thickness="0.03 m"/>
+      </mountings>
+      <mountings mountingId="mounting_182" name="Wooden floor infill cinder aggregate_RefAdv">
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_7" thickness="0.18 m"/>
+        <layers material="material_55" thickness="0.1 m"/>
+        <layers material="material_82" thickness="0.03 m"/>
+      </mountings>
+      <mountings mountingId="mounting_183" name="Wooden floor infill cinder aggregate_RefMed">
+        <layers material="material_30" thickness="0.08 m"/>
+        <layers material="material_7" thickness="0.18 m"/>
+        <layers material="material_55" thickness="0.1 m"/>
+        <layers material="material_82" thickness="0.03 m"/>
+      </mountings>
+      <mountings mountingId="mounting_184" name="Wooden floor infill cob ">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_94" thickness="0.1 m"/>
+        <layers material="material_89" thickness="0.02 m"/>
+      </mountings>
+      <mountings mountingId="mounting_185" name="Wooden floor infill cob _EnEV2016">
+        <layers material="material_30" thickness="0.075 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_94" thickness="0.1 m"/>
+        <layers material="material_89" thickness="0.02 m"/>
+      </mountings>
+      <mountings mountingId="mounting_186" name="Wooden floor infill cob _RefAdv">
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_94" thickness="0.1 m"/>
+        <layers material="material_89" thickness="0.02 m"/>
+      </mountings>
+      <mountings mountingId="mounting_187" name="Wooden floor infill cob _RefMed">
+        <layers material="material_30" thickness="0.08 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_94" thickness="0.1 m"/>
+        <layers material="material_89" thickness="0.02 m"/>
+      </mountings>
+      <mountings mountingId="mounting_188" name="Wooden floor infill sand">
+        <layers material="material_7" thickness="0.18 m"/>
+        <layers material="material_54" thickness="0.03 m"/>
+        <layers material="material_82" thickness="0.03 m"/>
+      </mountings>
+      <mountings mountingId="mounting_189" name="Wooden floor infill sand_EnEV2016">
+        <layers material="material_30" thickness="0.085 m"/>
+        <layers material="material_7" thickness="0.18 m"/>
+        <layers material="material_54" thickness="0.03 m"/>
+        <layers material="material_82" thickness="0.03 m"/>
+      </mountings>
+      <mountings mountingId="mounting_190" name="Wooden floor infill sand_RefAdv">
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_7" thickness="0.18 m"/>
+        <layers material="material_54" thickness="0.03 m"/>
+        <layers material="material_82" thickness="0.03 m"/>
+      </mountings>
+      <mountings mountingId="mounting_191" name="Wooden floor infill sand_RefMed">
+        <layers material="material_30" thickness="0.08 m"/>
+        <layers material="material_7" thickness="0.18 m"/>
+        <layers material="material_54" thickness="0.03 m"/>
+        <layers material="material_82" thickness="0.03 m"/>
+      </mountings>
+    </constructionCategories>
+    <constructionCategories name="pitchedRoof">
+      <mountings mountingId="mounting_152" name="Timber rafters closed">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_95" thickness="0.1 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_153" name="Timber rafters closed with fibreboard">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_95" thickness="0.1 m"/>
+        <layers material="material_92" thickness="0.025 m"/>
+      </mountings>
+      <mountings mountingId="mounting_154" name="Timber rafters insul-10cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.1 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_155" name="Timber rafters insul-12cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.12 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_156" name="Timber rafters insul-14cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.14 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_157" name="Timber rafters insul-16cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.16 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_158" name="Timber rafters insul-18cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.18 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_159" name="Timber rafters insul-18cm_EnEV2016">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.18 m"/>
+        <layers material="material_30" thickness="0.01 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_160" name="Timber rafters insul-20cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.2 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_161" name="Timber rafters insul-24cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.24 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_162" name="Timber rafters insul-28cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.28 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_163" name="Timber rafters insul-34cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.34 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_164" name="Timber rafters insul-42cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.42 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_165" name="Timber rafters insul-4cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.04 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_166" name="Timber rafters insul-5cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.05 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_167" name="Timber rafters insul-6cm">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.06 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_168" name="Timber rafters with pumicestone">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_53" thickness="0.3 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_169" name="Timber rafters_EnEV2016">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.1 m"/>
+        <layers material="material_30" thickness="0.065 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_170" name="Timber rafters_RefAdv">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_21" thickness="0.18 m"/>
+        <layers material="material_96" thickness="0.12 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+      <mountings mountingId="mounting_171" name="Timber rafters_RefMed">
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_96" thickness="0.12 m"/>
+        <layers material="material_41" thickness="0.013 m"/>
+      </mountings>
+    </constructionCategories>
+    <constructionCategories name="topCeiling">
+      <mountings mountingId="mounting_13" name="Breeze block ceiling">
+        <layers material="material_76" thickness="0.01 m"/>
+        <layers material="material_6" thickness="0.13 m"/>
+      </mountings>
+      <mountings mountingId="mounting_14" name="Breeze block ceiling insul-15cm">
+        <layers material="material_76" thickness="0.03 m"/>
+        <layers material="material_30" thickness="0.15 m"/>
+        <layers material="material_6" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_15" name="Breeze block ceiling insul-18cm">
+        <layers material="material_76" thickness="0.03 m"/>
+        <layers material="material_30" thickness="0.18 m"/>
+        <layers material="material_6" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_16" name="Breeze block ceiling insul-22cm">
+        <layers material="material_76" thickness="0.03 m"/>
+        <layers material="material_30" thickness="0.22 m"/>
+        <layers material="material_6" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_17" name="Breeze block ceiling insul-2cm">
+        <layers material="material_76" thickness="0.03 m"/>
+        <layers material="material_29" thickness="0.02 m"/>
+        <layers material="material_6" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_18" name="Breeze block ceiling insul-2cm_RefAdv">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_76" thickness="0.03 m"/>
+        <layers material="material_29" thickness="0.02 m"/>
+        <layers material="material_6" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_19" name="Breeze block ceiling insul-2cm_RefMed">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_76" thickness="0.03 m"/>
+        <layers material="material_29" thickness="0.02 m"/>
+        <layers material="material_6" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_20" name="Breeze block ceiling insul-30cm">
+        <layers material="material_76" thickness="0.03 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_6" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_21" name="Breeze block ceiling_EnEV2016">
+        <layers material="material_76" thickness="0.01 m"/>
+        <layers material="material_30" thickness="0.13 m"/>
+        <layers material="material_6" thickness="0.13 m"/>
+      </mountings>
+      <mountings mountingId="mounting_22" name="Breeze block ceiling_RefAdv">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_76" thickness="0.01 m"/>
+        <layers material="material_6" thickness="0.13 m"/>
+      </mountings>
+      <mountings mountingId="mounting_23" name="Breeze block ceiling_RefMed">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_76" thickness="0.01 m"/>
+        <layers material="material_6" thickness="0.13 m"/>
+      </mountings>
+      <mountings mountingId="mounting_32" name="Concrete ceiling foam insul-6cm">
+        <layers material="material_76" thickness="0.03 m"/>
+        <layers material="material_26" thickness="0.06 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_33" name="Concrete ceiling foam insul-6cm_EnEV2016">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.09 m"/>
+        <layers material="material_26" thickness="0.06 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_34" name="Concrete ceiling foam insul-6cm_RefAdv">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_76" thickness="0.03 m"/>
+        <layers material="material_26" thickness="0.06 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_35" name="Concrete ceiling foam insul-6cm_RefMed">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_76" thickness="0.03 m"/>
+        <layers material="material_26" thickness="0.06 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_36" name="Concrete ceiling insul-10cm">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.1 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_37" name="Concrete ceiling insul-10cm_EnEV2016">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.045 m"/>
+        <layers material="material_29" thickness="0.1 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_38" name="Concrete ceiling insul-10cm_RefAdv">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.1 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_39" name="Concrete ceiling insul-10cm_RefMed">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.1 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_40" name="Concrete ceiling insul-12cm">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.12 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_41" name="Concrete ceiling insul-12cm_EnEV2016">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.03 m"/>
+        <layers material="material_29" thickness="0.12 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_42" name="Concrete ceiling insul-12cm_RefAdv">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.12 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_43" name="Concrete ceiling insul-12cm_RefMed">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.12 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_44" name="Concrete ceiling insul-14cm">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.14 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_45" name="Concrete ceiling insul-14cm_EnEV2016">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.015 m"/>
+        <layers material="material_29" thickness="0.14 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_46" name="Concrete ceiling insul-14cm_EnEv2014">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.13 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_47" name="Concrete ceiling insul-14cm_RefAdv">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.14 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_48" name="Concrete ceiling insul-16cm">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.16 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_49" name="Concrete ceiling insul-16cmEPS035">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.16 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_50" name="Concrete ceiling insul-16cmEPS040">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.16 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_51" name="Concrete ceiling insul-16cm_RefAdv">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.16 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_52" name="Concrete ceiling insul-20cm">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.2 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_53" name="Concrete ceiling insul-24cm">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.24 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_54" name="Concrete ceiling insul-2cm">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.02 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_55" name="Concrete ceiling insul-2cm_EnEV2016">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_29" thickness="0.02 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_56" name="Concrete ceiling insul-2cm_RefAdv">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.02 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_57" name="Concrete ceiling insul-2cm_RefMed">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.02 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_58" name="Concrete ceiling insul-30cm">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_59" name="Concrete ceiling insul-4cm">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.04 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_60" name="Concrete ceiling insul-4cm_EnEV2016">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.1 m"/>
+        <layers material="material_29" thickness="0.04 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_61" name="Concrete ceiling insul-4cm_RefAdv">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.04 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_62" name="Concrete ceiling insul-4cm_RefMed">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.04 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_63" name="Concrete ceiling insul-5cm">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.05 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_64" name="Concrete ceiling insul-5cm_EnEV2016">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.09 m"/>
+        <layers material="material_29" thickness="0.05 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_65" name="Concrete ceiling insul-5cm_RefAdv">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.05 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_66" name="Concrete ceiling insul-5cm_RefMed">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.05 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_67" name="Concrete ceiling insul-8cm">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_68" name="Concrete ceiling insul-8cm_EnEV2016">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.065 m"/>
+        <layers material="material_29" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_69" name="Concrete ceiling insul-8cm_RefAdv">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_70" name="Concrete ceiling insul-8cm_RefMed">
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_76" thickness="0.02 m"/>
+        <layers material="material_29" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_71" name="Concrete ceiling with gravel insul-8cm">
+        <layers material="material_51" thickness="0.1 m"/>
+        <layers material="material_29" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_72" name="Concrete ceiling with gravel insul-8cm_EnEV2016">
+        <layers material="material_51" thickness="0.1 m"/>
+        <layers material="material_30" thickness="0.06 m"/>
+        <layers material="material_29" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_73" name="Concrete ceiling with gravel insul-8cm_RefAdv">
+        <layers material="material_51" thickness="0.1 m"/>
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_29" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_74" name="Concrete ceiling with gravel insul-8cm_RefMed">
+        <layers material="material_51" thickness="0.1 m"/>
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_29" thickness="0.08 m"/>
+        <layers material="material_14" thickness="0.15 m"/>
+      </mountings>
+      <mountings mountingId="mounting_172" name="Wood ceiling infill cob">
+        <layers material="material_89" thickness="0.02 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_173" name="Wood ceiling infill cob and dead floor">
+        <layers material="material_82" thickness="0.02 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_94" thickness="0.1 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_174" name="Wood ceiling infill cob and dead floor_EnEV2016">
+        <layers material="material_30" thickness="0.1 m"/>
+        <layers material="material_82" thickness="0.02 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_94" thickness="0.1 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_175" name="Wood ceiling infill cob and dead floor_RefAdv">
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_82" thickness="0.02 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_94" thickness="0.1 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_176" name="Wood ceiling infill cob and dead floor_RefMed">
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_82" thickness="0.02 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+        <layers material="material_94" thickness="0.1 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_177" name="Wood ceiling infill cob_EnEV2016">
+        <layers material="material_30" thickness="0.115 m"/>
+        <layers material="material_89" thickness="0.02 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_178" name="Wood ceiling infill cob_RefAdv">
+        <layers material="material_30" thickness="0.3 m"/>
+        <layers material="material_89" thickness="0.02 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+      </mountings>
+      <mountings mountingId="mounting_179" name="Wood ceiling infill cob_RefMed">
+        <layers material="material_30" thickness="0.12 m"/>
+        <layers material="material_89" thickness="0.02 m"/>
+        <layers material="material_93" thickness="0.25 m"/>
+        <layers material="material_82" thickness="0.01 m"/>
+      </mountings>
+    </constructionCategories>
+    <constructionCategories name="sharedWall">
+      <mountings mountingId="mounting_12" name="Beton shared wall">
+        <layers material="material_6" thickness="0.15 m"/>
+      </mountings>
+    </constructionCategories>
+    <constructionCategories name="internalWall">
+      <mountings mountingId="mounting_11" name="Beton internal wall">
+        <layers material="material_6" thickness="0.06 m"/>
+      </mountings>
+    </constructionCategories>
+    <constructionCategories name="intermediaryFloor">
+      <mountings mountingId="mounting_10" name="Beton intermediary floor">
+        <layers material="material_6" thickness="0.2 m"/>
+      </mountings>
+    </constructionCategories>
+  </materialCatalog>
+</buildphys:BuildingPhysicsCatalog>

de.hftstuttgart.buildingphysics/catalogs/migrateFromSimStadt.xsl

@@ -4,22 +4,22 @@
 
 	<xsl:template match="/buildingPhysicsLibrary">
 		<buildphys:BuildingPhysicsCatalog xmi:version="2.0"
-			xmlns:xmi="http://www.omg.org/XMI" xmlns:buildphys="http://www.hftstuttgart.de/buildingphysics"
-			author="Verena Weiler, HfT Stuttgart">
+			xmlns:xmi="http://www.omg.org/XMI" xmlns:buildphys="http://www.hftstuttgart.de/buildingphysics">
+			<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
+			<xsl:attribute name="description"><xsl:value-of select="description" /></xsl:attribute>
+			<xsl:attribute name="source"><xsl:value-of select="source" /></xsl:attribute>
 			<xsl:apply-templates select="windowLib" />
-			<xsl:apply-templates select="constructionLib" />
+			<xsl:apply-templates select="constructionLib/materialCategory" />
+			<xsl:apply-templates select="constructionLib/constructionCategory" />
 		</buildphys:BuildingPhysicsCatalog>
 	</xsl:template>
 
 	<xsl:template match="windowLib">
-		<xsl:element name="windowCatalog">
-			<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
-			<xsl:attribute name="description"><xsl:value-of select="description" /></xsl:attribute>
-			<xsl:attribute name="source"><xsl:value-of select="source" /></xsl:attribute>
+		<xsl:element name="windows">
 			<xsl:for-each select="windowType">
 				<xsl:element name="windowTypes">
 					<xsl:attribute name="windowTypeId">
-				<xsl:value-of select="'window_'" /><xsl:value-of select="id" /></xsl:attribute>
+						<xsl:value-of select="'window_'" /><xsl:value-of select="id" /></xsl:attribute>
 					<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
 					<xsl:attribute name="uValue"><xsl:value-of select="uValue" />
 						<xsl:value-of select="' W/(m²·K)'" /></xsl:attribute>
@@ -41,17 +41,7 @@
 		</xsl:element>
 	</xsl:template>
 
-	<xsl:template match="constructionLib">
-		<xsl:element name="materialCatalog">
-			<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
-			<xsl:attribute name="description"><xsl:value-of select="description" /></xsl:attribute>
-			<xsl:attribute name="source"><xsl:value-of select="source" /></xsl:attribute>
-			<xsl:apply-templates select="materialCategory" />
-			<xsl:apply-templates select="constructionCategory" />
-		</xsl:element>
-	</xsl:template>
-
-	<xsl:template match="materialCategory">
+	<xsl:template match="constructionLib/materialCategory">
 		<xsl:element name="materialCategories">
 			<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
 			<xsl:apply-templates select="material" />
@@ -83,7 +73,7 @@
 		</xsl:element>
 	</xsl:template>
 
-	<xsl:template match="constructionCategory">
+	<xsl:template match="constructionLib/constructionCategory">
 		<xsl:element name="constructionCategories">
 			<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
 			<xsl:apply-templates select="constructionType" />
@@ -91,9 +81,9 @@
 	</xsl:template>
 
 	<xsl:template match="constructionType">
-		<xsl:element name="mountings">
-			<xsl:attribute name="mountingId">
-				<xsl:value-of select="'mounting_'" /><xsl:value-of select="id" />
+		<xsl:element name="constructions">
+			<xsl:attribute name="constructionId">
+				<xsl:value-of select="'construction_'" /><xsl:value-of select="id" />
 			</xsl:attribute>
 			<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
 			<xsl:apply-templates select="layer" />

de.hftstuttgart.buildingphysics/model/buildingphysics.aird

@@ -6,9 +6,10 @@
     <semanticResources>platform:/resource/de.hftstuttgart.cityunits.model/model/Quantities.ecore</semanticResources>
     <semanticResources>platform:/resource/de.hftstuttgart.cityunits.model/model/Quantities.genmodel</semanticResources>
     <semanticResources>http://www.hftstuttgart.de/buildingphysics</semanticResources>
+    <semanticResources>../catalogs/2020%20German%20Buildings%20IWU.xmi</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_nfHygB3ZEeuNsK3dZmTkbQ">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_JKPtIZUqEeudooziRGqkJA" name="Buildingphysics Class Diagram" repPath="#_JKN38JUqEeudooziRGqkJA" changeId="5910fc7c-ffb8-4a2a-9d44-0858cf3e2591">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_JKPtIZUqEeudooziRGqkJA" name="Buildingphysics Class Diagram" repPath="#_JKN38JUqEeudooziRGqkJA" changeId="938342a3-345d-40bf-9732-a7d354ccd5c3">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="buildingphysics.ecore#/"/>
       </ownedRepresentationDescriptors>
@@ -20,15 +21,23 @@
         <children xmi:type="notation:Node" xmi:id="_J2xb8JUqEeudooziRGqkJA" type="2003" element="_J2jZgJUqEeudooziRGqkJA">
           <children xmi:type="notation:Node" xmi:id="_J2yDAJUqEeudooziRGqkJA" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_J2yDAZUqEeudooziRGqkJA" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_J2z4M5UqEeudooziRGqkJA" type="3010" element="_J2qHM5UqEeudooziRGqkJA">
-              <styles xmi:type="notation:FontStyle" xmi:id="_J2z4NJUqEeudooziRGqkJA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_J2z4NZUqEeudooziRGqkJA"/>
+            <children xmi:type="notation:Node" xmi:id="_xcfpAMBYEeuIHZm4y-I19A" type="3010" element="_J2r8YJUqEeudooziRGqkJA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_xcfpAcBYEeuIHZm4y-I19A" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_xcfpAsBYEeuIHZm4y-I19A"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_yBxgUMBYEeuIHZm4y-I19A" type="3010" element="_J2r8YpUqEeudooziRGqkJA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_yBxgUcBYEeuIHZm4y-I19A" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_yBxgUsBYEeuIHZm4y-I19A"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_yU3bcMBYEeuIHZm4y-I19A" type="3010" element="_J2r8ZJUqEeudooziRGqkJA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_yU3bccBYEeuIHZm4y-I19A" fontName=".AppleSystemUIFont" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_yU3bcsBYEeuIHZm4y-I19A"/>
             </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_J2yDApUqEeudooziRGqkJA"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_J2yDA5UqEeudooziRGqkJA"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_J2xb8ZUqEeudooziRGqkJA" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J2xb8pUqEeudooziRGqkJA" x="180" y="768"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J2xb8pUqEeudooziRGqkJA" x="297" y="676"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_J2yDBJUqEeudooziRGqkJA" type="2003" element="_J2lOsJUqEeudooziRGqkJA">
           <children xmi:type="notation:Node" xmi:id="_J2yDB5UqEeudooziRGqkJA" type="5007"/>
@@ -85,28 +94,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_J2yqEpUqEeudooziRGqkJA"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_J2yDBZUqEeudooziRGqkJA" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J2yDBpUqEeudooziRGqkJA" x="20" y="20"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_J2yqE5UqEeudooziRGqkJA" type="2003" element="_J2l1wJUqEeudooziRGqkJA">
-          <children xmi:type="notation:Node" xmi:id="_J2yqFpUqEeudooziRGqkJA" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_J2yqF5UqEeudooziRGqkJA" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_J20fTJUqEeudooziRGqkJA" type="3010" element="_J2r8YJUqEeudooziRGqkJA">
-              <styles xmi:type="notation:FontStyle" xmi:id="_J20fTZUqEeudooziRGqkJA" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_J20fTpUqEeudooziRGqkJA"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_J20fT5UqEeudooziRGqkJA" type="3010" element="_J2r8YpUqEeudooziRGqkJA">
-              <styles xmi:type="notation:FontStyle" xmi:id="_J20fUJUqEeudooziRGqkJA" fontName=".AppleSystemUIFont" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_J20fUZUqEeudooziRGqkJA"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_J21GUJUqEeudooziRGqkJA" type="3010" element="_J2r8ZJUqEeudooziRGqkJA">
-              <styles xmi:type="notation:FontStyle" xmi:id="_J21GUZUqEeudooziRGqkJA" fontName=".AppleSystemUIFont" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_J21GUpUqEeudooziRGqkJA"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_J2yqGJUqEeudooziRGqkJA"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_J2yqGZUqEeudooziRGqkJA"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_J2yqFJUqEeudooziRGqkJA" fontName=".AppleSystemUIFont" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J2yqFZUqEeudooziRGqkJA" x="193" y="488"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J2yDBpUqEeudooziRGqkJA" x="32" y="20"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_J2yqGpUqEeudooziRGqkJA" type="2003" element="_J2mc0JUqEeudooziRGqkJA">
           <children xmi:type="notation:Node" xmi:id="_J2yqHZUqEeudooziRGqkJA" type="5007"/>
@@ -115,16 +103,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_J2yqIJUqEeudooziRGqkJA"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_J2yqG5UqEeudooziRGqkJA" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J2yqHJUqEeudooziRGqkJA" x="76" y="628" height="59"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_J2yqIZUqEeudooziRGqkJA" type="2003" element="_J2mc05UqEeudooziRGqkJA">
-          <children xmi:type="notation:Node" xmi:id="_J2zRIJUqEeudooziRGqkJA" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_J2zRIZUqEeudooziRGqkJA" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_J2zRIpUqEeudooziRGqkJA"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_J2zRI5UqEeudooziRGqkJA"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_J2yqIpUqEeudooziRGqkJA" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J2yqI5UqEeudooziRGqkJA" x="297" y="628" height="59"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J2yqHJUqEeudooziRGqkJA" x="84" y="508" height="59"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_J2zRJJUqEeudooziRGqkJA" type="2003" element="_J2nD4JUqEeudooziRGqkJA">
           <children xmi:type="notation:Node" xmi:id="_J2zRJ5UqEeudooziRGqkJA" type="5007"/>
@@ -238,119 +217,39 @@
         <styles xmi:type="notation:DiagramStyle" xmi:id="_JKVzwpUqEeudooziRGqkJA"/>
         <edges xmi:type="notation:Edge" xmi:id="_J22UcJUqEeudooziRGqkJA" type="4001" element="_J2uYoJUqEeudooziRGqkJA" source="_J2xb8JUqEeudooziRGqkJA" target="_J2yqGpUqEeudooziRGqkJA">
           <children xmi:type="notation:Node" xmi:id="_J227gJUqEeudooziRGqkJA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J227gZUqEeudooziRGqkJA" x="22" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J227gZUqEeudooziRGqkJA" x="33" y="11"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_J227gpUqEeudooziRGqkJA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J227g5UqEeudooziRGqkJA" x="-23" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J227g5UqEeudooziRGqkJA" x="-46" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_J23ikJUqEeudooziRGqkJA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J23ikZUqEeudooziRGqkJA" x="14" y="22"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J23ikZUqEeudooziRGqkJA" x="-3" y="44"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_J22UcZUqEeudooziRGqkJA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_J22UcpUqEeudooziRGqkJA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J22Uc5UqEeudooziRGqkJA" points="[-2, 0, 102, 42]$[-2, -48, 102, -6]$[-104, -48, 0, -6]$[-104, -83, 0, -41]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J22Uc5UqEeudooziRGqkJA" points="[-2, 0, 211, 70]$[-2, -48, 211, 22]$[-215, -48, -2, 22]$[-215, -111, -2, -41]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J24wsJUqEeudooziRGqkJA" id="(0.5084745762711864,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J24wsZUqEeudooziRGqkJA" id="(0.5084745762711864,1.719298245614035)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_J24wspUqEeudooziRGqkJA" type="4001" element="_J2uYqpUqEeudooziRGqkJA" source="_J2xb8JUqEeudooziRGqkJA" target="_J2yqIZUqEeudooziRGqkJA">
-          <children xmi:type="notation:Node" xmi:id="_J24wtpUqEeudooziRGqkJA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J24wt5UqEeudooziRGqkJA" x="27" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J25XwJUqEeudooziRGqkJA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25XwZUqEeudooziRGqkJA" x="20" y="9"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J25XwpUqEeudooziRGqkJA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25Xw5UqEeudooziRGqkJA" x="21" y="-85"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J24ws5UqEeudooziRGqkJA" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_J24wtJUqEeudooziRGqkJA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J24wtZUqEeudooziRGqkJA" points="[-2, 0, -119, 42]$[-2, -48, -119, -6]$[117, -48, 0, -6]$[117, -83, 0, -41]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J25XxJUqEeudooziRGqkJA" id="(0.5084745762711864,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J25XxZUqEeudooziRGqkJA" id="(0.5084745762711864,1.719298245614035)"/>
-        </edges>
         <edges xmi:type="notation:Edge" xmi:id="_J25XxpUqEeudooziRGqkJA" type="4001" element="_J2u_tpUqEeudooziRGqkJA" source="_J2yqGpUqEeudooziRGqkJA" target="_J2yDBJUqEeudooziRGqkJA">
           <children xmi:type="notation:Node" xmi:id="_J25XypUqEeudooziRGqkJA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25Xy5UqEeudooziRGqkJA" x="6"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25Xy5UqEeudooziRGqkJA" x="-54"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_J25XzJUqEeudooziRGqkJA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25XzZUqEeudooziRGqkJA" x="285" y="-48"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25XzZUqEeudooziRGqkJA" x="183" y="-48"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_J25XzpUqEeudooziRGqkJA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25Xz5UqEeudooziRGqkJA" x="33"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25Xz5UqEeudooziRGqkJA" x="15"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_J25Xx5UqEeudooziRGqkJA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_J25XyJUqEeudooziRGqkJA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J25XyZUqEeudooziRGqkJA" points="[-19, -49, -14, 498]$[-19, -436, -14, 111]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J25XyZUqEeudooziRGqkJA" points="[-19, -49, -6, 378]$[-19, -316, -6, 111]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J25X0JUqEeudooziRGqkJA" id="(0.5,0.8596491228070176)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J25X0ZUqEeudooziRGqkJA" id="(0.5,0.5)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_J25X0pUqEeudooziRGqkJA" type="4001" element="_J2u_wJUqEeudooziRGqkJA" source="_J2yqIZUqEeudooziRGqkJA" target="_J2zRJJUqEeudooziRGqkJA">
-          <children xmi:type="notation:Node" xmi:id="_J25X1pUqEeudooziRGqkJA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25X15UqEeudooziRGqkJA" x="-15" y="1"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J25X2JUqEeudooziRGqkJA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25X2ZUqEeudooziRGqkJA" x="11" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J25X2pUqEeudooziRGqkJA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25X25UqEeudooziRGqkJA" x="8"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J25X05UqEeudooziRGqkJA" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_J25X1JUqEeudooziRGqkJA" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J25X1ZUqEeudooziRGqkJA" points="[58, 16, -59, 46]$[115, 16, -2, 46]$[115, -55, -2, -25]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J25X3JUqEeudooziRGqkJA" id="(0.5084745762711864,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J25X3ZUqEeudooziRGqkJA" id="(0.5084745762711864,1.3424657534246576)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_J25-3JUqEeudooziRGqkJA" type="4001" element="_J2vmypUqEeudooziRGqkJA" source="_J2yqGpUqEeudooziRGqkJA" target="_J2yqE5UqEeudooziRGqkJA">
-          <children xmi:type="notation:Node" xmi:id="_J25-4JUqEeudooziRGqkJA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25-4ZUqEeudooziRGqkJA" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J25-4pUqEeudooziRGqkJA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25-45UqEeudooziRGqkJA" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J25-5JUqEeudooziRGqkJA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25-5ZUqEeudooziRGqkJA" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J25-3ZUqEeudooziRGqkJA" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_J25-3pUqEeudooziRGqkJA" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J25-35UqEeudooziRGqkJA" points="[-1, 0, -93, 60]$[91, -60, -1, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J25-5pUqEeudooziRGqkJA" id="(0.5084745762711864,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J25-55UqEeudooziRGqkJA" id="(0.5084745762711864,1.0)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_J25-6JUqEeudooziRGqkJA" type="4001" element="_J2wN1pUqEeudooziRGqkJA" source="_J2yqIZUqEeudooziRGqkJA" target="_J2yqE5UqEeudooziRGqkJA">
-          <children xmi:type="notation:Node" xmi:id="_J25-7JUqEeudooziRGqkJA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J25-7ZUqEeudooziRGqkJA" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J26l4JUqEeudooziRGqkJA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J26l4ZUqEeudooziRGqkJA" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J26l4pUqEeudooziRGqkJA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J26l45UqEeudooziRGqkJA" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J25-6ZUqEeudooziRGqkJA" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_J25-6pUqEeudooziRGqkJA" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J25-65UqEeudooziRGqkJA" points="[-1, 0, 87, 60]$[-89, -60, -1, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J26l5JUqEeudooziRGqkJA" id="(0.5084745762711864,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J26l5ZUqEeudooziRGqkJA" id="(0.5084745762711864,1.0)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_jAUBELCmEeup29SeaUMpQQ" type="4001" element="_jAKQHLCmEeup29SeaUMpQQ" source="_J2yqIZUqEeudooziRGqkJA" target="_jAPIkLCmEeup29SeaUMpQQ">
-          <children xmi:type="notation:Node" xmi:id="_jAVPMLCmEeup29SeaUMpQQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jAVPMbCmEeup29SeaUMpQQ" x="18" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_jAVPMrCmEeup29SeaUMpQQ" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jAVPM7CmEeup29SeaUMpQQ" x="-18" y="9"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_jAV2QLCmEeup29SeaUMpQQ" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jAV2QbCmEeup29SeaUMpQQ" x="34"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_jAUBEbCmEeup29SeaUMpQQ" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_jAUBErCmEeup29SeaUMpQQ" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jAUBE7CmEeup29SeaUMpQQ" points="[59, -5, -224, 123]$[282, -5, -1, 123]$[282, -104, -1, 24]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jAaHsLCmEeup29SeaUMpQQ" id="(0.5,0.8596491228070176)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jAaHsbCmEeup29SeaUMpQQ" id="(0.5,0.6712328767123288)"/>
-        </edges>
         <edges xmi:type="notation:Edge" xmi:id="_jAaHsrCmEeup29SeaUMpQQ" type="4001" element="_jAK3JrCmEeup29SeaUMpQQ" source="_jAPIkLCmEeup29SeaUMpQQ" target="_jARk1LCmEeup29SeaUMpQQ">
           <children xmi:type="notation:Node" xmi:id="_jAaHtrCmEeup29SeaUMpQQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jAaHt7CmEeup29SeaUMpQQ" x="-9" y="5"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jAaHt7CmEeup29SeaUMpQQ" x="-2" y="9"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_jAaHuLCmEeup29SeaUMpQQ" type="6002">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jAaHubCmEeup29SeaUMpQQ" x="9"/>
@@ -360,13 +259,13 @@
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_jAaHs7CmEeup29SeaUMpQQ" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_jAaHtLCmEeup29SeaUMpQQ" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jAaHtbCmEeup29SeaUMpQQ" points="[0, -49, 0, 79]$[0, -100, 0, 28]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jAaHtbCmEeup29SeaUMpQQ" points="[6, -49, 0, 79]$[6, -100, 0, 28]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jAauwLCmEeup29SeaUMpQQ" id="(0.5,0.6712328767123288)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jAauwbCmEeup29SeaUMpQQ" id="(0.5,0.6363636363636364)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_jAauwrCmEeup29SeaUMpQQ" type="4001" element="_jALeNrCmEeup29SeaUMpQQ" source="_jAQ9wLCmEeup29SeaUMpQQ" target="_J2zRK5UqEeudooziRGqkJA">
           <children xmi:type="notation:Node" xmi:id="_jAauxrCmEeup29SeaUMpQQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jAaux7CmEeup29SeaUMpQQ" x="-30" y="31"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jAaux7CmEeup29SeaUMpQQ" x="-29" y="42"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_jAauyLCmEeup29SeaUMpQQ" type="6002">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jAauybCmEeup29SeaUMpQQ" x="81"/>
@@ -408,10 +307,42 @@
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_NbjSEb4uEeuIHZm4y-I19A" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_NbjSEr4uEeuIHZm4y-I19A" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NbjSE74uEeuIHZm4y-I19A" points="[0, 0, 71, 518]$[-35, 0, 36, 518]$[-35, -518, 36, 0]$[-70, -518, 1, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NbjSE74uEeuIHZm4y-I19A" points="[-1, -36, 18, 378]$[-1, -311, 18, 103]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NbrN4L4uEeuIHZm4y-I19A" id="(0.5,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NbrN4b4uEeuIHZm4y-I19A" id="(0.5,0.5)"/>
         </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_y2r5oMBZEeuIHZm4y-I19A" type="4001" element="_y2lL_MBZEeuIHZm4y-I19A" source="_J2xb8JUqEeudooziRGqkJA" target="_jAPIkLCmEeup29SeaUMpQQ">
+          <children xmi:type="notation:Node" xmi:id="_y2r5pMBZEeuIHZm4y-I19A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y2r5pcBZEeuIHZm4y-I19A" x="70" y="-11"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_y2r5psBZEeuIHZm4y-I19A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y2r5p8BZEeuIHZm4y-I19A" x="19" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_y2sgsMBZEeuIHZm4y-I19A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y2sgscBZEeuIHZm4y-I19A" x="-123" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_y2r5ocBZEeuIHZm4y-I19A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_y2r5osBZEeuIHZm4y-I19A" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_y2r5o8BZEeuIHZm4y-I19A" points="[-60, -28, -269, 103]$[-60, -76, -269, 55]$[225, -76, 16, 55]$[225, -131, 16, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y2sgssBZEeuIHZm4y-I19A" id="(1.0,0.2857142857142857)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y2sgs8BZEeuIHZm4y-I19A" id="(0.3728813559322034,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_8rO84MBZEeuIHZm4y-I19A" type="4001" element="_8rKEbMBZEeuIHZm4y-I19A" source="_J2xb8JUqEeudooziRGqkJA" target="_J2zRJJUqEeudooziRGqkJA">
+          <children xmi:type="notation:Node" xmi:id="_8rO85MBZEeuIHZm4y-I19A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8rO85cBZEeuIHZm4y-I19A" x="-15" y="-11"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8rO85sBZEeuIHZm4y-I19A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8rO858BZEeuIHZm4y-I19A" x="-16" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8rO86MBZEeuIHZm4y-I19A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8rO86cBZEeuIHZm4y-I19A" x="-12" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_8rO84cBZEeuIHZm4y-I19A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_8rO84sBZEeuIHZm4y-I19A" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8rO848BZEeuIHZm4y-I19A" points="[-41, 0, -125, 103]$[-41, -48, -125, 55]$[84, -48, 0, 55]$[84, -103, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8rO86sBZEeuIHZm4y-I19A" id="(0.8389830508474576,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8rO868BZEeuIHZm4y-I19A" id="(0.559322033898305,1.0)"/>
+        </edges>
       </data>
     </ownedAnnotationEntries>
     <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_JKdIgJUqEeudooziRGqkJA" source="DANNOTATION_CUSTOMIZATION_KEY">
@@ -462,24 +393,40 @@
         </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J2jZgJUqEeudooziRGqkJA" name="BuildingPhysicsCatalog" tooltipText="" outgoingEdges="_J2uYoJUqEeudooziRGqkJA _J2uYqpUqEeudooziRGqkJA" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J2jZgJUqEeudooziRGqkJA" name="BuildingPhysicsCatalog" tooltipText="" outgoingEdges="_J2uYoJUqEeudooziRGqkJA _y2lL_MBZEeuIHZm4y-I19A _8rKEbMBZEeuIHZm4y-I19A" width="12" height="10">
       <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//BuildingPhysicsCatalog"/>
       <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//BuildingPhysicsCatalog"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J2jZgZUqEeudooziRGqkJA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_t9adkcBZEeuIHZm4y-I19A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J2qHM5UqEeudooziRGqkJA" name="author : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//BuildingPhysicsCatalog/author"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//BuildingPhysicsCatalog/author"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_J2qHNZUqEeudooziRGqkJA" labelAlignment="LEFT" description="_J2qHNJUqEeudooziRGqkJA">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J2r8YJUqEeudooziRGqkJA" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//BuildingPhysicsCatalog/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//BuildingPhysicsCatalog/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J2r8YZUqEeudooziRGqkJA" labelAlignment="LEFT" description="_J2qHNJUqEeudooziRGqkJA">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J2r8YpUqEeudooziRGqkJA" name="description : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//BuildingPhysicsCatalog/description"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//BuildingPhysicsCatalog/description"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J2r8Y5UqEeudooziRGqkJA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J2r8ZJUqEeudooziRGqkJA" name="source : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//BuildingPhysicsCatalog/source"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//BuildingPhysicsCatalog/source"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J2r8ZZUqEeudooziRGqkJA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
     </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J2lOsJUqEeudooziRGqkJA" name="WindowType" tooltipText="" incomingEdges="_J2u_tpUqEeudooziRGqkJA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//WindowType"/>
@@ -588,45 +535,9 @@
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J2l1wJUqEeudooziRGqkJA" name="Catalog" tooltipText="" incomingEdges="_J2vmypUqEeudooziRGqkJA _J2wN1pUqEeudooziRGqkJA" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//Catalog"/>
-      <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//Catalog"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J2l1wZUqEeudooziRGqkJA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
-        <labelFormat>italic</labelFormat>
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J2r8YJUqEeudooziRGqkJA" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Catalog/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Catalog/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_J2r8YZUqEeudooziRGqkJA" labelAlignment="LEFT" description="_J2qHNJUqEeudooziRGqkJA">
-          <labelFormat>bold</labelFormat>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J2r8YpUqEeudooziRGqkJA" name="description : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Catalog/description"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Catalog/description"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_J2r8Y5UqEeudooziRGqkJA" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J2r8ZJUqEeudooziRGqkJA" name="source : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Catalog/source"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Catalog/source"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_J2r8ZZUqEeudooziRGqkJA" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J2mc0JUqEeudooziRGqkJA" name="WindowCatalog" tooltipText="" outgoingEdges="_J2u_tpUqEeudooziRGqkJA _J2vmypUqEeudooziRGqkJA" incomingEdges="_J2uYoJUqEeudooziRGqkJA" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//WindowCatalog"/>
-      <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//WindowCatalog"/>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J2mc0JUqEeudooziRGqkJA" name="WindowCategory" tooltipText="" outgoingEdges="_J2u_tpUqEeudooziRGqkJA" incomingEdges="_J2uYoJUqEeudooziRGqkJA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//WindowCategory"/>
+      <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//WindowCategory"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -635,18 +546,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J2mc05UqEeudooziRGqkJA" name="MaterialCatalog" tooltipText="" outgoingEdges="_J2u_wJUqEeudooziRGqkJA _J2wN1pUqEeudooziRGqkJA _jAKQHLCmEeup29SeaUMpQQ" incomingEdges="_J2uYqpUqEeudooziRGqkJA" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//MaterialCatalog"/>
-      <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//MaterialCatalog"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J2mc1JUqEeudooziRGqkJA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J2nD4JUqEeudooziRGqkJA" name="MaterialCategory" tooltipText="" outgoingEdges="_NbeZlr4uEeuIHZm4y-I19A" incomingEdges="_J2u_wJUqEeudooziRGqkJA" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J2nD4JUqEeudooziRGqkJA" name="MaterialCategory" tooltipText="" outgoingEdges="_NbeZlr4uEeuIHZm4y-I19A" incomingEdges="_8rKEbMBZEeuIHZm4y-I19A" width="12" height="10">
       <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//MaterialCategory"/>
       <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//MaterialCategory"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -764,9 +664,9 @@
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J2uYoJUqEeudooziRGqkJA" name="[1..1] windowCatalog" sourceNode="_J2jZgJUqEeudooziRGqkJA" targetNode="_J2mc0JUqEeudooziRGqkJA">
-      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//BuildingPhysicsCatalog/windowCatalog"/>
-      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//BuildingPhysicsCatalog/windowCatalog"/>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J2uYoJUqEeudooziRGqkJA" name="[1..1] windows" sourceNode="_J2jZgJUqEeudooziRGqkJA" targetNode="_J2mc0JUqEeudooziRGqkJA">
+      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//BuildingPhysicsCatalog/windows"/>
+      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//BuildingPhysicsCatalog/windows"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J2uYpJUqEeudooziRGqkJA" description="_J2uYoZUqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
         <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J2uYppUqEeudooziRGqkJA" showIcon="false">
           <customFeatures>labelSize</customFeatures>
@@ -778,23 +678,9 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J2uYqpUqEeudooziRGqkJA" name="[1..1] materialCatalog" sourceNode="_J2jZgJUqEeudooziRGqkJA" targetNode="_J2mc05UqEeudooziRGqkJA">
-      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//BuildingPhysicsCatalog/materialCatalog"/>
-      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//BuildingPhysicsCatalog/materialCatalog"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J2u_sJUqEeudooziRGqkJA" description="_J2uYoZUqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J2u_spUqEeudooziRGqkJA" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_J2u_sZUqEeudooziRGqkJA" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J2u_tpUqEeudooziRGqkJA" name="[0..*] windowTypes" sourceNode="_J2mc0JUqEeudooziRGqkJA" targetNode="_J2lOsJUqEeudooziRGqkJA">
-      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//WindowCatalog/windowTypes"/>
-      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//WindowCatalog/windowTypes"/>
+      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//WindowCategory/windowTypes"/>
+      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//WindowCategory/windowTypes"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J2u_upUqEeudooziRGqkJA" description="_J2u_t5UqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
         <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J2u_vJUqEeudooziRGqkJA" showIcon="false">
           <customFeatures>labelSize</customFeatures>
@@ -805,44 +691,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J2u_wJUqEeudooziRGqkJA" name="[0..*] materialCategories" sourceNode="_J2mc05UqEeudooziRGqkJA" targetNode="_J2nD4JUqEeudooziRGqkJA">
-      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//MaterialCatalog/materialCategories"/>
-      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//MaterialCatalog/materialCategories"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J2u_wZUqEeudooziRGqkJA" description="_J2u_t5UqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J2u_w5UqEeudooziRGqkJA" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_J2u_wpUqEeudooziRGqkJA" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J2vmypUqEeudooziRGqkJA" sourceNode="_J2mc0JUqEeudooziRGqkJA" targetNode="_J2l1wJUqEeudooziRGqkJA">
-      <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//WindowCatalog"/>
-      <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//WindowCatalog"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J2wN0JUqEeudooziRGqkJA" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J2wN0ZUqEeudooziRGqkJA" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J2wN0pUqEeudooziRGqkJA" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J2wN1pUqEeudooziRGqkJA" sourceNode="_J2mc05UqEeudooziRGqkJA" targetNode="_J2l1wJUqEeudooziRGqkJA">
-      <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//MaterialCatalog"/>
-      <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//MaterialCatalog"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J2wN15UqEeudooziRGqkJA" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J2wN2JUqEeudooziRGqkJA" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J2wN2ZUqEeudooziRGqkJA" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_i_5KU7CmEeup29SeaUMpQQ" name="ConstructionCategory" tooltipText="" outgoingEdges="_jAK3JrCmEeup29SeaUMpQQ" incomingEdges="_jAKQHLCmEeup29SeaUMpQQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_i_5KU7CmEeup29SeaUMpQQ" name="ConstructionCategory" tooltipText="" outgoingEdges="_jAK3JrCmEeup29SeaUMpQQ" incomingEdges="_y2lL_MBZEeuIHZm4y-I19A" width="12" height="10">
       <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//ConstructionCategory"/>
       <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//ConstructionCategory"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -880,9 +729,9 @@
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_i_7mkbCmEeup29SeaUMpQQ" name="Mounting" tooltipText="" outgoingEdges="_jAMFQLCmEeup29SeaUMpQQ" incomingEdges="_jAK3JrCmEeup29SeaUMpQQ" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//Mounting"/>
-      <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//Mounting"/>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_i_7mkbCmEeup29SeaUMpQQ" name="Construction" tooltipText="" outgoingEdges="_jAMFQLCmEeup29SeaUMpQQ" incomingEdges="_jAK3JrCmEeup29SeaUMpQQ" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//Construction"/>
+      <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//Construction"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -890,40 +739,26 @@
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_eYlQYL4tEeuIHZm4y-I19A" name="mountingId : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Mounting/mountingId"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Mounting/mountingId"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_eYlQYL4tEeuIHZm4y-I19A" name="constructionId : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Construction/constructionId"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Construction/constructionId"/>
         <ownedStyle xmi:type="diagram:BundledImage" uid="_eYlQYb4tEeuIHZm4y-I19A" labelAlignment="LEFT" description="_J2qHNJUqEeudooziRGqkJA">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
       <ownedElements xmi:type="diagram:DNodeListElement" uid="_jAIa4bCmEeup29SeaUMpQQ" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Mounting/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Mounting/name"/>
+        <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Construction/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Construction/name"/>
         <ownedStyle xmi:type="diagram:BundledImage" uid="_jAIa4rCmEeup29SeaUMpQQ" labelAlignment="LEFT" description="_J2qHNJUqEeudooziRGqkJA">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_jAKQHLCmEeup29SeaUMpQQ" name="[1..*] constructionCategories" sourceNode="_J2mc05UqEeudooziRGqkJA" targetNode="_i_5KU7CmEeup29SeaUMpQQ">
-      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
-      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_jAK3ILCmEeup29SeaUMpQQ" description="_J2uYoZUqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_jAK3IrCmEeup29SeaUMpQQ" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_jAK3IbCmEeup29SeaUMpQQ" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_jAK3JrCmEeup29SeaUMpQQ" name="[0..*] mountings" sourceNode="_i_5KU7CmEeup29SeaUMpQQ" targetNode="_i_7mkbCmEeup29SeaUMpQQ">
-      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//ConstructionCategory/mountings"/>
-      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//ConstructionCategory/mountings"/>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_jAK3JrCmEeup29SeaUMpQQ" name="[0..*] constructions" sourceNode="_i_5KU7CmEeup29SeaUMpQQ" targetNode="_i_7mkbCmEeup29SeaUMpQQ">
+      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//ConstructionCategory/constructions"/>
+      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//ConstructionCategory/constructions"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_jALeMLCmEeup29SeaUMpQQ" description="_J2u_t5UqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
         <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_jALeMrCmEeup29SeaUMpQQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
@@ -949,8 +784,8 @@
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DEdge" uid="_jAMFQLCmEeup29SeaUMpQQ" name="[1..*] layers" sourceNode="_i_7mkbCmEeup29SeaUMpQQ" targetNode="_i_5xYrCmEeup29SeaUMpQQ">
-      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//Mounting/layers"/>
-      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//Mounting/layers"/>
+      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//Construction/layers"/>
+      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//Construction/layers"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_jAMFQbCmEeup29SeaUMpQQ" description="_J2uYoZUqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
         <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_jAMFQ7CmEeup29SeaUMpQQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
@@ -972,6 +807,24 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_y2lL_MBZEeuIHZm4y-I19A" name="[0..*] constructionCategories" sourceNode="_J2jZgJUqEeudooziRGqkJA" targetNode="_i_5KU7CmEeup29SeaUMpQQ">
+      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//BuildingPhysicsCatalog/constructionCategories"/>
+      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//BuildingPhysicsCatalog/constructionCategories"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_1zisWMBZEeuIHZm4y-I19A" description="_J2u_t5UqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_1zisWsBZEeuIHZm4y-I19A" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_1zisWcBZEeuIHZm4y-I19A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_8rKEbMBZEeuIHZm4y-I19A" name="[0..*] materialCategories" sourceNode="_J2jZgJUqEeudooziRGqkJA" targetNode="_J2nD4JUqEeudooziRGqkJA">
+      <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//BuildingPhysicsCatalog/materialCategories"/>
+      <semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//BuildingPhysicsCatalog/materialCategories"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-BT_DMBZEeuIHZm4y-I19A" description="_J2u_t5UqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-BT_DsBZEeuIHZm4y-I19A" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_-BT_DcBZEeuIHZm4y-I19A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
     <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_JKOfAJUqEeudooziRGqkJA"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>

de.hftstuttgart.buildingphysics/model/buildingphysics.ecore

@@ -3,12 +3,15 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="buildingphysics" nsURI="http://www.hftstuttgart.de/buildingphysics"
     nsPrefix="buildphys">
   <eClassifiers xsi:type="ecore:EClass" name="BuildingPhysicsCatalog">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="author" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="windowCatalog" lowerBound="1"
-        eType="#//WindowCatalog" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="materialCatalog" lowerBound="1"
-        eType="#//MaterialCatalog" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="windows" lowerBound="1"
+        eType="#//WindowCategory" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="materialCategories" upperBound="-1"
+        eType="#//MaterialCategory" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="constructionCategories"
+        upperBound="-1" eType="#//ConstructionCategory" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="WindowType">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="windowTypeId" lowerBound="1"
@@ -48,21 +51,10 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalDescription" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Catalog" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WindowCatalog" eSuperTypes="#//Catalog">
+  <eClassifiers xsi:type="ecore:EClass" name="WindowCategory">
     <eStructuralFeatures xsi:type="ecore:EReference" name="windowTypes" upperBound="-1"
         eType="#//WindowType" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MaterialCatalog" eSuperTypes="#//Catalog">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="materialCategories" upperBound="-1"
-        eType="#//MaterialCategory" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="constructionCategories"
-        lowerBound="1" upperBound="-1" eType="#//ConstructionCategory" containment="true"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MaterialCategory">
     <eStructuralFeatures xsi:type="ecore:EReference" name="materials" upperBound="-1"
         eType="#//Material" containment="true" eOpposite="#//Material/category"/>
@@ -102,11 +94,11 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ConstructionCategory">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mountings" upperBound="-1"
-        eType="#//Mounting" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="constructions" upperBound="-1"
+        eType="#//Construction" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Mounting">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mountingId" lowerBound="1"
+  <eClassifiers xsi:type="ecore:EClass" name="Construction">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="constructionId" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="layers" lowerBound="1"

de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel

@@ -12,9 +12,12 @@
   <genPackages prefix="BuildingPhysics" basePackage="de.hftstuttgart" disposableProviderFactory="true"
       fileExtensions="buildphys" ecorePackage="buildingphysics.ecore#/">
     <genClasses ecoreClass="buildingphysics.ecore#//BuildingPhysicsCatalog">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//BuildingPhysicsCatalog/author"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/windowCatalog"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/materialCatalog"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/windows"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//BuildingPhysicsCatalog/name"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//BuildingPhysicsCatalog/description"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//BuildingPhysicsCatalog/source"/>
+      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/materialCategories"/>
+      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/constructionCategories"/>
     </genClasses>
     <genClasses image="false" ecoreClass="buildingphysics.ecore#//WindowType">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/windowTypeId"/>
@@ -30,25 +33,17 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalCarbon"/>
       <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalDescription"/>
     </genClasses>
-    <genClasses image="false" ecoreClass="buildingphysics.ecore#//Catalog">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/name"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/source"/>
-    </genClasses>
-    <genClasses ecoreClass="buildingphysics.ecore#//WindowCatalog">
-      <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//WindowCatalog/windowTypes"/>
-    </genClasses>
-    <genClasses ecoreClass="buildingphysics.ecore#//MaterialCatalog">
-      <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/materialCategories"/>
-      <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
+    <genClasses ecoreClass="buildingphysics.ecore#//WindowCategory">
+      <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//WindowCategory/windowTypes"/>
     </genClasses>
     <genClasses ecoreClass="buildingphysics.ecore#//MaterialCategory">
       <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCategory/materials"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//MaterialCategory/name"/>
+      <genFeatures createChild="false" propertyDescription="Name of material category"
+          ecoreFeature="ecore:EAttribute buildingphysics.ecore#//MaterialCategory/name"/>
     </genClasses>
     <genClasses image="false" ecoreClass="buildingphysics.ecore#//Material">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/materialId"/>
-      <genFeatures createChild="false" propertyDescription="Bla Blub" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/name"/>
+      <genFeatures createChild="false" propertyDescription="Name of material" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/density"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/heatCapacity"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/conductivity"/>
@@ -62,12 +57,12 @@
     </genClasses>
     <genClasses ecoreClass="buildingphysics.ecore#//ConstructionCategory">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//ConstructionCategory/name"/>
-      <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//ConstructionCategory/mountings"/>
+      <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//ConstructionCategory/constructions"/>
     </genClasses>
-    <genClasses image="false" ecoreClass="buildingphysics.ecore#//Mounting">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Mounting/mountingId"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Mounting/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Mounting/layers"/>
+    <genClasses image="false" ecoreClass="buildingphysics.ecore#//Construction">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Construction/constructionId"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Construction/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Construction/layers"/>
     </genClasses>
     <genClasses image="false" ecoreClass="buildingphysics.ecore#//Layer">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Layer/material"

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsCatalog.java

@@ -2,6 +2,7 @@
  */
 package de.hftstuttgart.buildingphysics;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -13,9 +14,12 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getAuthor <em>Author</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindowCatalog <em>Window Catalog</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getMaterialCatalog <em>Material Catalog</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindows <em>Windows</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getName <em>Name</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getDescription <em>Description</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getSource <em>Source</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getMaterialCategories <em>Material Categories</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getConstructionCategories <em>Construction Categories</em>}</li>
  * </ul>
  *
  * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog()
@@ -24,69 +28,115 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface BuildingPhysicsCatalog extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Author</b></em>' attribute.
+	 * Returns the value of the '<em><b>Windows</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Author</em>' attribute.
-	 * @see #setAuthor(String)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_Author()
+	 * @return the value of the '<em>Windows</em>' containment reference.
+	 * @see #setWindows(WindowCategory)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_Windows()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	WindowCategory getWindows();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindows <em>Windows</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Windows</em>' containment reference.
+	 * @see #getWindows()
+	 * @generated
+	 */
+	void setWindows(WindowCategory value);
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_Name()
 	 * @model required="true"
 	 * @generated
 	 */
-	String getAuthor();
+	String getName();
 
 	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getAuthor <em>Author</em>}' attribute.
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Author</em>' attribute.
-	 * @see #getAuthor()
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
 	 * @generated
 	 */
-	void setAuthor(String value);
+	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Window Catalog</b></em>' containment reference.
+	 * Returns the value of the '<em><b>Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Window Catalog</em>' containment reference.
-	 * @see #setWindowCatalog(WindowCatalog)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_WindowCatalog()
-	 * @model containment="true" required="true"
+	 * @return the value of the '<em>Description</em>' attribute.
+	 * @see #setDescription(String)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_Description()
+	 * @model
 	 * @generated
 	 */
-	WindowCatalog getWindowCatalog();
+	String getDescription();
 
 	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindowCatalog <em>Window Catalog</em>}' containment reference.
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Window Catalog</em>' containment reference.
-	 * @see #getWindowCatalog()
+	 * @param value the new value of the '<em>Description</em>' attribute.
+	 * @see #getDescription()
 	 * @generated
 	 */
-	void setWindowCatalog(WindowCatalog value);
+	void setDescription(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Material Catalog</b></em>' containment reference.
+	 * Returns the value of the '<em><b>Source</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Material Catalog</em>' containment reference.
-	 * @see #setMaterialCatalog(MaterialCatalog)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_MaterialCatalog()
-	 * @model containment="true" required="true"
+	 * @return the value of the '<em>Source</em>' attribute.
+	 * @see #setSource(String)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_Source()
+	 * @model
+	 * @generated
+	 */
+	String getSource();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getSource <em>Source</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Source</em>' attribute.
+	 * @see #getSource()
+	 * @generated
+	 */
+	void setSource(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Construction Categories</b></em>' containment reference list.
+	 * The list contents are of type {@link de.hftstuttgart.buildingphysics.ConstructionCategory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Construction Categories</em>' containment reference list.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_ConstructionCategories()
+	 * @model containment="true"
 	 * @generated
 	 */
-	MaterialCatalog getMaterialCatalog();
+	EList<ConstructionCategory> getConstructionCategories();
 
 	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getMaterialCatalog <em>Material Catalog</em>}' containment reference.
+	 * Returns the value of the '<em><b>Material Categories</b></em>' containment reference list.
+	 * The list contents are of type {@link de.hftstuttgart.buildingphysics.MaterialCategory}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Material Catalog</em>' containment reference.
-	 * @see #getMaterialCatalog()
+	 * @return the value of the '<em>Material Categories</em>' containment reference list.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_MaterialCategories()
+	 * @model containment="true"
 	 * @generated
 	 */
-	void setMaterialCatalog(MaterialCatalog value);
+	EList<MaterialCategory> getMaterialCategories();
 
 } // BuildingPhysicsCatalog

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsFactory.java

@@ -40,22 +40,13 @@ public interface BuildingPhysicsFactory extends EFactory {
 	WindowType createWindowType();
 
 	/**
-	 * Returns a new object of class '<em>Window Catalog</em>'.
+	 * Returns a new object of class '<em>Window Category</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Window Catalog</em>'.
+	 * @return a new object of class '<em>Window Category</em>'.
 	 * @generated
 	 */
-	WindowCatalog createWindowCatalog();
-
-	/**
-	 * Returns a new object of class '<em>Material Catalog</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Material Catalog</em>'.
-	 * @generated
-	 */
-	MaterialCatalog createMaterialCatalog();
+	WindowCategory createWindowCategory();
 
 	/**
 	 * Returns a new object of class '<em>Material Category</em>'.
@@ -85,13 +76,13 @@ public interface BuildingPhysicsFactory extends EFactory {
 	ConstructionCategory createConstructionCategory();
 
 	/**
-	 * Returns a new object of class '<em>Mounting</em>'.
+	 * Returns a new object of class '<em>Construction</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Mounting</em>'.
+	 * @return a new object of class '<em>Construction</em>'.
 	 * @generated
 	 */
-	Mounting createMounting();
+	Construction createConstruction();
 
 	/**
 	 * Returns a new object of class '<em>Layer</em>'.

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsPackage.java

@@ -67,31 +67,58 @@ public interface BuildingPhysicsPackage extends EPackage {
 	int BUILDING_PHYSICS_CATALOG = 0;
 
 	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
+	 * The feature id for the '<em><b>Windows</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int BUILDING_PHYSICS_CATALOG__AUTHOR = 0;
+	int BUILDING_PHYSICS_CATALOG__WINDOWS = 0;
 
 	/**
-	 * The feature id for the '<em><b>Window Catalog</b></em>' containment reference.
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUILDING_PHYSICS_CATALOG__NAME = 1;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUILDING_PHYSICS_CATALOG__DESCRIPTION = 2;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUILDING_PHYSICS_CATALOG__SOURCE = 3;
+
+	/**
+	 * The feature id for the '<em><b>Material Categories</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG = 1;
+	int BUILDING_PHYSICS_CATALOG__MATERIAL_CATEGORIES = 4;
 
 	/**
-	 * The feature id for the '<em><b>Material Catalog</b></em>' containment reference.
+	 * The feature id for the '<em><b>Construction Categories</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG = 2;
+	int BUILDING_PHYSICS_CATALOG__CONSTRUCTION_CATEGORIES = 5;
 
 	/**
 	 * The number of structural features of the '<em>Catalog</em>' class.
@@ -100,7 +127,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BUILDING_PHYSICS_CATALOG_FEATURE_COUNT = 3;
+	int BUILDING_PHYSICS_CATALOG_FEATURE_COUNT = 6;
 
 	/**
 	 * The number of operations of the '<em>Catalog</em>' class.
@@ -248,96 +275,14 @@ public interface BuildingPhysicsPackage extends EPackage {
 	int WINDOW_TYPE_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.CatalogImpl <em>Catalog</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.hftstuttgart.buildingphysics.impl.CatalogImpl
-	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getCatalog()
-	 * @generated
-	 */
-	int CATALOG = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATALOG__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATALOG__DESCRIPTION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATALOG__SOURCE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Catalog</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATALOG_FEATURE_COUNT = 3;
-
-	/**
-	 * The number of operations of the '<em>Catalog</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATALOG_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.WindowCatalogImpl <em>Window Catalog</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.hftstuttgart.buildingphysics.impl.WindowCatalogImpl
-	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getWindowCatalog()
-	 * @generated
-	 */
-	int WINDOW_CATALOG = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WINDOW_CATALOG__NAME = CATALOG__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WINDOW_CATALOG__DESCRIPTION = CATALOG__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.WindowCategoryImpl <em>Window Category</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see de.hftstuttgart.buildingphysics.impl.WindowCategoryImpl
+	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getWindowCategory()
 	 * @generated
-	 * @ordered
 	 */
-	int WINDOW_CATALOG__SOURCE = CATALOG__SOURCE;
+	int WINDOW_CATEGORY = 2;
 
 	/**
 	 * The feature id for the '<em><b>Window Types</b></em>' containment reference list.
@@ -346,98 +291,25 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int WINDOW_CATALOG__WINDOW_TYPES = CATALOG_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Window Catalog</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WINDOW_CATALOG_FEATURE_COUNT = CATALOG_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Window Catalog</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WINDOW_CATALOG_OPERATION_COUNT = CATALOG_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.MaterialCatalogImpl <em>Material Catalog</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.hftstuttgart.buildingphysics.impl.MaterialCatalogImpl
-	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getMaterialCatalog()
-	 * @generated
-	 */
-	int MATERIAL_CATALOG = 4;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATERIAL_CATALOG__NAME = CATALOG__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATERIAL_CATALOG__DESCRIPTION = CATALOG__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATERIAL_CATALOG__SOURCE = CATALOG__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Material Categories</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATERIAL_CATALOG__MATERIAL_CATEGORIES = CATALOG_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Construction Categories</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES = CATALOG_FEATURE_COUNT + 1;
+	int WINDOW_CATEGORY__WINDOW_TYPES = 0;
 
 	/**
-	 * The number of structural features of the '<em>Material Catalog</em>' class.
+	 * The number of structural features of the '<em>Window Category</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MATERIAL_CATALOG_FEATURE_COUNT = CATALOG_FEATURE_COUNT + 2;
+	int WINDOW_CATEGORY_FEATURE_COUNT = 1;
 
 	/**
-	 * The number of operations of the '<em>Material Catalog</em>' class.
+	 * The number of operations of the '<em>Window Category</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MATERIAL_CATALOG_OPERATION_COUNT = CATALOG_OPERATION_COUNT + 0;
+	int WINDOW_CATEGORY_OPERATION_COUNT = 0;
 
 	/**
 	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.MaterialCategoryImpl <em>Material Category</em>}' class.
@@ -447,7 +319,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getMaterialCategory()
 	 * @generated
 	 */
-	int MATERIAL_CATEGORY = 5;
+	int MATERIAL_CATEGORY = 3;
 
 	/**
 	 * The feature id for the '<em><b>Materials</b></em>' containment reference list.
@@ -493,7 +365,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getMaterial()
 	 * @generated
 	 */
-	int MATERIAL = 6;
+	int MATERIAL = 4;
 
 	/**
 	 * The feature id for the '<em><b>Material Id</b></em>' attribute.
@@ -629,7 +501,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getConstructionCategory()
 	 * @generated
 	 */
-	int CONSTRUCTION_CATEGORY = 7;
+	int CONSTRUCTION_CATEGORY = 5;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -641,13 +513,13 @@ public interface BuildingPhysicsPackage extends EPackage {
 	int CONSTRUCTION_CATEGORY__NAME = 0;
 
 	/**
-	 * The feature id for the '<em><b>Mountings</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Constructions</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONSTRUCTION_CATEGORY__MOUNTINGS = 1;
+	int CONSTRUCTION_CATEGORY__CONSTRUCTIONS = 1;
 
 	/**
 	 * The number of structural features of the '<em>Construction Category</em>' class.
@@ -668,23 +540,23 @@ public interface BuildingPhysicsPackage extends EPackage {
 	int CONSTRUCTION_CATEGORY_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.MountingImpl <em>Mounting</em>}' class.
+	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.ConstructionImpl <em>Construction</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see de.hftstuttgart.buildingphysics.impl.MountingImpl
-	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getMounting()
+	 * @see de.hftstuttgart.buildingphysics.impl.ConstructionImpl
+	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getConstruction()
 	 * @generated
 	 */
-	int MOUNTING = 8;
+	int CONSTRUCTION = 6;
 
 	/**
-	 * The feature id for the '<em><b>Mounting Id</b></em>' attribute.
+	 * The feature id for the '<em><b>Construction Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MOUNTING__MOUNTING_ID = 0;
+	int CONSTRUCTION__CONSTRUCTION_ID = 0;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -693,7 +565,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MOUNTING__NAME = 1;
+	int CONSTRUCTION__NAME = 1;
 
 	/**
 	 * The feature id for the '<em><b>Layers</b></em>' containment reference list.
@@ -702,25 +574,25 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MOUNTING__LAYERS = 2;
+	int CONSTRUCTION__LAYERS = 2;
 
 	/**
-	 * The number of structural features of the '<em>Mounting</em>' class.
+	 * The number of structural features of the '<em>Construction</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MOUNTING_FEATURE_COUNT = 3;
+	int CONSTRUCTION_FEATURE_COUNT = 3;
 
 	/**
-	 * The number of operations of the '<em>Mounting</em>' class.
+	 * The number of operations of the '<em>Construction</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MOUNTING_OPERATION_COUNT = 0;
+	int CONSTRUCTION_OPERATION_COUNT = 0;
 
 	/**
 	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.LayerImpl <em>Layer</em>}' class.
@@ -730,7 +602,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getLayer()
 	 * @generated
 	 */
-	int LAYER = 9;
+	int LAYER = 7;
 
 	/**
 	 * The feature id for the '<em><b>Material</b></em>' reference.
@@ -779,37 +651,70 @@ public interface BuildingPhysicsPackage extends EPackage {
 	EClass getBuildingPhysicsCatalog();
 
 	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getAuthor <em>Author</em>}'.
+	 * Returns the meta object for the containment reference '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindows <em>Windows</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Windows</em>'.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindows()
+	 * @see #getBuildingPhysicsCatalog()
+	 * @generated
+	 */
+	EReference getBuildingPhysicsCatalog_Windows();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getName()
+	 * @see #getBuildingPhysicsCatalog()
+	 * @generated
+	 */
+	EAttribute getBuildingPhysicsCatalog_Name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Author</em>'.
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getAuthor()
+	 * @return the meta object for the attribute '<em>Description</em>'.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getDescription()
 	 * @see #getBuildingPhysicsCatalog()
 	 * @generated
 	 */
-	EAttribute getBuildingPhysicsCatalog_Author();
+	EAttribute getBuildingPhysicsCatalog_Description();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindowCatalog <em>Window Catalog</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getSource <em>Source</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Window Catalog</em>'.
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindowCatalog()
+	 * @return the meta object for the attribute '<em>Source</em>'.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getSource()
 	 * @see #getBuildingPhysicsCatalog()
 	 * @generated
 	 */
-	EReference getBuildingPhysicsCatalog_WindowCatalog();
+	EAttribute getBuildingPhysicsCatalog_Source();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getMaterialCatalog <em>Material Catalog</em>}'.
+	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getConstructionCategories <em>Construction Categories</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Material Catalog</em>'.
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getMaterialCatalog()
+	 * @return the meta object for the containment reference list '<em>Construction Categories</em>'.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getConstructionCategories()
 	 * @see #getBuildingPhysicsCatalog()
 	 * @generated
 	 */
-	EReference getBuildingPhysicsCatalog_MaterialCatalog();
+	EReference getBuildingPhysicsCatalog_ConstructionCategories();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getMaterialCategories <em>Material Categories</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Material Categories</em>'.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getMaterialCategories()
+	 * @see #getBuildingPhysicsCatalog()
+	 * @generated
+	 */
+	EReference getBuildingPhysicsCatalog_MaterialCategories();
 
 	/**
 	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.WindowType <em>Window Type</em>}'.
@@ -954,100 +859,25 @@ public interface BuildingPhysicsPackage extends EPackage {
 	EAttribute getWindowType_DisposalDescription();
 
 	/**
-	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.Catalog <em>Catalog</em>}'.
+	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.WindowCategory <em>Window Category</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Catalog</em>'.
-	 * @see de.hftstuttgart.buildingphysics.Catalog
+	 * @return the meta object for class '<em>Window Category</em>'.
+	 * @see de.hftstuttgart.buildingphysics.WindowCategory
 	 * @generated
 	 */
-	EClass getCatalog();
+	EClass getWindowCategory();
 
 	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Catalog#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see de.hftstuttgart.buildingphysics.Catalog#getName()
-	 * @see #getCatalog()
-	 * @generated
-	 */
-	EAttribute getCatalog_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Catalog#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see de.hftstuttgart.buildingphysics.Catalog#getDescription()
-	 * @see #getCatalog()
-	 * @generated
-	 */
-	EAttribute getCatalog_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Catalog#getSource <em>Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Source</em>'.
-	 * @see de.hftstuttgart.buildingphysics.Catalog#getSource()
-	 * @see #getCatalog()
-	 * @generated
-	 */
-	EAttribute getCatalog_Source();
-
-	/**
-	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.WindowCatalog <em>Window Catalog</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Window Catalog</em>'.
-	 * @see de.hftstuttgart.buildingphysics.WindowCatalog
-	 * @generated
-	 */
-	EClass getWindowCatalog();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.WindowCatalog#getWindowTypes <em>Window Types</em>}'.
+	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.WindowCategory#getWindowTypes <em>Window Types</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Window Types</em>'.
-	 * @see de.hftstuttgart.buildingphysics.WindowCatalog#getWindowTypes()
-	 * @see #getWindowCatalog()
-	 * @generated
-	 */
-	EReference getWindowCatalog_WindowTypes();
-
-	/**
-	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.MaterialCatalog <em>Material Catalog</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Material Catalog</em>'.
-	 * @see de.hftstuttgart.buildingphysics.MaterialCatalog
-	 * @generated
-	 */
-	EClass getMaterialCatalog();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.MaterialCatalog#getMaterialCategories <em>Material Categories</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Material Categories</em>'.
-	 * @see de.hftstuttgart.buildingphysics.MaterialCatalog#getMaterialCategories()
-	 * @see #getMaterialCatalog()
-	 * @generated
-	 */
-	EReference getMaterialCatalog_MaterialCategories();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.MaterialCatalog#getConstructionCategories <em>Construction Categories</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Construction Categories</em>'.
-	 * @see de.hftstuttgart.buildingphysics.MaterialCatalog#getConstructionCategories()
-	 * @see #getMaterialCatalog()
+	 * @see de.hftstuttgart.buildingphysics.WindowCategory#getWindowTypes()
+	 * @see #getWindowCategory()
 	 * @generated
 	 */
-	EReference getMaterialCatalog_ConstructionCategories();
+	EReference getWindowCategory_WindowTypes();
 
 	/**
 	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.MaterialCategory <em>Material Category</em>}'.
@@ -1245,58 +1075,58 @@ public interface BuildingPhysicsPackage extends EPackage {
 	EAttribute getConstructionCategory_Name();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getMountings <em>Mountings</em>}'.
+	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getConstructions <em>Constructions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Mountings</em>'.
-	 * @see de.hftstuttgart.buildingphysics.ConstructionCategory#getMountings()
+	 * @return the meta object for the containment reference list '<em>Constructions</em>'.
+	 * @see de.hftstuttgart.buildingphysics.ConstructionCategory#getConstructions()
 	 * @see #getConstructionCategory()
 	 * @generated
 	 */
-	EReference getConstructionCategory_Mountings();
+	EReference getConstructionCategory_Constructions();
 
 	/**
-	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.Mounting <em>Mounting</em>}'.
+	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.Construction <em>Construction</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Mounting</em>'.
-	 * @see de.hftstuttgart.buildingphysics.Mounting
+	 * @return the meta object for class '<em>Construction</em>'.
+	 * @see de.hftstuttgart.buildingphysics.Construction
 	 * @generated
 	 */
-	EClass getMounting();
+	EClass getConstruction();
 
 	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Mounting#getMountingId <em>Mounting Id</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Construction#getConstructionId <em>Construction Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mounting Id</em>'.
-	 * @see de.hftstuttgart.buildingphysics.Mounting#getMountingId()
-	 * @see #getMounting()
+	 * @return the meta object for the attribute '<em>Construction Id</em>'.
+	 * @see de.hftstuttgart.buildingphysics.Construction#getConstructionId()
+	 * @see #getConstruction()
 	 * @generated
 	 */
-	EAttribute getMounting_MountingId();
+	EAttribute getConstruction_ConstructionId();
 
 	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Mounting#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Construction#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see de.hftstuttgart.buildingphysics.Mounting#getName()
-	 * @see #getMounting()
+	 * @see de.hftstuttgart.buildingphysics.Construction#getName()
+	 * @see #getConstruction()
 	 * @generated
 	 */
-	EAttribute getMounting_Name();
+	EAttribute getConstruction_Name();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.Mounting#getLayers <em>Layers</em>}'.
+	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.Construction#getLayers <em>Layers</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Layers</em>'.
-	 * @see de.hftstuttgart.buildingphysics.Mounting#getLayers()
-	 * @see #getMounting()
+	 * @see de.hftstuttgart.buildingphysics.Construction#getLayers()
+	 * @see #getConstruction()
 	 * @generated
 	 */
-	EReference getMounting_Layers();
+	EReference getConstruction_Layers();
 
 	/**
 	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.Layer <em>Layer</em>}'.
@@ -1364,28 +1194,54 @@ public interface BuildingPhysicsPackage extends EPackage {
 		EClass BUILDING_PHYSICS_CATALOG = eINSTANCE.getBuildingPhysicsCatalog();
 
 		/**
-		 * The meta object literal for the '<em><b>Author</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Windows</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference BUILDING_PHYSICS_CATALOG__WINDOWS = eINSTANCE.getBuildingPhysicsCatalog_Windows();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute BUILDING_PHYSICS_CATALOG__NAME = eINSTANCE.getBuildingPhysicsCatalog_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute BUILDING_PHYSICS_CATALOG__DESCRIPTION = eINSTANCE.getBuildingPhysicsCatalog_Description();
+
+		/**
+		 * The meta object literal for the '<em><b>Source</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute BUILDING_PHYSICS_CATALOG__AUTHOR = eINSTANCE.getBuildingPhysicsCatalog_Author();
+		EAttribute BUILDING_PHYSICS_CATALOG__SOURCE = eINSTANCE.getBuildingPhysicsCatalog_Source();
 
 		/**
-		 * The meta object literal for the '<em><b>Window Catalog</b></em>' containment reference feature.
+		 * The meta object literal for the '<em><b>Construction Categories</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG = eINSTANCE.getBuildingPhysicsCatalog_WindowCatalog();
+		EReference BUILDING_PHYSICS_CATALOG__CONSTRUCTION_CATEGORIES = eINSTANCE
+				.getBuildingPhysicsCatalog_ConstructionCategories();
 
 		/**
-		 * The meta object literal for the '<em><b>Material Catalog</b></em>' containment reference feature.
+		 * The meta object literal for the '<em><b>Material Categories</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG = eINSTANCE.getBuildingPhysicsCatalog_MaterialCatalog();
+		EReference BUILDING_PHYSICS_CATALOG__MATERIAL_CATEGORIES = eINSTANCE
+				.getBuildingPhysicsCatalog_MaterialCategories();
 
 		/**
 		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl <em>Window Type</em>}' class.
@@ -1494,48 +1350,14 @@ public interface BuildingPhysicsPackage extends EPackage {
 		EAttribute WINDOW_TYPE__DISPOSAL_DESCRIPTION = eINSTANCE.getWindowType_DisposalDescription();
 
 		/**
-		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.CatalogImpl <em>Catalog</em>}' class.
+		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.WindowCategoryImpl <em>Window Category</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see de.hftstuttgart.buildingphysics.impl.CatalogImpl
-		 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getCatalog()
+		 * @see de.hftstuttgart.buildingphysics.impl.WindowCategoryImpl
+		 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getWindowCategory()
 		 * @generated
 		 */
-		EClass CATALOG = eINSTANCE.getCatalog();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CATALOG__NAME = eINSTANCE.getCatalog_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CATALOG__DESCRIPTION = eINSTANCE.getCatalog_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Source</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CATALOG__SOURCE = eINSTANCE.getCatalog_Source();
-
-		/**
-		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.WindowCatalogImpl <em>Window Catalog</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.hftstuttgart.buildingphysics.impl.WindowCatalogImpl
-		 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getWindowCatalog()
-		 * @generated
-		 */
-		EClass WINDOW_CATALOG = eINSTANCE.getWindowCatalog();
+		EClass WINDOW_CATEGORY = eINSTANCE.getWindowCategory();
 
 		/**
 		 * The meta object literal for the '<em><b>Window Types</b></em>' containment reference list feature.
@@ -1543,33 +1365,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference WINDOW_CATALOG__WINDOW_TYPES = eINSTANCE.getWindowCatalog_WindowTypes();
-
-		/**
-		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.MaterialCatalogImpl <em>Material Catalog</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.hftstuttgart.buildingphysics.impl.MaterialCatalogImpl
-		 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getMaterialCatalog()
-		 * @generated
-		 */
-		EClass MATERIAL_CATALOG = eINSTANCE.getMaterialCatalog();
-
-		/**
-		 * The meta object literal for the '<em><b>Material Categories</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MATERIAL_CATALOG__MATERIAL_CATEGORIES = eINSTANCE.getMaterialCatalog_MaterialCategories();
-
-		/**
-		 * The meta object literal for the '<em><b>Construction Categories</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES = eINSTANCE.getMaterialCatalog_ConstructionCategories();
+		EReference WINDOW_CATEGORY__WINDOW_TYPES = eINSTANCE.getWindowCategory_WindowTypes();
 
 		/**
 		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.MaterialCategoryImpl <em>Material Category</em>}' class.
@@ -1722,30 +1518,30 @@ public interface BuildingPhysicsPackage extends EPackage {
 		EAttribute CONSTRUCTION_CATEGORY__NAME = eINSTANCE.getConstructionCategory_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Mountings</b></em>' containment reference list feature.
+		 * The meta object literal for the '<em><b>Constructions</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference CONSTRUCTION_CATEGORY__MOUNTINGS = eINSTANCE.getConstructionCategory_Mountings();
+		EReference CONSTRUCTION_CATEGORY__CONSTRUCTIONS = eINSTANCE.getConstructionCategory_Constructions();
 
 		/**
-		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.MountingImpl <em>Mounting</em>}' class.
+		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.ConstructionImpl <em>Construction</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see de.hftstuttgart.buildingphysics.impl.MountingImpl
-		 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getMounting()
+		 * @see de.hftstuttgart.buildingphysics.impl.ConstructionImpl
+		 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getConstruction()
 		 * @generated
 		 */
-		EClass MOUNTING = eINSTANCE.getMounting();
+		EClass CONSTRUCTION = eINSTANCE.getConstruction();
 
 		/**
-		 * The meta object literal for the '<em><b>Mounting Id</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Construction Id</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MOUNTING__MOUNTING_ID = eINSTANCE.getMounting_MountingId();
+		EAttribute CONSTRUCTION__CONSTRUCTION_ID = eINSTANCE.getConstruction_ConstructionId();
 
 		/**
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -1753,7 +1549,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MOUNTING__NAME = eINSTANCE.getMounting_Name();
+		EAttribute CONSTRUCTION__NAME = eINSTANCE.getConstruction_Name();
 
 		/**
 		 * The meta object literal for the '<em><b>Layers</b></em>' containment reference list feature.
@@ -1761,7 +1557,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MOUNTING__LAYERS = eINSTANCE.getMounting_Layers();
+		EReference CONSTRUCTION__LAYERS = eINSTANCE.getConstruction_Layers();
 
 		/**
 		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.LayerImpl <em>Layer</em>}' class.

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Catalog.java

-/**
- */
-package de.hftstuttgart.buildingphysics;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Catalog</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.Catalog#getName <em>Name</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.Catalog#getDescription <em>Description</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.Catalog#getSource <em>Source</em>}</li>
- * </ul>
- *
- * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog()
- * @model abstract="true"
- * @generated
- */
-public interface Catalog extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog_Name()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Catalog#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Catalog#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Source</em>' attribute.
-	 * @see #setSource(String)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog_Source()
-	 * @model
-	 * @generated
-	 */
-	String getSource();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Catalog#getSource <em>Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source</em>' attribute.
-	 * @see #getSource()
-	 * @generated
-	 */
-	void setSource(String value);
-
-} // Catalog

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Mounting.java → de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Construction.java

@@ -8,44 +8,44 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mounting</b></em>'.
+ * A representation of the model object '<em><b>Construction</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.Mounting#getMountingId <em>Mounting Id</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.Mounting#getName <em>Name</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.Mounting#getLayers <em>Layers</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Construction#getConstructionId <em>Construction Id</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Construction#getName <em>Name</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Construction#getLayers <em>Layers</em>}</li>
  * </ul>
  *
- * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting()
+ * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstruction()
  * @model
  * @generated
  */
-public interface Mounting extends EObject {
+public interface Construction extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mounting Id</b></em>' attribute.
+	 * Returns the value of the '<em><b>Construction Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mounting Id</em>' attribute.
-	 * @see #setMountingId(String)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting_MountingId()
+	 * @return the value of the '<em>Construction Id</em>' attribute.
+	 * @see #setConstructionId(String)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstruction_ConstructionId()
 	 * @model id="true" required="true"
 	 * @generated
 	 */
-	String getMountingId();
+	String getConstructionId();
 
 	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Mounting#getMountingId <em>Mounting Id</em>}' attribute.
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Construction#getConstructionId <em>Construction Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mounting Id</em>' attribute.
-	 * @see #getMountingId()
+	 * @param value the new value of the '<em>Construction Id</em>' attribute.
+	 * @see #getConstructionId()
 	 * @generated
 	 */
-	void setMountingId(String value);
+	void setConstructionId(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
@@ -53,14 +53,14 @@ public interface Mounting extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting_Name()
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstruction_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Mounting#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Construction#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -75,10 +75,10 @@ public interface Mounting extends EObject {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Layers</em>' containment reference list.
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting_Layers()
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstruction_Layers()
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
 	EList<Layer> getLayers();
 
-} // Mounting
+} // Construction

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/ConstructionCategory.java

@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
  * </p>
  * <ul>
  *   <li>{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getName <em>Name</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getMountings <em>Mountings</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getConstructions <em>Constructions</em>}</li>
  * </ul>
  *
  * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstructionCategory()
@@ -47,15 +47,15 @@ public interface ConstructionCategory extends EObject {
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Mountings</b></em>' containment reference list.
-	 * The list contents are of type {@link de.hftstuttgart.buildingphysics.Mounting}.
+	 * Returns the value of the '<em><b>Constructions</b></em>' containment reference list.
+	 * The list contents are of type {@link de.hftstuttgart.buildingphysics.Construction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mountings</em>' containment reference list.
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstructionCategory_Mountings()
+	 * @return the value of the '<em>Constructions</em>' containment reference list.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstructionCategory_Constructions()
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<Mounting> getMountings();
+	EList<Construction> getConstructions();
 
 } // ConstructionCategory

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/MaterialCatalog.java

-/**
- */
-package de.hftstuttgart.buildingphysics;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Material Catalog</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.MaterialCatalog#getMaterialCategories <em>Material Categories</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.MaterialCatalog#getConstructionCategories <em>Construction Categories</em>}</li>
- * </ul>
- *
- * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterialCatalog()
- * @model
- * @generated
- */
-public interface MaterialCatalog extends Catalog {
-	/**
-	 * Returns the value of the '<em><b>Material Categories</b></em>' containment reference list.
-	 * The list contents are of type {@link de.hftstuttgart.buildingphysics.MaterialCategory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Material Categories</em>' containment reference list.
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterialCatalog_MaterialCategories()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<MaterialCategory> getMaterialCategories();
-
-	/**
-	 * Returns the value of the '<em><b>Construction Categories</b></em>' containment reference list.
-	 * The list contents are of type {@link de.hftstuttgart.buildingphysics.ConstructionCategory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Construction Categories</em>' containment reference list.
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterialCatalog_ConstructionCategories()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	EList<ConstructionCategory> getConstructionCategories();
-
-} // MaterialCatalog

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowCatalog.java → de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowCategory.java

@@ -4,33 +4,35 @@ package de.hftstuttgart.buildingphysics;
 
 import org.eclipse.emf.common.util.EList;
 
+import org.eclipse.emf.ecore.EObject;
+
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Window Catalog</b></em>'.
+ * A representation of the model object '<em><b>Window Category</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.WindowCatalog#getWindowTypes <em>Window Types</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.WindowCategory#getWindowTypes <em>Window Types</em>}</li>
  * </ul>
  *
- * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowCatalog()
+ * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowCategory()
  * @model
  * @generated
  */
-public interface WindowCatalog extends Catalog {
+public interface WindowCategory extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Window Types</b></em>' containment reference list.
 	 * The list contents are of type {@link de.hftstuttgart.buildingphysics.WindowType}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Window Types</em>' containment reference list.
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowCatalog_WindowTypes()
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowCategory_WindowTypes()
 	 * @model containment="true"
 	 * @generated
 	 */
 	EList<WindowType> getWindowTypes();
 
-} // WindowCatalog
+} // WindowCategory

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsCatalogImpl.java

@@ -4,17 +4,22 @@ package de.hftstuttgart.buildingphysics.impl;
 
 import de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog;
 import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
-import de.hftstuttgart.buildingphysics.MaterialCatalog;
-import de.hftstuttgart.buildingphysics.WindowCatalog;
+import de.hftstuttgart.buildingphysics.ConstructionCategory;
+import de.hftstuttgart.buildingphysics.MaterialCategory;
+import de.hftstuttgart.buildingphysics.WindowCategory;
 
+import java.util.Collection;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
+import org.eclipse.emf.common.util.EList;
 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;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
@@ -24,81 +29,114 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.BuildingPhysicsCatalogImpl#getAuthor <em>Author</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.BuildingPhysicsCatalogImpl#getWindowCatalog <em>Window Catalog</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.BuildingPhysicsCatalogImpl#getMaterialCatalog <em>Material Catalog</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.BuildingPhysicsCatalogImpl#getWindows <em>Windows</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.BuildingPhysicsCatalogImpl#getName <em>Name</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.BuildingPhysicsCatalogImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.BuildingPhysicsCatalogImpl#getSource <em>Source</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.BuildingPhysicsCatalogImpl#getMaterialCategories <em>Material Categories</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.BuildingPhysicsCatalogImpl#getConstructionCategories <em>Construction Categories</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container implements BuildingPhysicsCatalog {
 	/**
-	 * The default value of the '{@link #getAuthor() <em>Author</em>}' attribute.
+	 * The cached value of the '{@link #getWindows() <em>Windows</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthor()
+	 * @see #getWindows()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String AUTHOR_EDEFAULT = null;
+	protected WindowCategory windows;
 
 	/**
-	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' attribute.
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthor()
+	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected String author = AUTHOR_EDEFAULT;
+	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getWindowCatalog() <em>Window Catalog</em>}' containment reference.
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getWindowCatalog()
+	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected WindowCatalog windowCatalog;
+	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getMaterialCatalog() <em>Material Catalog</em>}' containment reference.
+	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMaterialCatalog()
+	 * @see #getDescription()
 	 * @generated
 	 * @ordered
 	 */
-	protected MaterialCatalog materialCatalog;
+	protected static final String DESCRIPTION_EDEFAULT = null;
 
 	/**
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see #getDescription()
 	 * @generated
+	 * @ordered
 	 */
-	protected BuildingPhysicsCatalogImpl() {
-		super();
-	}
+	protected String description = DESCRIPTION_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getSource() <em>Source</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see #getSource()
 	 * @generated
+	 * @ordered
 	 */
-	@Override
-	protected EClass eStaticClass() {
-		return BuildingPhysicsPackage.Literals.BUILDING_PHYSICS_CATALOG;
-	}
+	protected static final String SOURCE_EDEFAULT = null;
 
 	/**
+	 * The cached value of the '{@link #getSource() <em>Source</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see #getSource()
 	 * @generated
+	 * @ordered
 	 */
-	@Override
-	public String getAuthor() {
-		return author;
+	protected String source = SOURCE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getMaterialCategories() <em>Material Categories</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMaterialCategories()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<MaterialCategory> materialCategories;
+
+	/**
+	 * The cached value of the '{@link #getConstructionCategories() <em>Construction Categories</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConstructionCategories()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ConstructionCategory> constructionCategories;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected BuildingPhysicsCatalogImpl() {
+		super();
 	}
 
 	/**
@@ -107,12 +145,8 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	 * @generated
 	 */
 	@Override
-	public void setAuthor(String newAuthor) {
-		String oldAuthor = author;
-		author = newAuthor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__AUTHOR, oldAuthor, author));
+	protected EClass eStaticClass() {
+		return BuildingPhysicsPackage.Literals.BUILDING_PHYSICS_CATALOG;
 	}
 
 	/**
@@ -121,8 +155,8 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	 * @generated
 	 */
 	@Override
-	public WindowCatalog getWindowCatalog() {
-		return windowCatalog;
+	public WindowCategory getWindows() {
+		return windows;
 	}
 
 	/**
@@ -130,13 +164,12 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetWindowCatalog(WindowCatalog newWindowCatalog, NotificationChain msgs) {
-		WindowCatalog oldWindowCatalog = windowCatalog;
-		windowCatalog = newWindowCatalog;
+	public NotificationChain basicSetWindows(WindowCategory newWindows, NotificationChain msgs) {
+		WindowCategory oldWindows = windows;
+		windows = newWindows;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-					BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG, oldWindowCatalog,
-					newWindowCatalog);
+					BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOWS, oldWindows, newWindows);
 			if (msgs == null)
 				msgs = notification;
 			else
@@ -151,24 +184,21 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	 * @generated
 	 */
 	@Override
-	public void setWindowCatalog(WindowCatalog newWindowCatalog) {
-		if (newWindowCatalog != windowCatalog) {
+	public void setWindows(WindowCategory newWindows) {
+		if (newWindows != windows) {
 			NotificationChain msgs = null;
-			if (windowCatalog != null)
-				msgs = ((InternalEObject) windowCatalog).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG, null,
-						msgs);
-			if (newWindowCatalog != null)
-				msgs = ((InternalEObject) newWindowCatalog).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG, null,
-						msgs);
-			msgs = basicSetWindowCatalog(newWindowCatalog, msgs);
+			if (windows != null)
+				msgs = ((InternalEObject) windows).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOWS, null, msgs);
+			if (newWindows != null)
+				msgs = ((InternalEObject) newWindows).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOWS, null, msgs);
+			msgs = basicSetWindows(newWindows, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-					BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG, newWindowCatalog,
-					newWindowCatalog));
+					BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOWS, newWindows, newWindows));
 	}
 
 	/**
@@ -177,8 +207,8 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	 * @generated
 	 */
 	@Override
-	public MaterialCatalog getMaterialCatalog() {
-		return materialCatalog;
+	public String getName() {
+		return name;
 	}
 
 	/**
@@ -186,19 +216,13 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetMaterialCatalog(MaterialCatalog newMaterialCatalog, NotificationChain msgs) {
-		MaterialCatalog oldMaterialCatalog = materialCatalog;
-		materialCatalog = newMaterialCatalog;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-					BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG, oldMaterialCatalog,
-					newMaterialCatalog);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__NAME,
+					oldName, name));
 	}
 
 	/**
@@ -207,24 +231,74 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	 * @generated
 	 */
 	@Override
-	public void setMaterialCatalog(MaterialCatalog newMaterialCatalog) {
-		if (newMaterialCatalog != materialCatalog) {
-			NotificationChain msgs = null;
-			if (materialCatalog != null)
-				msgs = ((InternalEObject) materialCatalog).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG,
-						null, msgs);
-			if (newMaterialCatalog != null)
-				msgs = ((InternalEObject) newMaterialCatalog).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG,
-						null, msgs);
-			msgs = basicSetMaterialCatalog(newMaterialCatalog, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDescription(String newDescription) {
+		String oldDescription = description;
+		description = newDescription;
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-					BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG, newMaterialCatalog,
-					newMaterialCatalog));
+					BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__DESCRIPTION, oldDescription, description));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getSource() {
+		return source;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSource(String newSource) {
+		String oldSource = source;
+		source = newSource;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__SOURCE, oldSource, source));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<ConstructionCategory> getConstructionCategories() {
+		if (constructionCategories == null) {
+			constructionCategories = new EObjectContainmentEList<ConstructionCategory>(ConstructionCategory.class, this,
+					BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__CONSTRUCTION_CATEGORIES);
+		}
+		return constructionCategories;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<MaterialCategory> getMaterialCategories() {
+		if (materialCategories == null) {
+			materialCategories = new EObjectContainmentEList<MaterialCategory>(MaterialCategory.class, this,
+					BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATEGORIES);
+		}
+		return materialCategories;
 	}
 
 	/**
@@ -235,10 +309,12 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG:
-			return basicSetWindowCatalog(null, msgs);
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG:
-			return basicSetMaterialCatalog(null, msgs);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOWS:
+			return basicSetWindows(null, msgs);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATEGORIES:
+			return ((InternalEList<?>) getMaterialCategories()).basicRemove(otherEnd, msgs);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__CONSTRUCTION_CATEGORIES:
+			return ((InternalEList<?>) getConstructionCategories()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -251,12 +327,18 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__AUTHOR:
-			return getAuthor();
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG:
-			return getWindowCatalog();
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG:
-			return getMaterialCatalog();
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOWS:
+			return getWindows();
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__NAME:
+			return getName();
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__DESCRIPTION:
+			return getDescription();
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__SOURCE:
+			return getSource();
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATEGORIES:
+			return getMaterialCategories();
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__CONSTRUCTION_CATEGORIES:
+			return getConstructionCategories();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -266,17 +348,29 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__AUTHOR:
-			setAuthor((String) newValue);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOWS:
+			setWindows((WindowCategory) newValue);
 			return;
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG:
-			setWindowCatalog((WindowCatalog) newValue);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__NAME:
+			setName((String) newValue);
 			return;
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG:
-			setMaterialCatalog((MaterialCatalog) newValue);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__DESCRIPTION:
+			setDescription((String) newValue);
+			return;
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__SOURCE:
+			setSource((String) newValue);
+			return;
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATEGORIES:
+			getMaterialCategories().clear();
+			getMaterialCategories().addAll((Collection<? extends MaterialCategory>) newValue);
+			return;
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__CONSTRUCTION_CATEGORIES:
+			getConstructionCategories().clear();
+			getConstructionCategories().addAll((Collection<? extends ConstructionCategory>) newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -290,14 +384,23 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__AUTHOR:
-			setAuthor(AUTHOR_EDEFAULT);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOWS:
+			setWindows((WindowCategory) null);
+			return;
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__DESCRIPTION:
+			setDescription(DESCRIPTION_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__SOURCE:
+			setSource(SOURCE_EDEFAULT);
 			return;
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG:
-			setWindowCatalog((WindowCatalog) null);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATEGORIES:
+			getMaterialCategories().clear();
 			return;
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG:
-			setMaterialCatalog((MaterialCatalog) null);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__CONSTRUCTION_CATEGORIES:
+			getConstructionCategories().clear();
 			return;
 		}
 		super.eUnset(featureID);
@@ -311,12 +414,18 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__AUTHOR:
-			return AUTHOR_EDEFAULT == null ? author != null : !AUTHOR_EDEFAULT.equals(author);
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG:
-			return windowCatalog != null;
-		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG:
-			return materialCatalog != null;
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__WINDOWS:
+			return windows != null;
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__DESCRIPTION:
+			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__SOURCE:
+			return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__MATERIAL_CATEGORIES:
+			return materialCategories != null && !materialCategories.isEmpty();
+		case BuildingPhysicsPackage.BUILDING_PHYSICS_CATALOG__CONSTRUCTION_CATEGORIES:
+			return constructionCategories != null && !constructionCategories.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -332,8 +441,12 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
 			return super.toString();
 
 		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (author: ");
-		result.append(author);
+		result.append(" (name: ");
+		result.append(name);
+		result.append(", description: ");
+		result.append(description);
+		result.append(", source: ");
+		result.append(source);
 		result.append(')');
 		return result.toString();
 	}

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsFactoryImpl.java

@@ -60,18 +60,16 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
 			return createBuildingPhysicsCatalog();
 		case BuildingPhysicsPackage.WINDOW_TYPE:
 			return createWindowType();
-		case BuildingPhysicsPackage.WINDOW_CATALOG:
-			return createWindowCatalog();
-		case BuildingPhysicsPackage.MATERIAL_CATALOG:
-			return createMaterialCatalog();
+		case BuildingPhysicsPackage.WINDOW_CATEGORY:
+			return createWindowCategory();
 		case BuildingPhysicsPackage.MATERIAL_CATEGORY:
 			return createMaterialCategory();
 		case BuildingPhysicsPackage.MATERIAL:
 			return createMaterial();
 		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY:
 			return createConstructionCategory();
-		case BuildingPhysicsPackage.MOUNTING:
-			return createMounting();
+		case BuildingPhysicsPackage.CONSTRUCTION:
+			return createConstruction();
 		case BuildingPhysicsPackage.LAYER:
 			return createLayer();
 		default:
@@ -107,20 +105,9 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public WindowCatalog createWindowCatalog() {
-		WindowCatalogImpl windowCatalog = new WindowCatalogImpl();
-		return windowCatalog;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public MaterialCatalog createMaterialCatalog() {
-		MaterialCatalogImpl materialCatalog = new MaterialCatalogImpl();
-		return materialCatalog;
+	public WindowCategory createWindowCategory() {
+		WindowCategoryImpl windowCategory = new WindowCategoryImpl();
+		return windowCategory;
 	}
 
 	/**
@@ -162,9 +149,9 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public Mounting createMounting() {
-		MountingImpl mounting = new MountingImpl();
-		return mounting;
+	public Construction createConstruction() {
+		ConstructionImpl construction = new ConstructionImpl();
+		return construction;
 	}
 
 	/**

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java

@@ -5,14 +5,12 @@ package de.hftstuttgart.buildingphysics.impl;
 import de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog;
 import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
 import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
-import de.hftstuttgart.buildingphysics.Catalog;
+import de.hftstuttgart.buildingphysics.Construction;
 import de.hftstuttgart.buildingphysics.ConstructionCategory;
 import de.hftstuttgart.buildingphysics.Layer;
 import de.hftstuttgart.buildingphysics.Material;
-import de.hftstuttgart.buildingphysics.MaterialCatalog;
 import de.hftstuttgart.buildingphysics.MaterialCategory;
-import de.hftstuttgart.buildingphysics.Mounting;
-import de.hftstuttgart.buildingphysics.WindowCatalog;
+import de.hftstuttgart.buildingphysics.WindowCategory;
 import de.hftstuttgart.buildingphysics.WindowType;
 
 import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
@@ -50,21 +48,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass catalogEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass windowCatalogEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass materialCatalogEClass = null;
+	private EClass windowCategoryEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -92,7 +76,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass mountingEClass = null;
+	private EClass constructionEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -184,8 +168,38 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EAttribute getBuildingPhysicsCatalog_Author() {
-		return (EAttribute) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(0);
+	public EReference getBuildingPhysicsCatalog_Windows() {
+		return (EReference) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getBuildingPhysicsCatalog_Name() {
+		return (EAttribute) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getBuildingPhysicsCatalog_Description() {
+		return (EAttribute) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getBuildingPhysicsCatalog_Source() {
+		return (EAttribute) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -194,8 +208,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EReference getBuildingPhysicsCatalog_WindowCatalog() {
-		return (EReference) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(1);
+	public EReference getBuildingPhysicsCatalog_ConstructionCategories() {
+		return (EReference) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -204,8 +218,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EReference getBuildingPhysicsCatalog_MaterialCatalog() {
-		return (EReference) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(2);
+	public EReference getBuildingPhysicsCatalog_MaterialCategories() {
+		return (EReference) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -344,18 +358,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EClass getCatalog() {
-		return catalogEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EAttribute getCatalog_Name() {
-		return (EAttribute) catalogEClass.getEStructuralFeatures().get(0);
+	public EClass getWindowCategory() {
+		return windowCategoryEClass;
 	}
 
 	/**
@@ -364,68 +368,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EAttribute getCatalog_Description() {
-		return (EAttribute) catalogEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EAttribute getCatalog_Source() {
-		return (EAttribute) catalogEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getWindowCatalog() {
-		return windowCatalogEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getWindowCatalog_WindowTypes() {
-		return (EReference) windowCatalogEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getMaterialCatalog() {
-		return materialCatalogEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getMaterialCatalog_MaterialCategories() {
-		return (EReference) materialCatalogEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getMaterialCatalog_ConstructionCategories() {
-		return (EReference) materialCatalogEClass.getEStructuralFeatures().get(1);
+	public EReference getWindowCategory_WindowTypes() {
+		return (EReference) windowCategoryEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -614,7 +558,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EReference getConstructionCategory_Mountings() {
+	public EReference getConstructionCategory_Constructions() {
 		return (EReference) constructionCategoryEClass.getEStructuralFeatures().get(1);
 	}
 
@@ -624,8 +568,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EClass getMounting() {
-		return mountingEClass;
+	public EClass getConstruction() {
+		return constructionEClass;
 	}
 
 	/**
@@ -634,8 +578,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EAttribute getMounting_MountingId() {
-		return (EAttribute) mountingEClass.getEStructuralFeatures().get(0);
+	public EAttribute getConstruction_ConstructionId() {
+		return (EAttribute) constructionEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -644,8 +588,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EAttribute getMounting_Name() {
-		return (EAttribute) mountingEClass.getEStructuralFeatures().get(1);
+	public EAttribute getConstruction_Name() {
+		return (EAttribute) constructionEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -654,8 +598,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EReference getMounting_Layers() {
-		return (EReference) mountingEClass.getEStructuralFeatures().get(2);
+	public EReference getConstruction_Layers() {
+		return (EReference) constructionEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -719,9 +663,12 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 
 		// Create classes and their features
 		buildingPhysicsCatalogEClass = createEClass(BUILDING_PHYSICS_CATALOG);
-		createEAttribute(buildingPhysicsCatalogEClass, BUILDING_PHYSICS_CATALOG__AUTHOR);
-		createEReference(buildingPhysicsCatalogEClass, BUILDING_PHYSICS_CATALOG__WINDOW_CATALOG);
-		createEReference(buildingPhysicsCatalogEClass, BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG);
+		createEReference(buildingPhysicsCatalogEClass, BUILDING_PHYSICS_CATALOG__WINDOWS);
+		createEAttribute(buildingPhysicsCatalogEClass, BUILDING_PHYSICS_CATALOG__NAME);
+		createEAttribute(buildingPhysicsCatalogEClass, BUILDING_PHYSICS_CATALOG__DESCRIPTION);
+		createEAttribute(buildingPhysicsCatalogEClass, BUILDING_PHYSICS_CATALOG__SOURCE);
+		createEReference(buildingPhysicsCatalogEClass, BUILDING_PHYSICS_CATALOG__MATERIAL_CATEGORIES);
+		createEReference(buildingPhysicsCatalogEClass, BUILDING_PHYSICS_CATALOG__CONSTRUCTION_CATEGORIES);
 
 		windowTypeEClass = createEClass(WINDOW_TYPE);
 		createEAttribute(windowTypeEClass, WINDOW_TYPE__WINDOW_TYPE_ID);
@@ -737,17 +684,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		createEAttribute(windowTypeEClass, WINDOW_TYPE__DISPOSAL_CARBON);
 		createEAttribute(windowTypeEClass, WINDOW_TYPE__DISPOSAL_DESCRIPTION);
 
-		catalogEClass = createEClass(CATALOG);
-		createEAttribute(catalogEClass, CATALOG__NAME);
-		createEAttribute(catalogEClass, CATALOG__DESCRIPTION);
-		createEAttribute(catalogEClass, CATALOG__SOURCE);
-
-		windowCatalogEClass = createEClass(WINDOW_CATALOG);
-		createEReference(windowCatalogEClass, WINDOW_CATALOG__WINDOW_TYPES);
-
-		materialCatalogEClass = createEClass(MATERIAL_CATALOG);
-		createEReference(materialCatalogEClass, MATERIAL_CATALOG__MATERIAL_CATEGORIES);
-		createEReference(materialCatalogEClass, MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES);
+		windowCategoryEClass = createEClass(WINDOW_CATEGORY);
+		createEReference(windowCategoryEClass, WINDOW_CATEGORY__WINDOW_TYPES);
 
 		materialCategoryEClass = createEClass(MATERIAL_CATEGORY);
 		createEReference(materialCategoryEClass, MATERIAL_CATEGORY__MATERIALS);
@@ -769,12 +707,12 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 
 		constructionCategoryEClass = createEClass(CONSTRUCTION_CATEGORY);
 		createEAttribute(constructionCategoryEClass, CONSTRUCTION_CATEGORY__NAME);
-		createEReference(constructionCategoryEClass, CONSTRUCTION_CATEGORY__MOUNTINGS);
+		createEReference(constructionCategoryEClass, CONSTRUCTION_CATEGORY__CONSTRUCTIONS);
 
-		mountingEClass = createEClass(MOUNTING);
-		createEAttribute(mountingEClass, MOUNTING__MOUNTING_ID);
-		createEAttribute(mountingEClass, MOUNTING__NAME);
-		createEReference(mountingEClass, MOUNTING__LAYERS);
+		constructionEClass = createEClass(CONSTRUCTION);
+		createEAttribute(constructionEClass, CONSTRUCTION__CONSTRUCTION_ID);
+		createEAttribute(constructionEClass, CONSTRUCTION__NAME);
+		createEReference(constructionEClass, CONSTRUCTION__LAYERS);
 
 		layerEClass = createEClass(LAYER);
 		createEReference(layerEClass, LAYER__MATERIAL);
@@ -814,21 +752,28 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		windowCatalogEClass.getESuperTypes().add(this.getCatalog());
-		materialCatalogEClass.getESuperTypes().add(this.getCatalog());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(buildingPhysicsCatalogEClass, BuildingPhysicsCatalog.class, "BuildingPhysicsCatalog", !IS_ABSTRACT,
 				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBuildingPhysicsCatalog_Author(), ecorePackage.getEString(), "author", null, 1, 1,
+		initEReference(getBuildingPhysicsCatalog_Windows(), this.getWindowCategory(), null, "windows", null, 1, 1,
+				BuildingPhysicsCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getBuildingPhysicsCatalog_Name(), ecorePackage.getEString(), "name", null, 1, 1,
 				BuildingPhysicsCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
 				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuildingPhysicsCatalog_WindowCatalog(), this.getWindowCatalog(), null, "windowCatalog", null,
-				1, 1, BuildingPhysicsCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuildingPhysicsCatalog_MaterialCatalog(), this.getMaterialCatalog(), null, "materialCatalog",
-				null, 1, 1, BuildingPhysicsCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getBuildingPhysicsCatalog_Description(), ecorePackage.getEString(), "description", null, 0, 1,
+				BuildingPhysicsCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getBuildingPhysicsCatalog_Source(), ecorePackage.getEString(), "source", null, 0, 1,
+				BuildingPhysicsCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getBuildingPhysicsCatalog_MaterialCategories(), this.getMaterialCategory(), null,
+				"materialCategories", null, 0, -1, BuildingPhysicsCatalog.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getBuildingPhysicsCatalog_ConstructionCategories(), this.getConstructionCategory(), null,
+				"constructionCategories", null, 0, -1, BuildingPhysicsCatalog.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(windowTypeEClass, WindowType.class, "WindowType", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
@@ -867,29 +812,12 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 				1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(catalogEClass, Catalog.class, "Catalog", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCatalog_Name(), ecorePackage.getEString(), "name", null, 1, 1, Catalog.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCatalog_Description(), ecorePackage.getEString(), "description", null, 0, 1, Catalog.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCatalog_Source(), ecorePackage.getEString(), "source", null, 0, 1, Catalog.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(windowCatalogEClass, WindowCatalog.class, "WindowCatalog", !IS_ABSTRACT, !IS_INTERFACE,
+		initEClass(windowCategoryEClass, WindowCategory.class, "WindowCategory", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getWindowCatalog_WindowTypes(), this.getWindowType(), null, "windowTypes", null, 0, -1,
-				WindowCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+		initEReference(getWindowCategory_WindowTypes(), this.getWindowType(), null, "windowTypes", null, 0, -1,
+				WindowCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
 				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(materialCatalogEClass, MaterialCatalog.class, "MaterialCatalog", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMaterialCatalog_MaterialCategories(), this.getMaterialCategory(), null, "materialCategories",
-				null, 0, -1, MaterialCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMaterialCatalog_ConstructionCategories(), this.getConstructionCategory(), null,
-				"constructionCategories", null, 1, -1, MaterialCatalog.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(materialCategoryEClass, MaterialCategory.class, "MaterialCategory", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getMaterialCategory_Materials(), this.getMaterial(), this.getMaterial_Category(), "materials",
@@ -941,17 +869,18 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		initEAttribute(getConstructionCategory_Name(), ecorePackage.getEString(), "name", null, 1, 1,
 				ConstructionCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
 				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConstructionCategory_Mountings(), this.getMounting(), null, "mountings", null, 0, -1,
-				ConstructionCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+		initEReference(getConstructionCategory_Constructions(), this.getConstruction(), null, "constructions", null, 0,
+				-1, ConstructionCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
 				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(mountingEClass, Mounting.class, "Mounting", !IS_ABSTRACT, !IS_INTERFACE,
+		initEClass(constructionEClass, Construction.class, "Construction", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMounting_MountingId(), ecorePackage.getEString(), "mountingId", null, 1, 1, Mounting.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMounting_Name(), ecorePackage.getEString(), "name", null, 1, 1, Mounting.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMounting_Layers(), this.getLayer(), null, "layers", null, 1, -1, Mounting.class,
+		initEAttribute(getConstruction_ConstructionId(), ecorePackage.getEString(), "constructionId", null, 1, 1,
+				Construction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstruction_Name(), ecorePackage.getEString(), "name", null, 1, 1, Construction.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getConstruction_Layers(), this.getLayer(), null, "layers", null, 1, -1, Construction.class,
 				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
 				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/CatalogImpl.java

-/**
- */
-package de.hftstuttgart.buildingphysics.impl;
-
-import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
-import de.hftstuttgart.buildingphysics.Catalog;
-
-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;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Catalog</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.CatalogImpl#getName <em>Name</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.CatalogImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.CatalogImpl#getSource <em>Source</em>}</li>
- * </ul>
- *
- * @generated
- */
-public abstract class CatalogImpl extends MinimalEObjectImpl.Container implements Catalog {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSource() <em>Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SOURCE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSource() <em>Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected String source = SOURCE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CatalogImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return BuildingPhysicsPackage.Literals.CATALOG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.CATALOG__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.CATALOG__DESCRIPTION,
-					oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getSource() {
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setSource(String newSource) {
-		String oldSource = source;
-		source = newSource;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.CATALOG__SOURCE, oldSource,
-					source));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.CATALOG__NAME:
-			return getName();
-		case BuildingPhysicsPackage.CATALOG__DESCRIPTION:
-			return getDescription();
-		case BuildingPhysicsPackage.CATALOG__SOURCE:
-			return getSource();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.CATALOG__NAME:
-			setName((String) newValue);
-			return;
-		case BuildingPhysicsPackage.CATALOG__DESCRIPTION:
-			setDescription((String) newValue);
-			return;
-		case BuildingPhysicsPackage.CATALOG__SOURCE:
-			setSource((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.CATALOG__NAME:
-			setName(NAME_EDEFAULT);
-			return;
-		case BuildingPhysicsPackage.CATALOG__DESCRIPTION:
-			setDescription(DESCRIPTION_EDEFAULT);
-			return;
-		case BuildingPhysicsPackage.CATALOG__SOURCE:
-			setSource(SOURCE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.CATALOG__NAME:
-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		case BuildingPhysicsPackage.CATALOG__DESCRIPTION:
-			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		case BuildingPhysicsPackage.CATALOG__SOURCE:
-			return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", description: ");
-		result.append(description);
-		result.append(", source: ");
-		result.append(source);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CatalogImpl

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/ConstructionCategoryImpl.java

@@ -3,8 +3,8 @@
 package de.hftstuttgart.buildingphysics.impl;
 
 import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
+import de.hftstuttgart.buildingphysics.Construction;
 import de.hftstuttgart.buildingphysics.ConstructionCategory;
-import de.hftstuttgart.buildingphysics.Mounting;
 
 import java.util.Collection;
 
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * </p>
  * <ul>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl#getName <em>Name</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl#getMountings <em>Mountings</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl#getConstructions <em>Constructions</em>}</li>
  * </ul>
  *
  * @generated
@@ -58,14 +58,14 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getMountings() <em>Mountings</em>}' containment reference list.
+	 * The cached value of the '{@link #getConstructions() <em>Constructions</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMountings()
+	 * @see #getConstructions()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<Mounting> mountings;
+	protected EList<Construction> constructions;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -116,12 +116,12 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
 	 * @generated
 	 */
 	@Override
-	public EList<Mounting> getMountings() {
-		if (mountings == null) {
-			mountings = new EObjectContainmentEList<Mounting>(Mounting.class, this,
-					BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS);
+	public EList<Construction> getConstructions() {
+		if (constructions == null) {
+			constructions = new EObjectContainmentEList<Construction>(Construction.class, this,
+					BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS);
 		}
-		return mountings;
+		return constructions;
 	}
 
 	/**
@@ -132,8 +132,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
-			return ((InternalEList<?>) getMountings()).basicRemove(otherEnd, msgs);
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
+			return ((InternalEList<?>) getConstructions()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -148,8 +148,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
 		switch (featureID) {
 		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
 			return getName();
-		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
-			return getMountings();
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
+			return getConstructions();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -166,9 +166,9 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
 		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
 			setName((String) newValue);
 			return;
-		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
-			getMountings().clear();
-			getMountings().addAll((Collection<? extends Mounting>) newValue);
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
+			getConstructions().clear();
+			getConstructions().addAll((Collection<? extends Construction>) newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -185,8 +185,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
 		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
 			setName(NAME_EDEFAULT);
 			return;
-		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
-			getMountings().clear();
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
+			getConstructions().clear();
 			return;
 		}
 		super.eUnset(featureID);
@@ -202,8 +202,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
 		switch (featureID) {
 		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
 			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
-			return mountings != null && !mountings.isEmpty();
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
+			return constructions != null && !constructions.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MountingImpl.java → de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/ConstructionImpl.java

@@ -3,8 +3,8 @@
 package de.hftstuttgart.buildingphysics.impl;
 
 import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
+import de.hftstuttgart.buildingphysics.Construction;
 import de.hftstuttgart.buildingphysics.Layer;
-import de.hftstuttgart.buildingphysics.Mounting;
 
 import java.util.Collection;
 
@@ -24,39 +24,39 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Mounting</b></em>'.
+ * An implementation of the model object '<em><b>Construction</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.MountingImpl#getMountingId <em>Mounting Id</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.MountingImpl#getName <em>Name</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.MountingImpl#getLayers <em>Layers</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionImpl#getConstructionId <em>Construction Id</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionImpl#getLayers <em>Layers</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class MountingImpl extends MinimalEObjectImpl.Container implements Mounting {
+public class ConstructionImpl extends MinimalEObjectImpl.Container implements Construction {
 	/**
-	 * The default value of the '{@link #getMountingId() <em>Mounting Id</em>}' attribute.
+	 * The default value of the '{@link #getConstructionId() <em>Construction Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMountingId()
+	 * @see #getConstructionId()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String MOUNTING_ID_EDEFAULT = null;
+	protected static final String CONSTRUCTION_ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getMountingId() <em>Mounting Id</em>}' attribute.
+	 * The cached value of the '{@link #getConstructionId() <em>Construction Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMountingId()
+	 * @see #getConstructionId()
 	 * @generated
 	 * @ordered
 	 */
-	protected String mountingId = MOUNTING_ID_EDEFAULT;
+	protected String constructionId = CONSTRUCTION_ID_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -93,7 +93,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected MountingImpl() {
+	protected ConstructionImpl() {
 		super();
 	}
 
@@ -104,7 +104,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildingPhysicsPackage.Literals.MOUNTING;
+		return BuildingPhysicsPackage.Literals.CONSTRUCTION;
 	}
 
 	/**
@@ -113,8 +113,8 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 	 * @generated
 	 */
 	@Override
-	public String getMountingId() {
-		return mountingId;
+	public String getConstructionId() {
+		return constructionId;
 	}
 
 	/**
@@ -123,12 +123,12 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 	 * @generated
 	 */
 	@Override
-	public void setMountingId(String newMountingId) {
-		String oldMountingId = mountingId;
-		mountingId = newMountingId;
+	public void setConstructionId(String newConstructionId) {
+		String oldConstructionId = constructionId;
+		constructionId = newConstructionId;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MOUNTING__MOUNTING_ID,
-					oldMountingId, mountingId));
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID,
+					oldConstructionId, constructionId));
 	}
 
 	/**
@@ -151,7 +151,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MOUNTING__NAME, oldName,
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.CONSTRUCTION__NAME, oldName,
 					name));
 	}
 
@@ -163,7 +163,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 	@Override
 	public EList<Layer> getLayers() {
 		if (layers == null) {
-			layers = new EObjectContainmentEList<Layer>(Layer.class, this, BuildingPhysicsPackage.MOUNTING__LAYERS);
+			layers = new EObjectContainmentEList<Layer>(Layer.class, this, BuildingPhysicsPackage.CONSTRUCTION__LAYERS);
 		}
 		return layers;
 	}
@@ -176,7 +176,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MOUNTING__LAYERS:
+		case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
 			return ((InternalEList<?>) getLayers()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -190,11 +190,11 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID:
-			return getMountingId();
-		case BuildingPhysicsPackage.MOUNTING__NAME:
+		case BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID:
+			return getConstructionId();
+		case BuildingPhysicsPackage.CONSTRUCTION__NAME:
 			return getName();
-		case BuildingPhysicsPackage.MOUNTING__LAYERS:
+		case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
 			return getLayers();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -209,13 +209,13 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID:
-			setMountingId((String) newValue);
+		case BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID:
+			setConstructionId((String) newValue);
 			return;
-		case BuildingPhysicsPackage.MOUNTING__NAME:
+		case BuildingPhysicsPackage.CONSTRUCTION__NAME:
 			setName((String) newValue);
 			return;
-		case BuildingPhysicsPackage.MOUNTING__LAYERS:
+		case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
 			getLayers().clear();
 			getLayers().addAll((Collection<? extends Layer>) newValue);
 			return;
@@ -231,13 +231,13 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID:
-			setMountingId(MOUNTING_ID_EDEFAULT);
+		case BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID:
+			setConstructionId(CONSTRUCTION_ID_EDEFAULT);
 			return;
-		case BuildingPhysicsPackage.MOUNTING__NAME:
+		case BuildingPhysicsPackage.CONSTRUCTION__NAME:
 			setName(NAME_EDEFAULT);
 			return;
-		case BuildingPhysicsPackage.MOUNTING__LAYERS:
+		case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
 			getLayers().clear();
 			return;
 		}
@@ -252,11 +252,12 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID:
-			return MOUNTING_ID_EDEFAULT == null ? mountingId != null : !MOUNTING_ID_EDEFAULT.equals(mountingId);
-		case BuildingPhysicsPackage.MOUNTING__NAME:
+		case BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID:
+			return CONSTRUCTION_ID_EDEFAULT == null ? constructionId != null
+					: !CONSTRUCTION_ID_EDEFAULT.equals(constructionId);
+		case BuildingPhysicsPackage.CONSTRUCTION__NAME:
 			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		case BuildingPhysicsPackage.MOUNTING__LAYERS:
+		case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
 			return layers != null && !layers.isEmpty();
 		}
 		return super.eIsSet(featureID);
@@ -273,12 +274,12 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
 			return super.toString();
 
 		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (mountingId: ");
-		result.append(mountingId);
+		result.append(" (constructionId: ");
+		result.append(constructionId);
 		result.append(", name: ");
 		result.append(name);
 		result.append(')');
 		return result.toString();
 	}
 
-} //MountingImpl
+} //ConstructionImpl

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialCatalogImpl.java

-/**
- */
-package de.hftstuttgart.buildingphysics.impl;
-
-import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
-import de.hftstuttgart.buildingphysics.ConstructionCategory;
-import de.hftstuttgart.buildingphysics.MaterialCatalog;
-import de.hftstuttgart.buildingphysics.MaterialCategory;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Material Catalog</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialCatalogImpl#getMaterialCategories <em>Material Categories</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialCatalogImpl#getConstructionCategories <em>Construction Categories</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class MaterialCatalogImpl extends CatalogImpl implements MaterialCatalog {
-	/**
-	 * The cached value of the '{@link #getMaterialCategories() <em>Material Categories</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMaterialCategories()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<MaterialCategory> materialCategories;
-
-	/**
-	 * The cached value of the '{@link #getConstructionCategories() <em>Construction Categories</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConstructionCategories()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ConstructionCategory> constructionCategories;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MaterialCatalogImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return BuildingPhysicsPackage.Literals.MATERIAL_CATALOG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<MaterialCategory> getMaterialCategories() {
-		if (materialCategories == null) {
-			materialCategories = new EObjectContainmentEList<MaterialCategory>(MaterialCategory.class, this,
-					BuildingPhysicsPackage.MATERIAL_CATALOG__MATERIAL_CATEGORIES);
-		}
-		return materialCategories;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<ConstructionCategory> getConstructionCategories() {
-		if (constructionCategories == null) {
-			constructionCategories = new EObjectContainmentEList<ConstructionCategory>(ConstructionCategory.class, this,
-					BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES);
-		}
-		return constructionCategories;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL_CATALOG__MATERIAL_CATEGORIES:
-			return ((InternalEList<?>) getMaterialCategories()).basicRemove(otherEnd, msgs);
-		case BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES:
-			return ((InternalEList<?>) getConstructionCategories()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL_CATALOG__MATERIAL_CATEGORIES:
-			return getMaterialCategories();
-		case BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES:
-			return getConstructionCategories();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL_CATALOG__MATERIAL_CATEGORIES:
-			getMaterialCategories().clear();
-			getMaterialCategories().addAll((Collection<? extends MaterialCategory>) newValue);
-			return;
-		case BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES:
-			getConstructionCategories().clear();
-			getConstructionCategories().addAll((Collection<? extends ConstructionCategory>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL_CATALOG__MATERIAL_CATEGORIES:
-			getMaterialCategories().clear();
-			return;
-		case BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES:
-			getConstructionCategories().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL_CATALOG__MATERIAL_CATEGORIES:
-			return materialCategories != null && !materialCategories.isEmpty();
-		case BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES:
-			return constructionCategories != null && !constructionCategories.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //MaterialCatalogImpl