Working version for Majid, course

hub/catalog_factories/data_models/cost/income.py

@@ -49,9 +49,8 @@ class Income:
   def electricity_export(self) -> Union[None, float]:
     """
     Get electricity export incomes in currency per J
-    :return: None or float
+    :return: None or float"""
-    """
+    return self._electricity_export
-    return self._construction_subsidy
 
   @property
   def reductions_tax(self) -> Union[None, float]:

hub/data/costs/montreal_costs.xml

@@ -96,7 +96,7 @@
 				<photovoltaic cost_unit="%">3.6</photovoltaic>
 			</subsidies>
             <electricity_export cost_unit="currency/kWh">0.07</electricity_export>
-            <tax_reduction cost_unit="%">0.05</tax_reduction>
+            <tax_reduction cost_unit="%">2</tax_reduction>
         </incomes>
     </archetype>
     <archetype function="non-residential" municipality="montreal" country="CA" lod="1">
@@ -195,8 +195,8 @@
 				<hvac cost_unit="%">1.5</hvac>
 				<photovoltaic cost_unit="%">3.6</photovoltaic>
 			</subsidies>
-            <electricity_export cost_unit="currency/kWh">0.05</electricity_export>
+            <electricity_export cost_unit="currency/kWh">0.07</electricity_export>
-            <tax_reduction cost_unit="%">0.05</tax_reduction>
+            <tax_reduction cost_unit="%">2</tax_reduction>
         </incomes>
     </archetype>
 </archetypes>

hub/exports/building_energy/idf.py

@@ -292,7 +292,7 @@ class Idf:
       return self._add_standard_compact_hourly_schedule(usage, schedule_type, new_schedules)
 
   def _add_construction(self, thermal_boundary):
-    vegetation_name = f'{thermal_boundary.construction_name}_{thermal_boundary.parent_surface.vegetation.name}'
+    #vegetation_name = f'{thermal_boundary.construction_name}_{thermal_boundary.parent_surface.vegetation.name}'
     for construction in self._idf.idfobjects[self._CONSTRUCTION]:
       if thermal_boundary.parent_surface.vegetation is not None:
         if construction.Name == vegetation_name: