From 408a32f781a544aaf32208dd45e13321b170abbc Mon Sep 17 00:00:00 2001 From: Guille Date: Mon, 10 Jul 2023 14:05:38 -0400 Subject: [PATCH] Consistence improvements and name fixing --- hub/catalog_factories/catalog.py | 2 +- hub/catalog_factories/costs_catalog_factory.py | 2 +- .../data_models/cost/operational_cost.py | 2 +- .../data_models/usages/{ocupancy.py => occupancy.py} | 0 hub/catalog_factories/data_models/usages/usage.py | 2 +- hub/catalog_factories/usage/comnet_catalog.py | 2 +- hub/catalog_factories/usage/nrcan_catalog.py | 2 +- tests/test_city_merge.py | 8 ++++---- tests/test_costs_catalog.py | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) rename hub/catalog_factories/data_models/usages/{ocupancy.py => occupancy.py} (100%) diff --git a/hub/catalog_factories/catalog.py b/hub/catalog_factories/catalog.py index a7e3cd85..8f92625c 100644 --- a/hub/catalog_factories/catalog.py +++ b/hub/catalog_factories/catalog.py @@ -8,7 +8,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca class Catalog: """ - Catalogs base class not implemented instance of the Catalog base class, + Catalogs base class catalog_factories will inherit from this class. """ diff --git a/hub/catalog_factories/costs_catalog_factory.py b/hub/catalog_factories/costs_catalog_factory.py index 51bafe17..de341991 100644 --- a/hub/catalog_factories/costs_catalog_factory.py +++ b/hub/catalog_factories/costs_catalog_factory.py @@ -13,7 +13,7 @@ from hub.catalog_factories.cost.montreal_custom_catalog import MontrealCustomCat Catalog = TypeVar('Catalog') -class CostCatalogFactory: +class CostsCatalogFactory: """ CostsCatalogFactory class """ diff --git a/hub/catalog_factories/data_models/cost/operational_cost.py b/hub/catalog_factories/data_models/cost/operational_cost.py index dd4b4715..b514d034 100644 --- a/hub/catalog_factories/data_models/cost/operational_cost.py +++ b/hub/catalog_factories/data_models/cost/operational_cost.py @@ -24,7 +24,7 @@ class OperationalCost: def fuels(self) -> List[Fuel]: """ Get fuels listed in capital costs - :return: [FUEL] + :return: [Fuel] """ return self._fuels diff --git a/hub/catalog_factories/data_models/usages/ocupancy.py b/hub/catalog_factories/data_models/usages/occupancy.py similarity index 100% rename from hub/catalog_factories/data_models/usages/ocupancy.py rename to hub/catalog_factories/data_models/usages/occupancy.py diff --git a/hub/catalog_factories/data_models/usages/usage.py b/hub/catalog_factories/data_models/usages/usage.py index 4ed0db2f..25a54d5f 100644 --- a/hub/catalog_factories/data_models/usages/usage.py +++ b/hub/catalog_factories/data_models/usages/usage.py @@ -8,7 +8,7 @@ from typing import Union from hub.catalog_factories.data_models.usages.appliances import Appliances from hub.catalog_factories.data_models.usages.lighting import Lighting -from hub.catalog_factories.data_models.usages.ocupancy import Occupancy +from hub.catalog_factories.data_models.usages.occupancy import Occupancy from hub.catalog_factories.data_models.usages.thermal_control import ThermalControl from hub.catalog_factories.data_models.usages.domestic_hot_water import DomesticHotWater diff --git a/hub/catalog_factories/usage/comnet_catalog.py b/hub/catalog_factories/usage/comnet_catalog.py index fb6f2b00..1d527573 100644 --- a/hub/catalog_factories/usage/comnet_catalog.py +++ b/hub/catalog_factories/usage/comnet_catalog.py @@ -14,7 +14,7 @@ from hub.catalog_factories.catalog import Catalog from hub.catalog_factories.data_models.usages.appliances import Appliances from hub.catalog_factories.data_models.usages.content import Content from hub.catalog_factories.data_models.usages.lighting import Lighting -from hub.catalog_factories.data_models.usages.ocupancy import Occupancy +from hub.catalog_factories.data_models.usages.occupancy import Occupancy from hub.catalog_factories.data_models.usages.domestic_hot_water import DomesticHotWater from hub.catalog_factories.data_models.usages.schedule import Schedule from hub.catalog_factories.data_models.usages.thermal_control import ThermalControl diff --git a/hub/catalog_factories/usage/nrcan_catalog.py b/hub/catalog_factories/usage/nrcan_catalog.py index fda4ac40..7530081f 100644 --- a/hub/catalog_factories/usage/nrcan_catalog.py +++ b/hub/catalog_factories/usage/nrcan_catalog.py @@ -15,7 +15,7 @@ from hub.catalog_factories.catalog import Catalog from hub.catalog_factories.data_models.usages.appliances import Appliances from hub.catalog_factories.data_models.usages.content import Content from hub.catalog_factories.data_models.usages.lighting import Lighting -from hub.catalog_factories.data_models.usages.ocupancy import Occupancy +from hub.catalog_factories.data_models.usages.occupancy import Occupancy from hub.catalog_factories.data_models.usages.domestic_hot_water import DomesticHotWater from hub.catalog_factories.data_models.usages.schedule import Schedule from hub.catalog_factories.data_models.usages.thermal_control import ThermalControl diff --git a/tests/test_city_merge.py b/tests/test_city_merge.py index 08f8b2f5..f5c1474a 100644 --- a/tests/test_city_merge.py +++ b/tests/test_city_merge.py @@ -72,14 +72,14 @@ class TestCityMerge(TestCase): for surface in building.surfaces: if surface.global_irradiance: merged_city_building_total_radiation += surface.global_irradiance[cte.YEAR].iloc[0, 0] - self.assertEqual(447383461, merged_city_building_total_radiation) + self.assertEqual(438405954, merged_city_building_total_radiation) merged_city = par_city.merge(full_city) merged_city_building_total_radiation = 0 for building in merged_city.buildings: for surface in building.surfaces: if surface.global_irradiance: merged_city_building_total_radiation += surface.global_irradiance[cte.YEAR].iloc[0, 0] - self.assertEqual(447383461, merged_city_building_total_radiation) + self.assertEqual(438405954, merged_city_building_total_radiation) for building in par_city.buildings: for surface in building.surfaces: @@ -91,12 +91,12 @@ class TestCityMerge(TestCase): for surface in building.surfaces: if surface.global_irradiance: merged_city_building_total_radiation += surface.global_irradiance[cte.YEAR].iloc[0, 0] - self.assertEqual(202699159, merged_city_building_total_radiation) + self.assertEqual(189336013, merged_city_building_total_radiation) merged_city = par_city.merge(full_city) merged_city_building_total_radiation = 0 for building in merged_city.buildings: for surface in building.surfaces: if surface.global_irradiance: merged_city_building_total_radiation += surface.global_irradiance[cte.YEAR].iloc[0, 0] - self.assertEqual(202699159, merged_city_building_total_radiation) + self.assertEqual(189336013, merged_city_building_total_radiation) diff --git a/tests/test_costs_catalog.py b/tests/test_costs_catalog.py index 1dd25021..8f873850 100644 --- a/tests/test_costs_catalog.py +++ b/tests/test_costs_catalog.py @@ -7,13 +7,13 @@ Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concord """ from unittest import TestCase -from hub.catalog_factories.costs_catalog_factory import CostCatalogFactory +from hub.catalog_factories.costs_catalog_factory import CostsCatalogFactory class TestCostsCatalog(TestCase): def test_costs_catalog(self): - catalog = CostCatalogFactory('montreal_custom').catalog + catalog = CostsCatalogFactory('montreal_custom').catalog catalog_categories = catalog.names() self.assertIsNotNone(catalog, 'catalog is none') content = catalog.entries()