Bugfixing in packet

costs/__init__.py

@@ -22,19 +22,7 @@ BASEMENT_HEATED_CASE = 1
 CLIMATE_REFERENCE_CITY = 'Montreal'
 WEATHER_FILE = 'CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw'
 WEATHER_FORMAT = 'epw'
-CURRENT_STATUS = 0
 
-# constants
-
-SKIN_RETROFIT = 1
-SYSTEM_RETROFIT_AND_PV = 2
-SKIN_RETROFIT_AND_SYSTEM_RETROFIT_AND_PV = 3
-RETROFITTING_SCENARIOS = [
-  CURRENT_STATUS,
-  SKIN_RETROFIT,
-  SYSTEM_RETROFIT_AND_PV,
-  SKIN_RETROFIT_AND_SYSTEM_RETROFIT_AND_PV
-]
 tmp_folder = Path('./tmp').resolve()
 out_path = Path('./outputs').resolve()
 files = glob.glob(f'{out_path}/*')

costs/capital_costs.py

@@ -7,8 +7,8 @@ import pandas as pd
 import numpy_financial as npf
 from hub.city_model_structure.building import Building
 import hub.helpers.constants as cte
-from configuration import Configuration
-from costs import SKIN_RETROFIT, SKIN_RETROFIT_AND_SYSTEM_RETROFIT_AND_PV, SYSTEM_RETROFIT_AND_PV
+from costs.configuration import Configuration
+from costs.constants import SKIN_RETROFIT, SKIN_RETROFIT_AND_SYSTEM_RETROFIT_AND_PV, SYSTEM_RETROFIT_AND_PV
 from costs.cost_base import CostBase
 
 

costs/configuration.py

@@ -1,7 +1,7 @@
 """
 Configuration module
 """
-from hub.catalog_factories.costs_catalog_factory import CostCatalogFactory
+from hub.catalog_factories.costs_catalog_factory import CostsCatalogFactory
 from hub.catalog_factories.catalog import Catalog
 
 
@@ -36,7 +36,7 @@ class Configuration:
     self._discount_rate = discount_rate
     self._retrofitting_year_construction = retrofitting_year_construction
     self._factories_handler = factories_handler
-    self._cost_catalog = CostCatalogFactory(factories_handler).catalog
+    self._cost_catalog = CostsCatalogFactory(factories_handler).catalog
     self._retrofit_scenario = retrofit_scenario
     self._fuel_type = fuel_type
 

costs/constants.py

@@ -0,0 +1,11 @@
+# constants
+CURRENT_STATUS = 0
+SKIN_RETROFIT = 1
+SYSTEM_RETROFIT_AND_PV = 2
+SKIN_RETROFIT_AND_SYSTEM_RETROFIT_AND_PV = 3
+RETROFITTING_SCENARIOS = [
+  CURRENT_STATUS,
+  SKIN_RETROFIT,
+  SYSTEM_RETROFIT_AND_PV,
+  SKIN_RETROFIT_AND_SYSTEM_RETROFIT_AND_PV
+]

costs/cost.py

@@ -5,9 +5,9 @@ import pandas as pd
 import numpy_financial as npf
 from hub.city_model_structure.building import Building
 
-from configuration import Configuration
+from costs.configuration import Configuration
 from costs import CapitalCosts, EndOfLifeCosts, TotalMaintenanceCosts, TotalOperationalCosts, TotalOperationalIncomes
-from costs import CURRENT_STATUS
+from costs.constants import CURRENT_STATUS
 
 
 class Cost:

costs/cost_base.py

@@ -4,7 +4,7 @@ Cost base module
 
 from hub.city_model_structure.building import Building
 
-from configuration import Configuration
+from costs.configuration import Configuration
 
 
 class CostBase:

costs/end_of_life_costs.py

@@ -5,7 +5,7 @@ import math
 import pandas as pd
 from hub.city_model_structure.building import Building
 
-from configuration import Configuration
+from costs.configuration import Configuration
 from costs.cost_base import CostBase
 
 

costs/total_maintenance_costs.py

@@ -6,7 +6,7 @@ import pandas as pd
 from hub.city_model_structure.building import Building
 import hub.helpers.constants as cte
 
-from configuration import Configuration
+from costs.configuration import Configuration
 from costs.cost_base import CostBase
 
 

costs/total_operational_costs.py

@@ -7,7 +7,7 @@ import pandas as pd
 from hub.city_model_structure.building import Building
 import hub.helpers.constants as cte
 
-from configuration import Configuration
+from costs.configuration import Configuration
 from costs.cost_base import CostBase
 
 

costs/total_operational_incomes.py

@@ -6,7 +6,7 @@ import pandas as pd
 from hub.city_model_structure.building import Building
 import hub.helpers.constants as cte
 
-from configuration import Configuration
+from costs.configuration import Configuration
 from costs.cost_base import CostBase
 
 

requirements.txt

@@ -1,2 +1,3 @@
 numpy_financial
 cerc_hub
+pandas