From 9700e5ce2122ef37e573652ba77718c90ac7a005 Mon Sep 17 00:00:00 2001 From: guille Date: Tue, 24 Jan 2023 10:51:50 -0500 Subject: [PATCH] packaging version --- .gitignore => hub/.gitignore | 2 +- CODE_OF_CONDUCT.md => hub/CODE_OF_CONDUCT.md | 0 .../CONTRIBUTING_CENTRAL_DATA_MODEL.md | 44 +++++++-------- .../CONTRIBUTING_EXTERNALS.md | 0 DEPLOYMENT.md => hub/DEPLOYMENT.md | 6 +- LICENSE.md => hub/LICENSE.md | 0 MACOS_INSTALL.md => hub/MACOS_INSTALL.md | 0 PYGUIDE.md => hub/PYGUIDE.md | 0 README.md => hub/README.md | 0 .../RECOGNIZED_FUNTIONS_AND_USAGES.md | 0 WINDOWS_INSTALL.md => hub/WINDOWS_INSTALL.md | 2 +- .../catalog_factories}/catalog.py | 0 .../construction/construction_helpers.py | 2 +- .../construction/nrel_catalog.py | 20 +++---- .../construction_catalog_factory.py | 2 +- .../data_models/construction/archetype.py | 2 +- .../data_models/construction/construction.py | 4 +- .../data_models/construction/content.py | 0 .../data_models/construction/layer.py | 0 .../data_models/construction/material.py | 0 .../data_models/construction/window.py | 0 .../data_models/greenery/content.py | 0 .../data_models/greenery/plant.py | 2 +- .../data_models/greenery/plant_percentage.py | 2 +- .../data_models/greenery/soil.py | 0 .../data_models/greenery/vegetation.py | 2 +- .../data_models/usages/appliances.py | 2 +- .../data_models/usages/content.py | 2 +- .../data_models/usages/internal_gain.py | 0 .../data_models/usages/lighting.py | 2 +- .../data_models/usages/ocupancy.py | 2 +- .../data_models/usages/schedule.py | 0 .../data_models/usages/thermal_control.py | 2 +- .../data_models/usages/usage.py | 8 +-- .../ecore_greenery/greenerycatalog.ecore | 0 .../ecore_greenery/greenerycatalog.py | 0 .../greenerycatalog_no_quantities.ecore | 0 .../greenery/greenery_catalog.py | 14 ++--- .../greenery_catalog_factory.py | 2 +- .../usage/comnet_catalog.py | 22 ++++---- .../catalog_factories}/usage/nrcan_catalog.py | 20 +++---- .../catalog_factories}/usage/usage_helper.py | 2 +- .../usage_catalog_factory.py | 4 +- .../city_model_structure}/attributes/edge.py | 0 .../city_model_structure}/attributes/node.py | 2 +- .../city_model_structure}/attributes/plane.py | 0 .../city_model_structure}/attributes/point.py | 0 .../attributes/polygon.py | 6 +- .../attributes/polyhedron.py | 2 +- .../attributes/record.py | 0 .../attributes/schedule.py | 0 .../attributes/time_series.py | 2 +- .../city_model_structure}/building.py | 12 ++-- .../building_demand/appliances.py | 2 +- .../building_demand/household.py | 0 .../building_demand/internal_gain.py | 2 +- .../building_demand/internal_zone.py | 8 +-- .../building_demand/layer.py | 2 +- .../building_demand/lighting.py | 2 +- .../building_demand/material.py | 0 .../building_demand/occupancy.py | 4 +- .../building_demand/occupant.py | 0 .../building_demand/storey.py | 6 +- .../building_demand/surface.py | 12 ++-- .../building_demand/thermal_boundary.py | 10 ++-- .../building_demand/thermal_control.py | 2 +- .../building_demand/thermal_opening.py | 2 +- .../building_demand/thermal_zone.py | 14 ++--- .../building_demand/usage_zone.py | 12 ++-- .../buildings_cluster.py | 2 +- .../city_model_structure}/bus_system.py | 10 ++-- .../city_model_structure}/city.py | 28 +++++----- .../city_model_structure}/city_object.py | 9 ++- .../city_objects_cluster.py | 4 +- .../city_model_structure}/energy_system.py | 6 +- .../energy_systems/air_source_hp.py | 2 +- .../energy_systems/heat_pump.py | 0 .../energy_systems/hvac_system.py | 2 +- .../energy_systems/hvac_terminal_unit.py | 0 .../energy_systems/water_to_water_hp.py | 2 +- .../city_model_structure}/fuel.py | 0 .../city_model_structure}/greenery/plant.py | 2 +- .../city_model_structure}/greenery/soil.py | 0 .../greenery/vegetation.py | 4 +- .../city_model_structure}/iot/sensor.py | 6 +- .../iot/sensor_measure.py | 0 .../city_model_structure}/iot/sensor_type.py | 0 .../city_model_structure}/iot/station.py | 2 +- .../city_model_structure}/lca_calculations.py | 2 +- .../city_model_structure}/lca_material.py | 0 .../city_model_structure}/level_of_detail.py | 0 .../city_model_structure}/machine.py | 0 .../city_model_structure}/network.py | 6 +- .../parts_consisting_building.py | 2 +- .../city_model_structure}/subway_entrance.py | 2 +- .../city_model_structure}/transport/bus.py | 2 +- .../transport/bus_depot.py | 2 +- .../transport/bus_edge.py | 2 +- .../transport/bus_network.py | 6 +- .../transport/bus_node.py | 4 +- .../transport/bus_stop.py | 6 +- .../transport/connection.py | 4 +- .../transport/crossing.py | 2 +- .../transport/fast_charging_infrastructure.py | 0 .../city_model_structure}/transport/join.py | 2 +- .../city_model_structure}/transport/lane.py | 0 .../transport/origin_destination_edge.py | 4 +- .../transport/origin_destination_network.py | 6 +- .../transport/origin_destination_node.py | 8 +-- .../city_model_structure}/transport/phase.py | 0 .../transport/traffic_edge.py | 6 +- .../transport/traffic_light.py | 4 +- .../transport/traffic_network.py | 6 +- .../transport/traffic_node.py | 6 +- .../transport/walkway_node.py | 2 +- .../city_model_structure}/vehicle.py | 0 {config => hub/config}/configuration.ini | 0 .../data}/construction/us_archetypes.xml | 0 .../data}/construction/us_constructions.xml | 0 .../customized_imports/ashrae_archetypes.xml | 0 .../energy_systems/heat_pumps/air_source.xlsx | Bin .../energy_systems/heat_pumps/as_parallel.txt | 0 .../energy_systems/heat_pumps/as_series.txt | 0 .../energy_systems/heat_pumps/constants.yaml | 0 .../energy_systems/heat_pumps/demand.txt | 0 .../heat_pumps/w2w_parallel.txt | 0 .../energy_systems/heat_pumps/w2w_series.txt | 0 .../heat_pumps/water_to_water.xlsx | Bin .../energy_systems/heat_pumps/wt_hourly3.txt | 0 .../data}/greenery/ecore_greenery_catalog.xml | 0 .../data}/life_cycle_assessment/lca_data.xml | 0 .../Data-driven_schedules_model_test.xlsx | Bin {data => hub/data}/schedules/doe_idf.xml | 0 ...01_ApartmentHighRise_STD2019_Rochester.idf | 0 ...901_ApartmentMidRise_STD2019_Rochester.idf | 0 .../ASHRAE901_Hospital_STD2019_Rochester.idf | 0 ...ASHRAE901_HotelLarge_STD2019_Rochester.idf | 0 ...ASHRAE901_HotelSmall_STD2019_Rochester.idf | 0 ...SHRAE901_OfficeLarge_STD2019_Rochester.idf | 0 ...HRAE901_OfficeMedium_STD2019_Rochester.idf | 0 ...SHRAE901_OfficeSmall_STD2019_Rochester.idf | 0 ...OutPatientHealthCare_STD2019_Rochester.idf | 0 ...1_RestaurantFastFood_STD2019_Rochester.idf | 0 ...01_RestaurantSitDown_STD2019_Rochester.idf | 0 ...901_RetailStandalone_STD2019_Rochester.idf | 0 ...E901_RetailStripmall_STD2019_Rochester.idf | 0 ...RAE901_SchoolPrimary_STD2019_Rochester.idf | 0 ...E901_SchoolSecondary_STD2019_Rochester.idf | 0 .../ASHRAE901_Warehouse_STD2019_Rochester.idf | 0 .../data}/sensors/concordia_energy_db.json | 0 .../data}/sensors/concordia_gas_flow_db.json | 0 .../sensors/concordia_temperature_db.json | 0 .../data}/usage/ca_archetypes_reduced.xml | 0 .../data}/usage/comnet_archetypes.xlsx | Bin .../usage/comnet_schedules_archetypes.xlsx | Bin {data => hub/data}/usage/de_library.xml | 0 {data => hub/data}/usage/nrcan.xml | 0 .../epw/CAN_BC_Summerland.717680_CWEC.epw | 0 .../CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw | 0 .../data}/weather/inseldb_new_york_city.dat | 0 {docs => hub/docs}/img_contributing/img_0.png | Bin {docs => hub/docs}/img_contributing/img_1.png | Bin .../docs}/img_contributing/img_10.png | Bin .../docs}/img_contributing/img_11.png | Bin .../docs}/img_contributing/img_12.png | Bin .../docs}/img_contributing/img_13.png | Bin .../docs}/img_contributing/img_14.png | Bin .../docs}/img_contributing/img_15.png | Bin .../docs}/img_contributing/img_16.png | Bin .../docs}/img_contributing/img_17.png | Bin .../docs}/img_contributing/img_18.png | Bin .../docs}/img_contributing/img_19.png | Bin {docs => hub/docs}/img_contributing/img_2.png | Bin .../docs}/img_contributing/img_20.png | Bin .../docs}/img_contributing/img_21.png | Bin .../docs}/img_contributing/img_22.png | Bin .../docs}/img_contributing/img_23.png | Bin .../docs}/img_contributing/img_24.png | Bin .../docs}/img_contributing/img_25.png | Bin .../docs}/img_contributing/img_26.png | Bin {docs => hub/docs}/img_contributing/img_3.png | Bin {docs => hub/docs}/img_contributing/img_4.png | Bin {docs => hub/docs}/img_contributing/img_5.png | Bin {docs => hub/docs}/img_contributing/img_6.png | Bin {docs => hub/docs}/img_contributing/img_7.png | Bin {docs => hub/docs}/img_contributing/img_8.png | Bin {docs => hub/docs}/img_contributing/img_9.png | Bin .../docs}/img_macos_install/img_0.png | Bin .../docs}/img_macos_install/img_1.png | Bin .../docs}/img_macos_install/img_10.png | Bin .../docs}/img_macos_install/img_11.png | Bin .../docs}/img_macos_install/img_12.png | Bin .../docs}/img_macos_install/img_13.png | Bin .../docs}/img_macos_install/img_14.png | Bin .../docs}/img_macos_install/img_15.png | Bin .../docs}/img_macos_install/img_16.png | Bin .../docs}/img_macos_install/img_17.png | Bin .../docs}/img_macos_install/img_18.png | Bin .../docs}/img_macos_install/img_19.png | Bin .../docs}/img_macos_install/img_2.png | Bin .../docs}/img_macos_install/img_3.png | Bin .../docs}/img_macos_install/img_4.png | Bin .../docs}/img_macos_install/img_5.png | Bin .../docs}/img_macos_install/img_6.png | Bin .../docs}/img_macos_install/img_7.png | Bin .../docs}/img_macos_install/img_8.png | Bin .../docs}/img_macos_install/img_9.png | Bin .../docs}/img_windows_install/img_0.png | Bin .../docs}/img_windows_install/img_1.png | Bin .../docs}/img_windows_install/img_10.png | Bin .../docs}/img_windows_install/img_11.png | Bin .../docs}/img_windows_install/img_12.png | Bin .../docs}/img_windows_install/img_13.png | Bin .../docs}/img_windows_install/img_14.png | Bin .../docs}/img_windows_install/img_15.png | Bin .../docs}/img_windows_install/img_16.png | Bin .../docs}/img_windows_install/img_17.png | Bin .../docs}/img_windows_install/img_2.png | Bin .../docs}/img_windows_install/img_20.png | Bin .../docs}/img_windows_install/img_21.png | Bin .../docs}/img_windows_install/img_22.png | Bin .../docs}/img_windows_install/img_23.png | Bin .../docs}/img_windows_install/img_24.png | Bin .../docs}/img_windows_install/img_25.png | Bin .../docs}/img_windows_install/img_26.png | Bin .../docs}/img_windows_install/img_27.png | Bin .../docs}/img_windows_install/img_28.png | Bin .../docs}/img_windows_install/img_29.png | Bin .../docs}/img_windows_install/img_3.png | Bin .../docs}/img_windows_install/img_30.png | Bin .../docs}/img_windows_install/img_31.png | Bin .../docs}/img_windows_install/img_32.png | Bin .../docs}/img_windows_install/img_33.png | Bin .../docs}/img_windows_install/img_4.png | Bin .../docs}/img_windows_install/img_5.png | Bin .../docs}/img_windows_install/img_6.png | Bin .../docs}/img_windows_install/img_7.png | Bin .../docs}/img_windows_install/img_8.png | Bin .../docs}/img_windows_install/img_9.png | Bin .../exports}/building_energy/energy_ade.py | 2 +- .../exports}/building_energy/idf.py | 4 +- .../building_energy/idf_files/Energy+.idd | 0 .../building_energy/idf_files/Minimal.idf | 0 .../insel/insel_monthly_energy_balance.py | 6 +- {exports => hub/exports}/db_factory.py | 4 +- .../energy_building_exports_factory.py | 6 +- .../energy_systems/air_source_hp_export.py | 2 +- .../energy_systems/heat_pump_export.py | 2 +- .../water_to_water_hp_export.py | 2 +- .../exports}/energy_systems_factory.py | 5 +- {exports => hub/exports}/exports_factory.py | 6 +- {exports => hub/exports}/formats/insel.py | 0 {exports => hub/exports}/formats/obj.py | 4 +- .../formats/simplified_radiosity_algorithm.py | 0 {exports => hub/exports}/formats/stl.py | 2 +- .../exports}/formats/triangular.py | 0 {exports => hub/exports}/user_factory.py | 2 +- {helpers => hub/helpers}/auth.py | 0 .../helpers}/configuration_helper.py | 0 {helpers => hub/helpers}/constants.py | 0 {helpers => hub/helpers}/enrich_city.py | 0 {helpers => hub/helpers}/geometry_helper.py | 8 +-- {helpers => hub/helpers}/location.py | 0 .../helpers}/monthly_to_hourly_demand.py | 4 +- {helpers => hub/helpers}/monthly_values.py | 0 .../helpers}/yearly_from_daily_schedules.py | 4 +- {hub_logger => hub/hub_logger}/__init__.py | 0 {imports => hub/imports}/__init__.py | 0 .../data_classes/building_achetype.py | 2 +- .../data_classes/layer_archetype.py | 0 .../thermal_boundary_archetype.py | 4 +- .../data_classes/thermal_opening_archetype.py | 0 .../helpers/construction_helper.py | 2 +- .../helpers/storeys_generation.py | 12 ++-- .../construction/nrel_physics_interface.py | 2 +- .../construction/us_physics_parameters.py | 12 ++-- .../imports}/construction_factory.py | 2 +- {imports => hub/imports}/db_factory.py | 6 +- .../air_source_hp_parameters.py | 4 +- .../water_to_water_hp_parameters.py | 4 +- .../imports}/energy_systems_factory.py | 4 +- {imports => hub/imports}/geometry/citygml.py | 14 ++--- .../geometry/citygml_classes/citygml_base.py | 2 - .../geometry/citygml_classes/citygml_lod1.py | 8 +-- .../geometry/citygml_classes/citygml_lod2.py | 8 +-- {imports => hub/imports}/geometry/geojson.py | 13 ++--- {imports => hub/imports}/geometry/gpandas.py | 10 ++-- .../geometry/helpers/geometry_helper.py | 2 +- {imports => hub/imports}/geometry/obj.py | 8 +-- .../imports}/geometry/osm_subway.py | 4 +- {imports => hub/imports}/geometry/rhino.py | 14 ++--- {imports => hub/imports}/geometry_factory.py | 14 ++--- .../life_cycle_assessment/lca_fuel.py | 2 +- .../life_cycle_assessment/lca_machine.py | 2 +- .../life_cycle_assessment/lca_material.py | 2 +- .../life_cycle_assessment/lca_vehicle.py | 2 +- .../imports}/life_cycle_assessment_factory.py | 8 +-- .../sensors/concordia_energy_consumption.py | 3 +- .../imports}/sensors/concordia_file_report.py | 0 .../imports}/sensors/concordia_gas_flow.py | 2 +- .../imports}/sensors/concordia_temperature.py | 2 +- {imports => hub/imports}/sensors_factory.py | 0 .../imports}/usage/ca_usage_parameters.py | 5 +- .../imports}/usage/comnet_usage_parameters.py | 24 ++++---- .../hft_internal_gains_archetype.py | 0 .../data_classes/usage_zone_archetype.py | 2 +- .../usage/helpers/schedules_helper.py | 2 +- .../imports}/usage/helpers/usage_helper.py | 2 +- .../imports}/usage/hft_usage_interface.py | 16 +++--- .../imports}/usage/hft_usage_parameters.py | 6 +- {imports => hub/imports}/usage_factory.py | 4 +- {imports => hub/imports}/user_factory.py | 4 +- .../weather/dat_weather_parameters.py | 2 +- .../weather/epw_weather_parameters.py | 2 +- .../imports}/weather/helpers/weather.py | 2 +- .../weather/xls_weather_parameters.py | 2 +- {imports => hub/imports}/weather_factory.py | 4 +- .../install_postgresql_linux.sh | 0 {persistence => hub/persistence}/README.md | 4 +- {persistence => hub/persistence}/__init__.py | 0 {persistence => hub/persistence}/base_repo.py | 2 +- {persistence => hub/persistence}/db_config.py | 2 +- {persistence => hub/persistence}/db_setup.py | 14 ++--- .../persistence}/models/__init__.py | 0 .../persistence}/models/city.py | 2 +- .../models/heat_pump_simulation.py | 2 +- .../persistence}/models/user.py | 2 +- .../persistence}/repositories/__init__.py | 0 .../persistence}/repositories/city_repo.py | 8 +-- .../repositories/heat_pump_simulation_repo.py | 6 +- .../persistence}/repositories/user_repo.py | 10 ++-- pylintrc => hub/pylintrc | 0 requirements.txt => hub/requirements.txt | 0 .../unittests}/test_city_layers.py | 8 +-- .../unittests}/test_city_merge.py | 2 +- .../unittests}/test_construction_catalog.py | 2 +- .../unittests}/test_construction_factory.py | 6 +- .../unittests}/test_db_factory.py | 16 +++--- .../test_energy_systems_air_source_hp.py | 12 ++-- .../test_energy_systems_water_to_water_hp.py | 12 ++-- .../unittests}/test_enrichement.py | 8 +-- {unittests => hub/unittests}/test_exports.py | 16 +++--- .../unittests}/test_geometry_factory.py | 8 +-- .../unittests}/test_greenery_catalog.py | 2 +- .../unittests}/test_greenery_in_idf.py | 20 +++---- .../unittests}/test_heat_pump_simulation.py | 28 +++++----- .../unittests}/test_insel_exports.py | 14 ++--- .../test_life_cycle_assessment_factory.py | 12 ++-- .../unittests}/test_usage_catalog.py | 2 +- .../unittests}/test_usage_factory.py | 6 +- .../unittests}/tests_data/C40_Final.gml | 0 .../unittests}/tests_data/C40_Game.gml | 0 ...gy demand weekly report_01-26-20_04-30.csv | 0 .../unittests}/tests_data/EV_GM_MB_LoD2.gml | 0 .../FZK-Haus-LoD4-KIT-IAI-KHH-B36-V1.gml | 0 .../unittests}/tests_data/FZK_Haus_LoD_0.gml | 0 .../unittests}/tests_data/FZK_Haus_LoD_1.gml | 0 .../unittests}/tests_data/FZK_Haus_LoD_2.gml | 0 .../unittests}/tests_data/FZK_Haus_LoD_3.gml | 0 .../unittests}/tests_data/city_layers.json | 0 .../unittests}/tests_data/concordia.geojson | 0 .../unittests}/tests_data/custom.geojson | 0 .../unittests}/tests_data/dompark.3dm | Bin .../unittests}/tests_data/kelowna.obj | 0 .../unittests}/tests_data/lca_data.xml | 0 .../tests_data/one_building_in_kelowna.gml | 0 .../one_building_in_kelowna_alkis.gml | 0 .../one_building_in_kelowna_sra_SW.out | 0 .../unittests}/tests_data/pluto_building.gml | 0 .../unittests}/tests_data/sample.geojson | 0 .../unittests}/tests_data/subway.osm | 0 .../unittests}/tests_outputs/.gitignore | 2 +- pyproject.toml | 52 ++++++++++++++++++ setup.py | 31 +++++++++++ 374 files changed, 570 insertions(+), 492 deletions(-) rename .gitignore => hub/.gitignore (94%) rename CODE_OF_CONDUCT.md => hub/CODE_OF_CONDUCT.md (100%) rename CONTRIBUTING_CENTRAL_DATA_MODEL.md => hub/CONTRIBUTING_CENTRAL_DATA_MODEL.md (85%) rename CONTRIBUTING_EXTERNALS.md => hub/CONTRIBUTING_EXTERNALS.md (100%) rename DEPLOYMENT.md => hub/DEPLOYMENT.md (98%) rename LICENSE.md => hub/LICENSE.md (100%) rename MACOS_INSTALL.md => hub/MACOS_INSTALL.md (100%) rename PYGUIDE.md => hub/PYGUIDE.md (100%) rename README.md => hub/README.md (100%) rename RECOGNIZED_FUNTIONS_AND_USAGES.md => hub/RECOGNIZED_FUNTIONS_AND_USAGES.md (100%) rename WINDOWS_INSTALL.md => hub/WINDOWS_INSTALL.md (99%) rename {catalog_factories => hub/catalog_factories}/catalog.py (100%) rename {catalog_factories => hub/catalog_factories}/construction/construction_helpers.py (96%) rename {catalog_factories => hub/catalog_factories}/construction/nrel_catalog.py (92%) rename {catalog_factories => hub/catalog_factories}/construction_catalog_factory.py (92%) rename {catalog_factories => hub/catalog_factories}/data_models/construction/archetype.py (97%) rename {catalog_factories => hub/catalog_factories}/data_models/construction/construction.py (89%) rename {catalog_factories => hub/catalog_factories}/data_models/construction/content.py (100%) rename {catalog_factories => hub/catalog_factories}/data_models/construction/layer.py (100%) rename {catalog_factories => hub/catalog_factories}/data_models/construction/material.py (100%) rename {catalog_factories => hub/catalog_factories}/data_models/construction/window.py (100%) rename {catalog_factories => hub/catalog_factories}/data_models/greenery/content.py (100%) rename {catalog_factories => hub/catalog_factories}/data_models/greenery/plant.py (96%) rename {catalog_factories => hub/catalog_factories}/data_models/greenery/plant_percentage.py (86%) rename {catalog_factories => hub/catalog_factories}/data_models/greenery/soil.py (100%) rename {catalog_factories => hub/catalog_factories}/data_models/greenery/vegetation.py (97%) rename {catalog_factories => hub/catalog_factories}/data_models/usages/appliances.py (95%) rename {catalog_factories => hub/catalog_factories}/data_models/usages/content.py (85%) rename {catalog_factories => hub/catalog_factories}/data_models/usages/internal_gain.py (100%) rename {catalog_factories => hub/catalog_factories}/data_models/usages/lighting.py (95%) rename {catalog_factories => hub/catalog_factories}/data_models/usages/ocupancy.py (96%) rename {catalog_factories => hub/catalog_factories}/data_models/usages/schedule.py (100%) rename {catalog_factories => hub/catalog_factories}/data_models/usages/thermal_control.py (97%) rename {catalog_factories => hub/catalog_factories}/data_models/usages/usage.py (89%) rename {catalog_factories => hub/catalog_factories}/greenery/ecore_greenery/greenerycatalog.ecore (100%) rename {catalog_factories => hub/catalog_factories}/greenery/ecore_greenery/greenerycatalog.py (100%) rename {catalog_factories => hub/catalog_factories}/greenery/ecore_greenery/greenerycatalog_no_quantities.ecore (100%) rename {catalog_factories => hub/catalog_factories}/greenery/greenery_catalog.py (86%) rename {catalog_factories => hub/catalog_factories}/greenery_catalog_factory.py (93%) rename {catalog_factories => hub/catalog_factories}/usage/comnet_catalog.py (93%) rename {catalog_factories => hub/catalog_factories}/usage/nrcan_catalog.py (91%) rename {catalog_factories => hub/catalog_factories}/usage/usage_helper.py (99%) rename {catalog_factories => hub/catalog_factories}/usage_catalog_factory.py (88%) rename {city_model_structure => hub/city_model_structure}/attributes/edge.py (100%) rename {city_model_structure => hub/city_model_structure}/attributes/node.py (94%) rename {city_model_structure => hub/city_model_structure}/attributes/plane.py (100%) rename {city_model_structure => hub/city_model_structure}/attributes/point.py (100%) rename {city_model_structure => hub/city_model_structure}/attributes/polygon.py (99%) rename {city_model_structure => hub/city_model_structure}/attributes/polyhedron.py (99%) rename {city_model_structure => hub/city_model_structure}/attributes/record.py (100%) rename {city_model_structure => hub/city_model_structure}/attributes/schedule.py (100%) rename {city_model_structure => hub/city_model_structure}/attributes/time_series.py (91%) rename {city_model_structure => hub/city_model_structure}/building.py (96%) rename {city_model_structure => hub/city_model_structure}/building_demand/appliances.py (97%) rename {city_model_structure => hub/city_model_structure}/building_demand/household.py (100%) rename {city_model_structure => hub/city_model_structure}/building_demand/internal_gain.py (97%) rename {city_model_structure => hub/city_model_structure}/building_demand/internal_zone.py (89%) rename {city_model_structure => hub/city_model_structure}/building_demand/layer.py (94%) rename {city_model_structure => hub/city_model_structure}/building_demand/lighting.py (97%) rename {city_model_structure => hub/city_model_structure}/building_demand/material.py (100%) rename {city_model_structure => hub/city_model_structure}/building_demand/occupancy.py (95%) rename {city_model_structure => hub/city_model_structure}/building_demand/occupant.py (100%) rename {city_model_structure => hub/city_model_structure}/building_demand/storey.py (92%) rename {city_model_structure => hub/city_model_structure}/building_demand/surface.py (96%) rename {city_model_structure => hub/city_model_structure}/building_demand/thermal_boundary.py (95%) rename {city_model_structure => hub/city_model_structure}/building_demand/thermal_control.py (98%) rename {city_model_structure => hub/city_model_structure}/building_demand/thermal_opening.py (98%) rename {city_model_structure => hub/city_model_structure}/building_demand/thermal_zone.py (97%) rename {city_model_structure => hub/city_model_structure}/building_demand/usage_zone.py (94%) rename {city_model_structure => hub/city_model_structure}/buildings_cluster.py (91%) rename {city_model_structure => hub/city_model_structure}/bus_system.py (78%) rename {city_model_structure => hub/city_model_structure}/city.py (93%) rename {city_model_structure => hub/city_model_structure}/city_object.py (95%) rename {city_model_structure => hub/city_model_structure}/city_objects_cluster.py (92%) rename {city_model_structure => hub/city_model_structure}/energy_system.py (86%) rename {city_model_structure => hub/city_model_structure}/energy_systems/air_source_hp.py (97%) rename {city_model_structure => hub/city_model_structure}/energy_systems/heat_pump.py (100%) rename {city_model_structure => hub/city_model_structure}/energy_systems/hvac_system.py (93%) rename {city_model_structure => hub/city_model_structure}/energy_systems/hvac_terminal_unit.py (100%) rename {city_model_structure => hub/city_model_structure}/energy_systems/water_to_water_hp.py (97%) rename {city_model_structure => hub/city_model_structure}/fuel.py (100%) rename {city_model_structure => hub/city_model_structure}/greenery/plant.py (97%) rename {city_model_structure => hub/city_model_structure}/greenery/soil.py (100%) rename {city_model_structure => hub/city_model_structure}/greenery/vegetation.py (92%) rename {city_model_structure => hub/city_model_structure}/iot/sensor.py (88%) rename {city_model_structure => hub/city_model_structure}/iot/sensor_measure.py (100%) rename {city_model_structure => hub/city_model_structure}/iot/sensor_type.py (100%) rename {city_model_structure => hub/city_model_structure}/iot/station.py (93%) rename {city_model_structure => hub/city_model_structure}/lca_calculations.py (91%) rename {city_model_structure => hub/city_model_structure}/lca_material.py (100%) rename {city_model_structure => hub/city_model_structure}/level_of_detail.py (100%) rename {city_model_structure => hub/city_model_structure}/machine.py (100%) rename {city_model_structure => hub/city_model_structure}/network.py (85%) rename {city_model_structure => hub/city_model_structure}/parts_consisting_building.py (92%) rename {city_model_structure => hub/city_model_structure}/subway_entrance.py (93%) rename {city_model_structure => hub/city_model_structure}/transport/bus.py (97%) rename {city_model_structure => hub/city_model_structure}/transport/bus_depot.py (92%) rename {city_model_structure => hub/city_model_structure}/transport/bus_edge.py (94%) rename {city_model_structure => hub/city_model_structure}/transport/bus_network.py (81%) rename {city_model_structure => hub/city_model_structure}/transport/bus_node.py (89%) rename {city_model_structure => hub/city_model_structure}/transport/bus_stop.py (84%) rename {city_model_structure => hub/city_model_structure}/transport/connection.py (95%) rename {city_model_structure => hub/city_model_structure}/transport/crossing.py (95%) rename {city_model_structure => hub/city_model_structure}/transport/fast_charging_infrastructure.py (100%) rename {city_model_structure => hub/city_model_structure}/transport/join.py (91%) rename {city_model_structure => hub/city_model_structure}/transport/lane.py (100%) rename {city_model_structure => hub/city_model_structure}/transport/origin_destination_edge.py (90%) rename {city_model_structure => hub/city_model_structure}/transport/origin_destination_network.py (79%) rename {city_model_structure => hub/city_model_structure}/transport/origin_destination_node.py (88%) rename {city_model_structure => hub/city_model_structure}/transport/phase.py (100%) rename {city_model_structure => hub/city_model_structure}/transport/traffic_edge.py (94%) rename {city_model_structure => hub/city_model_structure}/transport/traffic_light.py (93%) rename {city_model_structure => hub/city_model_structure}/transport/traffic_network.py (81%) rename {city_model_structure => hub/city_model_structure}/transport/traffic_node.py (91%) rename {city_model_structure => hub/city_model_structure}/transport/walkway_node.py (92%) rename {city_model_structure => hub/city_model_structure}/vehicle.py (100%) rename {config => hub/config}/configuration.ini (100%) rename {data => hub/data}/construction/us_archetypes.xml (100%) rename {data => hub/data}/construction/us_constructions.xml (100%) rename {data => hub/data}/customized_imports/ashrae_archetypes.xml (100%) rename {data => hub/data}/energy_systems/heat_pumps/air_source.xlsx (100%) rename {data => hub/data}/energy_systems/heat_pumps/as_parallel.txt (100%) rename {data => hub/data}/energy_systems/heat_pumps/as_series.txt (100%) rename {data => hub/data}/energy_systems/heat_pumps/constants.yaml (100%) rename {data => hub/data}/energy_systems/heat_pumps/demand.txt (100%) rename {data => hub/data}/energy_systems/heat_pumps/w2w_parallel.txt (100%) rename {data => hub/data}/energy_systems/heat_pumps/w2w_series.txt (100%) rename {data => hub/data}/energy_systems/heat_pumps/water_to_water.xlsx (100%) rename {data => hub/data}/energy_systems/heat_pumps/wt_hourly3.txt (100%) rename {data => hub/data}/greenery/ecore_greenery_catalog.xml (100%) rename {data => hub/data}/life_cycle_assessment/lca_data.xml (100%) rename {data => hub/data}/schedules/Data-driven_schedules_model_test.xlsx (100%) rename {data => hub/data}/schedules/doe_idf.xml (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_ApartmentHighRise_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_ApartmentMidRise_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_Hospital_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_HotelLarge_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_HotelSmall_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_OfficeLarge_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_OfficeMedium_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_OfficeSmall_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_OutPatientHealthCare_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_RestaurantFastFood_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_RestaurantSitDown_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_RetailStandalone_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_RetailStripmall_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_SchoolPrimary_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_SchoolSecondary_STD2019_Rochester.idf (100%) rename {data => hub/data}/schedules/idf_files/ASHRAE901_Warehouse_STD2019_Rochester.idf (100%) rename {data => hub/data}/sensors/concordia_energy_db.json (100%) rename {data => hub/data}/sensors/concordia_gas_flow_db.json (100%) rename {data => hub/data}/sensors/concordia_temperature_db.json (100%) rename {data => hub/data}/usage/ca_archetypes_reduced.xml (100%) rename {data => hub/data}/usage/comnet_archetypes.xlsx (100%) rename {data => hub/data}/usage/comnet_schedules_archetypes.xlsx (100%) rename {data => hub/data}/usage/de_library.xml (100%) rename {data => hub/data}/usage/nrcan.xml (100%) rename {data => hub/data}/weather/epw/CAN_BC_Summerland.717680_CWEC.epw (100%) rename {data => hub/data}/weather/epw/CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw (100%) rename {data => hub/data}/weather/inseldb_new_york_city.dat (100%) rename {docs => hub/docs}/img_contributing/img_0.png (100%) rename {docs => hub/docs}/img_contributing/img_1.png (100%) rename {docs => hub/docs}/img_contributing/img_10.png (100%) rename {docs => hub/docs}/img_contributing/img_11.png (100%) rename {docs => hub/docs}/img_contributing/img_12.png (100%) rename {docs => hub/docs}/img_contributing/img_13.png (100%) rename {docs => hub/docs}/img_contributing/img_14.png (100%) rename {docs => hub/docs}/img_contributing/img_15.png (100%) rename {docs => hub/docs}/img_contributing/img_16.png (100%) rename {docs => hub/docs}/img_contributing/img_17.png (100%) rename {docs => hub/docs}/img_contributing/img_18.png (100%) rename {docs => hub/docs}/img_contributing/img_19.png (100%) rename {docs => hub/docs}/img_contributing/img_2.png (100%) rename {docs => hub/docs}/img_contributing/img_20.png (100%) rename {docs => hub/docs}/img_contributing/img_21.png (100%) rename {docs => hub/docs}/img_contributing/img_22.png (100%) rename {docs => hub/docs}/img_contributing/img_23.png (100%) rename {docs => hub/docs}/img_contributing/img_24.png (100%) rename {docs => hub/docs}/img_contributing/img_25.png (100%) rename {docs => hub/docs}/img_contributing/img_26.png (100%) rename {docs => hub/docs}/img_contributing/img_3.png (100%) rename {docs => hub/docs}/img_contributing/img_4.png (100%) rename {docs => hub/docs}/img_contributing/img_5.png (100%) rename {docs => hub/docs}/img_contributing/img_6.png (100%) rename {docs => hub/docs}/img_contributing/img_7.png (100%) rename {docs => hub/docs}/img_contributing/img_8.png (100%) rename {docs => hub/docs}/img_contributing/img_9.png (100%) rename {docs => hub/docs}/img_macos_install/img_0.png (100%) rename {docs => hub/docs}/img_macos_install/img_1.png (100%) rename {docs => hub/docs}/img_macos_install/img_10.png (100%) rename {docs => hub/docs}/img_macos_install/img_11.png (100%) rename {docs => hub/docs}/img_macos_install/img_12.png (100%) rename {docs => hub/docs}/img_macos_install/img_13.png (100%) rename {docs => hub/docs}/img_macos_install/img_14.png (100%) rename {docs => hub/docs}/img_macos_install/img_15.png (100%) rename {docs => hub/docs}/img_macos_install/img_16.png (100%) rename {docs => hub/docs}/img_macos_install/img_17.png (100%) rename {docs => hub/docs}/img_macos_install/img_18.png (100%) rename {docs => hub/docs}/img_macos_install/img_19.png (100%) rename {docs => hub/docs}/img_macos_install/img_2.png (100%) rename {docs => hub/docs}/img_macos_install/img_3.png (100%) rename {docs => hub/docs}/img_macos_install/img_4.png (100%) rename {docs => hub/docs}/img_macos_install/img_5.png (100%) rename {docs => hub/docs}/img_macos_install/img_6.png (100%) rename {docs => hub/docs}/img_macos_install/img_7.png (100%) rename {docs => hub/docs}/img_macos_install/img_8.png (100%) rename {docs => hub/docs}/img_macos_install/img_9.png (100%) rename {docs => hub/docs}/img_windows_install/img_0.png (100%) rename {docs => hub/docs}/img_windows_install/img_1.png (100%) rename {docs => hub/docs}/img_windows_install/img_10.png (100%) rename {docs => hub/docs}/img_windows_install/img_11.png (100%) rename {docs => hub/docs}/img_windows_install/img_12.png (100%) rename {docs => hub/docs}/img_windows_install/img_13.png (100%) rename {docs => hub/docs}/img_windows_install/img_14.png (100%) rename {docs => hub/docs}/img_windows_install/img_15.png (100%) rename {docs => hub/docs}/img_windows_install/img_16.png (100%) rename {docs => hub/docs}/img_windows_install/img_17.png (100%) rename {docs => hub/docs}/img_windows_install/img_2.png (100%) rename {docs => hub/docs}/img_windows_install/img_20.png (100%) rename {docs => hub/docs}/img_windows_install/img_21.png (100%) rename {docs => hub/docs}/img_windows_install/img_22.png (100%) rename {docs => hub/docs}/img_windows_install/img_23.png (100%) rename {docs => hub/docs}/img_windows_install/img_24.png (100%) rename {docs => hub/docs}/img_windows_install/img_25.png (100%) rename {docs => hub/docs}/img_windows_install/img_26.png (100%) rename {docs => hub/docs}/img_windows_install/img_27.png (100%) rename {docs => hub/docs}/img_windows_install/img_28.png (100%) rename {docs => hub/docs}/img_windows_install/img_29.png (100%) rename {docs => hub/docs}/img_windows_install/img_3.png (100%) rename {docs => hub/docs}/img_windows_install/img_30.png (100%) rename {docs => hub/docs}/img_windows_install/img_31.png (100%) rename {docs => hub/docs}/img_windows_install/img_32.png (100%) rename {docs => hub/docs}/img_windows_install/img_33.png (100%) rename {docs => hub/docs}/img_windows_install/img_4.png (100%) rename {docs => hub/docs}/img_windows_install/img_5.png (100%) rename {docs => hub/docs}/img_windows_install/img_6.png (100%) rename {docs => hub/docs}/img_windows_install/img_7.png (100%) rename {docs => hub/docs}/img_windows_install/img_8.png (100%) rename {docs => hub/docs}/img_windows_install/img_9.png (100%) rename {exports => hub/exports}/building_energy/energy_ade.py (99%) rename {exports => hub/exports}/building_energy/idf.py (99%) rename {exports => hub/exports}/building_energy/idf_files/Energy+.idd (100%) rename {exports => hub/exports}/building_energy/idf_files/Minimal.idf (100%) rename {exports => hub/exports}/building_energy/insel/insel_monthly_energy_balance.py (98%) rename {exports => hub/exports}/db_factory.py (94%) rename {exports => hub/exports}/energy_building_exports_factory.py (92%) rename {exports => hub/exports}/energy_systems/air_source_hp_export.py (96%) rename {exports => hub/exports}/energy_systems/heat_pump_export.py (99%) rename {exports => hub/exports}/energy_systems/water_to_water_hp_export.py (96%) rename {exports => hub/exports}/energy_systems_factory.py (90%) rename {exports => hub/exports}/exports_factory.py (91%) rename {exports => hub/exports}/formats/insel.py (100%) rename {exports => hub/exports}/formats/obj.py (89%) rename {exports => hub/exports}/formats/simplified_radiosity_algorithm.py (100%) rename {exports => hub/exports}/formats/stl.py (86%) rename {exports => hub/exports}/formats/triangular.py (100%) rename {exports => hub/exports}/user_factory.py (95%) rename {helpers => hub/helpers}/auth.py (100%) rename {helpers => hub/helpers}/configuration_helper.py (100%) rename {helpers => hub/helpers}/constants.py (100%) rename {helpers => hub/helpers}/enrich_city.py (100%) rename {helpers => hub/helpers}/geometry_helper.py (96%) rename {helpers => hub/helpers}/location.py (100%) rename {helpers => hub/helpers}/monthly_to_hourly_demand.py (98%) rename {helpers => hub/helpers}/monthly_values.py (100%) rename {helpers => hub/helpers}/yearly_from_daily_schedules.py (93%) rename {hub_logger => hub/hub_logger}/__init__.py (100%) rename {imports => hub/imports}/__init__.py (100%) rename {imports => hub/imports}/construction/data_classes/building_achetype.py (96%) rename {imports => hub/imports}/construction/data_classes/layer_archetype.py (100%) rename {imports => hub/imports}/construction/data_classes/thermal_boundary_archetype.py (94%) rename {imports => hub/imports}/construction/data_classes/thermal_opening_archetype.py (100%) rename {imports => hub/imports}/construction/helpers/construction_helper.py (98%) rename {imports => hub/imports}/construction/helpers/storeys_generation.py (94%) rename {imports => hub/imports}/construction/nrel_physics_interface.py (97%) rename {imports => hub/imports}/construction/us_physics_parameters.py (94%) rename {imports => hub/imports}/construction_factory.py (93%) rename {imports => hub/imports}/db_factory.py (92%) rename {imports => hub/imports}/energy_systems/air_source_hp_parameters.py (97%) rename {imports => hub/imports}/energy_systems/water_to_water_hp_parameters.py (97%) rename {imports => hub/imports}/energy_systems_factory.py (86%) rename {imports => hub/imports}/geometry/citygml.py (94%) rename {imports => hub/imports}/geometry/citygml_classes/citygml_base.py (90%) rename {imports => hub/imports}/geometry/citygml_classes/citygml_lod1.py (88%) rename {imports => hub/imports}/geometry/citygml_classes/citygml_lod2.py (91%) rename {imports => hub/imports}/geometry/geojson.py (94%) rename {imports => hub/imports}/geometry/gpandas.py (92%) rename {imports => hub/imports}/geometry/helpers/geometry_helper.py (99%) rename {imports => hub/imports}/geometry/obj.py (91%) rename {imports => hub/imports}/geometry/osm_subway.py (94%) rename {imports => hub/imports}/geometry/rhino.py (91%) rename {imports => hub/imports}/geometry_factory.py (88%) rename {imports => hub/imports}/life_cycle_assessment/lca_fuel.py (94%) rename {imports => hub/imports}/life_cycle_assessment/lca_machine.py (95%) rename {imports => hub/imports}/life_cycle_assessment/lca_material.py (95%) rename {imports => hub/imports}/life_cycle_assessment/lca_vehicle.py (95%) rename {imports => hub/imports}/life_cycle_assessment_factory.py (83%) rename {imports => hub/imports}/sensors/concordia_energy_consumption.py (90%) rename {imports => hub/imports}/sensors/concordia_file_report.py (100%) rename {imports => hub/imports}/sensors/concordia_gas_flow.py (95%) rename {imports => hub/imports}/sensors/concordia_temperature.py (95%) rename {imports => hub/imports}/sensors_factory.py (100%) rename {imports => hub/imports}/usage/ca_usage_parameters.py (87%) rename {imports => hub/imports}/usage/comnet_usage_parameters.py (94%) rename {imports => hub/imports}/usage/data_classes/hft_internal_gains_archetype.py (100%) rename {imports => hub/imports}/usage/data_classes/usage_zone_archetype.py (96%) rename {imports => hub/imports}/usage/helpers/schedules_helper.py (98%) rename {imports => hub/imports}/usage/helpers/usage_helper.py (99%) rename {imports => hub/imports}/usage/hft_usage_interface.py (96%) rename {imports => hub/imports}/usage/hft_usage_parameters.py (87%) rename {imports => hub/imports}/usage_factory.py (90%) rename {imports => hub/imports}/user_factory.py (94%) rename {imports => hub/imports}/weather/dat_weather_parameters.py (98%) rename {imports => hub/imports}/weather/epw_weather_parameters.py (99%) rename {imports => hub/imports}/weather/helpers/weather.py (95%) rename {imports => hub/imports}/weather/xls_weather_parameters.py (98%) rename {imports => hub/imports}/weather_factory.py (90%) rename install_postgresql_linux.sh => hub/install_postgresql_linux.sh (100%) rename {persistence => hub/persistence}/README.md (98%) rename {persistence => hub/persistence}/__init__.py (100%) rename {persistence => hub/persistence}/base_repo.py (91%) rename {persistence => hub/persistence}/db_config.py (97%) rename {persistence => hub/persistence}/db_setup.py (80%) rename {persistence => hub/persistence}/models/__init__.py (100%) rename {persistence => hub/persistence}/models/city.py (97%) rename {persistence => hub/persistence}/models/heat_pump_simulation.py (98%) rename {persistence => hub/persistence}/models/user.py (97%) rename {persistence => hub/persistence}/repositories/__init__.py (100%) rename {persistence => hub/persistence}/repositories/city_repo.py (96%) rename {persistence => hub/persistence}/repositories/heat_pump_simulation_repo.py (96%) rename {persistence => hub/persistence}/repositories/user_repo.py (94%) rename pylintrc => hub/pylintrc (100%) rename requirements.txt => hub/requirements.txt (100%) rename {unittests => hub/unittests}/test_city_layers.py (91%) rename {unittests => hub/unittests}/test_city_merge.py (95%) rename {unittests => hub/unittests}/test_construction_catalog.py (91%) rename {unittests => hub/unittests}/test_construction_factory.py (98%) rename {unittests => hub/unittests}/test_db_factory.py (90%) rename {unittests => hub/unittests}/test_energy_systems_air_source_hp.py (84%) rename {unittests => hub/unittests}/test_energy_systems_water_to_water_hp.py (85%) rename {unittests => hub/unittests}/test_enrichement.py (96%) rename {unittests => hub/unittests}/test_exports.py (88%) rename {unittests => hub/unittests}/test_geometry_factory.py (96%) rename {unittests => hub/unittests}/test_greenery_catalog.py (93%) rename {unittests => hub/unittests}/test_greenery_in_idf.py (84%) rename {unittests => hub/unittests}/test_heat_pump_simulation.py (87%) rename {unittests => hub/unittests}/test_insel_exports.py (94%) rename {unittests => hub/unittests}/test_life_cycle_assessment_factory.py (79%) rename {unittests => hub/unittests}/test_usage_catalog.py (90%) rename {unittests => hub/unittests}/test_usage_factory.py (98%) rename {unittests => hub/unittests}/tests_data/C40_Final.gml (100%) rename {unittests => hub/unittests}/tests_data/C40_Game.gml (100%) rename {unittests => hub/unittests}/tests_data/EV-GM energy demand weekly report_01-26-20_04-30.csv (100%) rename {unittests => hub/unittests}/tests_data/EV_GM_MB_LoD2.gml (100%) rename {unittests => hub/unittests}/tests_data/FZK-Haus-LoD4-KIT-IAI-KHH-B36-V1.gml (100%) rename {unittests => hub/unittests}/tests_data/FZK_Haus_LoD_0.gml (100%) rename {unittests => hub/unittests}/tests_data/FZK_Haus_LoD_1.gml (100%) rename {unittests => hub/unittests}/tests_data/FZK_Haus_LoD_2.gml (100%) rename {unittests => hub/unittests}/tests_data/FZK_Haus_LoD_3.gml (100%) rename {unittests => hub/unittests}/tests_data/city_layers.json (100%) rename {unittests => hub/unittests}/tests_data/concordia.geojson (100%) rename {unittests => hub/unittests}/tests_data/custom.geojson (100%) rename {unittests => hub/unittests}/tests_data/dompark.3dm (100%) rename {unittests => hub/unittests}/tests_data/kelowna.obj (100%) rename {unittests => hub/unittests}/tests_data/lca_data.xml (100%) rename {unittests => hub/unittests}/tests_data/one_building_in_kelowna.gml (100%) rename {unittests => hub/unittests}/tests_data/one_building_in_kelowna_alkis.gml (100%) rename {unittests => hub/unittests}/tests_data/one_building_in_kelowna_sra_SW.out (100%) rename {unittests => hub/unittests}/tests_data/pluto_building.gml (100%) rename {unittests => hub/unittests}/tests_data/sample.geojson (100%) rename {unittests => hub/unittests}/tests_data/subway.osm (100%) rename {unittests => hub/unittests}/tests_outputs/.gitignore (72%) create mode 100644 pyproject.toml create mode 100644 setup.py diff --git a/.gitignore b/hub/.gitignore similarity index 94% rename from .gitignore rename to hub/.gitignore index edbb2b1c..8f8bdd78 100644 --- a/.gitignore +++ b/hub/.gitignore @@ -6,5 +6,5 @@ /data/energy_systems/heat_pumps/*.insel .DS_Store .env -logs +hub/logs **/__pycache__/ diff --git a/CODE_OF_CONDUCT.md b/hub/CODE_OF_CONDUCT.md similarity index 100% rename from CODE_OF_CONDUCT.md rename to hub/CODE_OF_CONDUCT.md diff --git a/CONTRIBUTING_CENTRAL_DATA_MODEL.md b/hub/CONTRIBUTING_CENTRAL_DATA_MODEL.md similarity index 85% rename from CONTRIBUTING_CENTRAL_DATA_MODEL.md rename to hub/CONTRIBUTING_CENTRAL_DATA_MODEL.md index 2666d1d2..436ab3ce 100644 --- a/CONTRIBUTING_CENTRAL_DATA_MODEL.md +++ b/hub/CONTRIBUTING_CENTRAL_DATA_MODEL.md @@ -17,13 +17,13 @@ If the code doesn't pass the quality review, it will be rejected. ## Adding new parameters to existing classes Adding a new parameter is an easy task. Open the desired class, for example, CityObject: -![city object](./docs/img_contributing/img_5.png) +![city object](docs/img_contributing/img_5.png) Add the name of your new parameter to the list at the constructor and initialize it as desired: -![new parameter](./docs/img_contributing/img_6.png) +![new parameter](docs/img_contributing/img_6.png) At the end of the class, add the corresponding getter and setter. It is very important that they are documented! -![getter and setter](./docs/img_contributing/img_7.png) +![getter and setter](docs/img_contributing/img_7.png) You will see that the name of the file (city_object.py) changes from white to blue. That means that your version is different from that one in the git. Once you finish doing your changes, you should commit and push them to your branch. The name of the file will turn back white. @@ -31,9 +31,9 @@ from that one in the git. Once you finish doing your changes, you should commit ## Creating a new class Create a new class in the corresponding folder (if it does not exist, create a new folder ad hoc). -![new folder](./docs/img_contributing/img_0.png) -![new file](./docs/img_contributing/img_1.png) -![add to git](./docs/img_contributing/img_2.png) +![new folder](docs/img_contributing/img_0.png) +![new file](docs/img_contributing/img_1.png) +![add to git](docs/img_contributing/img_2.png) And add it to git (the name of the file will turn from red to green). Every new class must have: @@ -61,7 +61,7 @@ This class models this and does that - All imported libraries together at the beginning. -![new class](./docs/img_contributing/img_3.png) +![new class](docs/img_contributing/img_3.png) A data class contains properties that describe the data model. Therefore, it should be mainly composed by getters and setters. We would like to avoid having methods in the data classes. All those methods that could be done in the factories must be written there. @@ -75,7 +75,7 @@ initialization and don’t have setter, while the others are initialized at None It is important to highlight that all setters and getters (@property) must have comments to describe the parameters, as shown in the previous image. -![new class getters and setters](./docs/img_contributing/img_4.png) +![new class getters and setters](docs/img_contributing/img_4.png) Once you finish doing your changes, you should commit and push them to your branch. The name of the new files will change from green to white. @@ -85,46 +85,46 @@ First, it is required to install a plugin for such purpose. We recommend [GitLab but you are free to choose the one you prefer. In order to install the plug, be sure that you have the latest pycharm version. Go to Help -> Check for Updates... It will ask you to Update the new version, click on Update and Restart and follow the instructions. -![update pycharm](./docs/img_contributing/img_9.png) +![update pycharm](docs/img_contributing/img_9.png) Don't forget to look in the bottom-right corner, there you always find the instructions, warnings, errors, announcements... -![pycharm announcement](./docs/img_contributing/img_10.png) +![pycharm announcement](docs/img_contributing/img_10.png) Once you updated pycharm, go to File -> Settings... -> Plugins and search for _GitLab Merge Request_ and press Install. -![pycharm plugins](./docs/img_contributing/img_11.png) +![pycharm plugins](docs/img_contributing/img_11.png) ### Select the project This step needs to be done only the first time. Once the plugin is installed, it will appear a new tab at the bottom list called Gitlab Merge Requests as in the image: -![new tab](./docs/img_contributing/img_12.png) +![new tab](docs/img_contributing/img_12.png) Click on _Clik to discover servers_ and select the gitlab.concordia.ca. -![new server](./docs/img_contributing/img_13.png) +![new server](docs/img_contributing/img_13.png) Observe that in the top-right corner of the tab, the message has changed from _No Repository_ to _Repo: /Guille/libs_. -![new repo](./docs/img_contributing/img_14.png) +![new repo](docs/img_contributing/img_14.png) If you now click on Refresh Merge Request (see previous image), you will get a message asking for a token. As you don't have one yet, click on Create token. -![create token](./docs/img_contributing/img_15.png) +![create token](docs/img_contributing/img_15.png) You will be sent to the gitlab repository to create a new token. Give a name to it and check all options. You are creating a token that has the same permits as your gitlab account has. -![create token in gitlab](./docs/img_contributing/img_16.png) +![create token in gitlab](docs/img_contributing/img_16.png) A new personal access token will be created. Copy and paste it in the Access Token box. A token is a personal and no-transferable key. Don't show it to anyone! -![copy token](./docs/img_contributing/img_17.png) +![copy token](docs/img_contributing/img_17.png) -![paste token](./docs/img_contributing/img_18.png) +![paste token](docs/img_contributing/img_18.png) ### Create merge request Every time you want to send some changes to the main branch (merge your branch to the main one) @@ -132,11 +132,11 @@ you will need to follow these steps. Right clic on the blanc area and select + Create Merge Request. -![new merge request](./docs/img_contributing/img_19.png) +![new merge request](docs/img_contributing/img_19.png) A window will appear with the information of the request: -![request info](./docs/img_contributing/img_20.png) +![request info](docs/img_contributing/img_20.png) Clic on Assignees + and look for the project owner, in this case, Guillermo Gutierrez Morote. Select him as assignee and clic OK. @@ -146,11 +146,11 @@ the email account you use for gitlab with the answer. Once the changes are accepted, go back to the main branch by selecting the Git tab (bottom-left). Right clic on Master and select Checkout. -![checkout master](./docs/img_contributing/img_24.png) +![checkout master](docs/img_contributing/img_24.png) Now pull (blue arrow), and delete the branch. -![erase branch](./docs/img_contributing/img_26.png) +![erase branch](docs/img_contributing/img_26.png) Now you have again the same version as in gitlab. For new changes, create a new branch and repeat the process. diff --git a/CONTRIBUTING_EXTERNALS.md b/hub/CONTRIBUTING_EXTERNALS.md similarity index 100% rename from CONTRIBUTING_EXTERNALS.md rename to hub/CONTRIBUTING_EXTERNALS.md diff --git a/DEPLOYMENT.md b/hub/DEPLOYMENT.md similarity index 98% rename from DEPLOYMENT.md rename to hub/DEPLOYMENT.md index 4613b954..4bbc1788 100644 --- a/DEPLOYMENT.md +++ b/hub/DEPLOYMENT.md @@ -41,8 +41,9 @@ section in persistence/README.md file. 2. The .env file should contain the following credentials: database user, database password, database host an,d database port 3. Provide the *absolute path* to the .env file to the persistence importers and exporters whenever using them in your code as shown below: + ```python -from exports.db_factory import DBFactory +from hub.exports.db_factory import DBFactory from pathlib import Path dotenv_path = (Path(__file__).parent / '.env').resolve() @@ -52,8 +53,9 @@ factory = DBFactory(db_name='hub_db', app_env='PROD', dotenv_path=dotenv_path) ## Create Database Tables ## Use the *DBSetup* class in the persistence package to create the required database tables as described below + ```python -from persistence import DBSetup +from hub.persistence import DBSetup from pathlib import Path dotenv_path = (Path(__file__).parent / '.env').resolve() diff --git a/LICENSE.md b/hub/LICENSE.md similarity index 100% rename from LICENSE.md rename to hub/LICENSE.md diff --git a/MACOS_INSTALL.md b/hub/MACOS_INSTALL.md similarity index 100% rename from MACOS_INSTALL.md rename to hub/MACOS_INSTALL.md diff --git a/PYGUIDE.md b/hub/PYGUIDE.md similarity index 100% rename from PYGUIDE.md rename to hub/PYGUIDE.md diff --git a/README.md b/hub/README.md similarity index 100% rename from README.md rename to hub/README.md diff --git a/RECOGNIZED_FUNTIONS_AND_USAGES.md b/hub/RECOGNIZED_FUNTIONS_AND_USAGES.md similarity index 100% rename from RECOGNIZED_FUNTIONS_AND_USAGES.md rename to hub/RECOGNIZED_FUNTIONS_AND_USAGES.md diff --git a/WINDOWS_INSTALL.md b/hub/WINDOWS_INSTALL.md similarity index 99% rename from WINDOWS_INSTALL.md rename to hub/WINDOWS_INSTALL.md index 548497f5..0eb13976 100644 --- a/WINDOWS_INSTALL.md +++ b/hub/WINDOWS_INSTALL.md @@ -235,7 +235,7 @@ Add the following code to your main.py ```python -from imports.geometry_factory import GeometryFactory +from hub.imports import GeometryFactory city = GeometryFactory('citygml', path='myfile.gml').city ``` diff --git a/catalog_factories/catalog.py b/hub/catalog_factories/catalog.py similarity index 100% rename from catalog_factories/catalog.py rename to hub/catalog_factories/catalog.py diff --git a/catalog_factories/construction/construction_helpers.py b/hub/catalog_factories/construction/construction_helpers.py similarity index 96% rename from catalog_factories/construction/construction_helpers.py rename to hub/catalog_factories/construction/construction_helpers.py index b19cfc3d..22299464 100644 --- a/catalog_factories/construction/construction_helpers.py +++ b/hub/catalog_factories/construction/construction_helpers.py @@ -1,4 +1,4 @@ -from helpers import constants as cte +from hub.helpers import constants as cte nrel_to_function = { 'residential': cte.RESIDENTIAL, diff --git a/catalog_factories/construction/nrel_catalog.py b/hub/catalog_factories/construction/nrel_catalog.py similarity index 92% rename from catalog_factories/construction/nrel_catalog.py rename to hub/catalog_factories/construction/nrel_catalog.py index 6495b8e0..2784f66a 100644 --- a/catalog_factories/construction/nrel_catalog.py +++ b/hub/catalog_factories/construction/nrel_catalog.py @@ -7,16 +7,16 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca import xmltodict from pathlib import Path -from catalog_factories.catalog import Catalog -from catalog_factories.data_models.construction.window import Window -from catalog_factories.data_models.construction.material import Material -from catalog_factories.data_models.construction.layer import Layer -from catalog_factories.data_models.construction.construction import Construction -from catalog_factories.data_models.construction.content import Content -from catalog_factories.data_models.construction.archetype import Archetype -from catalog_factories.construction.construction_helpers import nrel_to_function -from catalog_factories.construction.construction_helpers import reference_standard_to_construction_period -from catalog_factories.construction.construction_helpers import nrel_surfaces_types_to_hub_types +from hub.catalog_factories.catalog import Catalog +from hub.catalog_factories.data_models.construction.window import Window +from hub.catalog_factories.data_models.construction.material import Material +from hub.catalog_factories.data_models.construction.layer import Layer +from hub.catalog_factories.data_models.construction.construction import Construction +from hub.catalog_factories.data_models.construction.content import Content +from hub.catalog_factories.data_models.construction.archetype import Archetype +from hub.catalog_factories.construction.construction_helpers import nrel_to_function +from hub.catalog_factories.construction.construction_helpers import reference_standard_to_construction_period +from hub.catalog_factories.construction.construction_helpers import nrel_surfaces_types_to_hub_types class NrelCatalog(Catalog): diff --git a/catalog_factories/construction_catalog_factory.py b/hub/catalog_factories/construction_catalog_factory.py similarity index 92% rename from catalog_factories/construction_catalog_factory.py rename to hub/catalog_factories/construction_catalog_factory.py index a2724dee..c246374c 100644 --- a/catalog_factories/construction_catalog_factory.py +++ b/hub/catalog_factories/construction_catalog_factory.py @@ -7,7 +7,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca from pathlib import Path from typing import TypeVar -from catalog_factories.construction.nrel_catalog import NrelCatalog +from hub.catalog_factories.construction.nrel_catalog import NrelCatalog Catalog = TypeVar('Catalog') diff --git a/catalog_factories/data_models/construction/archetype.py b/hub/catalog_factories/data_models/construction/archetype.py similarity index 97% rename from catalog_factories/data_models/construction/archetype.py rename to hub/catalog_factories/data_models/construction/archetype.py index 7249c075..6f69a874 100644 --- a/catalog_factories/data_models/construction/archetype.py +++ b/hub/catalog_factories/data_models/construction/archetype.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from catalog_factories.data_models.construction.construction import Construction +from hub.catalog_factories.data_models.construction.construction import Construction class Archetype: diff --git a/catalog_factories/data_models/construction/construction.py b/hub/catalog_factories/data_models/construction/construction.py similarity index 89% rename from catalog_factories/data_models/construction/construction.py rename to hub/catalog_factories/data_models/construction/construction.py index 93eef068..8c999964 100644 --- a/catalog_factories/data_models/construction/construction.py +++ b/hub/catalog_factories/data_models/construction/construction.py @@ -4,8 +4,8 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from catalog_factories.data_models.construction.layer import Layer -from catalog_factories.data_models.construction.window import Window +from hub.catalog_factories.data_models.construction.layer import Layer +from hub.catalog_factories.data_models.construction.window import Window class Construction: diff --git a/catalog_factories/data_models/construction/content.py b/hub/catalog_factories/data_models/construction/content.py similarity index 100% rename from catalog_factories/data_models/construction/content.py rename to hub/catalog_factories/data_models/construction/content.py diff --git a/catalog_factories/data_models/construction/layer.py b/hub/catalog_factories/data_models/construction/layer.py similarity index 100% rename from catalog_factories/data_models/construction/layer.py rename to hub/catalog_factories/data_models/construction/layer.py diff --git a/catalog_factories/data_models/construction/material.py b/hub/catalog_factories/data_models/construction/material.py similarity index 100% rename from catalog_factories/data_models/construction/material.py rename to hub/catalog_factories/data_models/construction/material.py diff --git a/catalog_factories/data_models/construction/window.py b/hub/catalog_factories/data_models/construction/window.py similarity index 100% rename from catalog_factories/data_models/construction/window.py rename to hub/catalog_factories/data_models/construction/window.py diff --git a/catalog_factories/data_models/greenery/content.py b/hub/catalog_factories/data_models/greenery/content.py similarity index 100% rename from catalog_factories/data_models/greenery/content.py rename to hub/catalog_factories/data_models/greenery/content.py diff --git a/catalog_factories/data_models/greenery/plant.py b/hub/catalog_factories/data_models/greenery/plant.py similarity index 96% rename from catalog_factories/data_models/greenery/plant.py rename to hub/catalog_factories/data_models/greenery/plant.py index db7a0d6a..864e447d 100644 --- a/catalog_factories/data_models/greenery/plant.py +++ b/hub/catalog_factories/data_models/greenery/plant.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from catalog_factories.data_models.greenery.soil import Soil as hub_soil +from hub.catalog_factories.data_models.greenery.soil import Soil as hub_soil class Plant: diff --git a/catalog_factories/data_models/greenery/plant_percentage.py b/hub/catalog_factories/data_models/greenery/plant_percentage.py similarity index 86% rename from catalog_factories/data_models/greenery/plant_percentage.py rename to hub/catalog_factories/data_models/greenery/plant_percentage.py index 7501e186..e7d8e496 100644 --- a/catalog_factories/data_models/greenery/plant_percentage.py +++ b/hub/catalog_factories/data_models/greenery/plant_percentage.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from catalog_factories.data_models.greenery.plant import Plant as libs_plant +from hub.catalog_factories.data_models.greenery.plant import Plant as libs_plant class PlantPercentage(libs_plant): diff --git a/catalog_factories/data_models/greenery/soil.py b/hub/catalog_factories/data_models/greenery/soil.py similarity index 100% rename from catalog_factories/data_models/greenery/soil.py rename to hub/catalog_factories/data_models/greenery/soil.py diff --git a/catalog_factories/data_models/greenery/vegetation.py b/hub/catalog_factories/data_models/greenery/vegetation.py similarity index 97% rename from catalog_factories/data_models/greenery/vegetation.py rename to hub/catalog_factories/data_models/greenery/vegetation.py index 87a80c40..e7a5151b 100644 --- a/catalog_factories/data_models/greenery/vegetation.py +++ b/hub/catalog_factories/data_models/greenery/vegetation.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from catalog_factories.data_models.greenery.plant_percentage import PlantPercentage +from hub.catalog_factories.data_models.greenery.plant_percentage import PlantPercentage class Vegetation: diff --git a/catalog_factories/data_models/usages/appliances.py b/hub/catalog_factories/data_models/usages/appliances.py similarity index 95% rename from catalog_factories/data_models/usages/appliances.py rename to hub/catalog_factories/data_models/usages/appliances.py index 53f6539d..c519cf44 100644 --- a/catalog_factories/data_models/usages/appliances.py +++ b/hub/catalog_factories/data_models/usages/appliances.py @@ -7,7 +7,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca from typing import Union, List -from catalog_factories.data_models.usages.schedule import Schedule +from hub.catalog_factories.data_models.usages.schedule import Schedule class Appliances: diff --git a/catalog_factories/data_models/usages/content.py b/hub/catalog_factories/data_models/usages/content.py similarity index 85% rename from catalog_factories/data_models/usages/content.py rename to hub/catalog_factories/data_models/usages/content.py index eef5ddff..63fe8797 100644 --- a/catalog_factories/data_models/usages/content.py +++ b/hub/catalog_factories/data_models/usages/content.py @@ -4,7 +4,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from catalog_factories.data_models.usages.usage import Usage +from hub.catalog_factories.data_models.usages.usage import Usage class Content: diff --git a/catalog_factories/data_models/usages/internal_gain.py b/hub/catalog_factories/data_models/usages/internal_gain.py similarity index 100% rename from catalog_factories/data_models/usages/internal_gain.py rename to hub/catalog_factories/data_models/usages/internal_gain.py diff --git a/catalog_factories/data_models/usages/lighting.py b/hub/catalog_factories/data_models/usages/lighting.py similarity index 95% rename from catalog_factories/data_models/usages/lighting.py rename to hub/catalog_factories/data_models/usages/lighting.py index b519ec73..b7b48c4e 100644 --- a/catalog_factories/data_models/usages/lighting.py +++ b/hub/catalog_factories/data_models/usages/lighting.py @@ -7,7 +7,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca from typing import Union, List -from catalog_factories.data_models.usages.schedule import Schedule +from hub.catalog_factories.data_models.usages.schedule import Schedule class Lighting: diff --git a/catalog_factories/data_models/usages/ocupancy.py b/hub/catalog_factories/data_models/usages/ocupancy.py similarity index 96% rename from catalog_factories/data_models/usages/ocupancy.py rename to hub/catalog_factories/data_models/usages/ocupancy.py index c5be5ca4..b00a3a64 100644 --- a/catalog_factories/data_models/usages/ocupancy.py +++ b/hub/catalog_factories/data_models/usages/ocupancy.py @@ -6,7 +6,7 @@ Project Coder Guille Gutierrez Morote Guillermo.GutierrezMorote@concordia.ca """ from typing import Union, List -from catalog_factories.data_models.usages.schedule import Schedule +from hub.catalog_factories.data_models.usages.schedule import Schedule class Occupancy: diff --git a/catalog_factories/data_models/usages/schedule.py b/hub/catalog_factories/data_models/usages/schedule.py similarity index 100% rename from catalog_factories/data_models/usages/schedule.py rename to hub/catalog_factories/data_models/usages/schedule.py diff --git a/catalog_factories/data_models/usages/thermal_control.py b/hub/catalog_factories/data_models/usages/thermal_control.py similarity index 97% rename from catalog_factories/data_models/usages/thermal_control.py rename to hub/catalog_factories/data_models/usages/thermal_control.py index db209c7d..e058078f 100644 --- a/catalog_factories/data_models/usages/thermal_control.py +++ b/hub/catalog_factories/data_models/usages/thermal_control.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from typing import Union, List -from catalog_factories.data_models.usages.schedule import Schedule +from hub.catalog_factories.data_models.usages.schedule import Schedule class ThermalControl: diff --git a/catalog_factories/data_models/usages/usage.py b/hub/catalog_factories/data_models/usages/usage.py similarity index 89% rename from catalog_factories/data_models/usages/usage.py rename to hub/catalog_factories/data_models/usages/usage.py index e83178b8..fb0d06ed 100644 --- a/catalog_factories/data_models/usages/usage.py +++ b/hub/catalog_factories/data_models/usages/usage.py @@ -6,10 +6,10 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from typing import Union -from catalog_factories.data_models.usages.appliances import Appliances -from catalog_factories.data_models.usages.lighting import Lighting -from catalog_factories.data_models.usages.ocupancy import Occupancy -from catalog_factories.data_models.usages.thermal_control import ThermalControl +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.thermal_control import ThermalControl class Usage: diff --git a/catalog_factories/greenery/ecore_greenery/greenerycatalog.ecore b/hub/catalog_factories/greenery/ecore_greenery/greenerycatalog.ecore similarity index 100% rename from catalog_factories/greenery/ecore_greenery/greenerycatalog.ecore rename to hub/catalog_factories/greenery/ecore_greenery/greenerycatalog.ecore diff --git a/catalog_factories/greenery/ecore_greenery/greenerycatalog.py b/hub/catalog_factories/greenery/ecore_greenery/greenerycatalog.py similarity index 100% rename from catalog_factories/greenery/ecore_greenery/greenerycatalog.py rename to hub/catalog_factories/greenery/ecore_greenery/greenerycatalog.py diff --git a/catalog_factories/greenery/ecore_greenery/greenerycatalog_no_quantities.ecore b/hub/catalog_factories/greenery/ecore_greenery/greenerycatalog_no_quantities.ecore similarity index 100% rename from catalog_factories/greenery/ecore_greenery/greenerycatalog_no_quantities.ecore rename to hub/catalog_factories/greenery/ecore_greenery/greenerycatalog_no_quantities.ecore diff --git a/catalog_factories/greenery/greenery_catalog.py b/hub/catalog_factories/greenery/greenery_catalog.py similarity index 86% rename from catalog_factories/greenery/greenery_catalog.py rename to hub/catalog_factories/greenery/greenery_catalog.py index d5c604d8..c9d157c2 100644 --- a/catalog_factories/greenery/greenery_catalog.py +++ b/hub/catalog_factories/greenery/greenery_catalog.py @@ -6,14 +6,14 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from pyecore.resources import ResourceSet, URI -from catalog_factories.greenery.ecore_greenery.greenerycatalog import GreeneryCatalog as gc -from catalog_factories.catalog import Catalog +from hub.catalog_factories.greenery.ecore_greenery.greenerycatalog import GreeneryCatalog as gc +from hub.catalog_factories.catalog import Catalog from pathlib import Path -from catalog_factories.data_models.greenery.vegetation import Vegetation as libs_vegetation -from catalog_factories.data_models.greenery.plant import Plant as libs_plant -from catalog_factories.data_models.greenery.soil import Soil as libs_soil -from catalog_factories.data_models.greenery.plant_percentage import PlantPercentage as libs_pp -from catalog_factories.data_models.greenery.content import Content as GreeneryContent +from hub.catalog_factories.data_models.greenery.vegetation import Vegetation as libs_vegetation +from hub.catalog_factories.data_models.greenery.plant import Plant as libs_plant +from hub.catalog_factories.data_models.greenery.soil import Soil as libs_soil +from hub.catalog_factories.data_models.greenery.plant_percentage import PlantPercentage as libs_pp +from hub.catalog_factories.data_models.greenery.content import Content as GreeneryContent class GreeneryCatalog(Catalog): diff --git a/catalog_factories/greenery_catalog_factory.py b/hub/catalog_factories/greenery_catalog_factory.py similarity index 93% rename from catalog_factories/greenery_catalog_factory.py rename to hub/catalog_factories/greenery_catalog_factory.py index 08864c41..f0c38df6 100644 --- a/catalog_factories/greenery_catalog_factory.py +++ b/hub/catalog_factories/greenery_catalog_factory.py @@ -7,7 +7,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca from pathlib import Path from typing import TypeVar -from catalog_factories.greenery.greenery_catalog import GreeneryCatalog +from hub.catalog_factories.greenery.greenery_catalog import GreeneryCatalog Catalog = TypeVar('Catalog') class GreeneryCatalogFactory: diff --git a/catalog_factories/usage/comnet_catalog.py b/hub/catalog_factories/usage/comnet_catalog.py similarity index 93% rename from catalog_factories/usage/comnet_catalog.py rename to hub/catalog_factories/usage/comnet_catalog.py index 748d0b36..e8011ae4 100644 --- a/catalog_factories/usage/comnet_catalog.py +++ b/hub/catalog_factories/usage/comnet_catalog.py @@ -8,17 +8,17 @@ from typing import Dict import pandas as pd -import helpers.constants as cte -from catalog_factories.catalog import Catalog -from catalog_factories.data_models.usages.appliances import Appliances -from catalog_factories.data_models.usages.content import Content -from catalog_factories.data_models.usages.lighting import Lighting -from catalog_factories.data_models.usages.ocupancy import Occupancy -from catalog_factories.data_models.usages.schedule import Schedule -from catalog_factories.data_models.usages.thermal_control import ThermalControl -from catalog_factories.data_models.usages.usage import Usage -from catalog_factories.usage.usage_helper import UsageHelper -from helpers.configuration_helper import ConfigurationHelper as ch +import hub.helpers.constants as cte +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.schedule import Schedule +from hub.catalog_factories.data_models.usages.thermal_control import ThermalControl +from hub.catalog_factories.data_models.usages.usage import Usage +from hub.catalog_factories.usage.usage_helper import UsageHelper +from hub.helpers.configuration_helper import ConfigurationHelper as ch class ComnetCatalog(Catalog): diff --git a/catalog_factories/usage/nrcan_catalog.py b/hub/catalog_factories/usage/nrcan_catalog.py similarity index 91% rename from catalog_factories/usage/nrcan_catalog.py rename to hub/catalog_factories/usage/nrcan_catalog.py index 949cb3d2..432cb515 100644 --- a/catalog_factories/usage/nrcan_catalog.py +++ b/hub/catalog_factories/usage/nrcan_catalog.py @@ -9,16 +9,16 @@ import json import urllib.request import xmltodict -import helpers.constants as cte -from catalog_factories.catalog import Catalog -from catalog_factories.data_models.usages.appliances import Appliances -from catalog_factories.data_models.usages.content import Content -from catalog_factories.data_models.usages.lighting import Lighting -from catalog_factories.data_models.usages.ocupancy import Occupancy -from catalog_factories.data_models.usages.schedule import Schedule -from catalog_factories.data_models.usages.thermal_control import ThermalControl -from catalog_factories.data_models.usages.usage import Usage -from catalog_factories.usage.usage_helper import UsageHelper +import hub.helpers.constants as cte +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.schedule import Schedule +from hub.catalog_factories.data_models.usages.thermal_control import ThermalControl +from hub.catalog_factories.data_models.usages.usage import Usage +from hub.catalog_factories.usage.usage_helper import UsageHelper class NrcanCatalog(Catalog): diff --git a/catalog_factories/usage/usage_helper.py b/hub/catalog_factories/usage/usage_helper.py similarity index 99% rename from catalog_factories/usage/usage_helper.py rename to hub/catalog_factories/usage/usage_helper.py index 93c6fa04..ee477b9e 100644 --- a/catalog_factories/usage/usage_helper.py +++ b/hub/catalog_factories/usage/usage_helper.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys -import helpers.constants as cte +import hub.helpers.constants as cte from typing import Dict diff --git a/catalog_factories/usage_catalog_factory.py b/hub/catalog_factories/usage_catalog_factory.py similarity index 88% rename from catalog_factories/usage_catalog_factory.py rename to hub/catalog_factories/usage_catalog_factory.py index f7c20265..a554748a 100644 --- a/catalog_factories/usage_catalog_factory.py +++ b/hub/catalog_factories/usage_catalog_factory.py @@ -7,8 +7,8 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca from pathlib import Path from typing import TypeVar -from catalog_factories.usage.comnet_catalog import ComnetCatalog -from catalog_factories.usage.nrcan_catalog import NrcanCatalog +from hub.catalog_factories.usage.comnet_catalog import ComnetCatalog +from hub.catalog_factories.usage.nrcan_catalog import NrcanCatalog Catalog = TypeVar('Catalog') diff --git a/city_model_structure/attributes/edge.py b/hub/city_model_structure/attributes/edge.py similarity index 100% rename from city_model_structure/attributes/edge.py rename to hub/city_model_structure/attributes/edge.py diff --git a/city_model_structure/attributes/node.py b/hub/city_model_structure/attributes/node.py similarity index 94% rename from city_model_structure/attributes/node.py rename to hub/city_model_structure/attributes/node.py index df450570..0ba07501 100644 --- a/city_model_structure/attributes/node.py +++ b/hub/city_model_structure/attributes/node.py @@ -7,7 +7,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca import uuid from typing import List, TypeVar -from city_model_structure.attributes.time_series import TimeSeries +from hub.city_model_structure.attributes.time_series import TimeSeries Edge = TypeVar('Edge') diff --git a/city_model_structure/attributes/plane.py b/hub/city_model_structure/attributes/plane.py similarity index 100% rename from city_model_structure/attributes/plane.py rename to hub/city_model_structure/attributes/plane.py diff --git a/city_model_structure/attributes/point.py b/hub/city_model_structure/attributes/point.py similarity index 100% rename from city_model_structure/attributes/point.py rename to hub/city_model_structure/attributes/point.py diff --git a/city_model_structure/attributes/polygon.py b/hub/city_model_structure/attributes/polygon.py similarity index 99% rename from city_model_structure/attributes/polygon.py rename to hub/city_model_structure/attributes/polygon.py index b16a9f8a..94d47725 100644 --- a/city_model_structure/attributes/polygon.py +++ b/hub/city_model_structure/attributes/polygon.py @@ -13,9 +13,9 @@ import numpy as np from trimesh import Trimesh import trimesh.intersections -from city_model_structure.attributes.plane import Plane -from city_model_structure.attributes.point import Point -import helpers.constants as cte +from hub.city_model_structure.attributes.plane import Plane +from hub.city_model_structure.attributes.point import Point +import hub.helpers.constants as cte class Polygon: diff --git a/city_model_structure/attributes/polyhedron.py b/hub/city_model_structure/attributes/polyhedron.py similarity index 99% rename from city_model_structure/attributes/polyhedron.py rename to hub/city_model_structure/attributes/polyhedron.py index baa09fda..f27a8ff1 100644 --- a/city_model_structure/attributes/polyhedron.py +++ b/hub/city_model_structure/attributes/polyhedron.py @@ -11,7 +11,7 @@ import sys import math import numpy as np from trimesh import Trimesh -from helpers.configuration_helper import ConfigurationHelper +from hub.helpers.configuration_helper import ConfigurationHelper class Polyhedron: diff --git a/city_model_structure/attributes/record.py b/hub/city_model_structure/attributes/record.py similarity index 100% rename from city_model_structure/attributes/record.py rename to hub/city_model_structure/attributes/record.py diff --git a/city_model_structure/attributes/schedule.py b/hub/city_model_structure/attributes/schedule.py similarity index 100% rename from city_model_structure/attributes/schedule.py rename to hub/city_model_structure/attributes/schedule.py diff --git a/city_model_structure/attributes/time_series.py b/hub/city_model_structure/attributes/time_series.py similarity index 91% rename from city_model_structure/attributes/time_series.py rename to hub/city_model_structure/attributes/time_series.py index 81627305..265417bb 100644 --- a/city_model_structure/attributes/time_series.py +++ b/hub/city_model_structure/attributes/time_series.py @@ -6,7 +6,7 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List -from city_model_structure.attributes.record import Record +from hub.city_model_structure.attributes.record import Record class TimeSeries: diff --git a/city_model_structure/building.py b/hub/city_model_structure/building.py similarity index 96% rename from city_model_structure/building.py rename to hub/city_model_structure/building.py index 97f643d1..e9c6f29b 100644 --- a/city_model_structure/building.py +++ b/hub/city_model_structure/building.py @@ -8,12 +8,12 @@ Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concord from typing import List, Union import numpy as np -import helpers.constants as cte -from city_model_structure.building_demand.surface import Surface -from city_model_structure.city_object import CityObject -from city_model_structure.building_demand.household import Household -from city_model_structure.building_demand.internal_zone import InternalZone -from city_model_structure.attributes.polyhedron import Polyhedron +import hub.helpers.constants as cte +from hub.city_model_structure.building_demand.surface import Surface +from hub.city_model_structure.city_object import CityObject +from hub.city_model_structure.building_demand.household import Household +from hub.city_model_structure.building_demand.internal_zone import InternalZone +from hub.city_model_structure.attributes.polyhedron import Polyhedron class Building(CityObject): diff --git a/city_model_structure/building_demand/appliances.py b/hub/city_model_structure/building_demand/appliances.py similarity index 97% rename from city_model_structure/building_demand/appliances.py rename to hub/city_model_structure/building_demand/appliances.py index 9e0464b3..86ea8b81 100644 --- a/city_model_structure/building_demand/appliances.py +++ b/hub/city_model_structure/building_demand/appliances.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union, List -from city_model_structure.attributes.schedule import Schedule +from hub.city_model_structure.attributes.schedule import Schedule class Appliances: diff --git a/city_model_structure/building_demand/household.py b/hub/city_model_structure/building_demand/household.py similarity index 100% rename from city_model_structure/building_demand/household.py rename to hub/city_model_structure/building_demand/household.py diff --git a/city_model_structure/building_demand/internal_gain.py b/hub/city_model_structure/building_demand/internal_gain.py similarity index 97% rename from city_model_structure/building_demand/internal_gain.py rename to hub/city_model_structure/building_demand/internal_gain.py index d4e9825e..229b7752 100644 --- a/city_model_structure/building_demand/internal_gain.py +++ b/hub/city_model_structure/building_demand/internal_gain.py @@ -6,7 +6,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from typing import Union, List -from city_model_structure.attributes.schedule import Schedule +from hub.city_model_structure.attributes.schedule import Schedule class InternalGain: diff --git a/city_model_structure/building_demand/internal_zone.py b/hub/city_model_structure/building_demand/internal_zone.py similarity index 89% rename from city_model_structure/building_demand/internal_zone.py rename to hub/city_model_structure/building_demand/internal_zone.py index 8c1d3376..7cad3a15 100644 --- a/city_model_structure/building_demand/internal_zone.py +++ b/hub/city_model_structure/building_demand/internal_zone.py @@ -7,10 +7,10 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca import uuid from typing import Union, List -from city_model_structure.building_demand.usage_zone import UsageZone -from city_model_structure.building_demand.thermal_zone import ThermalZone -from city_model_structure.attributes.polyhedron import Polyhedron -from city_model_structure.energy_systems.hvac_system import HvacSystem +from hub.city_model_structure.building_demand.usage_zone import UsageZone +from hub.city_model_structure.building_demand.thermal_zone import ThermalZone +from hub.city_model_structure.attributes.polyhedron import Polyhedron +from hub.city_model_structure.energy_systems.hvac_system import HvacSystem class InternalZone: diff --git a/city_model_structure/building_demand/layer.py b/hub/city_model_structure/building_demand/layer.py similarity index 94% rename from city_model_structure/building_demand/layer.py rename to hub/city_model_structure/building_demand/layer.py index b7b25983..09853c62 100644 --- a/city_model_structure/building_demand/layer.py +++ b/hub/city_model_structure/building_demand/layer.py @@ -6,7 +6,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import uuid from typing import Union -from city_model_structure.building_demand.material import Material +from hub.city_model_structure.building_demand.material import Material class Layer: diff --git a/city_model_structure/building_demand/lighting.py b/hub/city_model_structure/building_demand/lighting.py similarity index 97% rename from city_model_structure/building_demand/lighting.py rename to hub/city_model_structure/building_demand/lighting.py index d2ba27e6..db52bb6b 100644 --- a/city_model_structure/building_demand/lighting.py +++ b/hub/city_model_structure/building_demand/lighting.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union, List -from city_model_structure.attributes.schedule import Schedule +from hub.city_model_structure.attributes.schedule import Schedule class Lighting: diff --git a/city_model_structure/building_demand/material.py b/hub/city_model_structure/building_demand/material.py similarity index 100% rename from city_model_structure/building_demand/material.py rename to hub/city_model_structure/building_demand/material.py diff --git a/city_model_structure/building_demand/occupancy.py b/hub/city_model_structure/building_demand/occupancy.py similarity index 95% rename from city_model_structure/building_demand/occupancy.py rename to hub/city_model_structure/building_demand/occupancy.py index 27376a03..99e4ab23 100644 --- a/city_model_structure/building_demand/occupancy.py +++ b/hub/city_model_structure/building_demand/occupancy.py @@ -5,8 +5,8 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union, List -from city_model_structure.attributes.schedule import Schedule -from city_model_structure.building_demand.occupant import Occupant +from hub.city_model_structure.attributes.schedule import Schedule +from hub.city_model_structure.building_demand.occupant import Occupant class Occupancy: diff --git a/city_model_structure/building_demand/occupant.py b/hub/city_model_structure/building_demand/occupant.py similarity index 100% rename from city_model_structure/building_demand/occupant.py rename to hub/city_model_structure/building_demand/occupant.py diff --git a/city_model_structure/building_demand/storey.py b/hub/city_model_structure/building_demand/storey.py similarity index 92% rename from city_model_structure/building_demand/storey.py rename to hub/city_model_structure/building_demand/storey.py index 4a491758..acdadd76 100644 --- a/city_model_structure/building_demand/storey.py +++ b/hub/city_model_structure/building_demand/storey.py @@ -7,9 +7,9 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca from __future__ import annotations from typing import List -from city_model_structure.building_demand.surface import Surface -from city_model_structure.building_demand.thermal_boundary import ThermalBoundary -from city_model_structure.building_demand.thermal_zone import ThermalZone +from hub.city_model_structure.building_demand.surface import Surface +from hub.city_model_structure.building_demand.thermal_boundary import ThermalBoundary +from hub.city_model_structure.building_demand.thermal_zone import ThermalZone class Storey: diff --git a/city_model_structure/building_demand/surface.py b/hub/city_model_structure/building_demand/surface.py similarity index 96% rename from city_model_structure/building_demand/surface.py rename to hub/city_model_structure/building_demand/surface.py index 6fbb53cc..1c4e4cac 100644 --- a/city_model_structure/building_demand/surface.py +++ b/hub/city_model_structure/building_demand/surface.py @@ -10,12 +10,12 @@ from __future__ import annotations import uuid import numpy as np from typing import List, Union -from city_model_structure.attributes.polygon import Polygon -from city_model_structure.attributes.plane import Plane -from city_model_structure.attributes.point import Point -from city_model_structure.greenery.vegetation import Vegetation -from city_model_structure.building_demand.thermal_boundary import ThermalBoundary -import helpers.constants as cte +from hub.city_model_structure.attributes.polygon import Polygon +from hub.city_model_structure.attributes.plane import Plane +from hub.city_model_structure.attributes.point import Point +from hub.city_model_structure.greenery.vegetation import Vegetation +from hub.city_model_structure.building_demand.thermal_boundary import ThermalBoundary +import hub.helpers.constants as cte class Surface: diff --git a/city_model_structure/building_demand/thermal_boundary.py b/hub/city_model_structure/building_demand/thermal_boundary.py similarity index 95% rename from city_model_structure/building_demand/thermal_boundary.py rename to hub/city_model_structure/building_demand/thermal_boundary.py index 2e4b4b72..eb11a158 100644 --- a/city_model_structure/building_demand/thermal_boundary.py +++ b/hub/city_model_structure/building_demand/thermal_boundary.py @@ -8,11 +8,11 @@ Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concord import uuid from typing import List, Union, TypeVar -from helpers.configuration_helper import ConfigurationHelper as ch -import helpers.constants as cte -from city_model_structure.building_demand.layer import Layer -from city_model_structure.building_demand.thermal_opening import ThermalOpening -from city_model_structure.building_demand.thermal_zone import ThermalZone +from hub.helpers.configuration_helper import ConfigurationHelper as ch +import hub.helpers.constants as cte +from hub.city_model_structure.building_demand.layer import Layer +from hub.city_model_structure.building_demand.thermal_opening import ThermalOpening +from hub.city_model_structure.building_demand.thermal_zone import ThermalZone Surface = TypeVar('Surface') diff --git a/city_model_structure/building_demand/thermal_control.py b/hub/city_model_structure/building_demand/thermal_control.py similarity index 98% rename from city_model_structure/building_demand/thermal_control.py rename to hub/city_model_structure/building_demand/thermal_control.py index 466f5cf1..d939c4eb 100644 --- a/city_model_structure/building_demand/thermal_control.py +++ b/hub/city_model_structure/building_demand/thermal_control.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union, List -from city_model_structure.attributes.schedule import Schedule +from hub.city_model_structure.attributes.schedule import Schedule class ThermalControl: diff --git a/city_model_structure/building_demand/thermal_opening.py b/hub/city_model_structure/building_demand/thermal_opening.py similarity index 98% rename from city_model_structure/building_demand/thermal_opening.py rename to hub/city_model_structure/building_demand/thermal_opening.py index 5310d93b..bac2893b 100644 --- a/city_model_structure/building_demand/thermal_opening.py +++ b/hub/city_model_structure/building_demand/thermal_opening.py @@ -7,7 +7,7 @@ Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concord """ import uuid from typing import TypeVar, Union -from helpers.configuration_helper import ConfigurationHelper as ch +from hub.helpers.configuration_helper import ConfigurationHelper as ch Polygon = TypeVar('Polygon') diff --git a/city_model_structure/building_demand/thermal_zone.py b/hub/city_model_structure/building_demand/thermal_zone.py similarity index 97% rename from city_model_structure/building_demand/thermal_zone.py rename to hub/city_model_structure/building_demand/thermal_zone.py index 1e66402e..d4e2e290 100644 --- a/city_model_structure/building_demand/thermal_zone.py +++ b/hub/city_model_structure/building_demand/thermal_zone.py @@ -10,13 +10,13 @@ import uuid import copy import numpy from typing import List, Union, TypeVar -from city_model_structure.building_demand.occupancy import Occupancy -from city_model_structure.building_demand.appliances import Appliances -from city_model_structure.building_demand.lighting import Lighting -from city_model_structure.building_demand.internal_gain import InternalGain -from city_model_structure.building_demand.thermal_control import ThermalControl -from city_model_structure.attributes.schedule import Schedule -import helpers.constants as cte +from hub.city_model_structure.building_demand.occupancy import Occupancy +from hub.city_model_structure.building_demand.appliances import Appliances +from hub.city_model_structure.building_demand.lighting import Lighting +from hub.city_model_structure.building_demand.internal_gain import InternalGain +from hub.city_model_structure.building_demand.thermal_control import ThermalControl +from hub.city_model_structure.attributes.schedule import Schedule +import hub.helpers.constants as cte ThermalBoundary = TypeVar('ThermalBoundary') InternalZone = TypeVar('InternalZone') diff --git a/city_model_structure/building_demand/usage_zone.py b/hub/city_model_structure/building_demand/usage_zone.py similarity index 94% rename from city_model_structure/building_demand/usage_zone.py rename to hub/city_model_structure/building_demand/usage_zone.py index 225f9cb2..274d9213 100644 --- a/city_model_structure/building_demand/usage_zone.py +++ b/hub/city_model_structure/building_demand/usage_zone.py @@ -7,12 +7,12 @@ Code contributors: Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import uuid from typing import Union, List -import helpers.constants as cte -from city_model_structure.building_demand.occupancy import Occupancy -from city_model_structure.building_demand.lighting import Lighting -from city_model_structure.building_demand.appliances import Appliances -from city_model_structure.building_demand.thermal_control import ThermalControl -from city_model_structure.building_demand.internal_gain import InternalGain +import hub.helpers.constants as cte +from hub.city_model_structure.building_demand.occupancy import Occupancy +from hub.city_model_structure.building_demand.lighting import Lighting +from hub.city_model_structure.building_demand.appliances import Appliances +from hub.city_model_structure.building_demand.thermal_control import ThermalControl +from hub.city_model_structure.building_demand.internal_gain import InternalGain class UsageZone: diff --git a/city_model_structure/buildings_cluster.py b/hub/city_model_structure/buildings_cluster.py similarity index 91% rename from city_model_structure/buildings_cluster.py rename to hub/city_model_structure/buildings_cluster.py index c30b485c..64f8bd1d 100644 --- a/city_model_structure/buildings_cluster.py +++ b/hub/city_model_structure/buildings_cluster.py @@ -7,7 +7,7 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca from typing import List, TypeVar -from city_model_structure.city_objects_cluster import CityObjectsCluster +from hub.city_model_structure.city_objects_cluster import CityObjectsCluster CityObject = TypeVar('CityObject') diff --git a/city_model_structure/bus_system.py b/hub/city_model_structure/bus_system.py similarity index 78% rename from city_model_structure/bus_system.py rename to hub/city_model_structure/bus_system.py index 328834ae..66a1bda2 100644 --- a/city_model_structure/bus_system.py +++ b/hub/city_model_structure/bus_system.py @@ -6,11 +6,11 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List -from city_model_structure.city_object import CityObject -from city_model_structure.attributes.polygon import Polygon -from city_model_structure.transport.bus_network import BusNetwork -from city_model_structure.transport.bus_node import BusNode -from city_model_structure.transport.bus import Bus +from hub.city_model_structure.city_object import CityObject +from hub.city_model_structure.attributes.polygon import Polygon +from hub.city_model_structure.transport.bus_network import BusNetwork +from hub.city_model_structure.transport.bus_node import BusNode +from hub.city_model_structure.transport.bus import Bus class BusSystem(CityObject): diff --git a/city_model_structure/city.py b/hub/city_model_structure/city.py similarity index 93% rename from city_model_structure/city.py rename to hub/city_model_structure/city.py index eb61ff9b..a6aa9c8a 100644 --- a/city_model_structure/city.py +++ b/hub/city_model_structure/city.py @@ -14,20 +14,20 @@ import pyproj from typing import List, Union from pyproj import Transformer from pathlib import Path -from city_model_structure.building import Building -from city_model_structure.city_object import CityObject -from city_model_structure.city_objects_cluster import CityObjectsCluster -from city_model_structure.buildings_cluster import BuildingsCluster -from city_model_structure.fuel import Fuel -from city_model_structure.iot.station import Station -from city_model_structure.level_of_detail import LevelOfDetail -from city_model_structure.machine import Machine -from city_model_structure.parts_consisting_building import PartsConsistingBuilding -from city_model_structure.subway_entrance import SubwayEntrance -from helpers.geometry_helper import GeometryHelper -from helpers.location import Location -from city_model_structure.energy_system import EnergySystem -from city_model_structure.lca_material import LcaMaterial +from hub.city_model_structure.building import Building +from hub.city_model_structure.city_object import CityObject +from hub.city_model_structure.city_objects_cluster import CityObjectsCluster +from hub.city_model_structure.buildings_cluster import BuildingsCluster +from hub.city_model_structure.fuel import Fuel +from hub.city_model_structure.iot.station import Station +from hub.city_model_structure.level_of_detail import LevelOfDetail +from hub.city_model_structure.machine import Machine +from hub.city_model_structure.parts_consisting_building import PartsConsistingBuilding +from hub.city_model_structure.subway_entrance import SubwayEntrance +from hub.helpers.geometry_helper import GeometryHelper +from hub.helpers.location import Location +from hub.city_model_structure.energy_system import EnergySystem +from hub.city_model_structure.lca_material import LcaMaterial class City: diff --git a/city_model_structure/city_object.py b/hub/city_model_structure/city_object.py similarity index 95% rename from city_model_structure/city_object.py rename to hub/city_model_structure/city_object.py index 09320603..a6c2cad2 100644 --- a/city_model_structure/city_object.py +++ b/hub/city_model_structure/city_object.py @@ -5,13 +5,12 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -import math from typing import List, Union -from city_model_structure.iot.sensor import Sensor -from city_model_structure.building_demand.surface import Surface -from city_model_structure.attributes.polyhedron import Polyhedron -from helpers.configuration_helper import ConfigurationHelper +from hub.city_model_structure.iot.sensor import Sensor +from hub.city_model_structure.building_demand.surface import Surface +from hub.city_model_structure.attributes.polyhedron import Polyhedron +from hub.helpers.configuration_helper import ConfigurationHelper class CityObject: diff --git a/city_model_structure/city_objects_cluster.py b/hub/city_model_structure/city_objects_cluster.py similarity index 92% rename from city_model_structure/city_objects_cluster.py rename to hub/city_model_structure/city_objects_cluster.py index 8357a28e..57a13f55 100644 --- a/city_model_structure/city_objects_cluster.py +++ b/hub/city_model_structure/city_objects_cluster.py @@ -7,8 +7,8 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca from abc import ABC from typing import List -from city_model_structure.iot.sensor import Sensor -from city_model_structure.city_object import CityObject +from hub.city_model_structure.iot.sensor import Sensor +from hub.city_model_structure.city_object import CityObject class CityObjectsCluster(ABC, CityObject): diff --git a/city_model_structure/energy_system.py b/hub/city_model_structure/energy_system.py similarity index 86% rename from city_model_structure/energy_system.py rename to hub/city_model_structure/energy_system.py index deecb2fc..d7cf1a25 100644 --- a/city_model_structure/energy_system.py +++ b/hub/city_model_structure/energy_system.py @@ -6,9 +6,9 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca Code contributors: Peter Yefi peteryefi@gmail.com """ -from city_model_structure.city_object import CityObject -from city_model_structure.energy_systems.air_source_hp import AirSourceHP -from city_model_structure.energy_systems.water_to_water_hp import WaterToWaterHP +from hub.city_model_structure.city_object import CityObject +from hub.city_model_structure.energy_systems.air_source_hp import AirSourceHP +from hub.city_model_structure.energy_systems.water_to_water_hp import WaterToWaterHP class EnergySystem(CityObject): diff --git a/city_model_structure/energy_systems/air_source_hp.py b/hub/city_model_structure/energy_systems/air_source_hp.py similarity index 97% rename from city_model_structure/energy_systems/air_source_hp.py rename to hub/city_model_structure/energy_systems/air_source_hp.py index b5c2e233..8f730124 100644 --- a/city_model_structure/energy_systems/air_source_hp.py +++ b/hub/city_model_structure/energy_systems/air_source_hp.py @@ -7,7 +7,7 @@ Code contributors: Peter Yefi peteryefi@gmail.com """ from typing import List -from city_model_structure.energy_systems.heat_pump import HeatPump +from hub.city_model_structure.energy_systems.heat_pump import HeatPump class AirSourceHP(HeatPump): diff --git a/city_model_structure/energy_systems/heat_pump.py b/hub/city_model_structure/energy_systems/heat_pump.py similarity index 100% rename from city_model_structure/energy_systems/heat_pump.py rename to hub/city_model_structure/energy_systems/heat_pump.py diff --git a/city_model_structure/energy_systems/hvac_system.py b/hub/city_model_structure/energy_systems/hvac_system.py similarity index 93% rename from city_model_structure/energy_systems/hvac_system.py rename to hub/city_model_structure/energy_systems/hvac_system.py index d526b445..2f0b5ac3 100644 --- a/city_model_structure/energy_systems/hvac_system.py +++ b/hub/city_model_structure/energy_systems/hvac_system.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union, List -from city_model_structure.building_demand.thermal_zone import ThermalZone +from hub.city_model_structure.building_demand.thermal_zone import ThermalZone class HvacSystem: diff --git a/city_model_structure/energy_systems/hvac_terminal_unit.py b/hub/city_model_structure/energy_systems/hvac_terminal_unit.py similarity index 100% rename from city_model_structure/energy_systems/hvac_terminal_unit.py rename to hub/city_model_structure/energy_systems/hvac_terminal_unit.py diff --git a/city_model_structure/energy_systems/water_to_water_hp.py b/hub/city_model_structure/energy_systems/water_to_water_hp.py similarity index 97% rename from city_model_structure/energy_systems/water_to_water_hp.py rename to hub/city_model_structure/energy_systems/water_to_water_hp.py index 12c80343..e0de7bad 100644 --- a/city_model_structure/energy_systems/water_to_water_hp.py +++ b/hub/city_model_structure/energy_systems/water_to_water_hp.py @@ -6,7 +6,7 @@ Project Coder Peter Yefi peteryefi@gmail.com """ from typing import List -from city_model_structure.energy_systems.heat_pump import HeatPump +from hub.city_model_structure.energy_systems.heat_pump import HeatPump class WaterToWaterHP(HeatPump): diff --git a/city_model_structure/fuel.py b/hub/city_model_structure/fuel.py similarity index 100% rename from city_model_structure/fuel.py rename to hub/city_model_structure/fuel.py diff --git a/city_model_structure/greenery/plant.py b/hub/city_model_structure/greenery/plant.py similarity index 97% rename from city_model_structure/greenery/plant.py rename to hub/city_model_structure/greenery/plant.py index 8962d8ee..1d37f4d4 100644 --- a/city_model_structure/greenery/plant.py +++ b/hub/city_model_structure/greenery/plant.py @@ -6,7 +6,7 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List -from city_model_structure.greenery.soil import Soil +from hub.city_model_structure.greenery.soil import Soil class Plant: diff --git a/city_model_structure/greenery/soil.py b/hub/city_model_structure/greenery/soil.py similarity index 100% rename from city_model_structure/greenery/soil.py rename to hub/city_model_structure/greenery/soil.py diff --git a/city_model_structure/greenery/vegetation.py b/hub/city_model_structure/greenery/vegetation.py similarity index 92% rename from city_model_structure/greenery/vegetation.py rename to hub/city_model_structure/greenery/vegetation.py index 3889b885..9f044540 100644 --- a/city_model_structure/greenery/vegetation.py +++ b/hub/city_model_structure/greenery/vegetation.py @@ -6,8 +6,8 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List -from city_model_structure.greenery.soil import Soil -from city_model_structure.greenery.plant import Plant +from hub.city_model_structure.greenery.soil import Soil +from hub.city_model_structure.greenery.plant import Plant class Vegetation: diff --git a/city_model_structure/iot/sensor.py b/hub/city_model_structure/iot/sensor.py similarity index 88% rename from city_model_structure/iot/sensor.py rename to hub/city_model_structure/iot/sensor.py index 48e0eb12..16eb6590 100644 --- a/city_model_structure/iot/sensor.py +++ b/hub/city_model_structure/iot/sensor.py @@ -5,9 +5,9 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from helpers.location import Location -from city_model_structure.iot.sensor_measure import SensorMeasure -from city_model_structure.iot.sensor_type import SensorType +from hub.helpers.location import Location +from hub.city_model_structure.iot.sensor_measure import SensorMeasure +from hub.city_model_structure.iot.sensor_type import SensorType class Sensor: diff --git a/city_model_structure/iot/sensor_measure.py b/hub/city_model_structure/iot/sensor_measure.py similarity index 100% rename from city_model_structure/iot/sensor_measure.py rename to hub/city_model_structure/iot/sensor_measure.py diff --git a/city_model_structure/iot/sensor_type.py b/hub/city_model_structure/iot/sensor_type.py similarity index 100% rename from city_model_structure/iot/sensor_type.py rename to hub/city_model_structure/iot/sensor_type.py diff --git a/city_model_structure/iot/station.py b/hub/city_model_structure/iot/station.py similarity index 93% rename from city_model_structure/iot/station.py rename to hub/city_model_structure/iot/station.py index 19a05775..bd4e912f 100644 --- a/city_model_structure/iot/station.py +++ b/hub/city_model_structure/iot/station.py @@ -6,7 +6,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import uuid -from city_model_structure.iot.sensor import Sensor +from hub.city_model_structure.iot.sensor import Sensor class Station: diff --git a/city_model_structure/lca_calculations.py b/hub/city_model_structure/lca_calculations.py similarity index 91% rename from city_model_structure/lca_calculations.py rename to hub/city_model_structure/lca_calculations.py index c0ea24e1..b6c4b7e4 100644 --- a/city_model_structure/lca_calculations.py +++ b/hub/city_model_structure/lca_calculations.py @@ -4,7 +4,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project Coder Atiya atiya.atiya@mail.concordia.ca """ -from city_model_structure.machine import Machine +from hub.city_model_structure.machine import Machine class LcaCalculations: diff --git a/city_model_structure/lca_material.py b/hub/city_model_structure/lca_material.py similarity index 100% rename from city_model_structure/lca_material.py rename to hub/city_model_structure/lca_material.py diff --git a/city_model_structure/level_of_detail.py b/hub/city_model_structure/level_of_detail.py similarity index 100% rename from city_model_structure/level_of_detail.py rename to hub/city_model_structure/level_of_detail.py diff --git a/city_model_structure/machine.py b/hub/city_model_structure/machine.py similarity index 100% rename from city_model_structure/machine.py rename to hub/city_model_structure/machine.py diff --git a/city_model_structure/network.py b/hub/city_model_structure/network.py similarity index 85% rename from city_model_structure/network.py rename to hub/city_model_structure/network.py index 9c88bb0b..07242aed 100644 --- a/city_model_structure/network.py +++ b/hub/city_model_structure/network.py @@ -8,9 +8,9 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca import uuid from typing import List -from city_model_structure.city_object import CityObject -from city_model_structure.attributes.edge import Edge -from city_model_structure.attributes.node import Node +from hub.city_model_structure.city_object import CityObject +from hub.city_model_structure.attributes.edge import Edge +from hub.city_model_structure.attributes.node import Node class Network(CityObject): diff --git a/city_model_structure/parts_consisting_building.py b/hub/city_model_structure/parts_consisting_building.py similarity index 92% rename from city_model_structure/parts_consisting_building.py rename to hub/city_model_structure/parts_consisting_building.py index 17aedb26..05c8d1aa 100644 --- a/city_model_structure/parts_consisting_building.py +++ b/hub/city_model_structure/parts_consisting_building.py @@ -6,7 +6,7 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, TypeVar -from city_model_structure.city_objects_cluster import CityObjectsCluster +from hub.city_model_structure.city_objects_cluster import CityObjectsCluster CityObject = TypeVar('CityObject') diff --git a/city_model_structure/subway_entrance.py b/hub/city_model_structure/subway_entrance.py similarity index 93% rename from city_model_structure/subway_entrance.py rename to hub/city_model_structure/subway_entrance.py index e4c96158..0f555086 100644 --- a/city_model_structure/subway_entrance.py +++ b/hub/city_model_structure/subway_entrance.py @@ -4,7 +4,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ -from city_model_structure.city_object import CityObject +from hub.city_model_structure.city_object import CityObject class SubwayEntrance(CityObject): diff --git a/city_model_structure/transport/bus.py b/hub/city_model_structure/transport/bus.py similarity index 97% rename from city_model_structure/transport/bus.py rename to hub/city_model_structure/transport/bus.py index ef62b91d..6d8efd18 100644 --- a/city_model_structure/transport/bus.py +++ b/hub/city_model_structure/transport/bus.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ -from city_model_structure.attributes.schedule import Schedule +from hub.city_model_structure.attributes.schedule import Schedule class Bus: diff --git a/city_model_structure/transport/bus_depot.py b/hub/city_model_structure/transport/bus_depot.py similarity index 92% rename from city_model_structure/transport/bus_depot.py rename to hub/city_model_structure/transport/bus_depot.py index 8dde8571..3ec0c3eb 100644 --- a/city_model_structure/transport/bus_depot.py +++ b/hub/city_model_structure/transport/bus_depot.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ -from city_model_structure.transport.bus_node import BusNode +from hub.city_model_structure.transport.bus_node import BusNode class BusDepot(BusNode): diff --git a/city_model_structure/transport/bus_edge.py b/hub/city_model_structure/transport/bus_edge.py similarity index 94% rename from city_model_structure/transport/bus_edge.py rename to hub/city_model_structure/transport/bus_edge.py index cc08be7c..d6100a26 100644 --- a/city_model_structure/transport/bus_edge.py +++ b/hub/city_model_structure/transport/bus_edge.py @@ -6,7 +6,7 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, TypeVar -from city_model_structure.attributes.edge import Edge +from hub.city_model_structure.attributes.edge import Edge BusNode = TypeVar('BusNode') diff --git a/city_model_structure/transport/bus_network.py b/hub/city_model_structure/transport/bus_network.py similarity index 81% rename from city_model_structure/transport/bus_network.py rename to hub/city_model_structure/transport/bus_network.py index fd134dee..23781b0c 100644 --- a/city_model_structure/transport/bus_network.py +++ b/hub/city_model_structure/transport/bus_network.py @@ -6,9 +6,9 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List -from city_model_structure.network import Network -from city_model_structure.transport.bus_edge import BusEdge -from city_model_structure.transport.bus_node import BusNode +from hub.city_model_structure.network import Network +from hub.city_model_structure.transport.bus_edge import BusEdge +from hub.city_model_structure.transport.bus_node import BusNode class BusNetwork(Network): diff --git a/city_model_structure/transport/bus_node.py b/hub/city_model_structure/transport/bus_node.py similarity index 89% rename from city_model_structure/transport/bus_node.py rename to hub/city_model_structure/transport/bus_node.py index 71a99301..5c77db1d 100644 --- a/city_model_structure/transport/bus_node.py +++ b/hub/city_model_structure/transport/bus_node.py @@ -7,8 +7,8 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca from typing import List, TypeVar -from city_model_structure.attributes.node import Node -from city_model_structure.attributes.point import Point +from hub.city_model_structure.attributes.node import Node +from hub.city_model_structure.attributes.point import Point BusEdge = TypeVar('BusEdge') diff --git a/city_model_structure/transport/bus_stop.py b/hub/city_model_structure/transport/bus_stop.py similarity index 84% rename from city_model_structure/transport/bus_stop.py rename to hub/city_model_structure/transport/bus_stop.py index b68b7750..551aab9d 100644 --- a/city_model_structure/transport/bus_stop.py +++ b/hub/city_model_structure/transport/bus_stop.py @@ -6,9 +6,9 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union -from city_model_structure.transport.bus_node import BusNode -from city_model_structure.transport.fast_charging_infrastructure import FastChargingInfrastructure -from city_model_structure.attributes.schedule import Schedule +from hub.city_model_structure.transport.bus_node import BusNode +from hub.city_model_structure.transport.fast_charging_infrastructure import FastChargingInfrastructure +from hub.city_model_structure.attributes.schedule import Schedule class BusStop(BusNode): diff --git a/city_model_structure/transport/connection.py b/hub/city_model_structure/transport/connection.py similarity index 95% rename from city_model_structure/transport/connection.py rename to hub/city_model_structure/transport/connection.py index 4ebbc467..9cb3c132 100644 --- a/city_model_structure/transport/connection.py +++ b/hub/city_model_structure/transport/connection.py @@ -9,8 +9,8 @@ Code contributors: Guille guille.gutierrezmorote@concordia.ca import ast from typing import Union -from city_model_structure.attributes.edge import Edge -from city_model_structure.transport.lane import Lane +from hub.city_model_structure.attributes.edge import Edge +from hub.city_model_structure.transport.lane import Lane class Connection: diff --git a/city_model_structure/transport/crossing.py b/hub/city_model_structure/transport/crossing.py similarity index 95% rename from city_model_structure/transport/crossing.py rename to hub/city_model_structure/transport/crossing.py index d9e83142..04c2f516 100644 --- a/city_model_structure/transport/crossing.py +++ b/hub/city_model_structure/transport/crossing.py @@ -8,7 +8,7 @@ Code contributors: Guille guille.gutierrezmorote@concordia.ca import ast from typing import List, Union -from city_model_structure.transport.traffic_node import TrafficNode +from hub.city_model_structure.transport.traffic_node import TrafficNode class Crossing(TrafficNode): diff --git a/city_model_structure/transport/fast_charging_infrastructure.py b/hub/city_model_structure/transport/fast_charging_infrastructure.py similarity index 100% rename from city_model_structure/transport/fast_charging_infrastructure.py rename to hub/city_model_structure/transport/fast_charging_infrastructure.py diff --git a/city_model_structure/transport/join.py b/hub/city_model_structure/transport/join.py similarity index 91% rename from city_model_structure/transport/join.py rename to hub/city_model_structure/transport/join.py index 3b7ae328..c9a30861 100644 --- a/city_model_structure/transport/join.py +++ b/hub/city_model_structure/transport/join.py @@ -6,7 +6,7 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca Code contributors: Guille guille.gutierrezmorote@concordia.ca """ -from city_model_structure.transport.traffic_node import TrafficNode +from hub.city_model_structure.transport.traffic_node import TrafficNode class Join(TrafficNode): diff --git a/city_model_structure/transport/lane.py b/hub/city_model_structure/transport/lane.py similarity index 100% rename from city_model_structure/transport/lane.py rename to hub/city_model_structure/transport/lane.py diff --git a/city_model_structure/transport/origin_destination_edge.py b/hub/city_model_structure/transport/origin_destination_edge.py similarity index 90% rename from city_model_structure/transport/origin_destination_edge.py rename to hub/city_model_structure/transport/origin_destination_edge.py index 9bada29d..c8b81a2b 100644 --- a/city_model_structure/transport/origin_destination_edge.py +++ b/hub/city_model_structure/transport/origin_destination_edge.py @@ -6,8 +6,8 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, TypeVar -from city_model_structure.attributes.edge import Edge -from city_model_structure.attributes.schedule import Schedule +from hub.city_model_structure.attributes.edge import Edge +from hub.city_model_structure.attributes.schedule import Schedule OriginDestinationNode = TypeVar('OriginDestinationNode') diff --git a/city_model_structure/transport/origin_destination_network.py b/hub/city_model_structure/transport/origin_destination_network.py similarity index 79% rename from city_model_structure/transport/origin_destination_network.py rename to hub/city_model_structure/transport/origin_destination_network.py index 905ef058..a5608d11 100644 --- a/city_model_structure/transport/origin_destination_network.py +++ b/hub/city_model_structure/transport/origin_destination_network.py @@ -6,9 +6,9 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List -from city_model_structure.network import Network -from city_model_structure.transport.origin_destination_edge import OriginDestinationEdge -from city_model_structure.transport.origin_destination_node import OriginDestinationNode +from hub.city_model_structure.network import Network +from hub.city_model_structure.transport.origin_destination_edge import OriginDestinationEdge +from hub.city_model_structure.transport.origin_destination_node import OriginDestinationNode class OriginDestinationNetwork(Network): diff --git a/city_model_structure/transport/origin_destination_node.py b/hub/city_model_structure/transport/origin_destination_node.py similarity index 88% rename from city_model_structure/transport/origin_destination_node.py rename to hub/city_model_structure/transport/origin_destination_node.py index c24886ad..8d9e8aa3 100644 --- a/city_model_structure/transport/origin_destination_node.py +++ b/hub/city_model_structure/transport/origin_destination_node.py @@ -6,10 +6,10 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, TypeVar -from city_model_structure.attributes.node import Node -from city_model_structure.attributes.point import Point -from city_model_structure.attributes.polygon import Polygon -from city_model_structure.city_object import CityObject +from hub.city_model_structure.attributes.node import Node +from hub.city_model_structure.attributes.point import Point +from hub.city_model_structure.attributes.polygon import Polygon +from hub.city_model_structure.city_object import CityObject OriginDestinationEdge = TypeVar('OriginDestinationEdge') diff --git a/city_model_structure/transport/phase.py b/hub/city_model_structure/transport/phase.py similarity index 100% rename from city_model_structure/transport/phase.py rename to hub/city_model_structure/transport/phase.py diff --git a/city_model_structure/transport/traffic_edge.py b/hub/city_model_structure/transport/traffic_edge.py similarity index 94% rename from city_model_structure/transport/traffic_edge.py rename to hub/city_model_structure/transport/traffic_edge.py index a608c812..0978b5ec 100644 --- a/city_model_structure/transport/traffic_edge.py +++ b/hub/city_model_structure/transport/traffic_edge.py @@ -7,9 +7,9 @@ Code contributors: Guille guille.gutierrezmorote@concordia.ca """ from typing import List, Union -from city_model_structure.attributes.edge import Edge -from city_model_structure.transport.traffic_node import TrafficNode -from city_model_structure.transport.lane import Lane +from hub.city_model_structure.attributes.edge import Edge +from hub.city_model_structure.transport.traffic_node import TrafficNode +from hub.city_model_structure.transport.lane import Lane class TrafficEdge(Edge): diff --git a/city_model_structure/transport/traffic_light.py b/hub/city_model_structure/transport/traffic_light.py similarity index 93% rename from city_model_structure/transport/traffic_light.py rename to hub/city_model_structure/transport/traffic_light.py index ffc94c75..12fe8a41 100644 --- a/city_model_structure/transport/traffic_light.py +++ b/hub/city_model_structure/transport/traffic_light.py @@ -8,8 +8,8 @@ Code contributors: Guille guille.gutierrezmorote@concordia.ca import ast from typing import List, Union -from city_model_structure.transport.phase import Phase -from city_model_structure.transport.traffic_node import TrafficNode +from hub.city_model_structure.transport.phase import Phase +from hub.city_model_structure.transport.traffic_node import TrafficNode class TrafficLight(TrafficNode): diff --git a/city_model_structure/transport/traffic_network.py b/hub/city_model_structure/transport/traffic_network.py similarity index 81% rename from city_model_structure/transport/traffic_network.py rename to hub/city_model_structure/transport/traffic_network.py index 1db151b7..cf07da72 100644 --- a/city_model_structure/transport/traffic_network.py +++ b/hub/city_model_structure/transport/traffic_network.py @@ -7,9 +7,9 @@ Code contributors: Guille guille.gutierrezmorote@concordia.ca """ from typing import List -from city_model_structure.network import Network -from city_model_structure.transport.traffic_edge import TrafficEdge -from city_model_structure.transport.traffic_node import TrafficNode +from hub.city_model_structure.network import Network +from hub.city_model_structure.transport.traffic_edge import TrafficEdge +from hub.city_model_structure.transport.traffic_node import TrafficNode class TrafficNetwork(Network): diff --git a/city_model_structure/transport/traffic_node.py b/hub/city_model_structure/transport/traffic_node.py similarity index 91% rename from city_model_structure/transport/traffic_node.py rename to hub/city_model_structure/transport/traffic_node.py index 02ebb1be..1f53d7fc 100644 --- a/city_model_structure/transport/traffic_node.py +++ b/hub/city_model_structure/transport/traffic_node.py @@ -8,9 +8,9 @@ Code contributors: Guille guille.gutierrezmorote@concordia.ca from typing import List, TypeVar -from city_model_structure.attributes.edge import Edge -from city_model_structure.attributes.node import Node -from city_model_structure.attributes.point import Point +from hub.city_model_structure.attributes.edge import Edge +from hub.city_model_structure.attributes.node import Node +from hub.city_model_structure.attributes.point import Point Connection = TypeVar('Connection') TrafficEdge = TypeVar('TrafficEdge') diff --git a/city_model_structure/transport/walkway_node.py b/hub/city_model_structure/transport/walkway_node.py similarity index 92% rename from city_model_structure/transport/walkway_node.py rename to hub/city_model_structure/transport/walkway_node.py index 54d2dec5..198f673b 100644 --- a/city_model_structure/transport/walkway_node.py +++ b/hub/city_model_structure/transport/walkway_node.py @@ -7,7 +7,7 @@ Code contributors: Guille guille.gutierrezmorote@concordia.ca """ from typing import List, Union -from city_model_structure.transport.traffic_node import TrafficNode +from hub.city_model_structure.transport.traffic_node import TrafficNode class WalkwayNode(TrafficNode): diff --git a/city_model_structure/vehicle.py b/hub/city_model_structure/vehicle.py similarity index 100% rename from city_model_structure/vehicle.py rename to hub/city_model_structure/vehicle.py diff --git a/config/configuration.ini b/hub/config/configuration.ini similarity index 100% rename from config/configuration.ini rename to hub/config/configuration.ini diff --git a/data/construction/us_archetypes.xml b/hub/data/construction/us_archetypes.xml similarity index 100% rename from data/construction/us_archetypes.xml rename to hub/data/construction/us_archetypes.xml diff --git a/data/construction/us_constructions.xml b/hub/data/construction/us_constructions.xml similarity index 100% rename from data/construction/us_constructions.xml rename to hub/data/construction/us_constructions.xml diff --git a/data/customized_imports/ashrae_archetypes.xml b/hub/data/customized_imports/ashrae_archetypes.xml similarity index 100% rename from data/customized_imports/ashrae_archetypes.xml rename to hub/data/customized_imports/ashrae_archetypes.xml diff --git a/data/energy_systems/heat_pumps/air_source.xlsx b/hub/data/energy_systems/heat_pumps/air_source.xlsx similarity index 100% rename from data/energy_systems/heat_pumps/air_source.xlsx rename to hub/data/energy_systems/heat_pumps/air_source.xlsx diff --git a/data/energy_systems/heat_pumps/as_parallel.txt b/hub/data/energy_systems/heat_pumps/as_parallel.txt similarity index 100% rename from data/energy_systems/heat_pumps/as_parallel.txt rename to hub/data/energy_systems/heat_pumps/as_parallel.txt diff --git a/data/energy_systems/heat_pumps/as_series.txt b/hub/data/energy_systems/heat_pumps/as_series.txt similarity index 100% rename from data/energy_systems/heat_pumps/as_series.txt rename to hub/data/energy_systems/heat_pumps/as_series.txt diff --git a/data/energy_systems/heat_pumps/constants.yaml b/hub/data/energy_systems/heat_pumps/constants.yaml similarity index 100% rename from data/energy_systems/heat_pumps/constants.yaml rename to hub/data/energy_systems/heat_pumps/constants.yaml diff --git a/data/energy_systems/heat_pumps/demand.txt b/hub/data/energy_systems/heat_pumps/demand.txt similarity index 100% rename from data/energy_systems/heat_pumps/demand.txt rename to hub/data/energy_systems/heat_pumps/demand.txt diff --git a/data/energy_systems/heat_pumps/w2w_parallel.txt b/hub/data/energy_systems/heat_pumps/w2w_parallel.txt similarity index 100% rename from data/energy_systems/heat_pumps/w2w_parallel.txt rename to hub/data/energy_systems/heat_pumps/w2w_parallel.txt diff --git a/data/energy_systems/heat_pumps/w2w_series.txt b/hub/data/energy_systems/heat_pumps/w2w_series.txt similarity index 100% rename from data/energy_systems/heat_pumps/w2w_series.txt rename to hub/data/energy_systems/heat_pumps/w2w_series.txt diff --git a/data/energy_systems/heat_pumps/water_to_water.xlsx b/hub/data/energy_systems/heat_pumps/water_to_water.xlsx similarity index 100% rename from data/energy_systems/heat_pumps/water_to_water.xlsx rename to hub/data/energy_systems/heat_pumps/water_to_water.xlsx diff --git a/data/energy_systems/heat_pumps/wt_hourly3.txt b/hub/data/energy_systems/heat_pumps/wt_hourly3.txt similarity index 100% rename from data/energy_systems/heat_pumps/wt_hourly3.txt rename to hub/data/energy_systems/heat_pumps/wt_hourly3.txt diff --git a/data/greenery/ecore_greenery_catalog.xml b/hub/data/greenery/ecore_greenery_catalog.xml similarity index 100% rename from data/greenery/ecore_greenery_catalog.xml rename to hub/data/greenery/ecore_greenery_catalog.xml diff --git a/data/life_cycle_assessment/lca_data.xml b/hub/data/life_cycle_assessment/lca_data.xml similarity index 100% rename from data/life_cycle_assessment/lca_data.xml rename to hub/data/life_cycle_assessment/lca_data.xml diff --git a/data/schedules/Data-driven_schedules_model_test.xlsx b/hub/data/schedules/Data-driven_schedules_model_test.xlsx similarity index 100% rename from data/schedules/Data-driven_schedules_model_test.xlsx rename to hub/data/schedules/Data-driven_schedules_model_test.xlsx diff --git a/data/schedules/doe_idf.xml b/hub/data/schedules/doe_idf.xml similarity index 100% rename from data/schedules/doe_idf.xml rename to hub/data/schedules/doe_idf.xml diff --git a/data/schedules/idf_files/ASHRAE901_ApartmentHighRise_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_ApartmentHighRise_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_ApartmentHighRise_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_ApartmentHighRise_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_ApartmentMidRise_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_ApartmentMidRise_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_ApartmentMidRise_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_ApartmentMidRise_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_Hospital_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_Hospital_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_Hospital_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_Hospital_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_HotelLarge_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_HotelLarge_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_HotelLarge_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_HotelLarge_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_HotelSmall_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_HotelSmall_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_HotelSmall_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_HotelSmall_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_OfficeLarge_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_OfficeLarge_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_OfficeLarge_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_OfficeLarge_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_OfficeMedium_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_OfficeMedium_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_OfficeMedium_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_OfficeMedium_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_OfficeSmall_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_OfficeSmall_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_OfficeSmall_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_OfficeSmall_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_OutPatientHealthCare_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_OutPatientHealthCare_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_OutPatientHealthCare_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_OutPatientHealthCare_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_RestaurantFastFood_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_RestaurantFastFood_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_RestaurantFastFood_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_RestaurantFastFood_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_RestaurantSitDown_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_RestaurantSitDown_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_RestaurantSitDown_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_RestaurantSitDown_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_RetailStandalone_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_RetailStandalone_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_RetailStandalone_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_RetailStandalone_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_RetailStripmall_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_RetailStripmall_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_RetailStripmall_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_RetailStripmall_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_SchoolPrimary_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_SchoolPrimary_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_SchoolPrimary_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_SchoolPrimary_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_SchoolSecondary_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_SchoolSecondary_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_SchoolSecondary_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_SchoolSecondary_STD2019_Rochester.idf diff --git a/data/schedules/idf_files/ASHRAE901_Warehouse_STD2019_Rochester.idf b/hub/data/schedules/idf_files/ASHRAE901_Warehouse_STD2019_Rochester.idf similarity index 100% rename from data/schedules/idf_files/ASHRAE901_Warehouse_STD2019_Rochester.idf rename to hub/data/schedules/idf_files/ASHRAE901_Warehouse_STD2019_Rochester.idf diff --git a/data/sensors/concordia_energy_db.json b/hub/data/sensors/concordia_energy_db.json similarity index 100% rename from data/sensors/concordia_energy_db.json rename to hub/data/sensors/concordia_energy_db.json diff --git a/data/sensors/concordia_gas_flow_db.json b/hub/data/sensors/concordia_gas_flow_db.json similarity index 100% rename from data/sensors/concordia_gas_flow_db.json rename to hub/data/sensors/concordia_gas_flow_db.json diff --git a/data/sensors/concordia_temperature_db.json b/hub/data/sensors/concordia_temperature_db.json similarity index 100% rename from data/sensors/concordia_temperature_db.json rename to hub/data/sensors/concordia_temperature_db.json diff --git a/data/usage/ca_archetypes_reduced.xml b/hub/data/usage/ca_archetypes_reduced.xml similarity index 100% rename from data/usage/ca_archetypes_reduced.xml rename to hub/data/usage/ca_archetypes_reduced.xml diff --git a/data/usage/comnet_archetypes.xlsx b/hub/data/usage/comnet_archetypes.xlsx similarity index 100% rename from data/usage/comnet_archetypes.xlsx rename to hub/data/usage/comnet_archetypes.xlsx diff --git a/data/usage/comnet_schedules_archetypes.xlsx b/hub/data/usage/comnet_schedules_archetypes.xlsx similarity index 100% rename from data/usage/comnet_schedules_archetypes.xlsx rename to hub/data/usage/comnet_schedules_archetypes.xlsx diff --git a/data/usage/de_library.xml b/hub/data/usage/de_library.xml similarity index 100% rename from data/usage/de_library.xml rename to hub/data/usage/de_library.xml diff --git a/data/usage/nrcan.xml b/hub/data/usage/nrcan.xml similarity index 100% rename from data/usage/nrcan.xml rename to hub/data/usage/nrcan.xml diff --git a/data/weather/epw/CAN_BC_Summerland.717680_CWEC.epw b/hub/data/weather/epw/CAN_BC_Summerland.717680_CWEC.epw similarity index 100% rename from data/weather/epw/CAN_BC_Summerland.717680_CWEC.epw rename to hub/data/weather/epw/CAN_BC_Summerland.717680_CWEC.epw diff --git a/data/weather/epw/CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw b/hub/data/weather/epw/CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw similarity index 100% rename from data/weather/epw/CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw rename to hub/data/weather/epw/CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw diff --git a/data/weather/inseldb_new_york_city.dat b/hub/data/weather/inseldb_new_york_city.dat similarity index 100% rename from data/weather/inseldb_new_york_city.dat rename to hub/data/weather/inseldb_new_york_city.dat diff --git a/docs/img_contributing/img_0.png b/hub/docs/img_contributing/img_0.png similarity index 100% rename from docs/img_contributing/img_0.png rename to hub/docs/img_contributing/img_0.png diff --git a/docs/img_contributing/img_1.png b/hub/docs/img_contributing/img_1.png similarity index 100% rename from docs/img_contributing/img_1.png rename to hub/docs/img_contributing/img_1.png diff --git a/docs/img_contributing/img_10.png b/hub/docs/img_contributing/img_10.png similarity index 100% rename from docs/img_contributing/img_10.png rename to hub/docs/img_contributing/img_10.png diff --git a/docs/img_contributing/img_11.png b/hub/docs/img_contributing/img_11.png similarity index 100% rename from docs/img_contributing/img_11.png rename to hub/docs/img_contributing/img_11.png diff --git a/docs/img_contributing/img_12.png b/hub/docs/img_contributing/img_12.png similarity index 100% rename from docs/img_contributing/img_12.png rename to hub/docs/img_contributing/img_12.png diff --git a/docs/img_contributing/img_13.png b/hub/docs/img_contributing/img_13.png similarity index 100% rename from docs/img_contributing/img_13.png rename to hub/docs/img_contributing/img_13.png diff --git a/docs/img_contributing/img_14.png b/hub/docs/img_contributing/img_14.png similarity index 100% rename from docs/img_contributing/img_14.png rename to hub/docs/img_contributing/img_14.png diff --git a/docs/img_contributing/img_15.png b/hub/docs/img_contributing/img_15.png similarity index 100% rename from docs/img_contributing/img_15.png rename to hub/docs/img_contributing/img_15.png diff --git a/docs/img_contributing/img_16.png b/hub/docs/img_contributing/img_16.png similarity index 100% rename from docs/img_contributing/img_16.png rename to hub/docs/img_contributing/img_16.png diff --git a/docs/img_contributing/img_17.png b/hub/docs/img_contributing/img_17.png similarity index 100% rename from docs/img_contributing/img_17.png rename to hub/docs/img_contributing/img_17.png diff --git a/docs/img_contributing/img_18.png b/hub/docs/img_contributing/img_18.png similarity index 100% rename from docs/img_contributing/img_18.png rename to hub/docs/img_contributing/img_18.png diff --git a/docs/img_contributing/img_19.png b/hub/docs/img_contributing/img_19.png similarity index 100% rename from docs/img_contributing/img_19.png rename to hub/docs/img_contributing/img_19.png diff --git a/docs/img_contributing/img_2.png b/hub/docs/img_contributing/img_2.png similarity index 100% rename from docs/img_contributing/img_2.png rename to hub/docs/img_contributing/img_2.png diff --git a/docs/img_contributing/img_20.png b/hub/docs/img_contributing/img_20.png similarity index 100% rename from docs/img_contributing/img_20.png rename to hub/docs/img_contributing/img_20.png diff --git a/docs/img_contributing/img_21.png b/hub/docs/img_contributing/img_21.png similarity index 100% rename from docs/img_contributing/img_21.png rename to hub/docs/img_contributing/img_21.png diff --git a/docs/img_contributing/img_22.png b/hub/docs/img_contributing/img_22.png similarity index 100% rename from docs/img_contributing/img_22.png rename to hub/docs/img_contributing/img_22.png diff --git a/docs/img_contributing/img_23.png b/hub/docs/img_contributing/img_23.png similarity index 100% rename from docs/img_contributing/img_23.png rename to hub/docs/img_contributing/img_23.png diff --git a/docs/img_contributing/img_24.png b/hub/docs/img_contributing/img_24.png similarity index 100% rename from docs/img_contributing/img_24.png rename to hub/docs/img_contributing/img_24.png diff --git a/docs/img_contributing/img_25.png b/hub/docs/img_contributing/img_25.png similarity index 100% rename from docs/img_contributing/img_25.png rename to hub/docs/img_contributing/img_25.png diff --git a/docs/img_contributing/img_26.png b/hub/docs/img_contributing/img_26.png similarity index 100% rename from docs/img_contributing/img_26.png rename to hub/docs/img_contributing/img_26.png diff --git a/docs/img_contributing/img_3.png b/hub/docs/img_contributing/img_3.png similarity index 100% rename from docs/img_contributing/img_3.png rename to hub/docs/img_contributing/img_3.png diff --git a/docs/img_contributing/img_4.png b/hub/docs/img_contributing/img_4.png similarity index 100% rename from docs/img_contributing/img_4.png rename to hub/docs/img_contributing/img_4.png diff --git a/docs/img_contributing/img_5.png b/hub/docs/img_contributing/img_5.png similarity index 100% rename from docs/img_contributing/img_5.png rename to hub/docs/img_contributing/img_5.png diff --git a/docs/img_contributing/img_6.png b/hub/docs/img_contributing/img_6.png similarity index 100% rename from docs/img_contributing/img_6.png rename to hub/docs/img_contributing/img_6.png diff --git a/docs/img_contributing/img_7.png b/hub/docs/img_contributing/img_7.png similarity index 100% rename from docs/img_contributing/img_7.png rename to hub/docs/img_contributing/img_7.png diff --git a/docs/img_contributing/img_8.png b/hub/docs/img_contributing/img_8.png similarity index 100% rename from docs/img_contributing/img_8.png rename to hub/docs/img_contributing/img_8.png diff --git a/docs/img_contributing/img_9.png b/hub/docs/img_contributing/img_9.png similarity index 100% rename from docs/img_contributing/img_9.png rename to hub/docs/img_contributing/img_9.png diff --git a/docs/img_macos_install/img_0.png b/hub/docs/img_macos_install/img_0.png similarity index 100% rename from docs/img_macos_install/img_0.png rename to hub/docs/img_macos_install/img_0.png diff --git a/docs/img_macos_install/img_1.png b/hub/docs/img_macos_install/img_1.png similarity index 100% rename from docs/img_macos_install/img_1.png rename to hub/docs/img_macos_install/img_1.png diff --git a/docs/img_macos_install/img_10.png b/hub/docs/img_macos_install/img_10.png similarity index 100% rename from docs/img_macos_install/img_10.png rename to hub/docs/img_macos_install/img_10.png diff --git a/docs/img_macos_install/img_11.png b/hub/docs/img_macos_install/img_11.png similarity index 100% rename from docs/img_macos_install/img_11.png rename to hub/docs/img_macos_install/img_11.png diff --git a/docs/img_macos_install/img_12.png b/hub/docs/img_macos_install/img_12.png similarity index 100% rename from docs/img_macos_install/img_12.png rename to hub/docs/img_macos_install/img_12.png diff --git a/docs/img_macos_install/img_13.png b/hub/docs/img_macos_install/img_13.png similarity index 100% rename from docs/img_macos_install/img_13.png rename to hub/docs/img_macos_install/img_13.png diff --git a/docs/img_macos_install/img_14.png b/hub/docs/img_macos_install/img_14.png similarity index 100% rename from docs/img_macos_install/img_14.png rename to hub/docs/img_macos_install/img_14.png diff --git a/docs/img_macos_install/img_15.png b/hub/docs/img_macos_install/img_15.png similarity index 100% rename from docs/img_macos_install/img_15.png rename to hub/docs/img_macos_install/img_15.png diff --git a/docs/img_macos_install/img_16.png b/hub/docs/img_macos_install/img_16.png similarity index 100% rename from docs/img_macos_install/img_16.png rename to hub/docs/img_macos_install/img_16.png diff --git a/docs/img_macos_install/img_17.png b/hub/docs/img_macos_install/img_17.png similarity index 100% rename from docs/img_macos_install/img_17.png rename to hub/docs/img_macos_install/img_17.png diff --git a/docs/img_macos_install/img_18.png b/hub/docs/img_macos_install/img_18.png similarity index 100% rename from docs/img_macos_install/img_18.png rename to hub/docs/img_macos_install/img_18.png diff --git a/docs/img_macos_install/img_19.png b/hub/docs/img_macos_install/img_19.png similarity index 100% rename from docs/img_macos_install/img_19.png rename to hub/docs/img_macos_install/img_19.png diff --git a/docs/img_macos_install/img_2.png b/hub/docs/img_macos_install/img_2.png similarity index 100% rename from docs/img_macos_install/img_2.png rename to hub/docs/img_macos_install/img_2.png diff --git a/docs/img_macos_install/img_3.png b/hub/docs/img_macos_install/img_3.png similarity index 100% rename from docs/img_macos_install/img_3.png rename to hub/docs/img_macos_install/img_3.png diff --git a/docs/img_macos_install/img_4.png b/hub/docs/img_macos_install/img_4.png similarity index 100% rename from docs/img_macos_install/img_4.png rename to hub/docs/img_macos_install/img_4.png diff --git a/docs/img_macos_install/img_5.png b/hub/docs/img_macos_install/img_5.png similarity index 100% rename from docs/img_macos_install/img_5.png rename to hub/docs/img_macos_install/img_5.png diff --git a/docs/img_macos_install/img_6.png b/hub/docs/img_macos_install/img_6.png similarity index 100% rename from docs/img_macos_install/img_6.png rename to hub/docs/img_macos_install/img_6.png diff --git a/docs/img_macos_install/img_7.png b/hub/docs/img_macos_install/img_7.png similarity index 100% rename from docs/img_macos_install/img_7.png rename to hub/docs/img_macos_install/img_7.png diff --git a/docs/img_macos_install/img_8.png b/hub/docs/img_macos_install/img_8.png similarity index 100% rename from docs/img_macos_install/img_8.png rename to hub/docs/img_macos_install/img_8.png diff --git a/docs/img_macos_install/img_9.png b/hub/docs/img_macos_install/img_9.png similarity index 100% rename from docs/img_macos_install/img_9.png rename to hub/docs/img_macos_install/img_9.png diff --git a/docs/img_windows_install/img_0.png b/hub/docs/img_windows_install/img_0.png similarity index 100% rename from docs/img_windows_install/img_0.png rename to hub/docs/img_windows_install/img_0.png diff --git a/docs/img_windows_install/img_1.png b/hub/docs/img_windows_install/img_1.png similarity index 100% rename from docs/img_windows_install/img_1.png rename to hub/docs/img_windows_install/img_1.png diff --git a/docs/img_windows_install/img_10.png b/hub/docs/img_windows_install/img_10.png similarity index 100% rename from docs/img_windows_install/img_10.png rename to hub/docs/img_windows_install/img_10.png diff --git a/docs/img_windows_install/img_11.png b/hub/docs/img_windows_install/img_11.png similarity index 100% rename from docs/img_windows_install/img_11.png rename to hub/docs/img_windows_install/img_11.png diff --git a/docs/img_windows_install/img_12.png b/hub/docs/img_windows_install/img_12.png similarity index 100% rename from docs/img_windows_install/img_12.png rename to hub/docs/img_windows_install/img_12.png diff --git a/docs/img_windows_install/img_13.png b/hub/docs/img_windows_install/img_13.png similarity index 100% rename from docs/img_windows_install/img_13.png rename to hub/docs/img_windows_install/img_13.png diff --git a/docs/img_windows_install/img_14.png b/hub/docs/img_windows_install/img_14.png similarity index 100% rename from docs/img_windows_install/img_14.png rename to hub/docs/img_windows_install/img_14.png diff --git a/docs/img_windows_install/img_15.png b/hub/docs/img_windows_install/img_15.png similarity index 100% rename from docs/img_windows_install/img_15.png rename to hub/docs/img_windows_install/img_15.png diff --git a/docs/img_windows_install/img_16.png b/hub/docs/img_windows_install/img_16.png similarity index 100% rename from docs/img_windows_install/img_16.png rename to hub/docs/img_windows_install/img_16.png diff --git a/docs/img_windows_install/img_17.png b/hub/docs/img_windows_install/img_17.png similarity index 100% rename from docs/img_windows_install/img_17.png rename to hub/docs/img_windows_install/img_17.png diff --git a/docs/img_windows_install/img_2.png b/hub/docs/img_windows_install/img_2.png similarity index 100% rename from docs/img_windows_install/img_2.png rename to hub/docs/img_windows_install/img_2.png diff --git a/docs/img_windows_install/img_20.png b/hub/docs/img_windows_install/img_20.png similarity index 100% rename from docs/img_windows_install/img_20.png rename to hub/docs/img_windows_install/img_20.png diff --git a/docs/img_windows_install/img_21.png b/hub/docs/img_windows_install/img_21.png similarity index 100% rename from docs/img_windows_install/img_21.png rename to hub/docs/img_windows_install/img_21.png diff --git a/docs/img_windows_install/img_22.png b/hub/docs/img_windows_install/img_22.png similarity index 100% rename from docs/img_windows_install/img_22.png rename to hub/docs/img_windows_install/img_22.png diff --git a/docs/img_windows_install/img_23.png b/hub/docs/img_windows_install/img_23.png similarity index 100% rename from docs/img_windows_install/img_23.png rename to hub/docs/img_windows_install/img_23.png diff --git a/docs/img_windows_install/img_24.png b/hub/docs/img_windows_install/img_24.png similarity index 100% rename from docs/img_windows_install/img_24.png rename to hub/docs/img_windows_install/img_24.png diff --git a/docs/img_windows_install/img_25.png b/hub/docs/img_windows_install/img_25.png similarity index 100% rename from docs/img_windows_install/img_25.png rename to hub/docs/img_windows_install/img_25.png diff --git a/docs/img_windows_install/img_26.png b/hub/docs/img_windows_install/img_26.png similarity index 100% rename from docs/img_windows_install/img_26.png rename to hub/docs/img_windows_install/img_26.png diff --git a/docs/img_windows_install/img_27.png b/hub/docs/img_windows_install/img_27.png similarity index 100% rename from docs/img_windows_install/img_27.png rename to hub/docs/img_windows_install/img_27.png diff --git a/docs/img_windows_install/img_28.png b/hub/docs/img_windows_install/img_28.png similarity index 100% rename from docs/img_windows_install/img_28.png rename to hub/docs/img_windows_install/img_28.png diff --git a/docs/img_windows_install/img_29.png b/hub/docs/img_windows_install/img_29.png similarity index 100% rename from docs/img_windows_install/img_29.png rename to hub/docs/img_windows_install/img_29.png diff --git a/docs/img_windows_install/img_3.png b/hub/docs/img_windows_install/img_3.png similarity index 100% rename from docs/img_windows_install/img_3.png rename to hub/docs/img_windows_install/img_3.png diff --git a/docs/img_windows_install/img_30.png b/hub/docs/img_windows_install/img_30.png similarity index 100% rename from docs/img_windows_install/img_30.png rename to hub/docs/img_windows_install/img_30.png diff --git a/docs/img_windows_install/img_31.png b/hub/docs/img_windows_install/img_31.png similarity index 100% rename from docs/img_windows_install/img_31.png rename to hub/docs/img_windows_install/img_31.png diff --git a/docs/img_windows_install/img_32.png b/hub/docs/img_windows_install/img_32.png similarity index 100% rename from docs/img_windows_install/img_32.png rename to hub/docs/img_windows_install/img_32.png diff --git a/docs/img_windows_install/img_33.png b/hub/docs/img_windows_install/img_33.png similarity index 100% rename from docs/img_windows_install/img_33.png rename to hub/docs/img_windows_install/img_33.png diff --git a/docs/img_windows_install/img_4.png b/hub/docs/img_windows_install/img_4.png similarity index 100% rename from docs/img_windows_install/img_4.png rename to hub/docs/img_windows_install/img_4.png diff --git a/docs/img_windows_install/img_5.png b/hub/docs/img_windows_install/img_5.png similarity index 100% rename from docs/img_windows_install/img_5.png rename to hub/docs/img_windows_install/img_5.png diff --git a/docs/img_windows_install/img_6.png b/hub/docs/img_windows_install/img_6.png similarity index 100% rename from docs/img_windows_install/img_6.png rename to hub/docs/img_windows_install/img_6.png diff --git a/docs/img_windows_install/img_7.png b/hub/docs/img_windows_install/img_7.png similarity index 100% rename from docs/img_windows_install/img_7.png rename to hub/docs/img_windows_install/img_7.png diff --git a/docs/img_windows_install/img_8.png b/hub/docs/img_windows_install/img_8.png similarity index 100% rename from docs/img_windows_install/img_8.png rename to hub/docs/img_windows_install/img_8.png diff --git a/docs/img_windows_install/img_9.png b/hub/docs/img_windows_install/img_9.png similarity index 100% rename from docs/img_windows_install/img_9.png rename to hub/docs/img_windows_install/img_9.png diff --git a/exports/building_energy/energy_ade.py b/hub/exports/building_energy/energy_ade.py similarity index 99% rename from exports/building_energy/energy_ade.py rename to hub/exports/building_energy/energy_ade.py index 8e618f4f..419e4f02 100644 --- a/exports/building_energy/energy_ade.py +++ b/hub/exports/building_energy/energy_ade.py @@ -9,7 +9,7 @@ import uuid import datetime from pathlib import Path import xmltodict -import helpers.constants as cte +import hub.helpers.constants as cte class EnergyAde: diff --git a/exports/building_energy/idf.py b/hub/exports/building_energy/idf.py similarity index 99% rename from exports/building_energy/idf.py rename to hub/exports/building_energy/idf.py index d65bf796..edfb604e 100644 --- a/exports/building_energy/idf.py +++ b/hub/exports/building_energy/idf.py @@ -9,8 +9,8 @@ Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concord import copy from pathlib import Path from geomeppy import IDF -import helpers.constants as cte -from city_model_structure.attributes.schedule import Schedule +import hub.helpers.constants as cte +from hub.city_model_structure.attributes.schedule import Schedule class Idf: diff --git a/exports/building_energy/idf_files/Energy+.idd b/hub/exports/building_energy/idf_files/Energy+.idd similarity index 100% rename from exports/building_energy/idf_files/Energy+.idd rename to hub/exports/building_energy/idf_files/Energy+.idd diff --git a/exports/building_energy/idf_files/Minimal.idf b/hub/exports/building_energy/idf_files/Minimal.idf similarity index 100% rename from exports/building_energy/idf_files/Minimal.idf rename to hub/exports/building_energy/idf_files/Minimal.idf diff --git a/exports/building_energy/insel/insel_monthly_energy_balance.py b/hub/exports/building_energy/insel/insel_monthly_energy_balance.py similarity index 98% rename from exports/building_energy/insel/insel_monthly_energy_balance.py rename to hub/exports/building_energy/insel/insel_monthly_energy_balance.py index 55f08443..3fb01bef 100644 --- a/exports/building_energy/insel/insel_monthly_energy_balance.py +++ b/hub/exports/building_energy/insel/insel_monthly_energy_balance.py @@ -8,9 +8,9 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca import numpy as np from pathlib import Path -from exports.formats.insel import Insel -from imports.weather.helpers.weather import Weather -import helpers.constants as cte +from hub.exports.formats.insel import Insel +from hub.imports.weather.helpers.weather import Weather +import hub.helpers.constants as cte _CONSTRUCTION_CODE = { cte.WALL: '1', diff --git a/exports/db_factory.py b/hub/exports/db_factory.py similarity index 94% rename from exports/db_factory.py rename to hub/exports/db_factory.py index 0abfb827..482ed481 100644 --- a/exports/db_factory.py +++ b/hub/exports/db_factory.py @@ -4,8 +4,8 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project CoderPeter Yefi peteryefi@gmail.com """ -from persistence import CityRepo -from persistence import HeatPumpSimulationRepo +from hub.persistence import CityRepo +from hub.persistence import HeatPumpSimulationRepo class DBFactory: diff --git a/exports/energy_building_exports_factory.py b/hub/exports/energy_building_exports_factory.py similarity index 92% rename from exports/energy_building_exports_factory.py rename to hub/exports/energy_building_exports_factory.py index 7b3be9fd..dd0d9170 100644 --- a/exports/energy_building_exports_factory.py +++ b/hub/exports/energy_building_exports_factory.py @@ -6,9 +6,9 @@ Project Coder Pilar Monsalvete Alvarez de uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path -from exports.building_energy.energy_ade import EnergyAde -from exports.building_energy.idf import Idf -from exports.building_energy.insel.insel_monthly_energy_balance import InselMonthlyEnergyBalance +from hub.exports.building_energy.energy_ade import EnergyAde +from hub.exports.building_energy.idf import Idf +from hub.exports.building_energy.insel.insel_monthly_energy_balance import InselMonthlyEnergyBalance class EnergyBuildingsExportsFactory: diff --git a/exports/energy_systems/air_source_hp_export.py b/hub/exports/energy_systems/air_source_hp_export.py similarity index 96% rename from exports/energy_systems/air_source_hp_export.py rename to hub/exports/energy_systems/air_source_hp_export.py index 5d8c1971..962daab0 100644 --- a/exports/energy_systems/air_source_hp_export.py +++ b/hub/exports/energy_systems/air_source_hp_export.py @@ -5,7 +5,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project Coder Peter Yefi peteryefi@gmail.com """ -from exports.energy_systems.heat_pump_export import HeatPumpExport +from hub.exports.energy_systems.heat_pump_export import HeatPumpExport from typing import List, Dict, Union diff --git a/exports/energy_systems/heat_pump_export.py b/hub/exports/energy_systems/heat_pump_export.py similarity index 99% rename from exports/energy_systems/heat_pump_export.py rename to hub/exports/energy_systems/heat_pump_export.py index c5db0e84..6496dc95 100644 --- a/exports/energy_systems/heat_pump_export.py +++ b/hub/exports/energy_systems/heat_pump_export.py @@ -9,7 +9,7 @@ from typing import List, Union, Dict import yaml from string import Template import pandas as pd -from hub_logger import logger +from hub.hub_logger import logger class HeatPumpExport: diff --git a/exports/energy_systems/water_to_water_hp_export.py b/hub/exports/energy_systems/water_to_water_hp_export.py similarity index 96% rename from exports/energy_systems/water_to_water_hp_export.py rename to hub/exports/energy_systems/water_to_water_hp_export.py index b2d98e05..af7b5009 100644 --- a/exports/energy_systems/water_to_water_hp_export.py +++ b/hub/exports/energy_systems/water_to_water_hp_export.py @@ -5,7 +5,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project Coder Peter Yefi peteryefi@gmail.com """ -from exports.energy_systems.heat_pump_export import HeatPumpExport +from hub.exports.energy_systems.heat_pump_export import HeatPumpExport from typing import List, Dict, Union diff --git a/exports/energy_systems_factory.py b/hub/exports/energy_systems_factory.py similarity index 90% rename from exports/energy_systems_factory.py rename to hub/exports/energy_systems_factory.py index 29a3c3c4..9975e462 100644 --- a/exports/energy_systems_factory.py +++ b/hub/exports/energy_systems_factory.py @@ -6,9 +6,8 @@ Project Coder Peter Yefi peteryefi@gmail.com """ from pathlib import Path -from exports.energy_systems.heat_pump_export import HeatPumpExport -from exports.energy_systems.air_source_hp_export import AirSourceHPExport -from exports.energy_systems.water_to_water_hp_export import WaterToWaterHPExport +from hub.exports.energy_systems.air_source_hp_export import AirSourceHPExport +from hub.exports.energy_systems.water_to_water_hp_export import WaterToWaterHPExport class EnergySystemsExportFactory: diff --git a/exports/exports_factory.py b/hub/exports/exports_factory.py similarity index 91% rename from exports/exports_factory.py rename to hub/exports/exports_factory.py index 7fba6483..5ee3a686 100644 --- a/exports/exports_factory.py +++ b/hub/exports/exports_factory.py @@ -6,9 +6,9 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from pathlib import Path -from exports.formats.obj import Obj -from exports.formats.simplified_radiosity_algorithm import SimplifiedRadiosityAlgorithm -from exports.formats.stl import Stl +from hub.exports.formats.obj import Obj +from hub.exports.formats.simplified_radiosity_algorithm import SimplifiedRadiosityAlgorithm +from hub.exports.formats.stl import Stl class ExportsFactory: diff --git a/exports/formats/insel.py b/hub/exports/formats/insel.py similarity index 100% rename from exports/formats/insel.py rename to hub/exports/formats/insel.py diff --git a/exports/formats/obj.py b/hub/exports/formats/obj.py similarity index 89% rename from exports/formats/obj.py rename to hub/exports/formats/obj.py index f7237005..64c856f1 100644 --- a/exports/formats/obj.py +++ b/hub/exports/formats/obj.py @@ -7,8 +7,8 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca from pathlib import Path import trimesh.exchange.obj -from exports.formats.triangular import Triangular -from imports.geometry_factory import GeometryFactory +from hub.exports.formats.triangular import Triangular +from hub.imports.geometry_factory import GeometryFactory class Obj(Triangular): diff --git a/exports/formats/simplified_radiosity_algorithm.py b/hub/exports/formats/simplified_radiosity_algorithm.py similarity index 100% rename from exports/formats/simplified_radiosity_algorithm.py rename to hub/exports/formats/simplified_radiosity_algorithm.py diff --git a/exports/formats/stl.py b/hub/exports/formats/stl.py similarity index 86% rename from exports/formats/stl.py rename to hub/exports/formats/stl.py index 30479a95..3904c5f1 100644 --- a/exports/formats/stl.py +++ b/hub/exports/formats/stl.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from exports.formats.triangular import Triangular +from hub.exports.formats.triangular import Triangular class Stl(Triangular): diff --git a/exports/formats/triangular.py b/hub/exports/formats/triangular.py similarity index 100% rename from exports/formats/triangular.py rename to hub/exports/formats/triangular.py diff --git a/exports/user_factory.py b/hub/exports/user_factory.py similarity index 95% rename from exports/user_factory.py rename to hub/exports/user_factory.py index 6ac06abc..0c932418 100644 --- a/exports/user_factory.py +++ b/hub/exports/user_factory.py @@ -4,7 +4,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project CoderPeter Yefi peteryefi@gmail.com """ -from persistence import UserRepo +from hub.persistence import UserRepo class UserFactory: diff --git a/helpers/auth.py b/hub/helpers/auth.py similarity index 100% rename from helpers/auth.py rename to hub/helpers/auth.py diff --git a/helpers/configuration_helper.py b/hub/helpers/configuration_helper.py similarity index 100% rename from helpers/configuration_helper.py rename to hub/helpers/configuration_helper.py diff --git a/helpers/constants.py b/hub/helpers/constants.py similarity index 100% rename from helpers/constants.py rename to hub/helpers/constants.py diff --git a/helpers/enrich_city.py b/hub/helpers/enrich_city.py similarity index 100% rename from helpers/enrich_city.py rename to hub/helpers/enrich_city.py diff --git a/helpers/geometry_helper.py b/hub/helpers/geometry_helper.py similarity index 96% rename from helpers/geometry_helper.py rename to hub/helpers/geometry_helper.py index eb802980..1c67bf4a 100644 --- a/helpers/geometry_helper.py +++ b/hub/helpers/geometry_helper.py @@ -10,10 +10,10 @@ import numpy as np import requests from trimesh import Trimesh from trimesh import intersections -from city_model_structure.attributes.polygon import Polygon -from city_model_structure.attributes.polyhedron import Polyhedron -from helpers.location import Location -from helpers.configuration_helper import ConfigurationHelper +from hub.city_model_structure.attributes.polygon import Polygon +from hub.city_model_structure.attributes.polyhedron import Polyhedron +from hub.helpers.location import Location +from hub.helpers.configuration_helper import ConfigurationHelper class GeometryHelper: diff --git a/helpers/location.py b/hub/helpers/location.py similarity index 100% rename from helpers/location.py rename to hub/helpers/location.py diff --git a/helpers/monthly_to_hourly_demand.py b/hub/helpers/monthly_to_hourly_demand.py similarity index 98% rename from helpers/monthly_to_hourly_demand.py rename to hub/helpers/monthly_to_hourly_demand.py index bc7d11d4..c27682c4 100644 --- a/helpers/monthly_to_hourly_demand.py +++ b/hub/helpers/monthly_to_hourly_demand.py @@ -6,8 +6,8 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import calendar as cal import pandas as pd -from city_model_structure.building_demand.occupant import Occupant -import helpers.constants as cte +from hub.city_model_structure.building_demand.occupant import Occupant +import hub.helpers.constants as cte class MonthlyToHourlyDemand: diff --git a/helpers/monthly_values.py b/hub/helpers/monthly_values.py similarity index 100% rename from helpers/monthly_values.py rename to hub/helpers/monthly_values.py diff --git a/helpers/yearly_from_daily_schedules.py b/hub/helpers/yearly_from_daily_schedules.py similarity index 93% rename from helpers/yearly_from_daily_schedules.py rename to hub/helpers/yearly_from_daily_schedules.py index d5ab535f..01ae88e3 100644 --- a/helpers/yearly_from_daily_schedules.py +++ b/hub/helpers/yearly_from_daily_schedules.py @@ -5,8 +5,8 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import calendar as cal -import helpers.constants as cte -from city_model_structure.attributes.schedule import Schedule +import hub.helpers.constants as cte +from hub.city_model_structure.attributes.schedule import Schedule class YearlyFromDailySchedules: diff --git a/hub_logger/__init__.py b/hub/hub_logger/__init__.py similarity index 100% rename from hub_logger/__init__.py rename to hub/hub_logger/__init__.py diff --git a/imports/__init__.py b/hub/imports/__init__.py similarity index 100% rename from imports/__init__.py rename to hub/imports/__init__.py diff --git a/imports/construction/data_classes/building_achetype.py b/hub/imports/construction/data_classes/building_achetype.py similarity index 96% rename from imports/construction/data_classes/building_achetype.py rename to hub/imports/construction/data_classes/building_achetype.py index 708549b5..b6477694 100644 --- a/imports/construction/data_classes/building_achetype.py +++ b/hub/imports/construction/data_classes/building_achetype.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List -from imports.construction.data_classes.thermal_boundary_archetype import ThermalBoundaryArchetype +from hub.imports.construction.data_classes.thermal_boundary_archetype import ThermalBoundaryArchetype class BuildingArchetype: diff --git a/imports/construction/data_classes/layer_archetype.py b/hub/imports/construction/data_classes/layer_archetype.py similarity index 100% rename from imports/construction/data_classes/layer_archetype.py rename to hub/imports/construction/data_classes/layer_archetype.py diff --git a/imports/construction/data_classes/thermal_boundary_archetype.py b/hub/imports/construction/data_classes/thermal_boundary_archetype.py similarity index 94% rename from imports/construction/data_classes/thermal_boundary_archetype.py rename to hub/imports/construction/data_classes/thermal_boundary_archetype.py index 36ed66bd..4c78e7c6 100644 --- a/imports/construction/data_classes/thermal_boundary_archetype.py +++ b/hub/imports/construction/data_classes/thermal_boundary_archetype.py @@ -6,8 +6,8 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List -from imports.construction.data_classes.layer_archetype import LayerArchetype -from imports.construction.data_classes.thermal_opening_archetype import ThermalOpeningArchetype +from hub.imports.construction.data_classes.layer_archetype import LayerArchetype +from hub.imports.construction.data_classes.thermal_opening_archetype import ThermalOpeningArchetype class ThermalBoundaryArchetype: diff --git a/imports/construction/data_classes/thermal_opening_archetype.py b/hub/imports/construction/data_classes/thermal_opening_archetype.py similarity index 100% rename from imports/construction/data_classes/thermal_opening_archetype.py rename to hub/imports/construction/data_classes/thermal_opening_archetype.py diff --git a/imports/construction/helpers/construction_helper.py b/hub/imports/construction/helpers/construction_helper.py similarity index 98% rename from imports/construction/helpers/construction_helper.py rename to hub/imports/construction/helpers/construction_helper.py index f29ba890..935e1e13 100644 --- a/imports/construction/helpers/construction_helper.py +++ b/hub/imports/construction/helpers/construction_helper.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys -from helpers import constants as cte +from hub.helpers import constants as cte class ConstructionHelper: diff --git a/imports/construction/helpers/storeys_generation.py b/hub/imports/construction/helpers/storeys_generation.py similarity index 94% rename from imports/construction/helpers/storeys_generation.py rename to hub/imports/construction/helpers/storeys_generation.py index 19bad00e..6a1d40a3 100644 --- a/imports/construction/helpers/storeys_generation.py +++ b/hub/imports/construction/helpers/storeys_generation.py @@ -9,12 +9,12 @@ import math import numpy as np from typing import List -from helpers import constants as cte -from city_model_structure.attributes.polygon import Polygon -from city_model_structure.attributes.point import Point -from city_model_structure.building_demand.storey import Storey -from city_model_structure.building_demand.surface import Surface -from city_model_structure.building_demand.thermal_zone import ThermalZone +from hub.helpers import constants as cte +from hub.city_model_structure.attributes.polygon import Polygon +from hub.city_model_structure.attributes.point import Point +from hub.city_model_structure.building_demand.storey import Storey +from hub.city_model_structure.building_demand.surface import Surface +from hub.city_model_structure.building_demand.thermal_zone import ThermalZone class StoreysGeneration: diff --git a/imports/construction/nrel_physics_interface.py b/hub/imports/construction/nrel_physics_interface.py similarity index 97% rename from imports/construction/nrel_physics_interface.py rename to hub/imports/construction/nrel_physics_interface.py index 354b3176..7e802cf6 100644 --- a/imports/construction/nrel_physics_interface.py +++ b/hub/imports/construction/nrel_physics_interface.py @@ -6,7 +6,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ -from imports.construction.helpers.storeys_generation import StoreysGeneration +from hub.imports.construction.helpers.storeys_generation import StoreysGeneration class NrelPhysicsInterface: diff --git a/imports/construction/us_physics_parameters.py b/hub/imports/construction/us_physics_parameters.py similarity index 94% rename from imports/construction/us_physics_parameters.py rename to hub/imports/construction/us_physics_parameters.py index 50267c7d..68f1c3c2 100644 --- a/imports/construction/us_physics_parameters.py +++ b/hub/imports/construction/us_physics_parameters.py @@ -7,12 +7,12 @@ Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concord """ import sys -from imports.construction.nrel_physics_interface import NrelPhysicsInterface -from catalog_factories.construction_catalog_factory import ConstructionCatalogFactory -from city_model_structure.building_demand.layer import Layer -from city_model_structure.building_demand.material import Material -from imports.construction.helpers.construction_helper import ConstructionHelper -from hub_logger import logger +from hub.imports.construction.nrel_physics_interface import NrelPhysicsInterface +from hub.catalog_factories.construction_catalog_factory import ConstructionCatalogFactory +from hub.city_model_structure.building_demand.layer import Layer +from hub.city_model_structure.building_demand.material import Material +from hub.imports.construction.helpers.construction_helper import ConstructionHelper +from hub.hub_logger import logger class UsPhysicsParameters(NrelPhysicsInterface): diff --git a/imports/construction_factory.py b/hub/imports/construction_factory.py similarity index 93% rename from imports/construction_factory.py rename to hub/imports/construction_factory.py index 7f136ed0..bc77be4f 100644 --- a/imports/construction_factory.py +++ b/hub/imports/construction_factory.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from pathlib import Path -from imports.construction.us_physics_parameters import UsPhysicsParameters +from hub.imports.construction.us_physics_parameters import UsPhysicsParameters class ConstructionFactory: diff --git a/imports/db_factory.py b/hub/imports/db_factory.py similarity index 92% rename from imports/db_factory.py rename to hub/imports/db_factory.py index 00f7e53f..f4d75ba8 100644 --- a/imports/db_factory.py +++ b/hub/imports/db_factory.py @@ -4,10 +4,10 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project CoderPeter Yefi peteryefi@gmail.com """ -from persistence import CityRepo -from persistence import HeatPumpSimulationRepo +from hub.persistence import CityRepo +from hub.persistence import HeatPumpSimulationRepo from typing import Dict -from city_model_structure.city import City +from hub.city_model_structure.city import City class DBFactory: diff --git a/imports/energy_systems/air_source_hp_parameters.py b/hub/imports/energy_systems/air_source_hp_parameters.py similarity index 97% rename from imports/energy_systems/air_source_hp_parameters.py rename to hub/imports/energy_systems/air_source_hp_parameters.py index 3d6a19cf..e1d81853 100644 --- a/imports/energy_systems/air_source_hp_parameters.py +++ b/hub/imports/energy_systems/air_source_hp_parameters.py @@ -7,8 +7,8 @@ Project Coder Peter Yefi peteryefi@gmail.comCode contributor Pilar Monsalvete Al import pandas as pd from typing import Dict -from city_model_structure.energy_systems.air_source_hp import AirSourceHP -from city_model_structure.energy_system import EnergySystem +from hub.city_model_structure.energy_systems.air_source_hp import AirSourceHP +from hub.city_model_structure.energy_system import EnergySystem from scipy.optimize import curve_fit import numpy as np from typing import List diff --git a/imports/energy_systems/water_to_water_hp_parameters.py b/hub/imports/energy_systems/water_to_water_hp_parameters.py similarity index 97% rename from imports/energy_systems/water_to_water_hp_parameters.py rename to hub/imports/energy_systems/water_to_water_hp_parameters.py index ad941925..923f92e0 100644 --- a/imports/energy_systems/water_to_water_hp_parameters.py +++ b/hub/imports/energy_systems/water_to_water_hp_parameters.py @@ -7,8 +7,8 @@ Project Coder Peter Yefi peteryefi@gmail.com import pandas as pd from typing import Dict -from city_model_structure.energy_systems.water_to_water_hp import WaterToWaterHP -from city_model_structure.energy_system import EnergySystem +from hub.city_model_structure.energy_systems.water_to_water_hp import WaterToWaterHP +from hub.city_model_structure.energy_system import EnergySystem from scipy.optimize import curve_fit import numpy as np from typing import List diff --git a/imports/energy_systems_factory.py b/hub/imports/energy_systems_factory.py similarity index 86% rename from imports/energy_systems_factory.py rename to hub/imports/energy_systems_factory.py index 98cb000d..f167b848 100644 --- a/imports/energy_systems_factory.py +++ b/hub/imports/energy_systems_factory.py @@ -6,8 +6,8 @@ Project Coder Pilar Monsalvete pilar.monsalvete@concordi. Code contributors: Peter Yefi peteryefi@gmail.com """ from pathlib import Path -from imports.energy_systems.air_source_hp_parameters import AirSourceHeatPumpParameters -from imports.energy_systems.water_to_water_hp_parameters import WaterToWaterHPParameters +from hub.imports.energy_systems.air_source_hp_parameters import AirSourceHeatPumpParameters +from hub.imports.energy_systems.water_to_water_hp_parameters import WaterToWaterHPParameters class EnergySystemsFactory: diff --git a/imports/geometry/citygml.py b/hub/imports/geometry/citygml.py similarity index 94% rename from imports/geometry/citygml.py rename to hub/imports/geometry/citygml.py index 758882e2..f68fdd9d 100644 --- a/imports/geometry/citygml.py +++ b/hub/imports/geometry/citygml.py @@ -4,17 +4,15 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -import math -import sys import numpy as np import xmltodict -from city_model_structure.city import City -from city_model_structure.building import Building -from city_model_structure.parts_consisting_building import PartsConsistingBuilding -from helpers.geometry_helper import GeometryHelper -from imports.geometry.citygml_classes.citygml_lod2 import CityGmlLod2 -from imports.geometry.citygml_classes.citygml_lod1 import CityGmlLod1 +from hub.city_model_structure.city import City +from hub.city_model_structure.building import Building +from hub.city_model_structure.parts_consisting_building import PartsConsistingBuilding +from hub.helpers.geometry_helper import GeometryHelper +from hub.imports.geometry.citygml_classes.citygml_lod2 import CityGmlLod2 +from hub.imports.geometry.citygml_classes.citygml_lod1 import CityGmlLod1 class CityGml: diff --git a/imports/geometry/citygml_classes/citygml_base.py b/hub/imports/geometry/citygml_classes/citygml_base.py similarity index 90% rename from imports/geometry/citygml_classes/citygml_base.py rename to hub/imports/geometry/citygml_classes/citygml_base.py index c4b1182f..01406509 100644 --- a/imports/geometry/citygml_classes/citygml_base.py +++ b/hub/imports/geometry/citygml_classes/citygml_base.py @@ -6,8 +6,6 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from abc import ABC -import numpy as np -from imports.geometry.helpers.geometry_helper import GeometryHelper class CityGmlBase(ABC): diff --git a/imports/geometry/citygml_classes/citygml_lod1.py b/hub/imports/geometry/citygml_classes/citygml_lod1.py similarity index 88% rename from imports/geometry/citygml_classes/citygml_lod1.py rename to hub/imports/geometry/citygml_classes/citygml_lod1.py index 68601dc5..4afb440c 100644 --- a/imports/geometry/citygml_classes/citygml_lod1.py +++ b/hub/imports/geometry/citygml_classes/citygml_lod1.py @@ -6,10 +6,10 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from imports.geometry.helpers.geometry_helper import GeometryHelper -from imports.geometry.citygml_classes.citygml_base import CityGmlBase -from city_model_structure.building_demand.surface import Surface -from city_model_structure.attributes.polygon import Polygon +from hub.imports.geometry.helpers.geometry_helper import GeometryHelper +from hub.imports.geometry.citygml_classes.citygml_base import CityGmlBase +from hub.city_model_structure.building_demand.surface import Surface +from hub.city_model_structure.attributes.polygon import Polygon class CityGmlLod1(CityGmlBase): diff --git a/imports/geometry/citygml_classes/citygml_lod2.py b/hub/imports/geometry/citygml_classes/citygml_lod2.py similarity index 91% rename from imports/geometry/citygml_classes/citygml_lod2.py rename to hub/imports/geometry/citygml_classes/citygml_lod2.py index f83ea6aa..1c4f6839 100644 --- a/imports/geometry/citygml_classes/citygml_lod2.py +++ b/hub/imports/geometry/citygml_classes/citygml_lod2.py @@ -6,10 +6,10 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from imports.geometry.citygml_classes.citygml_base import CityGmlBase -from imports.geometry.helpers.geometry_helper import GeometryHelper -from city_model_structure.building_demand.surface import Surface -from city_model_structure.attributes.polygon import Polygon +from hub.imports.geometry.citygml_classes.citygml_base import CityGmlBase +from hub.imports.geometry.helpers.geometry_helper import GeometryHelper +from hub.city_model_structure.building_demand.surface import Surface +from hub.city_model_structure.attributes.polygon import Polygon class CityGmlLod2(CityGmlBase): diff --git a/imports/geometry/geojson.py b/hub/imports/geometry/geojson.py similarity index 94% rename from imports/geometry/geojson.py rename to hub/imports/geometry/geojson.py index 9b30738e..f7c91082 100644 --- a/imports/geometry/geojson.py +++ b/hub/imports/geometry/geojson.py @@ -7,17 +7,16 @@ Project Coder Guillermo Gutierrez Guillermo.GutierrezMorote@concordia.ca import json import trimesh.creation -import numpy as np from pyproj import Transformer from shapely.geometry import Polygon as ShapelyPolygon -import helpers.constants as cte -from imports.geometry.helpers.geometry_helper import GeometryHelper -from city_model_structure.attributes.polygon import Polygon -from city_model_structure.building import Building -from city_model_structure.building_demand.surface import Surface -from city_model_structure.city import City +import hub.helpers.constants as cte +from hub.imports.geometry.helpers.geometry_helper import GeometryHelper +from hub.city_model_structure.attributes.polygon import Polygon +from hub.city_model_structure.building import Building +from hub.city_model_structure.building_demand.surface import Surface +from hub.city_model_structure.city import City class Geojson: diff --git a/imports/geometry/gpandas.py b/hub/imports/geometry/gpandas.py similarity index 92% rename from imports/geometry/gpandas.py rename to hub/imports/geometry/gpandas.py index f953d74d..83536137 100644 --- a/imports/geometry/gpandas.py +++ b/hub/imports/geometry/gpandas.py @@ -14,12 +14,12 @@ from shapely.geometry import Point from shapely.geometry import Polygon as ShapelyPoly from trimesh import Scene -from city_model_structure.attributes.polygon import Polygon -from city_model_structure.building import Building -from city_model_structure.building_demand.surface import Surface -from city_model_structure.city import City +from hub.city_model_structure.attributes.polygon import Polygon +from hub.city_model_structure.building import Building +from hub.city_model_structure.building_demand.surface import Surface +from hub.city_model_structure.city import City -import helpers.constants as cte +import hub.helpers.constants as cte class GPandas: diff --git a/imports/geometry/helpers/geometry_helper.py b/hub/imports/geometry/helpers/geometry_helper.py similarity index 99% rename from imports/geometry/helpers/geometry_helper.py rename to hub/imports/geometry/helpers/geometry_helper.py index 4197b732..1752ac18 100644 --- a/imports/geometry/helpers/geometry_helper.py +++ b/hub/imports/geometry/helpers/geometry_helper.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ -import helpers.constants as cte +import hub.helpers.constants as cte import numpy as np diff --git a/imports/geometry/obj.py b/hub/imports/geometry/obj.py similarity index 91% rename from imports/geometry/obj.py rename to hub/imports/geometry/obj.py index 2b392a73..c1a1cee4 100644 --- a/imports/geometry/obj.py +++ b/hub/imports/geometry/obj.py @@ -7,10 +7,10 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca import trimesh.exchange.load from trimesh import Scene import trimesh.geometry -from city_model_structure.city import City -from city_model_structure.building import Building -from city_model_structure.building_demand.surface import Surface -from city_model_structure.attributes.polygon import Polygon +from hub.city_model_structure.city import City +from hub.city_model_structure.building import Building +from hub.city_model_structure.building_demand.surface import Surface +from hub.city_model_structure.attributes.polygon import Polygon class Obj: diff --git a/imports/geometry/osm_subway.py b/hub/imports/geometry/osm_subway.py similarity index 94% rename from imports/geometry/osm_subway.py rename to hub/imports/geometry/osm_subway.py index c007839a..8e0bd27b 100644 --- a/imports/geometry/osm_subway.py +++ b/hub/imports/geometry/osm_subway.py @@ -8,8 +8,8 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca import sys import xmltodict from pyproj import Transformer -from city_model_structure.city import City -from city_model_structure.subway_entrance import SubwayEntrance +from hub.city_model_structure.city import City +from hub.city_model_structure.subway_entrance import SubwayEntrance class OsmSubway: diff --git a/imports/geometry/rhino.py b/hub/imports/geometry/rhino.py similarity index 91% rename from imports/geometry/rhino.py rename to hub/imports/geometry/rhino.py index 3c5a7f03..dab5cd2e 100644 --- a/imports/geometry/rhino.py +++ b/hub/imports/geometry/rhino.py @@ -9,13 +9,13 @@ from rhino3dm import * from rhino3dm._rhino3dm import Extrusion from rhino3dm._rhino3dm import MeshType -from city_model_structure.attributes.point import Point -from city_model_structure.attributes.polygon import Polygon -from city_model_structure.building import Building -from city_model_structure.building_demand.surface import Surface as HubSurface -from city_model_structure.city import City -from helpers.configuration_helper import ConfigurationHelper -from imports.geometry.helpers.geometry_helper import GeometryHelper +from hub.city_model_structure.attributes.point import Point +from hub.city_model_structure.attributes.polygon import Polygon +from hub.city_model_structure.building import Building +from hub.city_model_structure.building_demand.surface import Surface as HubSurface +from hub.city_model_structure.city import City +from hub.helpers.configuration_helper import ConfigurationHelper +from hub.imports.geometry.helpers.geometry_helper import GeometryHelper class Rhino: diff --git a/imports/geometry_factory.py b/hub/imports/geometry_factory.py similarity index 88% rename from imports/geometry_factory.py rename to hub/imports/geometry_factory.py index b7f16cb4..59990fcf 100644 --- a/imports/geometry_factory.py +++ b/hub/imports/geometry_factory.py @@ -6,13 +6,13 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import geopandas -from city_model_structure.city import City -from imports.geometry.citygml import CityGml -from imports.geometry.obj import Obj -from imports.geometry.osm_subway import OsmSubway -from imports.geometry.rhino import Rhino -from imports.geometry.gpandas import GPandas -from imports.geometry.geojson import Geojson +from hub.city_model_structure.city import City +from hub.imports.geometry.citygml import CityGml +from hub.imports.geometry.obj import Obj +from hub.imports.geometry.osm_subway import OsmSubway +from hub.imports.geometry.rhino import Rhino +from hub.imports.geometry.gpandas import GPandas +from hub.imports.geometry.geojson import Geojson class GeometryFactory: diff --git a/imports/life_cycle_assessment/lca_fuel.py b/hub/imports/life_cycle_assessment/lca_fuel.py similarity index 94% rename from imports/life_cycle_assessment/lca_fuel.py rename to hub/imports/life_cycle_assessment/lca_fuel.py index 7089918a..e2bb15a0 100644 --- a/imports/life_cycle_assessment/lca_fuel.py +++ b/hub/imports/life_cycle_assessment/lca_fuel.py @@ -6,7 +6,7 @@ Project Coder Atiya atiya.atiya@mail.concordia.ca """ import xmltodict from pathlib import Path -from city_model_structure.fuel import Fuel +from hub.city_model_structure.fuel import Fuel class LcaFuel: def __init__(self, city, base_path): diff --git a/imports/life_cycle_assessment/lca_machine.py b/hub/imports/life_cycle_assessment/lca_machine.py similarity index 95% rename from imports/life_cycle_assessment/lca_machine.py rename to hub/imports/life_cycle_assessment/lca_machine.py index 01eed943..ab3d8d61 100644 --- a/imports/life_cycle_assessment/lca_machine.py +++ b/hub/imports/life_cycle_assessment/lca_machine.py @@ -6,7 +6,7 @@ Project Coder Atiya atiya.atiya@mail.concordia.ca """ import xmltodict from pathlib import Path -from city_model_structure.machine import Machine +from hub.city_model_structure.machine import Machine class LcaMachine: def __init__(self, city, base_path): diff --git a/imports/life_cycle_assessment/lca_material.py b/hub/imports/life_cycle_assessment/lca_material.py similarity index 95% rename from imports/life_cycle_assessment/lca_material.py rename to hub/imports/life_cycle_assessment/lca_material.py index 7ac4b4ee..f61ce50b 100644 --- a/imports/life_cycle_assessment/lca_material.py +++ b/hub/imports/life_cycle_assessment/lca_material.py @@ -6,7 +6,7 @@ Project Coder Atiya atiya.atiya@mail.concordia.ca """ import xmltodict from pathlib import Path -from city_model_structure.lca_material import LcaMaterial as LMaterial +from hub.city_model_structure.lca_material import LcaMaterial as LMaterial class LcaMaterial: def __init__(self, city, base_path): diff --git a/imports/life_cycle_assessment/lca_vehicle.py b/hub/imports/life_cycle_assessment/lca_vehicle.py similarity index 95% rename from imports/life_cycle_assessment/lca_vehicle.py rename to hub/imports/life_cycle_assessment/lca_vehicle.py index 60778ff2..89f95174 100644 --- a/imports/life_cycle_assessment/lca_vehicle.py +++ b/hub/imports/life_cycle_assessment/lca_vehicle.py @@ -6,7 +6,7 @@ Project Coder Atiya atiya.atiya@mail.concordia.ca """ import xmltodict from pathlib import Path -from city_model_structure.vehicle import Vehicle +from hub.city_model_structure.vehicle import Vehicle class LcaVehicle: diff --git a/imports/life_cycle_assessment_factory.py b/hub/imports/life_cycle_assessment_factory.py similarity index 83% rename from imports/life_cycle_assessment_factory.py rename to hub/imports/life_cycle_assessment_factory.py index b2cd172c..27add0a0 100644 --- a/imports/life_cycle_assessment_factory.py +++ b/hub/imports/life_cycle_assessment_factory.py @@ -6,10 +6,10 @@ Project Coder Atiya atiya.atiya@mail.concordia.ca """ from pathlib import Path -from imports.life_cycle_assessment.lca_fuel import LcaFuel -from imports.life_cycle_assessment.lca_vehicle import LcaVehicle -from imports.life_cycle_assessment.lca_machine import LcaMachine -from imports.life_cycle_assessment.lca_material import LcaMaterial +from hub.imports.life_cycle_assessment.lca_fuel import LcaFuel +from hub.imports.life_cycle_assessment.lca_vehicle import LcaVehicle +from hub.imports.life_cycle_assessment.lca_machine import LcaMachine +from hub.imports.life_cycle_assessment.lca_material import LcaMaterial class LifeCycleAssessment: diff --git a/imports/sensors/concordia_energy_consumption.py b/hub/imports/sensors/concordia_energy_consumption.py similarity index 90% rename from imports/sensors/concordia_energy_consumption.py rename to hub/imports/sensors/concordia_energy_consumption.py index 2f8b5d2f..5a69685f 100644 --- a/imports/sensors/concordia_energy_consumption.py +++ b/hub/imports/sensors/concordia_energy_consumption.py @@ -5,8 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import pandas as pd -from imports.sensors.concordia_file_report import ConcordiaFileReport -from city_model_structure.iot.concordia_energy_sensor import ConcordiaEnergySensor +from hub.imports.sensors.concordia_file_report import ConcordiaFileReport class ConcordiaEnergyConsumption(ConcordiaFileReport): diff --git a/imports/sensors/concordia_file_report.py b/hub/imports/sensors/concordia_file_report.py similarity index 100% rename from imports/sensors/concordia_file_report.py rename to hub/imports/sensors/concordia_file_report.py diff --git a/imports/sensors/concordia_gas_flow.py b/hub/imports/sensors/concordia_gas_flow.py similarity index 95% rename from imports/sensors/concordia_gas_flow.py rename to hub/imports/sensors/concordia_gas_flow.py index fcf6fc3a..d72bd442 100644 --- a/imports/sensors/concordia_gas_flow.py +++ b/hub/imports/sensors/concordia_gas_flow.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import pandas as pd -from imports.sensors.concordia_file_report import ConcordiaFileReport +from hub.imports.sensors.concordia_file_report import ConcordiaFileReport from city_model_structure.iot.concordia_gas_flow_sensor import ConcordiaGasFlowSensor diff --git a/imports/sensors/concordia_temperature.py b/hub/imports/sensors/concordia_temperature.py similarity index 95% rename from imports/sensors/concordia_temperature.py rename to hub/imports/sensors/concordia_temperature.py index d2a3b7f4..c1e4537d 100644 --- a/imports/sensors/concordia_temperature.py +++ b/hub/imports/sensors/concordia_temperature.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import pandas as pd -from imports.sensors.concordia_file_report import ConcordiaFileReport +from hub.imports.sensors.concordia_file_report import ConcordiaFileReport from city_model_structure.iot.concordia_temperature_sensor import ConcordiaTemperatureSensor diff --git a/imports/sensors_factory.py b/hub/imports/sensors_factory.py similarity index 100% rename from imports/sensors_factory.py rename to hub/imports/sensors_factory.py diff --git a/imports/usage/ca_usage_parameters.py b/hub/imports/usage/ca_usage_parameters.py similarity index 87% rename from imports/usage/ca_usage_parameters.py rename to hub/imports/usage/ca_usage_parameters.py index cc5c4f41..66196416 100644 --- a/imports/usage/ca_usage_parameters.py +++ b/hub/imports/usage/ca_usage_parameters.py @@ -6,9 +6,8 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys -from imports.geometry.helpers.geometry_helper import GeometryHelper -from imports.usage.hft_usage_interface import HftUsageInterface -from imports.usage.helpers.usage_helper import UsageHelper +from hub.imports.geometry.helpers.geometry_helper import GeometryHelper +from hub.imports.usage.hft_usage_interface import HftUsageInterface class HftUsageParameters(HftUsageInterface): diff --git a/imports/usage/comnet_usage_parameters.py b/hub/imports/usage/comnet_usage_parameters.py similarity index 94% rename from imports/usage/comnet_usage_parameters.py rename to hub/imports/usage/comnet_usage_parameters.py index c1cf1117..26691173 100644 --- a/imports/usage/comnet_usage_parameters.py +++ b/hub/imports/usage/comnet_usage_parameters.py @@ -10,18 +10,18 @@ from typing import Dict import pandas as pd import numpy -import helpers.constants as cte -from helpers.configuration_helper import ConfigurationHelper as ch -from imports.geometry.helpers.geometry_helper import GeometryHelper -from imports.usage.helpers.usage_helper import UsageHelper -from imports.usage.helpers.schedules_helper import SchedulesHelper -from city_model_structure.building_demand.usage_zone import UsageZone -from city_model_structure.building_demand.lighting import Lighting -from city_model_structure.building_demand.occupancy import Occupancy -from city_model_structure.building_demand.appliances import Appliances -from city_model_structure.building_demand.thermal_control import ThermalControl -from city_model_structure.attributes.schedule import Schedule -from city_model_structure.building_demand.internal_gain import InternalGain +import hub.helpers.constants as cte +from hub.helpers.configuration_helper import ConfigurationHelper as ch +from hub.imports.geometry.helpers.geometry_helper import GeometryHelper +from hub.imports.usage.helpers.usage_helper import UsageHelper +from hub.imports.usage.helpers.schedules_helper import SchedulesHelper +from hub.city_model_structure.building_demand.usage_zone import UsageZone +from hub.city_model_structure.building_demand.lighting import Lighting +from hub.city_model_structure.building_demand.occupancy import Occupancy +from hub.city_model_structure.building_demand.appliances import Appliances +from hub.city_model_structure.building_demand.thermal_control import ThermalControl +from hub.city_model_structure.attributes.schedule import Schedule +from hub.city_model_structure.building_demand.internal_gain import InternalGain class ComnetUsageParameters: diff --git a/imports/usage/data_classes/hft_internal_gains_archetype.py b/hub/imports/usage/data_classes/hft_internal_gains_archetype.py similarity index 100% rename from imports/usage/data_classes/hft_internal_gains_archetype.py rename to hub/imports/usage/data_classes/hft_internal_gains_archetype.py diff --git a/imports/usage/data_classes/usage_zone_archetype.py b/hub/imports/usage/data_classes/usage_zone_archetype.py similarity index 96% rename from imports/usage/data_classes/usage_zone_archetype.py rename to hub/imports/usage/data_classes/usage_zone_archetype.py index 65d73449..f4267e48 100644 --- a/imports/usage/data_classes/usage_zone_archetype.py +++ b/hub/imports/usage/data_classes/usage_zone_archetype.py @@ -6,7 +6,7 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List -from imports.usage.data_classes.hft_internal_gains_archetype import HftInternalGainsArchetype +from hub.imports.usage.data_classes.hft_internal_gains_archetype import HftInternalGainsArchetype class UsageZoneArchetype: diff --git a/imports/usage/helpers/schedules_helper.py b/hub/imports/usage/helpers/schedules_helper.py similarity index 98% rename from imports/usage/helpers/schedules_helper.py rename to hub/imports/usage/helpers/schedules_helper.py index 66510083..dfe6a68b 100644 --- a/imports/usage/helpers/schedules_helper.py +++ b/hub/imports/usage/helpers/schedules_helper.py @@ -6,7 +6,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys -import helpers.constants as cte +import hub.helpers.constants as cte class SchedulesHelper: diff --git a/imports/usage/helpers/usage_helper.py b/hub/imports/usage/helpers/usage_helper.py similarity index 99% rename from imports/usage/helpers/usage_helper.py rename to hub/imports/usage/helpers/usage_helper.py index 7ddbe01d..112a2771 100644 --- a/imports/usage/helpers/usage_helper.py +++ b/hub/imports/usage/helpers/usage_helper.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys -import helpers.constants as cte +import hub.helpers.constants as cte class UsageHelper: diff --git a/imports/usage/hft_usage_interface.py b/hub/imports/usage/hft_usage_interface.py similarity index 96% rename from imports/usage/hft_usage_interface.py rename to hub/imports/usage/hft_usage_interface.py index 0eeea969..10953cff 100644 --- a/imports/usage/hft_usage_interface.py +++ b/hub/imports/usage/hft_usage_interface.py @@ -7,14 +7,14 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import xmltodict import copy -from city_model_structure.building_demand.usage_zone import UsageZone -from city_model_structure.building_demand.internal_gain import InternalGain -from city_model_structure.building_demand.occupancy import Occupancy -from city_model_structure.building_demand.appliances import Appliances -from city_model_structure.building_demand.thermal_control import ThermalControl -from city_model_structure.attributes.schedule import Schedule -import helpers.constants as cte -from imports.usage.helpers.usage_helper import UsageHelper +from hub.city_model_structure.building_demand.usage_zone import UsageZone +from hub.city_model_structure.building_demand.internal_gain import InternalGain +from hub.city_model_structure.building_demand.occupancy import Occupancy +from hub.city_model_structure.building_demand.appliances import Appliances +from hub.city_model_structure.building_demand.thermal_control import ThermalControl +from hub.city_model_structure.attributes.schedule import Schedule +import hub.helpers.constants as cte +from hub.imports.usage.helpers.usage_helper import UsageHelper class HftUsageInterface: diff --git a/imports/usage/hft_usage_parameters.py b/hub/imports/usage/hft_usage_parameters.py similarity index 87% rename from imports/usage/hft_usage_parameters.py rename to hub/imports/usage/hft_usage_parameters.py index afe7e300..0ddd968c 100644 --- a/imports/usage/hft_usage_parameters.py +++ b/hub/imports/usage/hft_usage_parameters.py @@ -6,9 +6,9 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys -from imports.geometry.helpers.geometry_helper import GeometryHelper -from imports.usage.hft_usage_interface import HftUsageInterface -from imports.usage.helpers.usage_helper import UsageHelper +from hub.imports.geometry.helpers.geometry_helper import GeometryHelper +from hub.imports.usage.hft_usage_interface import HftUsageInterface +from hub.imports.usage.helpers.usage_helper import UsageHelper class HftUsageParameters(HftUsageInterface): diff --git a/imports/usage_factory.py b/hub/imports/usage_factory.py similarity index 90% rename from imports/usage_factory.py rename to hub/imports/usage_factory.py index 50d94915..b192c90c 100644 --- a/imports/usage_factory.py +++ b/hub/imports/usage_factory.py @@ -7,8 +7,8 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path -from imports.usage.hft_usage_parameters import HftUsageParameters -from imports.usage.comnet_usage_parameters import ComnetUsageParameters +from hub.imports.usage.hft_usage_parameters import HftUsageParameters +from hub.imports.usage.comnet_usage_parameters import ComnetUsageParameters class UsageFactory: diff --git a/imports/user_factory.py b/hub/imports/user_factory.py similarity index 94% rename from imports/user_factory.py rename to hub/imports/user_factory.py index ebfd3ee2..3d900c1f 100644 --- a/imports/user_factory.py +++ b/hub/imports/user_factory.py @@ -4,8 +4,8 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project CoderPeter Yefi peteryefi@gmail.com """ -from persistence import UserRepo -from persistence import UserRoles +from hub.persistence import UserRepo +from hub.persistence import UserRoles class UserFactory: diff --git a/imports/weather/dat_weather_parameters.py b/hub/imports/weather/dat_weather_parameters.py similarity index 98% rename from imports/weather/dat_weather_parameters.py rename to hub/imports/weather/dat_weather_parameters.py index c9414d6f..2ce20d20 100644 --- a/imports/weather/dat_weather_parameters.py +++ b/hub/imports/weather/dat_weather_parameters.py @@ -8,7 +8,7 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca import sys from pathlib import Path import pandas as pd -import helpers.constants as cte +import hub.helpers.constants as cte class DatWeatherParameters: diff --git a/imports/weather/epw_weather_parameters.py b/hub/imports/weather/epw_weather_parameters.py similarity index 99% rename from imports/weather/epw_weather_parameters.py rename to hub/imports/weather/epw_weather_parameters.py index c0db288a..4456c112 100644 --- a/imports/weather/epw_weather_parameters.py +++ b/hub/imports/weather/epw_weather_parameters.py @@ -8,7 +8,7 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca import sys from pathlib import Path import pandas as pd -import helpers.constants as cte +import hub.helpers.constants as cte class EpwWeatherParameters: diff --git a/imports/weather/helpers/weather.py b/hub/imports/weather/helpers/weather.py similarity index 95% rename from imports/weather/helpers/weather.py rename to hub/imports/weather/helpers/weather.py index 1e8799e6..94769078 100644 --- a/imports/weather/helpers/weather.py +++ b/hub/imports/weather/helpers/weather.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import math -import helpers.constants as cte +import hub.helpers.constants as cte class Weather: diff --git a/imports/weather/xls_weather_parameters.py b/hub/imports/weather/xls_weather_parameters.py similarity index 98% rename from imports/weather/xls_weather_parameters.py rename to hub/imports/weather/xls_weather_parameters.py index 33aef0b6..fc991e36 100644 --- a/imports/weather/xls_weather_parameters.py +++ b/hub/imports/weather/xls_weather_parameters.py @@ -9,7 +9,7 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca import sys from pathlib import Path import pandas as pd -import helpers.constants as cte +import hub.helpers.constants as cte class XlsWeatherParameters: diff --git a/imports/weather_factory.py b/hub/imports/weather_factory.py similarity index 90% rename from imports/weather_factory.py rename to hub/imports/weather_factory.py index 83c15cf9..0b214a79 100644 --- a/imports/weather_factory.py +++ b/hub/imports/weather_factory.py @@ -5,8 +5,8 @@ Copyright © 2022 Concordia CERC group Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path -from imports.weather.xls_weather_parameters import XlsWeatherParameters -from imports.weather.epw_weather_parameters import EpwWeatherParameters +from hub.imports.weather.xls_weather_parameters import XlsWeatherParameters +from hub.imports.weather.epw_weather_parameters import EpwWeatherParameters class WeatherFactory: diff --git a/install_postgresql_linux.sh b/hub/install_postgresql_linux.sh similarity index 100% rename from install_postgresql_linux.sh rename to hub/install_postgresql_linux.sh diff --git a/persistence/README.md b/hub/persistence/README.md similarity index 98% rename from persistence/README.md rename to hub/persistence/README.md index 157edd6d..bff34cf7 100644 --- a/persistence/README.md +++ b/hub/persistence/README.md @@ -9,8 +9,10 @@ of the class objects to database table columns This defines repository classes that contain CRUD methods for database operations. The constructor of all repositories requires The database name to connect to and the application environment (PROD or TEST). Tests use a different database from the production environment, which is why this is necessary. An example is shown below + ```python -from persistence import CityRepo +from hub.persistence import CityRepo + # instantiate city repo for hub production database city_repo = CityRepo(db_name='hub', app_env='PROD') ``` diff --git a/persistence/__init__.py b/hub/persistence/__init__.py similarity index 100% rename from persistence/__init__.py rename to hub/persistence/__init__.py diff --git a/persistence/base_repo.py b/hub/persistence/base_repo.py similarity index 91% rename from persistence/base_repo.py rename to hub/persistence/base_repo.py index 266fb4bf..130f7c5e 100644 --- a/persistence/base_repo.py +++ b/hub/persistence/base_repo.py @@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group Project Coder Peter Yefi peteryefi@gmail.com """ -from persistence.db_config import BaseConfiguration +from hub.persistence.db_config import BaseConfiguration from sqlalchemy import create_engine from sqlalchemy.orm import Session diff --git a/persistence/db_config.py b/hub/persistence/db_config.py similarity index 97% rename from persistence/db_config.py rename to hub/persistence/db_config.py index abe08db3..4ef2dc14 100644 --- a/persistence/db_config.py +++ b/hub/persistence/db_config.py @@ -8,7 +8,7 @@ Project Coder Peter Yefi peteryefi@gmail.com import os from dotenv import load_dotenv from sqlalchemy.ext.declarative import declarative_base -from hub_logger import logger +from hub.hub_logger import logger Base = declarative_base() diff --git a/persistence/db_setup.py b/hub/persistence/db_setup.py similarity index 80% rename from persistence/db_setup.py rename to hub/persistence/db_setup.py index e182ed35..dd591749 100644 --- a/persistence/db_setup.py +++ b/hub/persistence/db_setup.py @@ -1,10 +1,10 @@ -from persistence.models import City -from persistence import BaseRepo -from persistence.models import HeatPumpSimulation -from persistence.models import User -from persistence.repositories import UserRepo -from persistence.models import UserRoles -from hub_logger import logger +from hub.persistence.models import City +from hub.persistence import BaseRepo +from hub.persistence.models import HeatPumpSimulation +from hub.persistence.models import User +from hub.persistence.repositories import UserRepo +from hub.persistence.models import UserRoles +from hub.hub_logger import logger class DBSetup: diff --git a/persistence/models/__init__.py b/hub/persistence/models/__init__.py similarity index 100% rename from persistence/models/__init__.py rename to hub/persistence/models/__init__.py diff --git a/persistence/models/city.py b/hub/persistence/models/city.py similarity index 97% rename from persistence/models/city.py rename to hub/persistence/models/city.py index 2b9e9a12..86ab2bc1 100644 --- a/persistence/models/city.py +++ b/hub/persistence/models/city.py @@ -7,7 +7,7 @@ Project Coder Peter Yefi peteryefi@gmail.com from sqlalchemy import Column, Integer, String, Sequence, ForeignKey from sqlalchemy import DateTime, PickleType, Float -from persistence.db_config import Base +from hub.persistence.db_config import Base from sqlalchemy.dialects.postgresql import JSONB from sqlalchemy.orm import relationship import datetime diff --git a/persistence/models/heat_pump_simulation.py b/hub/persistence/models/heat_pump_simulation.py similarity index 98% rename from persistence/models/heat_pump_simulation.py rename to hub/persistence/models/heat_pump_simulation.py index a4c55ce4..05f447d9 100644 --- a/persistence/models/heat_pump_simulation.py +++ b/hub/persistence/models/heat_pump_simulation.py @@ -8,7 +8,7 @@ Project Coder Peter Yefi peteryefi@gmail.com from sqlalchemy import Column, Integer, String, Sequence from sqlalchemy import Enum, ForeignKey, Float, DateTime from sqlalchemy.dialects.postgresql import JSONB -from persistence.db_config import Base +from hub.persistence.db_config import Base import enum import datetime diff --git a/persistence/models/user.py b/hub/persistence/models/user.py similarity index 97% rename from persistence/models/user.py rename to hub/persistence/models/user.py index 5c7fbc96..91027b27 100644 --- a/persistence/models/user.py +++ b/hub/persistence/models/user.py @@ -7,7 +7,7 @@ Project Coder Peter Yefi peteryefi@gmail.com from sqlalchemy import Column, Integer, String, Sequence from sqlalchemy import DateTime, Enum -from persistence.db_config import Base +from hub.persistence.db_config import Base import datetime from sqlalchemy.orm import validates import re diff --git a/persistence/repositories/__init__.py b/hub/persistence/repositories/__init__.py similarity index 100% rename from persistence/repositories/__init__.py rename to hub/persistence/repositories/__init__.py diff --git a/persistence/repositories/city_repo.py b/hub/persistence/repositories/city_repo.py similarity index 96% rename from persistence/repositories/city_repo.py rename to hub/persistence/repositories/city_repo.py index a14b6b88..cda51259 100644 --- a/persistence/repositories/city_repo.py +++ b/hub/persistence/repositories/city_repo.py @@ -5,16 +5,16 @@ Copyright © 2022 Concordia CERC group Project Coder Peter Yefi peteryefi@gmail.com """ -from city_model_structure.city import City -from persistence import BaseRepo +from hub.city_model_structure.city import City +from hub.persistence import BaseRepo from sqlalchemy.exc import SQLAlchemyError from sqlalchemy import select -from persistence.models import City as DBCity +from hub.persistence.models import City as DBCity import pickle import requests from urllib3.exceptions import HTTPError from typing import Union, Dict -from hub_logger import logger +from hub.hub_logger import logger import datetime diff --git a/persistence/repositories/heat_pump_simulation_repo.py b/hub/persistence/repositories/heat_pump_simulation_repo.py similarity index 96% rename from persistence/repositories/heat_pump_simulation_repo.py rename to hub/persistence/repositories/heat_pump_simulation_repo.py index b93f14b0..4f0ef60e 100644 --- a/persistence/repositories/heat_pump_simulation_repo.py +++ b/hub/persistence/repositories/heat_pump_simulation_repo.py @@ -5,12 +5,12 @@ Copyright © 2022 Concordia CERC group Project Coder Peter Yefi peteryefi@gmail.com """ -from persistence import BaseRepo, CityRepo +from hub.persistence import BaseRepo, CityRepo from sqlalchemy.exc import SQLAlchemyError from sqlalchemy import select -from persistence.models import HeatPumpSimulation +from hub.persistence.models import HeatPumpSimulation from typing import Union, Dict -from hub_logger import logger +from hub.hub_logger import logger class HeatPumpSimulationRepo(BaseRepo): diff --git a/persistence/repositories/user_repo.py b/hub/persistence/repositories/user_repo.py similarity index 94% rename from persistence/repositories/user_repo.py rename to hub/persistence/repositories/user_repo.py index 585628a9..cfff2f22 100644 --- a/persistence/repositories/user_repo.py +++ b/hub/persistence/repositories/user_repo.py @@ -5,14 +5,14 @@ Copyright © 2022 Concordia CERC group Project Coder Peter Yefi peteryefi@gmail.com """ -from persistence import BaseRepo +from hub.persistence import BaseRepo from sqlalchemy.exc import SQLAlchemyError from sqlalchemy import select -from persistence.models import User -from persistence.models import UserRoles -from helpers.auth import Auth +from hub.persistence.models import User +from hub.persistence.models import UserRoles +from hub.helpers.auth import Auth from typing import Union, Dict -from hub_logger import logger +from hub.hub_logger import logger import datetime diff --git a/pylintrc b/hub/pylintrc similarity index 100% rename from pylintrc rename to hub/pylintrc diff --git a/requirements.txt b/hub/requirements.txt similarity index 100% rename from requirements.txt rename to hub/requirements.txt diff --git a/unittests/test_city_layers.py b/hub/unittests/test_city_layers.py similarity index 91% rename from unittests/test_city_layers.py rename to hub/unittests/test_city_layers.py index 153515fb..dee4e26b 100644 --- a/unittests/test_city_layers.py +++ b/hub/unittests/test_city_layers.py @@ -12,10 +12,10 @@ import os import time import uuid from pathlib import Path -from imports.geometry_factory import GeometryFactory -from imports.usage_factory import UsageFactory -from imports.construction_factory import ConstructionFactory -from exports.energy_building_exports_factory import EnergyBuildingsExportsFactory +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.usage_factory import UsageFactory +from hub.imports.construction_factory import ConstructionFactory +from hub.exports.energy_building_exports_factory import EnergyBuildingsExportsFactory import pandas as pd from geopandas import GeoDataFrame from shapely.geometry import Polygon diff --git a/unittests/test_city_merge.py b/hub/unittests/test_city_merge.py similarity index 95% rename from unittests/test_city_merge.py rename to hub/unittests/test_city_merge.py index 3e087fa0..ff7f4869 100644 --- a/unittests/test_city_merge.py +++ b/hub/unittests/test_city_merge.py @@ -7,7 +7,7 @@ Project Coder Guille Gutierrez Guillermo.GutierrezMorote@concordia.ca from pathlib import Path from unittest import TestCase -from imports.geometry_factory import GeometryFactory +from hub.imports.geometry_factory import GeometryFactory class TestCityMerge(TestCase): diff --git a/unittests/test_construction_catalog.py b/hub/unittests/test_construction_catalog.py similarity index 91% rename from unittests/test_construction_catalog.py rename to hub/unittests/test_construction_catalog.py index 8ee48cae..ba50cd26 100644 --- a/unittests/test_construction_catalog.py +++ b/hub/unittests/test_construction_catalog.py @@ -6,7 +6,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from unittest import TestCase -from catalog_factories.construction_catalog_factory import ConstructionCatalogFactory +from hub.catalog_factories.construction_catalog_factory import ConstructionCatalogFactory class TestConstructionCatalog(TestCase): diff --git a/unittests/test_construction_factory.py b/hub/unittests/test_construction_factory.py similarity index 98% rename from unittests/test_construction_factory.py rename to hub/unittests/test_construction_factory.py index 6ba75ee9..0678709a 100644 --- a/unittests/test_construction_factory.py +++ b/hub/unittests/test_construction_factory.py @@ -7,9 +7,9 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca from pathlib import Path from unittest import TestCase -from imports.geometry_factory import GeometryFactory -from imports.construction_factory import ConstructionFactory -from imports.geometry.helpers.geometry_helper import GeometryHelper +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.construction_factory import ConstructionFactory +from hub.imports.geometry.helpers.geometry_helper import GeometryHelper class TestConstructionFactory(TestCase): diff --git a/unittests/test_db_factory.py b/hub/unittests/test_db_factory.py similarity index 90% rename from unittests/test_db_factory.py rename to hub/unittests/test_db_factory.py index 09a062ab..5e54a50f 100644 --- a/unittests/test_db_factory.py +++ b/hub/unittests/test_db_factory.py @@ -5,14 +5,14 @@ Copyright © 2022 Concordia CERC group Project Coder Peter Yefi peteryefi@gmail.com """ from unittest import TestCase -from imports.geometry_factory import GeometryFactory -from imports.db_factory import DBFactory -from imports.user_factory import UserFactory -from exports.db_factory import DBFactory as ExportDBFactory -from persistence.base_repo import BaseRepo +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.db_factory import DBFactory +from hub.imports.user_factory import UserFactory +from hub.exports.db_factory import DBFactory as ExportDBFactory +from hub.persistence.base_repo import BaseRepo from sqlalchemy import create_engine -from persistence.models import City -from persistence.models import User, UserRoles +from hub.persistence.models import City +from hub.persistence.models import User, UserRoles from pickle import loads from sqlalchemy.exc import ProgrammingError @@ -48,7 +48,7 @@ class TestDBFactory(TestCase): User.__table__.create(bind=repo.engine, checkfirst=True) City.__table__.create(bind=repo.engine, checkfirst=True) - city_file = "../unittests/tests_data/C40_Final.gml" + city_file = "tests_data/C40_Final.gml" cls.city = GeometryFactory('citygml', city_file).city cls._db_factory = DBFactory(db_name='test_db', app_env='TEST', dotenv_path='../.env') cls._export_db_factory = ExportDBFactory(db_name='test_db', app_env='TEST', dotenv_path='../.env') diff --git a/unittests/test_energy_systems_air_source_hp.py b/hub/unittests/test_energy_systems_air_source_hp.py similarity index 84% rename from unittests/test_energy_systems_air_source_hp.py rename to hub/unittests/test_energy_systems_air_source_hp.py index a35a9c97..f5933df1 100644 --- a/unittests/test_energy_systems_air_source_hp.py +++ b/hub/unittests/test_energy_systems_air_source_hp.py @@ -6,10 +6,10 @@ Project Coder Peter Yefi peteryefi@gmail.com """ import pandas as pd from unittest import TestCase -from imports.geometry_factory import GeometryFactory -from imports.energy_systems_factory import EnergySystemsFactory -from city_model_structure.energy_systems.air_source_hp import AirSourceHP -from exports.energy_systems_factory import EnergySystemsExportFactory +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.energy_systems_factory import EnergySystemsFactory +from hub.city_model_structure.energy_systems.air_source_hp import AirSourceHP +from hub.exports.energy_systems_factory import EnergySystemsExportFactory import os # User defined paramenters @@ -38,8 +38,8 @@ class TestEnergySystemsFactory(TestCase): Test setup :return: None """ - city_file = "../unittests/tests_data/C40_Final.gml" - self._output_path = "../unittests/tests_data/as_user_output.csv" + city_file = "tests_data/C40_Final.gml" + self._output_path = "/tests_data/as_user_output.csv" self._city = GeometryFactory('citygml', path=city_file).city EnergySystemsFactory('air source hp', self._city).enrich() diff --git a/unittests/test_energy_systems_water_to_water_hp.py b/hub/unittests/test_energy_systems_water_to_water_hp.py similarity index 85% rename from unittests/test_energy_systems_water_to_water_hp.py rename to hub/unittests/test_energy_systems_water_to_water_hp.py index 95837aee..e2909d96 100644 --- a/unittests/test_energy_systems_water_to_water_hp.py +++ b/hub/unittests/test_energy_systems_water_to_water_hp.py @@ -5,10 +5,10 @@ Copyright © 2022 Concordia CERC group Project Coder Peter Yefi peteryefi@gmail.com """ from unittest import TestCase -from imports.geometry_factory import GeometryFactory -from imports.energy_systems_factory import EnergySystemsFactory -from city_model_structure.energy_systems.water_to_water_hp import WaterToWaterHP -from exports.energy_systems_factory import EnergySystemsExportFactory +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.energy_systems_factory import EnergySystemsFactory +from hub.city_model_structure.energy_systems.water_to_water_hp import WaterToWaterHP +from hub.exports.energy_systems_factory import EnergySystemsExportFactory import pandas as pd import os @@ -39,8 +39,8 @@ class TestEnergySystemsFactory(TestCase): Test setup :return: None """ - city_file = "../unittests/tests_data/C40_Final.gml" - self._output_path = "../unittests/tests_data/w2w_user_output.csv" + city_file = "tests_data/C40_Final.gml" + self._output_path = "/tests_data/w2w_user_output.csv" self._city = GeometryFactory('citygml', path=city_file).city EnergySystemsFactory('water to water hp', self._city).enrich() diff --git a/unittests/test_enrichement.py b/hub/unittests/test_enrichement.py similarity index 96% rename from unittests/test_enrichement.py rename to hub/unittests/test_enrichement.py index 4d8ac187..b4129477 100644 --- a/unittests/test_enrichement.py +++ b/hub/unittests/test_enrichement.py @@ -6,10 +6,10 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path from unittest import TestCase -from imports.geometry_factory import GeometryFactory -from imports.geometry.helpers.geometry_helper import GeometryHelper -from imports.usage_factory import UsageFactory -from imports.construction_factory import ConstructionFactory +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.geometry.helpers.geometry_helper import GeometryHelper +from hub.imports.usage_factory import UsageFactory +from hub.imports.construction_factory import ConstructionFactory class TestGeometryFactory(TestCase): diff --git a/unittests/test_exports.py b/hub/unittests/test_exports.py similarity index 88% rename from unittests/test_exports.py rename to hub/unittests/test_exports.py index db564af2..f216dc08 100644 --- a/unittests/test_exports.py +++ b/hub/unittests/test_exports.py @@ -9,14 +9,14 @@ Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concord from pathlib import Path from unittest import TestCase import pandas as pd -from imports.geometry_factory import GeometryFactory -from imports.geometry.helpers.geometry_helper import GeometryHelper -from imports.construction_factory import ConstructionFactory -from imports.usage_factory import UsageFactory -from exports.exports_factory import ExportsFactory -from exports.energy_building_exports_factory import EnergyBuildingsExportsFactory -import helpers.constants as cte -from city_model_structure.city import City +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.geometry.helpers.geometry_helper import GeometryHelper +from hub.imports.construction_factory import ConstructionFactory +from hub.imports.usage_factory import UsageFactory +from hub.exports.exports_factory import ExportsFactory +from hub.exports.energy_building_exports_factory import EnergyBuildingsExportsFactory +import hub.helpers.constants as cte +from hub.city_model_structure.city import City class TestExports(TestCase): diff --git a/unittests/test_geometry_factory.py b/hub/unittests/test_geometry_factory.py similarity index 96% rename from unittests/test_geometry_factory.py rename to hub/unittests/test_geometry_factory.py index 2558c637..6f2df014 100644 --- a/unittests/test_geometry_factory.py +++ b/hub/unittests/test_geometry_factory.py @@ -9,9 +9,9 @@ from unittest import TestCase from numpy import inf -import exports.exports_factory -from imports.construction_factory import ConstructionFactory -from imports.geometry_factory import GeometryFactory +import hub.exports.exports_factory +from hub.imports.construction_factory import ConstructionFactory +from hub.imports.geometry_factory import GeometryFactory class TestGeometryFactory(TestCase): @@ -156,6 +156,6 @@ class TestGeometryFactory(TestCase): year_of_construction_field='ANNEE_CONS', function_field='LIBELLE_UT') - exports.exports_factory.ExportsFactory('obj', city, self._output_path).export() + hub.exports.exports_factory.ExportsFactory('obj', city, self._output_path).export() self.assertEqual(207, len(city.buildings), 'wrong number of buildings') self._check_buildings(city) diff --git a/unittests/test_greenery_catalog.py b/hub/unittests/test_greenery_catalog.py similarity index 93% rename from unittests/test_greenery_catalog.py rename to hub/unittests/test_greenery_catalog.py index efcde06e..d7f9c3c5 100644 --- a/unittests/test_greenery_catalog.py +++ b/hub/unittests/test_greenery_catalog.py @@ -7,7 +7,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca from unittest import TestCase -from catalog_factories.greenery_catalog_factory import GreeneryCatalogFactory +from hub.catalog_factories.greenery_catalog_factory import GreeneryCatalogFactory class TestGreeneryCatalog(TestCase): diff --git a/unittests/test_greenery_in_idf.py b/hub/unittests/test_greenery_in_idf.py similarity index 84% rename from unittests/test_greenery_in_idf.py rename to hub/unittests/test_greenery_in_idf.py index bef10a57..70ded84e 100644 --- a/unittests/test_greenery_in_idf.py +++ b/hub/unittests/test_greenery_in_idf.py @@ -6,15 +6,15 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path import csv -import helpers.constants as cte +import hub.helpers.constants as cte from unittest import TestCase -from imports.geometry_factory import GeometryFactory -from imports.usage_factory import UsageFactory -from imports.construction_factory import ConstructionFactory -from exports.energy_building_exports_factory import EnergyBuildingsExportsFactory -from city_model_structure.greenery.vegetation import Vegetation -from city_model_structure.greenery.soil import Soil -from city_model_structure.greenery.plant import Plant +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.usage_factory import UsageFactory +from hub.imports.construction_factory import ConstructionFactory +from hub.exports.energy_building_exports_factory import EnergyBuildingsExportsFactory +from hub.city_model_structure.greenery.vegetation import Vegetation +from hub.city_model_structure.greenery.soil import Soil +from hub.city_model_structure.greenery.plant import Plant class GreeneryInIdf(TestCase): @@ -24,8 +24,8 @@ class GreeneryInIdf(TestCase): @staticmethod def test_greenery_in_idf(): - city_file = "../unittests/tests_data/one_building_in_kelowna.gml" - output_path = Path('../unittests/tests_outputs/').resolve() + city_file = "tests_data/one_building_in_kelowna.gml" + output_path = Path('tests_outputs/').resolve() city = GeometryFactory('citygml', path=city_file).city for building in city.buildings: diff --git a/unittests/test_heat_pump_simulation.py b/hub/unittests/test_heat_pump_simulation.py similarity index 87% rename from unittests/test_heat_pump_simulation.py rename to hub/unittests/test_heat_pump_simulation.py index 1fa31e4f..61c1f13b 100644 --- a/unittests/test_heat_pump_simulation.py +++ b/hub/unittests/test_heat_pump_simulation.py @@ -5,21 +5,21 @@ Copyright © 2022 Concordia CERC group Project Coder Peter Yefi peteryefi@gmail.com """ from unittest import TestCase -from imports.geometry_factory import GeometryFactory -from imports.energy_systems_factory import EnergySystemsFactory -from exports.energy_systems_factory import EnergySystemsExportFactory -from imports.db_factory import DBFactory -from exports.db_factory import DBFactory as ExportDBFactory -from persistence.base_repo import BaseRepo +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.energy_systems_factory import EnergySystemsFactory +from hub.exports.energy_systems_factory import EnergySystemsExportFactory +from hub.imports.db_factory import DBFactory +from hub.exports.db_factory import DBFactory as ExportDBFactory +from hub.persistence.base_repo import BaseRepo from sqlalchemy import create_engine -from persistence.models import City -from persistence.models import SimulationTypes -from persistence.models import HeatPumpTypes -from persistence.models import HeatPumpSimulation -from persistence.models import User +from hub.persistence.models import City +from hub.persistence.models import SimulationTypes +from hub.persistence.models import HeatPumpTypes +from hub.persistence.models import HeatPumpSimulation +from hub.persistence.models import User from sqlalchemy.exc import ProgrammingError -from imports.user_factory import UserFactory -from persistence.models import UserRoles +from hub.imports.user_factory import UserFactory +from hub.persistence.models import UserRoles # User defined paramenters hp_sim_data = { @@ -69,7 +69,7 @@ class TestHeatPumpSimulation(TestCase): HeatPumpSimulation.__table__.create(bind=repo.engine, checkfirst=True) - city_file = "../unittests/tests_data/C40_Final.gml" + city_file = "tests_data/C40_Final.gml" cls._city = GeometryFactory('citygml', city_file).city EnergySystemsFactory('air source hp', cls._city).enrich() diff --git a/unittests/test_insel_exports.py b/hub/unittests/test_insel_exports.py similarity index 94% rename from unittests/test_insel_exports.py rename to hub/unittests/test_insel_exports.py index bc6b2776..473e65d5 100644 --- a/unittests/test_insel_exports.py +++ b/hub/unittests/test_insel_exports.py @@ -8,13 +8,13 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca from pathlib import Path from unittest import TestCase import pandas as pd -import helpers.constants as cte -from helpers.monthly_values import MonthlyValues -from imports.geometry_factory import GeometryFactory -from imports.construction_factory import ConstructionFactory -from imports.usage_factory import UsageFactory -from exports.energy_building_exports_factory import EnergyBuildingsExportsFactory -from imports.weather_factory import WeatherFactory +import hub.helpers.constants as cte +from hub.helpers.monthly_values import MonthlyValues +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.construction_factory import ConstructionFactory +from hub.imports.usage_factory import UsageFactory +from hub.exports.energy_building_exports_factory import EnergyBuildingsExportsFactory +from hub.imports.weather_factory import WeatherFactory class TestExports(TestCase): diff --git a/unittests/test_life_cycle_assessment_factory.py b/hub/unittests/test_life_cycle_assessment_factory.py similarity index 79% rename from unittests/test_life_cycle_assessment_factory.py rename to hub/unittests/test_life_cycle_assessment_factory.py index ef00cd79..38e87267 100644 --- a/unittests/test_life_cycle_assessment_factory.py +++ b/hub/unittests/test_life_cycle_assessment_factory.py @@ -6,8 +6,8 @@ Project Coder Atiya atiya.atiya@mail.concordia.ca """ from pathlib import Path from unittest import TestCase -from imports.geometry_factory import GeometryFactory -from imports.life_cycle_assessment_factory import LifeCycleAssessment +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.life_cycle_assessment_factory import LifeCycleAssessment class TestLifeCycleAssessment(TestCase): @@ -23,28 +23,28 @@ class TestLifeCycleAssessment(TestCase): self._example_path = (Path(__file__).parent / 'tests_data').resolve() def test_fuel(self): - city_file = "../unittests/tests_data/C40_Final.gml" + city_file = "tests_data/C40_Final.gml" city = GeometryFactory('citygml', path=city_file).city LifeCycleAssessment('fuel', city).enrich() for fuel in city.fuels: self.assertTrue(len(city.fuels) > 0) def test_vehicle(self): - city_file = "../unittests/tests_data/C40_Final.gml" + city_file = "tests_data/C40_Final.gml" city = GeometryFactory('citygml', path=city_file).city LifeCycleAssessment('vehicle', city).enrich() for vehicle in city.vehicles: self.assertTrue(len(city.vehicles) > 0) def test_machine(self): - city_file = "../unittests/tests_data/C40_Final.gml" + city_file = "tests_data/C40_Final.gml" city = GeometryFactory('citygml', path=city_file).city LifeCycleAssessment('machine', city).enrich() for machine in city.machines: self.assertTrue(len(city.machines) > 0) def test_material(self): - city_file = "../unittests/tests_data/C40_Final.gml" + city_file = "tests_data/C40_Final.gml" city = GeometryFactory('citygml', path=city_file).city LifeCycleAssessment('material', city).enrich() for material in city.lca_materials: diff --git a/unittests/test_usage_catalog.py b/hub/unittests/test_usage_catalog.py similarity index 90% rename from unittests/test_usage_catalog.py rename to hub/unittests/test_usage_catalog.py index 2cc5dfe5..257fd9ae 100644 --- a/unittests/test_usage_catalog.py +++ b/hub/unittests/test_usage_catalog.py @@ -6,7 +6,7 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from unittest import TestCase -from catalog_factories.usage_catalog_factory import UsageCatalogFactory +from hub.catalog_factories.usage_catalog_factory import UsageCatalogFactory class TestConstructionCatalog(TestCase): diff --git a/unittests/test_usage_factory.py b/hub/unittests/test_usage_factory.py similarity index 98% rename from unittests/test_usage_factory.py rename to hub/unittests/test_usage_factory.py index d9357fa8..767fefc1 100644 --- a/unittests/test_usage_factory.py +++ b/hub/unittests/test_usage_factory.py @@ -7,9 +7,9 @@ Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca from pathlib import Path from unittest import TestCase -from imports.geometry_factory import GeometryFactory -from imports.usage_factory import UsageFactory -from imports.geometry.helpers.geometry_helper import GeometryHelper +from hub.imports.geometry_factory import GeometryFactory +from hub.imports.usage_factory import UsageFactory +from hub.imports.geometry.helpers.geometry_helper import GeometryHelper class TestUsageFactory(TestCase): diff --git a/unittests/tests_data/C40_Final.gml b/hub/unittests/tests_data/C40_Final.gml similarity index 100% rename from unittests/tests_data/C40_Final.gml rename to hub/unittests/tests_data/C40_Final.gml diff --git a/unittests/tests_data/C40_Game.gml b/hub/unittests/tests_data/C40_Game.gml similarity index 100% rename from unittests/tests_data/C40_Game.gml rename to hub/unittests/tests_data/C40_Game.gml diff --git a/unittests/tests_data/EV-GM energy demand weekly report_01-26-20_04-30.csv b/hub/unittests/tests_data/EV-GM energy demand weekly report_01-26-20_04-30.csv similarity index 100% rename from unittests/tests_data/EV-GM energy demand weekly report_01-26-20_04-30.csv rename to hub/unittests/tests_data/EV-GM energy demand weekly report_01-26-20_04-30.csv diff --git a/unittests/tests_data/EV_GM_MB_LoD2.gml b/hub/unittests/tests_data/EV_GM_MB_LoD2.gml similarity index 100% rename from unittests/tests_data/EV_GM_MB_LoD2.gml rename to hub/unittests/tests_data/EV_GM_MB_LoD2.gml diff --git a/unittests/tests_data/FZK-Haus-LoD4-KIT-IAI-KHH-B36-V1.gml b/hub/unittests/tests_data/FZK-Haus-LoD4-KIT-IAI-KHH-B36-V1.gml similarity index 100% rename from unittests/tests_data/FZK-Haus-LoD4-KIT-IAI-KHH-B36-V1.gml rename to hub/unittests/tests_data/FZK-Haus-LoD4-KIT-IAI-KHH-B36-V1.gml diff --git a/unittests/tests_data/FZK_Haus_LoD_0.gml b/hub/unittests/tests_data/FZK_Haus_LoD_0.gml similarity index 100% rename from unittests/tests_data/FZK_Haus_LoD_0.gml rename to hub/unittests/tests_data/FZK_Haus_LoD_0.gml diff --git a/unittests/tests_data/FZK_Haus_LoD_1.gml b/hub/unittests/tests_data/FZK_Haus_LoD_1.gml similarity index 100% rename from unittests/tests_data/FZK_Haus_LoD_1.gml rename to hub/unittests/tests_data/FZK_Haus_LoD_1.gml diff --git a/unittests/tests_data/FZK_Haus_LoD_2.gml b/hub/unittests/tests_data/FZK_Haus_LoD_2.gml similarity index 100% rename from unittests/tests_data/FZK_Haus_LoD_2.gml rename to hub/unittests/tests_data/FZK_Haus_LoD_2.gml diff --git a/unittests/tests_data/FZK_Haus_LoD_3.gml b/hub/unittests/tests_data/FZK_Haus_LoD_3.gml similarity index 100% rename from unittests/tests_data/FZK_Haus_LoD_3.gml rename to hub/unittests/tests_data/FZK_Haus_LoD_3.gml diff --git a/unittests/tests_data/city_layers.json b/hub/unittests/tests_data/city_layers.json similarity index 100% rename from unittests/tests_data/city_layers.json rename to hub/unittests/tests_data/city_layers.json diff --git a/unittests/tests_data/concordia.geojson b/hub/unittests/tests_data/concordia.geojson similarity index 100% rename from unittests/tests_data/concordia.geojson rename to hub/unittests/tests_data/concordia.geojson diff --git a/unittests/tests_data/custom.geojson b/hub/unittests/tests_data/custom.geojson similarity index 100% rename from unittests/tests_data/custom.geojson rename to hub/unittests/tests_data/custom.geojson diff --git a/unittests/tests_data/dompark.3dm b/hub/unittests/tests_data/dompark.3dm similarity index 100% rename from unittests/tests_data/dompark.3dm rename to hub/unittests/tests_data/dompark.3dm diff --git a/unittests/tests_data/kelowna.obj b/hub/unittests/tests_data/kelowna.obj similarity index 100% rename from unittests/tests_data/kelowna.obj rename to hub/unittests/tests_data/kelowna.obj diff --git a/unittests/tests_data/lca_data.xml b/hub/unittests/tests_data/lca_data.xml similarity index 100% rename from unittests/tests_data/lca_data.xml rename to hub/unittests/tests_data/lca_data.xml diff --git a/unittests/tests_data/one_building_in_kelowna.gml b/hub/unittests/tests_data/one_building_in_kelowna.gml similarity index 100% rename from unittests/tests_data/one_building_in_kelowna.gml rename to hub/unittests/tests_data/one_building_in_kelowna.gml diff --git a/unittests/tests_data/one_building_in_kelowna_alkis.gml b/hub/unittests/tests_data/one_building_in_kelowna_alkis.gml similarity index 100% rename from unittests/tests_data/one_building_in_kelowna_alkis.gml rename to hub/unittests/tests_data/one_building_in_kelowna_alkis.gml diff --git a/unittests/tests_data/one_building_in_kelowna_sra_SW.out b/hub/unittests/tests_data/one_building_in_kelowna_sra_SW.out similarity index 100% rename from unittests/tests_data/one_building_in_kelowna_sra_SW.out rename to hub/unittests/tests_data/one_building_in_kelowna_sra_SW.out diff --git a/unittests/tests_data/pluto_building.gml b/hub/unittests/tests_data/pluto_building.gml similarity index 100% rename from unittests/tests_data/pluto_building.gml rename to hub/unittests/tests_data/pluto_building.gml diff --git a/unittests/tests_data/sample.geojson b/hub/unittests/tests_data/sample.geojson similarity index 100% rename from unittests/tests_data/sample.geojson rename to hub/unittests/tests_data/sample.geojson diff --git a/unittests/tests_data/subway.osm b/hub/unittests/tests_data/subway.osm similarity index 100% rename from unittests/tests_data/subway.osm rename to hub/unittests/tests_data/subway.osm diff --git a/unittests/tests_outputs/.gitignore b/hub/unittests/tests_outputs/.gitignore similarity index 72% rename from unittests/tests_outputs/.gitignore rename to hub/unittests/tests_outputs/.gitignore index 86d0cb27..9c3f9e45 100644 --- a/unittests/tests_outputs/.gitignore +++ b/hub/unittests/tests_outputs/.gitignore @@ -1,4 +1,4 @@ # Ignore everything in this directory -* +.gitignore # Except this file !.gitignore \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..6a96c00c --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,52 @@ +# pyproject.toml + +[build-system] +requires = ["setuptools>=61.0.0", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "cerc_hub" +version = "0.1.6" +description = "CERC Hub consist in a set of classes (Central data model), importers and exporters to help researchers to create better and sustainable cities" +readme = "README.md" +authors = [{ name = "Guillermo Gutierrez", email = "Guillermo.GutierrezMorote@concordia.ca" }] +license = { file = "LICENSE.md" } +classifiers = [ + "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)", + "Programming Language :: Python", + "Programming Language :: Python :: 3", +] +keywords = ["city", "hub", "cerc"] +dependencies = [ + "xmltodict", + "numpy", + "trimesh", + "pyproj", + "pandas", + "requests", + "esoreader", + "geomeppy", + "PyWavefront", + "xlrd", + "openpyxl", + "networkx", + "parseidf==1.0.0", + "ply", + "rhino3dm==7.7.0", + "scipy", + "PyYAML", + "pyecore==0.12.2", + "python-dotenv", + "SQLAlchemy", + "bcrypt==4.0.1", + "shapely", + "geopandas", + "triangle" +] +requires-python = ">=3.9" + +[project.optional-dependencies] +dev = ["pip-tools", "pytest"] + +[project.urls] +Homepage = "https://rs-loy-gitlab.concordia.ca/Guille/hub" diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..3d10ffd9 --- /dev/null +++ b/setup.py @@ -0,0 +1,31 @@ +from setuptools import setup, find_packages +import os.path +import glob + +setup( + name='hub', + version="0.1", + packages=find_packages(exclude="unittests"), + data_files=[ + ('config', [os.path.join('hub/config', 'configuration.ini')]), + ('greenery', glob.glob('hub/catalog_factories/greenery/ecore_greenery/*.ecore')), + ('data', glob.glob('hub/data/construction/*.xml')), + ('data', glob.glob('hub/data/customized_imports/*.xml')), + ('data', glob.glob('hub/data/energy_systems/*.xml')), + ('data', glob.glob('hub/data/energy_systems/*.insel')), + ('data', glob.glob('hub/data/energy_systems/*.xlsx')), + ('data', glob.glob('hub/data/energy_systems/*.txt')), + ('data', glob.glob('hub/data/energy_systems/*.yaml')), + ('data', glob.glob('hub/data/greenery/*.xml')), + ('data', glob.glob('hub/data/life_cycle_assessment/*.xml')), + ('data', glob.glob('hub/data/schedules/*.xml')), + ('data', glob.glob('hub/data/schedules/*.xlsx')), + ('data', glob.glob('hub/data/schedules/idf_files/*.idf')), + ('data', glob.glob('hub/data/sensors/*.json')), + ('data', glob.glob('hub/data/usage/*.xml')), + ('data', glob.glob('hub/data/usage/*.xlsx')), + ('data', glob.glob('hub/data/weather/*.dat')), + ('data', glob.glob('hub/data/weather/epw/*.epw')), + ('data', glob.glob('hub/data/weather/*.dat')) + ], +)