From fe31091556fa552d52a5e2f6605dd96ba4dc2865 Mon Sep 17 00:00:00 2001 From: peteryefi Date: Tue, 22 Oct 2024 11:24:23 -0400 Subject: [PATCH 1/3] Restructured project for building --- .bumpversion.cfg | 2 +- .gitignore | 3 +- MANIFEST.in | 6 +- readme.md => README.md | 73 ++++++------ datatypes/relationships/one_to_many.py | 14 --- enumerations/__init__.py | 62 ---------- .../relationships => metamenth}/__init__.py | 0 .../datatypes}/__init__.py | 0 {datatypes => metamenth/datatypes}/address.py | 4 +- .../datatypes}/binary_measure.py | 4 +- .../datatypes}/continuous_measure.py | 2 +- .../datatypes}/exponential_measure.py | 2 +- .../datatypes}/interfaces/__init__.py | 0 .../interfaces/abstract_dynamic_entity.py | 10 +- .../datatypes}/interfaces/abstract_measure.py | 4 +- .../interfaces/abstract_range_measure.py | 2 +- .../datatypes}/linear_measure.py | 2 +- {datatypes => metamenth/datatypes}/measure.py | 2 +- .../datatypes}/observable_message.py | 0 .../datatypes}/operational_schedule.py | 2 +- {datatypes => metamenth/datatypes}/point.py | 0 .../datatypes}/rated_device_measure.py | 4 +- .../datatypes/relationships}/__init__.py | 0 .../relationships/interfaces}/__init__.py | 0 .../interfaces/abstract_relationship.py | 2 +- .../datatypes/relationships/one_to_many.py | 14 +++ .../datatypes}/schedulable_entity.py | 10 +- .../energysystem}/__init__.py | 0 .../energysystem/electricals}/__init__.py | 0 .../energysystem}/electricals/alternator.py | 6 +- .../electricals/automatic_transfer_switch.py | 12 +- .../uninterruptible_power_supply.py | 18 +-- .../energysystem}/engine.py | 12 +- .../energysystem/interfaces}/__init__.py | 0 .../abstract_common_energy_system.py | 6 +- .../interfaces/abstract_electrical.py | 4 +- .../interfaces/abstract_energy_system.py | 6 +- .../non_renewable_energy_system.py | 4 +- .../energysystem}/renewable_energy_system.py | 4 +- .../energysystem}/solar_pv.py | 10 +- .../energysystem/storage_system}/__init__.py | 0 .../energysystem}/storage_system/battery.py | 8 +- .../storage_system/electric_vehicle.py | 8 +- .../immobile_storage_energy_system.py | 20 ++-- .../mobile_storage_energy_system.py | 4 +- .../storage_system/super_capacitor.py | 8 +- .../energysystem}/wind_mill.py | 6 +- metamenth/enumerations/__init__.py | 62 ++++++++++ .../enumerations}/abstract_enum.py | 0 .../enumerations}/air_volume_type.py | 2 +- .../enumerations}/appliacne_category.py | 2 +- .../enumerations}/appliance_type.py | 2 +- .../enumerations}/ats_operation_mode.py | 2 +- .../enumerations}/ats_power_source_type.py | 2 +- .../enumerations}/ats_switching_mechanism.py | 2 +- .../enumerations}/ats_transition_type.py | 2 +- .../enumerations}/battery_tech.py | 2 +- .../enumerations}/boiler_category.py | 2 +- .../enumerations}/building_entity.py | 0 .../enumerations}/building_type.py | 2 +- .../enumerations}/capacitor_tech.py | 2 +- .../enumerations}/cell_type.py | 2 +- .../enumerations}/chiller_type.py | 2 +- .../enumerations}/circulation_pump_type.py | 2 +- .../enumerations}/coil_material.py | 2 +- .../enumerations}/compressor_type.py | 2 +- .../enumerations}/cover_type.py | 0 .../enumerations}/damper_type.py | 2 +- .../enumerations}/data_measurement_type.py | 0 .../duct_connection_entity_type.py | 2 +- .../enumerations}/duct_sub_type.py | 2 +- .../enumerations}/duct_type.py | 2 +- .../enumerations}/energy_source.py | 2 +- .../enumerations}/engine_mode.py | 2 +- .../enumerations}/engine_sub_type.py | 2 +- .../enumerations}/engine_type.py | 2 +- .../enumerations}/filter_type.py | 2 +- .../enumerations}/floor_type.py | 2 +- .../enumerations}/heat_exchanger_flow_type.py | 2 +- .../enumerations}/heat_exchanger_type.py | 2 +- .../enumerations}/heat_source.py | 2 +- .../enumerations}/heating_type.py | 2 +- .../enumerations}/hvac_type.py | 0 .../enumerations}/layer_roughness.py | 2 +- .../enumerations}/material_type.py | 0 .../enumerations}/measurement_unit.py | 2 +- .../meter_accumulation_frequency.py | 2 +- .../enumerations}/meter_measure_mode.py | 2 +- .../enumerations}/meter_type.py | 2 +- .../enumerations}/open_space_type.py | 2 +- .../enumerations}/operation_type.py | 2 +- .../enumerations}/power_state.py | 2 +- .../enumerations}/pump_type.py | 2 +- .../enumerations}/radiant_slab_type.py | 2 +- .../enumerations}/recording_types.py | 0 .../enumerations}/refrigerant_type.py | 2 +- .../enumerations}/relationship_name.py | 2 +- .../enumerations}/room_type.py | 2 +- .../enumerations}/sensor_log_type.py | 2 +- .../enumerations}/sensor_measure.py | 2 +- .../enumerations}/sensor_measure_type.py | 0 .../enumerations}/solar_distribution_type.py | 2 +- .../enumerations}/solar_pv_type.py | 2 +- .../enumerations}/terrain_type.py | 2 +- .../enumerations}/trigger_type.py | 0 .../enumerations}/ups_phase.py | 2 +- .../enumerations}/v2g_mode.py | 2 +- .../enumerations}/ventilation_type.py | 2 +- .../enumerations}/waveform.py | 2 +- .../enumerations}/wind_turbine_type.py | 2 +- .../enumerations}/zone_type.py | 0 .../measure_instruments}/__init__.py | 0 .../measure_instruments}/damper_position.py | 2 +- .../electric_vehicle_connectivity.py | 6 +- .../measure_instruments}/ev_charging_meter.py | 12 +- .../interfaces}/__init__.py | 0 .../interfaces/abstract_data_measure.py | 4 +- .../interfaces/abstract_reader.py | 4 +- .../measure_instruments}/meter.py | 14 +-- .../measure_instruments}/meter_measure.py | 4 +- .../measure_instruments}/sensor_data.py | 2 +- .../measure_instruments}/status_measure.py | 2 +- .../measure_instruments}/trigger_history.py | 8 +- .../measure_instruments}/weather_data.py | 4 +- .../measure_instruments}/weather_station.py | 6 +- {misc => metamenth/misc}/__init__.py | 0 {misc => metamenth/misc}/measure_factory.py | 12 +- .../misc}/state_track_decorator.py | 2 +- {misc => metamenth/misc}/validate.py | 22 ++-- .../observers}/__init__.py | 0 .../observers/interfaces}/__init__.py | 0 .../observers}/interfaces/observer.py | 2 +- .../observers}/observable.py | 2 +- .../structure_state_change_logger.py | 4 +- .../structure}/__init__.py | 0 .../structure}/building.py | 42 +++---- {structure => metamenth/structure}/cover.py | 6 +- .../structure}/envelope.py | 4 +- {structure => metamenth/structure}/floor.py | 20 ++-- .../structure}/interfaces/__init__.py | 0 .../interfaces/abstract_floor_space.py | 42 +++---- .../structure}/interfaces/abstract_space.py | 10 +- {structure => metamenth/structure}/layer.py | 6 +- .../structure}/material.py | 6 +- .../structure}/open_space.py | 6 +- {structure => metamenth/structure}/room.py | 7 +- .../subsystem}/__init__.py | 0 .../subsystem}/appliance.py | 14 +-- .../subsystem}/baseboard_heater.py | 6 +- .../subsystem}/building_control_system.py | 4 +- .../subsystem/hvac_components}/__init__.py | 0 .../hvac_components/air_volume_box.py | 8 +- .../subsystem}/hvac_components/boiler.py | 6 +- .../subsystem}/hvac_components/chiller.py | 6 +- .../hvac_components/circulation_pump.py | 6 +- .../subsystem}/hvac_components/compressor.py | 4 +- .../subsystem}/hvac_components/condenser.py | 8 +- .../subsystem}/hvac_components/controller.py | 16 +-- .../hvac_components/cooling_tower.py | 2 +- .../subsystem}/hvac_components/damper.py | 8 +- .../subsystem}/hvac_components/duct.py | 28 ++--- .../hvac_components/duct_connection.py | 29 +++-- .../subsystem}/hvac_components/fan.py | 6 +- .../subsystem}/hvac_components/filter.py | 8 +- .../hvac_components/heat_exchanger.py | 6 +- .../subsystem}/hvac_components/heat_pump.py | 10 +- .../hvac_components}/interfaces/__init__.py | 0 .../abstract_duct_connected_component.py | 6 +- .../interfaces/abstract_hvac_component.py | 20 ++-- .../subsystem}/hvac_components/pump.py | 8 +- .../variable_frequency_drive.py | 4 +- .../subsystem}/hvac_system.py | 2 +- .../subsystem}/interfaces/__init__.py | 0 .../interfaces/abstract_subsystem.py | 0 .../abstract_ventilation_component.py | 4 +- .../subsystem}/radiant_slab.py | 4 +- .../subsystem}/thermal_storage.py | 2 +- .../subsystem}/ventilation_system.py | 14 +-- .../transducers}/__init__.py | 0 .../transducers}/actuator.py | 8 +- .../transducers/interfaces}/__init__.py | 0 .../interfaces/abstract_transducer.py | 8 +- .../transducers}/sensor.py | 16 +-- {utils => metamenth/utils}/__init__.py | 0 {utils => metamenth/utils}/entity_insert.py | 4 +- {utils => metamenth/utils}/entity_remover.py | 2 +- .../utils/search}/__init__.py | 0 .../utils}/search/structure_entity_search.py | 12 +- .../utils}/search/structure_search.py | 14 +-- {visitors => metamenth/virtual}/__init__.py | 0 .../virtual}/interfaces/__init__.py | 0 .../interfaces/abstract_zonal_entity.py | 8 +- {virtual => metamenth/virtual}/zone.py | 16 +-- metamenth/visitors/__init__.py | 0 .../hvac_component_search_visitor.py | 6 +- metamenth/visitors/interfaces/__init__.py | 0 .../interfaces/abstract_space_visitor.py | 2 +- .../visitors}/meter_search_visitor.py | 2 +- .../visitors}/sensor_search_visitor.py | 2 +- .../visitors}/space_search_visitor.py | 2 +- setup.py | 6 +- tests/energy_system/test_energy_systems.py | 62 +++++----- tests/measurement_instruments/test_meter.py | 18 +-- .../test_weather_station.py | 14 +-- tests/structure/base_test.py | 48 ++++---- tests/structure/test_building.py | 50 ++++---- tests/structure/test_cover_and_envelope.py | 12 +- tests/structure/test_floor.py | 14 +-- tests/structure/test_layer.py | 16 +-- tests/structure/test_material.py | 12 +- tests/structure/test_open_space.py | 20 ++-- tests/structure/test_room.py | 60 +++++----- tests/structure/test_zone.py | 26 ++--- tests/subsystem/base_test.py | 34 +++--- tests/subsystem/test_appliance.py | 24 ++-- .../subsystem/test_building_control_system.py | 108 +++++++++--------- tests/transducer/test_actuator.py | 32 +++--- tests/transducer/test_sensor.py | 18 +-- .../test_hvac_component_search_visitor.py | 42 +++---- tests/visitors/test_meter_search_visitor.py | 36 +++--- tests/visitors/test_sensor_search_visitor.py | 54 ++++----- tests/visitors/test_space_search_visitor.py | 32 +++--- 222 files changed, 933 insertions(+), 935 deletions(-) rename readme.md => README.md (63%) delete mode 100644 datatypes/relationships/one_to_many.py delete mode 100644 enumerations/__init__.py rename {datatypes/relationships => metamenth}/__init__.py (100%) rename {datatypes => metamenth/datatypes}/__init__.py (100%) rename {datatypes => metamenth/datatypes}/address.py (95%) rename {datatypes => metamenth/datatypes}/binary_measure.py (80%) rename {datatypes => metamenth/datatypes}/continuous_measure.py (81%) rename {datatypes => metamenth/datatypes}/exponential_measure.py (86%) rename {datatypes => metamenth/datatypes}/interfaces/__init__.py (100%) rename {datatypes => metamenth/datatypes}/interfaces/abstract_dynamic_entity.py (87%) rename {datatypes => metamenth/datatypes}/interfaces/abstract_measure.py (83%) rename {datatypes => metamenth/datatypes}/interfaces/abstract_range_measure.py (92%) rename {datatypes => metamenth/datatypes}/linear_measure.py (85%) rename {datatypes => metamenth/datatypes}/measure.py (81%) rename {datatypes => metamenth/datatypes}/observable_message.py (100%) rename {datatypes => metamenth/datatypes}/operational_schedule.py (88%) rename {datatypes => metamenth/datatypes}/point.py (100%) rename {datatypes => metamenth/datatypes}/rated_device_measure.py (78%) rename {datatypes/relationships/interfaces => metamenth/datatypes/relationships}/__init__.py (100%) rename {energysystem => metamenth/datatypes/relationships/interfaces}/__init__.py (100%) rename {datatypes => metamenth/datatypes}/relationships/interfaces/abstract_relationship.py (71%) create mode 100644 metamenth/datatypes/relationships/one_to_many.py rename {datatypes => metamenth/datatypes}/schedulable_entity.py (86%) rename {energysystem/electricals => metamenth/energysystem}/__init__.py (100%) rename {energysystem/interfaces => metamenth/energysystem/electricals}/__init__.py (100%) rename {energysystem => metamenth/energysystem}/electricals/alternator.py (74%) rename {energysystem => metamenth/energysystem}/electricals/automatic_transfer_switch.py (82%) rename {energysystem => metamenth/energysystem}/electricals/uninterruptible_power_supply.py (82%) rename {energysystem => metamenth/energysystem}/engine.py (85%) rename {energysystem/storage_system => metamenth/energysystem/interfaces}/__init__.py (100%) rename {energysystem => metamenth/energysystem}/interfaces/abstract_common_energy_system.py (90%) rename {energysystem => metamenth/energysystem}/interfaces/abstract_electrical.py (81%) rename {energysystem => metamenth/energysystem}/interfaces/abstract_energy_system.py (88%) rename {energysystem => metamenth/energysystem}/non_renewable_energy_system.py (55%) rename {energysystem => metamenth/energysystem}/renewable_energy_system.py (55%) rename {energysystem => metamenth/energysystem}/solar_pv.py (86%) rename {measure_instruments/interfaces => metamenth/energysystem/storage_system}/__init__.py (100%) rename {energysystem => metamenth/energysystem}/storage_system/battery.py (58%) rename {energysystem => metamenth/energysystem}/storage_system/electric_vehicle.py (81%) rename {energysystem => metamenth/energysystem}/storage_system/immobile_storage_energy_system.py (81%) rename {energysystem => metamenth/energysystem}/storage_system/mobile_storage_energy_system.py (55%) rename {energysystem => metamenth/energysystem}/storage_system/super_capacitor.py (59%) rename {energysystem => metamenth/energysystem}/wind_mill.py (87%) create mode 100644 metamenth/enumerations/__init__.py rename {enumerations => metamenth/enumerations}/abstract_enum.py (100%) rename {enumerations => metamenth/enumerations}/air_volume_type.py (78%) rename {enumerations => metamenth/enumerations}/appliacne_category.py (80%) rename {enumerations => metamenth/enumerations}/appliance_type.py (95%) rename {enumerations => metamenth/enumerations}/ats_operation_mode.py (78%) rename {enumerations => metamenth/enumerations}/ats_power_source_type.py (86%) rename {enumerations => metamenth/enumerations}/ats_switching_mechanism.py (79%) rename {enumerations => metamenth/enumerations}/ats_transition_type.py (73%) rename {enumerations => metamenth/enumerations}/battery_tech.py (78%) rename {enumerations => metamenth/enumerations}/boiler_category.py (83%) rename {enumerations => metamenth/enumerations}/building_entity.py (100%) rename {enumerations => metamenth/enumerations}/building_type.py (79%) rename {enumerations => metamenth/enumerations}/capacitor_tech.py (79%) rename {enumerations => metamenth/enumerations}/cell_type.py (80%) rename {enumerations => metamenth/enumerations}/chiller_type.py (77%) rename {enumerations => metamenth/enumerations}/circulation_pump_type.py (79%) rename {enumerations => metamenth/enumerations}/coil_material.py (67%) rename {enumerations => metamenth/enumerations}/compressor_type.py (87%) rename {enumerations => metamenth/enumerations}/cover_type.py (100%) rename {enumerations => metamenth/enumerations}/damper_type.py (82%) rename {enumerations => metamenth/enumerations}/data_measurement_type.py (100%) rename {enumerations => metamenth/enumerations}/duct_connection_entity_type.py (76%) rename {enumerations => metamenth/enumerations}/duct_sub_type.py (83%) rename {enumerations => metamenth/enumerations}/duct_type.py (80%) rename {enumerations => metamenth/enumerations}/energy_source.py (74%) rename {enumerations => metamenth/enumerations}/engine_mode.py (80%) rename {enumerations => metamenth/enumerations}/engine_sub_type.py (89%) rename {enumerations => metamenth/enumerations}/engine_type.py (84%) rename {enumerations => metamenth/enumerations}/filter_type.py (87%) rename {enumerations => metamenth/enumerations}/floor_type.py (78%) rename {enumerations => metamenth/enumerations}/heat_exchanger_flow_type.py (77%) rename {enumerations => metamenth/enumerations}/heat_exchanger_type.py (81%) rename {enumerations => metamenth/enumerations}/heat_source.py (86%) rename {enumerations => metamenth/enumerations}/heating_type.py (78%) rename {enumerations => metamenth/enumerations}/hvac_type.py (100%) rename {enumerations => metamenth/enumerations}/layer_roughness.py (84%) rename {enumerations => metamenth/enumerations}/material_type.py (100%) rename {enumerations => metamenth/enumerations}/measurement_unit.py (96%) rename {enumerations => metamenth/enumerations}/meter_accumulation_frequency.py (82%) rename {enumerations => metamenth/enumerations}/meter_measure_mode.py (76%) rename {enumerations => metamenth/enumerations}/meter_type.py (80%) rename {enumerations => metamenth/enumerations}/open_space_type.py (89%) rename {enumerations => metamenth/enumerations}/operation_type.py (77%) rename {enumerations => metamenth/enumerations}/power_state.py (86%) rename {enumerations => metamenth/enumerations}/pump_type.py (83%) rename {enumerations => metamenth/enumerations}/radiant_slab_type.py (79%) rename {enumerations => metamenth/enumerations}/recording_types.py (100%) rename {enumerations => metamenth/enumerations}/refrigerant_type.py (73%) rename {enumerations => metamenth/enumerations}/relationship_name.py (81%) rename {enumerations => metamenth/enumerations}/room_type.py (95%) rename {enumerations => metamenth/enumerations}/sensor_log_type.py (77%) rename {enumerations => metamenth/enumerations}/sensor_measure.py (91%) rename {enumerations => metamenth/enumerations}/sensor_measure_type.py (100%) rename {enumerations => metamenth/enumerations}/solar_distribution_type.py (87%) rename {enumerations => metamenth/enumerations}/solar_pv_type.py (80%) rename {enumerations => metamenth/enumerations}/terrain_type.py (79%) rename {enumerations => metamenth/enumerations}/trigger_type.py (100%) rename {enumerations => metamenth/enumerations}/ups_phase.py (77%) rename {enumerations => metamenth/enumerations}/v2g_mode.py (82%) rename {enumerations => metamenth/enumerations}/ventilation_type.py (75%) rename {enumerations => metamenth/enumerations}/waveform.py (79%) rename {enumerations => metamenth/enumerations}/wind_turbine_type.py (86%) rename {enumerations => metamenth/enumerations}/zone_type.py (100%) rename {measure_instruments => metamenth/measure_instruments}/__init__.py (100%) rename {measure_instruments => metamenth/measure_instruments}/damper_position.py (74%) rename {measure_instruments => metamenth/measure_instruments}/electric_vehicle_connectivity.py (91%) rename {measure_instruments => metamenth/measure_instruments}/ev_charging_meter.py (85%) rename {observers => metamenth/measure_instruments/interfaces}/__init__.py (100%) rename {measure_instruments => metamenth/measure_instruments}/interfaces/abstract_data_measure.py (95%) rename {measure_instruments => metamenth/measure_instruments}/interfaces/abstract_reader.py (96%) rename {measure_instruments => metamenth/measure_instruments}/meter.py (92%) rename {measure_instruments => metamenth/measure_instruments}/meter_measure.py (81%) rename {measure_instruments => metamenth/measure_instruments}/sensor_data.py (74%) rename {measure_instruments => metamenth/measure_instruments}/status_measure.py (74%) rename {measure_instruments => metamenth/measure_instruments}/trigger_history.py (64%) rename {measure_instruments => metamenth/measure_instruments}/weather_data.py (91%) rename {measure_instruments => metamenth/measure_instruments}/weather_station.py (94%) rename {misc => metamenth/misc}/__init__.py (100%) rename {misc => metamenth/misc}/measure_factory.py (61%) rename {misc => metamenth/misc}/state_track_decorator.py (96%) rename {misc => metamenth/misc}/validate.py (93%) rename {observers/interfaces => metamenth/observers}/__init__.py (100%) rename {subsystem => metamenth/observers/interfaces}/__init__.py (100%) rename {observers => metamenth/observers}/interfaces/observer.py (86%) rename {observers => metamenth/observers}/observable.py (87%) rename {observers => metamenth/observers}/structure_state_change_logger.py (74%) rename {structure => metamenth/structure}/__init__.py (100%) rename {structure => metamenth/structure}/building.py (93%) rename {structure => metamenth/structure}/cover.py (94%) rename {structure => metamenth/structure}/envelope.py (94%) rename {structure => metamenth/structure}/floor.py (94%) rename {structure => metamenth/structure}/interfaces/__init__.py (100%) rename {structure => metamenth/structure}/interfaces/abstract_floor_space.py (86%) rename {structure => metamenth/structure}/interfaces/abstract_space.py (87%) rename {structure => metamenth/structure}/layer.py (95%) rename {structure => metamenth/structure}/material.py (97%) rename {structure => metamenth/structure}/open_space.py (85%) rename {structure => metamenth/structure}/room.py (87%) rename {subsystem/hvac_components => metamenth/subsystem}/__init__.py (100%) rename {subsystem => metamenth/subsystem}/appliance.py (88%) rename {subsystem => metamenth/subsystem}/baseboard_heater.py (85%) rename {subsystem => metamenth/subsystem}/building_control_system.py (82%) rename {subsystem/hvac_components/interfaces => metamenth/subsystem/hvac_components}/__init__.py (100%) rename {subsystem => metamenth/subsystem}/hvac_components/air_volume_box.py (89%) rename {subsystem => metamenth/subsystem}/hvac_components/boiler.py (85%) rename {subsystem => metamenth/subsystem}/hvac_components/chiller.py (86%) rename {subsystem => metamenth/subsystem}/hvac_components/circulation_pump.py (86%) rename {subsystem => metamenth/subsystem}/hvac_components/compressor.py (83%) rename {subsystem => metamenth/subsystem}/hvac_components/condenser.py (88%) rename {subsystem => metamenth/subsystem}/hvac_components/controller.py (89%) rename {subsystem => metamenth/subsystem}/hvac_components/cooling_tower.py (74%) rename {subsystem => metamenth/subsystem}/hvac_components/damper.py (88%) rename {subsystem => metamenth/subsystem}/hvac_components/duct.py (89%) rename {subsystem => metamenth/subsystem}/hvac_components/duct_connection.py (77%) rename {subsystem => metamenth/subsystem}/hvac_components/fan.py (81%) rename {subsystem => metamenth/subsystem}/hvac_components/filter.py (90%) rename {subsystem => metamenth/subsystem}/hvac_components/heat_exchanger.py (88%) rename {subsystem => metamenth/subsystem}/hvac_components/heat_pump.py (85%) rename {subsystem => metamenth/subsystem/hvac_components}/interfaces/__init__.py (100%) rename {subsystem => metamenth/subsystem}/hvac_components/interfaces/abstract_duct_connected_component.py (74%) rename {subsystem => metamenth/subsystem}/hvac_components/interfaces/abstract_hvac_component.py (89%) rename {subsystem => metamenth/subsystem}/hvac_components/pump.py (90%) rename {subsystem => metamenth/subsystem}/hvac_components/variable_frequency_drive.py (93%) rename {subsystem => metamenth/subsystem}/hvac_system.py (92%) rename {transducers => metamenth/subsystem}/interfaces/__init__.py (100%) rename {subsystem => metamenth/subsystem}/interfaces/abstract_subsystem.py (100%) rename {subsystem => metamenth/subsystem}/interfaces/abstract_ventilation_component.py (90%) rename {subsystem => metamenth/subsystem}/radiant_slab.py (83%) rename {subsystem => metamenth/subsystem}/thermal_storage.py (68%) rename {subsystem => metamenth/subsystem}/ventilation_system.py (88%) rename {transducers => metamenth/transducers}/__init__.py (100%) rename {transducers => metamenth/transducers}/actuator.py (87%) rename {virtual => metamenth/transducers/interfaces}/__init__.py (100%) rename {transducers => metamenth/transducers}/interfaces/abstract_transducer.py (93%) rename {transducers => metamenth/transducers}/sensor.py (90%) rename {utils => metamenth/utils}/__init__.py (100%) rename {utils => metamenth/utils}/entity_insert.py (94%) rename {utils => metamenth/utils}/entity_remover.py (95%) rename {virtual/interfaces => metamenth/utils/search}/__init__.py (100%) rename {utils => metamenth/utils}/search/structure_entity_search.py (91%) rename {utils => metamenth/utils}/search/structure_search.py (88%) rename {visitors => metamenth/virtual}/__init__.py (100%) rename {visitors => metamenth/virtual}/interfaces/__init__.py (100%) rename {virtual => metamenth/virtual}/interfaces/abstract_zonal_entity.py (90%) rename {virtual => metamenth/virtual}/zone.py (95%) create mode 100644 metamenth/visitors/__init__.py rename {visitors => metamenth/visitors}/hvac_component_search_visitor.py (92%) create mode 100644 metamenth/visitors/interfaces/__init__.py rename {visitors => metamenth/visitors}/interfaces/abstract_space_visitor.py (97%) rename {visitors => metamenth/visitors}/meter_search_visitor.py (95%) rename {visitors => metamenth/visitors}/sensor_search_visitor.py (95%) rename {visitors => metamenth/visitors}/space_search_visitor.py (93%) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 23c5294..9b00393 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.2 +current_version = 1.0.2b1 commit = True tag = True diff --git a/.gitignore b/.gitignore index 6d08ebb..9503be7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .idea/ .coverage -.bumpversion.cfg \ No newline at end of file +.bumpversion.cfg +.DS_Store \ No newline at end of file diff --git a/MANIFEST.in b/MANIFEST.in index 9b8a39e..0d01808 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,8 @@ include README.md include requirements.txt +include LICENSE exclude tests/* -exclude .github/* \ No newline at end of file +exclude .github/* +exclude relationship/* +exclude venv/* +recursive-include metamenth * \ No newline at end of file diff --git a/readme.md b/README.md similarity index 63% rename from readme.md rename to README.md index ff48435..9330e96 100644 --- a/readme.md +++ b/README.md @@ -38,39 +38,40 @@ Read the documentation here: [MetamEnTh Documentation](https://github.com/petery ./run_tests.sh ### Example usage + ```python from unittest import TestCase -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure -from enumerations import MeasurementUnit -from structure.open_space import OpenSpace -from enumerations import OpenSpaceType -from enumerations import RoomType -from structure.room import Room -from structure.floor import Floor -from enumerations import FloorType -from structure.building import Building -from enumerations import BuildingType -from datatypes.address import Address -from structure.layer import Layer -from structure.material import Material -from enumerations import MaterialType -from enumerations import LayerRoughness -from structure.cover import Cover -from structure.envelope import Envelope -from enumerations import CoverType +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes import Measure +from metamenth.enumerations import MeasurementUnit +from metamenth.structure.open_space import OpenSpace +from metamenth.enumerations import OpenSpaceType +from metamenth.enumerations import RoomType +from metamenth.structure.room import Room +from metamenth.structure import Floor +from metamenth.enumerations import FloorType +from metamenth.structure.building import Building +from metamenth.enumerations import BuildingType +from metamenth.datatypes.address import Address +from metamenth.structure import Layer +from metamenth.structure import Material +from metamenth.enumerations import MaterialType +from metamenth.enumerations import LayerRoughness +from metamenth.structure.cover import Cover +from metamenth.structure.envelope import Envelope +from metamenth.enumerations import CoverType floor_area = MeasureFactory.create_measure(RecordingType.BINARY.value, - Measure(MeasurementUnit.SQUARE_METERS, 5)) + Measure(MeasurementUnit.SQUARE_METERS, 5)) # height of building height = MeasureFactory.create_measure(RecordingType.BINARY.value, - Measure(MeasurementUnit.METERS, 30)) + Measure(MeasurementUnit.METERS, 30)) # internal mass of the building internal_mass = MeasureFactory.create_measure(RecordingType.BINARY.value, - Measure(MeasurementUnit.KILOGRAMS, 2000)) + Measure(MeasurementUnit.KILOGRAMS, 2000)) area = MeasureFactory.create_measure(RecordingType.BINARY.value, - Measure(MeasurementUnit.SQUARE_METERS, 45)) + Measure(MeasurementUnit.SQUARE_METERS, 45)) # create room room = Room(area, "Office 1", RoomType.OFFICE) @@ -87,26 +88,26 @@ address = Address("Montreal", "6399 Rue Sherbrooke", "QC", "H1N 2Z3", "Canada") # create building building = Building(2009, height, floor_area, internal_mass, address, - BuildingType.COMMERCIAL, [floor]) + BuildingType.COMMERCIAL, [floor]) # material properties density_measure = MeasureFactory.create_measure(RecordingType.BINARY.value, - Measure(MeasurementUnit.KILOGRAM_PER_CUBIC_METER, 0.5)) + Measure(MeasurementUnit.KILOGRAM_PER_CUBIC_METER, 0.5)) hc_measure = MeasureFactory.create_measure(RecordingType.BINARY.value, - Measure(MeasurementUnit.JOULES_PER_KELVIN, 4.5)) + Measure(MeasurementUnit.JOULES_PER_KELVIN, 4.5)) tt_measure = MeasureFactory.create_measure(RecordingType.BINARY.value, - Measure(MeasurementUnit.WATTS_PER_SQUARE_METER_KELVIN, 2.5)) + Measure(MeasurementUnit.WATTS_PER_SQUARE_METER_KELVIN, 2.5)) tr_measure = MeasureFactory.create_measure(RecordingType.BINARY.value, - Measure(MeasurementUnit.SQUARE_METERS_KELVIN_PER_WATTS, - 2.3)) + Measure(MeasurementUnit.SQUARE_METERS_KELVIN_PER_WATTS, + 2.3)) # create roof material roof_material = Material( - description="Steel roof", - material_type=MaterialType.ROOF_STEEL, - density=density_measure, - heat_capacity=hc_measure, - thermal_transmittance=tt_measure, - thermal_resistance=tr_measure + description="Steel roof", + material_type=MaterialType.ROOF_STEEL, + density=density_measure, + heat_capacity=hc_measure, + thermal_transmittance=tt_measure, + thermal_resistance=tr_measure ) # roof layer measurement diff --git a/datatypes/relationships/one_to_many.py b/datatypes/relationships/one_to_many.py deleted file mode 100644 index d004fac..0000000 --- a/datatypes/relationships/one_to_many.py +++ /dev/null @@ -1,14 +0,0 @@ -from datatypes.relationships.interfaces.abstract_relationship import AbstractRelationship -from enumerations import RelationshipName -from subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent -from subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent -from typing import Union -from typing import List - - -class OneToMany(AbstractRelationship): - - def __init__(self, name: RelationshipName, hvac_component: Union[List[AbstractHVACComponent], - List[AbstractDuctConnectedComponent]]): - super().__init__(name) - self.component = hvac_component diff --git a/enumerations/__init__.py b/enumerations/__init__.py deleted file mode 100644 index 9364e67..0000000 --- a/enumerations/__init__.py +++ /dev/null @@ -1,62 +0,0 @@ -from .measurement_unit import MeasurementUnit -from .building_type import BuildingType -from .floor_type import FloorType -from .meter_type import MeterType -from .zone_type import ZoneType -from .open_space_type import OpenSpaceType -from .room_type import RoomType -from .data_measurement_type import DataMeasurementType -from .hvac_type import HVACType -from .material_type import MaterialType -from .cover_type import CoverType -from .building_entity import BuildingEntity -from .trigger_type import TriggerType -from .sensor_measure_type import SensorMeasureType -from .sensor_measure import SensorMeasure -from .recording_types import RecordingType -from .sensor_log_type import SensorLogType -from .meter_measure_mode import MeterMeasureMode -from .meter_accumulation_frequency import MeterAccumulationFrequency -from .appliacne_category import ApplianceCategory -from .appliance_type import ApplianceType -from .waveform import WaveForm -from .duct_type import DuctType -from .duct_sub_type import DuctSubType -from .heat_exchanger_flow_type import HeatExchangerFlowType -from .heat_exchanger_type import HeatExchangerType -from .power_state import PowerState -from .damper_type import DamperType -from .duct_connection_entity_type import DuctConnectionEntityType -from .ventilation_type import VentilationType -from .radiant_slab_type import RadiantSlabType -from .heating_type import HeatingType -from .compressor_type import CompressorType -from .boiler_category import BoilerCategory -from .refrigerant_type import RefrigerantType -from .coil_material import CoilMaterial -from .heat_source import HeatSource -from .chiller_type import ChillerType -from .circulation_pump_type import CirculationPumpType -from .air_volume_type import AirVolumeType -from .cell_type import CellType -from .solar_pv_type import SolarPVType -from .wind_turbine_type import WindTurbineType -from .engine_type import EngineType -from .engine_sub_type import EngineSubType -from .engine_mode import EngineMode -from .energy_source import EnergySource -from .capacitor_tech import CapacitorTech -from .battery_tech import BatteryTech -from .v2g_mode import V2GMode -from .ats_transition_type import ATSTransitionType -from .ats_power_source_type import ATSPowerSourceType -from .ats_operation_mode import ATSOperationMode -from .ats_switching_mechanism import ATSSwitchingMechanism -from .ups_phase import UPSPhase -from .operation_type import OperationType -from .filter_type import FilterType -from .layer_roughness import LayerRoughness -from .pump_type import PumpType -from .terrain_type import TerrainType -from .solar_distribution_type import SolarDistributionType -from .relationship_name import RelationshipName diff --git a/datatypes/relationships/__init__.py b/metamenth/__init__.py similarity index 100% rename from datatypes/relationships/__init__.py rename to metamenth/__init__.py diff --git a/datatypes/__init__.py b/metamenth/datatypes/__init__.py similarity index 100% rename from datatypes/__init__.py rename to metamenth/datatypes/__init__.py diff --git a/datatypes/address.py b/metamenth/datatypes/address.py similarity index 95% rename from datatypes/address.py rename to metamenth/datatypes/address.py index 148673b..2fc8f22 100644 --- a/datatypes/address.py +++ b/metamenth/datatypes/address.py @@ -1,6 +1,6 @@ from .point import Point -from datatypes.binary_measure import BinaryMeasure -from misc import Validate +from metamenth.datatypes.binary_measure import BinaryMeasure +from metamenth.misc import Validate class Address: diff --git a/datatypes/binary_measure.py b/metamenth/datatypes/binary_measure.py similarity index 80% rename from datatypes/binary_measure.py rename to metamenth/datatypes/binary_measure.py index ce86ba3..d111574 100644 --- a/datatypes/binary_measure.py +++ b/metamenth/datatypes/binary_measure.py @@ -1,6 +1,6 @@ -from datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure from .measure import Measure -from enumerations import DataMeasurementType +from metamenth.enumerations import DataMeasurementType class BinaryMeasure(AbstractMeasure): diff --git a/datatypes/continuous_measure.py b/metamenth/datatypes/continuous_measure.py similarity index 81% rename from datatypes/continuous_measure.py rename to metamenth/datatypes/continuous_measure.py index 7ca61ef..af7871d 100644 --- a/datatypes/continuous_measure.py +++ b/metamenth/datatypes/continuous_measure.py @@ -1,4 +1,4 @@ -from datatypes.interfaces.abstract_range_measure import AbstractRangeMeasure +from metamenth.datatypes.interfaces.abstract_range_measure import AbstractRangeMeasure from .measure import Measure diff --git a/datatypes/exponential_measure.py b/metamenth/datatypes/exponential_measure.py similarity index 86% rename from datatypes/exponential_measure.py rename to metamenth/datatypes/exponential_measure.py index 98986d1..3ea3b03 100644 --- a/datatypes/exponential_measure.py +++ b/metamenth/datatypes/exponential_measure.py @@ -1,4 +1,4 @@ -from datatypes.interfaces.abstract_range_measure import AbstractRangeMeasure +from metamenth.datatypes.interfaces.abstract_range_measure import AbstractRangeMeasure from .measure import Measure diff --git a/datatypes/interfaces/__init__.py b/metamenth/datatypes/interfaces/__init__.py similarity index 100% rename from datatypes/interfaces/__init__.py rename to metamenth/datatypes/interfaces/__init__.py diff --git a/datatypes/interfaces/abstract_dynamic_entity.py b/metamenth/datatypes/interfaces/abstract_dynamic_entity.py similarity index 87% rename from datatypes/interfaces/abstract_dynamic_entity.py rename to metamenth/datatypes/interfaces/abstract_dynamic_entity.py index c280877..7951feb 100644 --- a/datatypes/interfaces/abstract_dynamic_entity.py +++ b/metamenth/datatypes/interfaces/abstract_dynamic_entity.py @@ -1,9 +1,9 @@ from abc import ABC -from utils import EntityInsert -from utils import EntityRemover -from utils import StructureEntitySearch -from transducers.interfaces.abstract_transducer import AbstractTransducer -from enumerations import BuildingEntity +from metamenth.utils import EntityInsert +from metamenth.utils import EntityRemover +from metamenth.utils import StructureEntitySearch +from metamenth.transducers.interfaces.abstract_transducer import AbstractTransducer +from metamenth.enumerations import BuildingEntity from typing import Dict diff --git a/datatypes/interfaces/abstract_measure.py b/metamenth/datatypes/interfaces/abstract_measure.py similarity index 83% rename from datatypes/interfaces/abstract_measure.py rename to metamenth/datatypes/interfaces/abstract_measure.py index b8d16dc..8ebe894 100644 --- a/datatypes/interfaces/abstract_measure.py +++ b/metamenth/datatypes/interfaces/abstract_measure.py @@ -1,6 +1,6 @@ from abc import ABC -from datatypes.measure import Measure -from enumerations import DataMeasurementType +from metamenth.datatypes.measure import Measure +from metamenth.enumerations import DataMeasurementType class AbstractMeasure(ABC): diff --git a/datatypes/interfaces/abstract_range_measure.py b/metamenth/datatypes/interfaces/abstract_range_measure.py similarity index 92% rename from datatypes/interfaces/abstract_range_measure.py rename to metamenth/datatypes/interfaces/abstract_range_measure.py index 498f9d1..6d2e866 100644 --- a/datatypes/interfaces/abstract_range_measure.py +++ b/metamenth/datatypes/interfaces/abstract_range_measure.py @@ -1,5 +1,5 @@ from .abstract_measure import AbstractMeasure -from datatypes.measure import Measure +from metamenth.datatypes.measure import Measure class AbstractRangeMeasure(AbstractMeasure): diff --git a/datatypes/linear_measure.py b/metamenth/datatypes/linear_measure.py similarity index 85% rename from datatypes/linear_measure.py rename to metamenth/datatypes/linear_measure.py index 09b74a3..8ed5903 100644 --- a/datatypes/linear_measure.py +++ b/metamenth/datatypes/linear_measure.py @@ -1,4 +1,4 @@ -from datatypes.interfaces.abstract_range_measure import AbstractRangeMeasure +from metamenth.datatypes.interfaces.abstract_range_measure import AbstractRangeMeasure from .measure import Measure diff --git a/datatypes/measure.py b/metamenth/datatypes/measure.py similarity index 81% rename from datatypes/measure.py rename to metamenth/datatypes/measure.py index 34e1670..2430908 100644 --- a/datatypes/measure.py +++ b/metamenth/datatypes/measure.py @@ -1,5 +1,5 @@ from dataclasses import dataclass -from enumerations import MeasurementUnit +from metamenth.enumerations import MeasurementUnit @dataclass diff --git a/datatypes/observable_message.py b/metamenth/datatypes/observable_message.py similarity index 100% rename from datatypes/observable_message.py rename to metamenth/datatypes/observable_message.py diff --git a/datatypes/operational_schedule.py b/metamenth/datatypes/operational_schedule.py similarity index 88% rename from datatypes/operational_schedule.py rename to metamenth/datatypes/operational_schedule.py index 41eff8f..0478091 100644 --- a/datatypes/operational_schedule.py +++ b/metamenth/datatypes/operational_schedule.py @@ -1,7 +1,7 @@ from datetime import datetime from dataclasses import dataclass from typing import Type -from datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure from uuid import uuid4 diff --git a/datatypes/point.py b/metamenth/datatypes/point.py similarity index 100% rename from datatypes/point.py rename to metamenth/datatypes/point.py diff --git a/datatypes/rated_device_measure.py b/metamenth/datatypes/rated_device_measure.py similarity index 78% rename from datatypes/rated_device_measure.py rename to metamenth/datatypes/rated_device_measure.py index 988c0f1..026e11f 100644 --- a/datatypes/rated_device_measure.py +++ b/metamenth/datatypes/rated_device_measure.py @@ -1,6 +1,6 @@ from dataclasses import dataclass -from enumerations import WaveForm -from datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.enumerations import WaveForm +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure @dataclass diff --git a/datatypes/relationships/interfaces/__init__.py b/metamenth/datatypes/relationships/__init__.py similarity index 100% rename from datatypes/relationships/interfaces/__init__.py rename to metamenth/datatypes/relationships/__init__.py diff --git a/energysystem/__init__.py b/metamenth/datatypes/relationships/interfaces/__init__.py similarity index 100% rename from energysystem/__init__.py rename to metamenth/datatypes/relationships/interfaces/__init__.py diff --git a/datatypes/relationships/interfaces/abstract_relationship.py b/metamenth/datatypes/relationships/interfaces/abstract_relationship.py similarity index 71% rename from datatypes/relationships/interfaces/abstract_relationship.py rename to metamenth/datatypes/relationships/interfaces/abstract_relationship.py index ae8325f..0cd1ae4 100644 --- a/datatypes/relationships/interfaces/abstract_relationship.py +++ b/metamenth/datatypes/relationships/interfaces/abstract_relationship.py @@ -1,5 +1,5 @@ from abc import ABC -from enumerations import RelationshipName +from metamenth.enumerations import RelationshipName class AbstractRelationship(ABC): diff --git a/metamenth/datatypes/relationships/one_to_many.py b/metamenth/datatypes/relationships/one_to_many.py new file mode 100644 index 0000000..9ccc3e0 --- /dev/null +++ b/metamenth/datatypes/relationships/one_to_many.py @@ -0,0 +1,14 @@ +from metamenth.datatypes.relationships.interfaces.abstract_relationship import AbstractRelationship +from metamenth.enumerations import RelationshipName +from metamenth.subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent +from metamenth.subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent +from typing import Union +from typing import List + + +class OneToMany(AbstractRelationship): + + def __init__(self, name: RelationshipName, hvac_component: Union[List[AbstractHVACComponent], + List[AbstractDuctConnectedComponent]]): + super().__init__(name) + self.component = hvac_component diff --git a/datatypes/schedulable_entity.py b/metamenth/datatypes/schedulable_entity.py similarity index 86% rename from datatypes/schedulable_entity.py rename to metamenth/datatypes/schedulable_entity.py index 7195cc8..98d9aeb 100644 --- a/datatypes/schedulable_entity.py +++ b/metamenth/datatypes/schedulable_entity.py @@ -1,10 +1,10 @@ from typing import List -from datatypes.operational_schedule import OperationalSchedule -from utils import EntityRemover -from utils import EntityInsert -from utils import StructureEntitySearch +from metamenth.datatypes.operational_schedule import OperationalSchedule +from metamenth.utils import EntityRemover +from metamenth.utils import EntityInsert +from metamenth.utils import StructureEntitySearch from typing import Dict -from enumerations import BuildingEntity +from metamenth.enumerations import BuildingEntity class SchedulableEntity: diff --git a/energysystem/electricals/__init__.py b/metamenth/energysystem/__init__.py similarity index 100% rename from energysystem/electricals/__init__.py rename to metamenth/energysystem/__init__.py diff --git a/energysystem/interfaces/__init__.py b/metamenth/energysystem/electricals/__init__.py similarity index 100% rename from energysystem/interfaces/__init__.py rename to metamenth/energysystem/electricals/__init__.py diff --git a/energysystem/electricals/alternator.py b/metamenth/energysystem/electricals/alternator.py similarity index 74% rename from energysystem/electricals/alternator.py rename to metamenth/energysystem/electricals/alternator.py index 0cbc5bb..f4a7450 100644 --- a/energysystem/electricals/alternator.py +++ b/metamenth/energysystem/electricals/alternator.py @@ -1,6 +1,6 @@ -from energysystem.interfaces.abstract_electrical import AbstractElectrical -from enumerations import PowerState -from datatypes.binary_measure import BinaryMeasure +from metamenth.energysystem.interfaces.abstract_electrical import AbstractElectrical +from metamenth.enumerations import PowerState +from metamenth.datatypes.binary_measure import BinaryMeasure class Alternator(AbstractElectrical): diff --git a/energysystem/electricals/automatic_transfer_switch.py b/metamenth/energysystem/electricals/automatic_transfer_switch.py similarity index 82% rename from energysystem/electricals/automatic_transfer_switch.py rename to metamenth/energysystem/electricals/automatic_transfer_switch.py index df56101..509b289 100644 --- a/energysystem/electricals/automatic_transfer_switch.py +++ b/metamenth/energysystem/electricals/automatic_transfer_switch.py @@ -1,9 +1,9 @@ -from energysystem.interfaces.abstract_electrical import AbstractElectrical -from enumerations import PowerState -from enumerations import ATSPowerSourceType -from enumerations import ATSOperationMode -from enumerations import ATSTransitionType -from enumerations import ATSSwitchingMechanism +from metamenth.energysystem.interfaces.abstract_electrical import AbstractElectrical +from metamenth.enumerations import PowerState +from metamenth.enumerations import ATSPowerSourceType +from metamenth.enumerations import ATSOperationMode +from metamenth.enumerations import ATSTransitionType +from metamenth.enumerations import ATSSwitchingMechanism class AutomaticTransferSwitch(AbstractElectrical): diff --git a/energysystem/electricals/uninterruptible_power_supply.py b/metamenth/energysystem/electricals/uninterruptible_power_supply.py similarity index 82% rename from energysystem/electricals/uninterruptible_power_supply.py rename to metamenth/energysystem/electricals/uninterruptible_power_supply.py index 254484e..0e43df9 100644 --- a/energysystem/electricals/uninterruptible_power_supply.py +++ b/metamenth/energysystem/electricals/uninterruptible_power_supply.py @@ -1,12 +1,12 @@ -from energysystem.interfaces.abstract_electrical import AbstractElectrical -from enumerations import PowerState -from enumerations import UPSPhase -from datatypes.binary_measure import BinaryMeasure -from energysystem.storage_system.immobile_storage_energy_system import ImmobileStorageEnergySystem -from enumerations import BuildingEntity -from utils import EntityInsert -from utils import EntityRemover -from utils import StructureEntitySearch +from metamenth.energysystem.interfaces.abstract_electrical import AbstractElectrical +from metamenth.enumerations import PowerState +from metamenth.enumerations import UPSPhase +from metamenth.datatypes.binary_measure import BinaryMeasure +from metamenth.energysystem.storage_system.immobile_storage_energy_system import ImmobileStorageEnergySystem +from metamenth.enumerations import BuildingEntity +from metamenth.utils import EntityInsert +from metamenth.utils import EntityRemover +from metamenth.utils import StructureEntitySearch class UninterruptiblePowerSupply(AbstractElectrical): diff --git a/energysystem/engine.py b/metamenth/energysystem/engine.py similarity index 85% rename from energysystem/engine.py rename to metamenth/energysystem/engine.py index fdd4675..41aaff5 100644 --- a/energysystem/engine.py +++ b/metamenth/energysystem/engine.py @@ -1,9 +1,9 @@ -from energysystem.non_renewable_energy_system import NonRenewableEnergySystem -from enumerations import MeasurementUnit -from enumerations import EngineType -from enumerations import EngineMode -from enumerations import EngineSubType -from misc import Validate +from metamenth.energysystem.non_renewable_energy_system import NonRenewableEnergySystem +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import EngineType +from metamenth.enumerations import EngineMode +from metamenth.enumerations import EngineSubType +from metamenth.misc import Validate class Engine(NonRenewableEnergySystem): diff --git a/energysystem/storage_system/__init__.py b/metamenth/energysystem/interfaces/__init__.py similarity index 100% rename from energysystem/storage_system/__init__.py rename to metamenth/energysystem/interfaces/__init__.py diff --git a/energysystem/interfaces/abstract_common_energy_system.py b/metamenth/energysystem/interfaces/abstract_common_energy_system.py similarity index 90% rename from energysystem/interfaces/abstract_common_energy_system.py rename to metamenth/energysystem/interfaces/abstract_common_energy_system.py index d0ccb08..bd58f93 100644 --- a/energysystem/interfaces/abstract_common_energy_system.py +++ b/metamenth/energysystem/interfaces/abstract_common_energy_system.py @@ -1,7 +1,7 @@ import uuid -from datatypes.schedulable_entity import SchedulableEntity -from datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity -from measure_instruments.meter import Meter +from metamenth.datatypes.schedulable_entity import SchedulableEntity +from metamenth.datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity +from metamenth.measure_instruments.meter import Meter class AbstractCommonEnergySystem(AbstractDynamicEntity): diff --git a/energysystem/interfaces/abstract_electrical.py b/metamenth/energysystem/interfaces/abstract_electrical.py similarity index 81% rename from energysystem/interfaces/abstract_electrical.py rename to metamenth/energysystem/interfaces/abstract_electrical.py index 50db48c..6b09c91 100644 --- a/energysystem/interfaces/abstract_electrical.py +++ b/metamenth/energysystem/interfaces/abstract_electrical.py @@ -1,5 +1,5 @@ -from enumerations import PowerState -from energysystem.interfaces.abstract_common_energy_system import AbstractCommonEnergySystem +from metamenth.enumerations import PowerState +from metamenth.energysystem.interfaces.abstract_common_energy_system import AbstractCommonEnergySystem class AbstractElectrical(AbstractCommonEnergySystem): diff --git a/energysystem/interfaces/abstract_energy_system.py b/metamenth/energysystem/interfaces/abstract_energy_system.py similarity index 88% rename from energysystem/interfaces/abstract_energy_system.py rename to metamenth/energysystem/interfaces/abstract_energy_system.py index cb577b8..3a9d982 100644 --- a/energysystem/interfaces/abstract_energy_system.py +++ b/metamenth/energysystem/interfaces/abstract_energy_system.py @@ -1,6 +1,6 @@ -from enumerations import MeasurementUnit -from datatypes.binary_measure import BinaryMeasure -from energysystem.interfaces.abstract_common_energy_system import AbstractCommonEnergySystem +from metamenth.enumerations import MeasurementUnit +from metamenth.datatypes.binary_measure import BinaryMeasure +from metamenth.energysystem.interfaces.abstract_common_energy_system import AbstractCommonEnergySystem class AbstractEnergySystem(AbstractCommonEnergySystem): diff --git a/energysystem/non_renewable_energy_system.py b/metamenth/energysystem/non_renewable_energy_system.py similarity index 55% rename from energysystem/non_renewable_energy_system.py rename to metamenth/energysystem/non_renewable_energy_system.py index d61ca10..32dcb0a 100644 --- a/energysystem/non_renewable_energy_system.py +++ b/metamenth/energysystem/non_renewable_energy_system.py @@ -1,5 +1,5 @@ -from energysystem.interfaces.abstract_energy_system import AbstractEnergySystem -from enumerations import MeasurementUnit +from metamenth.energysystem.interfaces.abstract_energy_system import AbstractEnergySystem +from metamenth.enumerations import MeasurementUnit class NonRenewableEnergySystem(AbstractEnergySystem): diff --git a/energysystem/renewable_energy_system.py b/metamenth/energysystem/renewable_energy_system.py similarity index 55% rename from energysystem/renewable_energy_system.py rename to metamenth/energysystem/renewable_energy_system.py index 2c37c2e..ad4f3eb 100644 --- a/energysystem/renewable_energy_system.py +++ b/metamenth/energysystem/renewable_energy_system.py @@ -1,5 +1,5 @@ -from energysystem.interfaces.abstract_energy_system import AbstractEnergySystem -from enumerations import MeasurementUnit +from metamenth.energysystem.interfaces.abstract_energy_system import AbstractEnergySystem +from metamenth.enumerations import MeasurementUnit class RenewableEnergySystem(AbstractEnergySystem): diff --git a/energysystem/solar_pv.py b/metamenth/energysystem/solar_pv.py similarity index 86% rename from energysystem/solar_pv.py rename to metamenth/energysystem/solar_pv.py index f2e5558..3b2719f 100644 --- a/energysystem/solar_pv.py +++ b/metamenth/energysystem/solar_pv.py @@ -1,8 +1,8 @@ -from energysystem.renewable_energy_system import RenewableEnergySystem -from enumerations import MeasurementUnit -from enumerations import SolarPVType -from enumerations import CellType -from datatypes.binary_measure import BinaryMeasure +from metamenth.energysystem.renewable_energy_system import RenewableEnergySystem +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import SolarPVType +from metamenth.enumerations import CellType +from metamenth.datatypes.binary_measure import BinaryMeasure class SolarPV(RenewableEnergySystem): diff --git a/measure_instruments/interfaces/__init__.py b/metamenth/energysystem/storage_system/__init__.py similarity index 100% rename from measure_instruments/interfaces/__init__.py rename to metamenth/energysystem/storage_system/__init__.py diff --git a/energysystem/storage_system/battery.py b/metamenth/energysystem/storage_system/battery.py similarity index 58% rename from energysystem/storage_system/battery.py rename to metamenth/energysystem/storage_system/battery.py index 7249c7b..a3c08d0 100644 --- a/energysystem/storage_system/battery.py +++ b/metamenth/energysystem/storage_system/battery.py @@ -1,7 +1,7 @@ -from energysystem.storage_system.immobile_storage_energy_system import ImmobileStorageEnergySystem -from enumerations import MeasurementUnit -from enumerations import EnergySource -from enumerations import BatteryTech +from metamenth.energysystem.storage_system.immobile_storage_energy_system import ImmobileStorageEnergySystem +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import EnergySource +from metamenth.enumerations import BatteryTech class Battery(ImmobileStorageEnergySystem): diff --git a/energysystem/storage_system/electric_vehicle.py b/metamenth/energysystem/storage_system/electric_vehicle.py similarity index 81% rename from energysystem/storage_system/electric_vehicle.py rename to metamenth/energysystem/storage_system/electric_vehicle.py index 69de0ad..6b037f0 100644 --- a/energysystem/storage_system/electric_vehicle.py +++ b/metamenth/energysystem/storage_system/electric_vehicle.py @@ -1,7 +1,7 @@ -from energysystem.storage_system.mobile_storage_energy_system import MobileStorageEnergySystem -from enumerations import MeasurementUnit -from datatypes.binary_measure import BinaryMeasure -from enumerations import V2GMode +from metamenth.energysystem.storage_system.mobile_storage_energy_system import MobileStorageEnergySystem +from metamenth.enumerations import MeasurementUnit +from metamenth.datatypes.binary_measure import BinaryMeasure +from metamenth.enumerations import V2GMode class ElectricVehicle(MobileStorageEnergySystem): diff --git a/energysystem/storage_system/immobile_storage_energy_system.py b/metamenth/energysystem/storage_system/immobile_storage_energy_system.py similarity index 81% rename from energysystem/storage_system/immobile_storage_energy_system.py rename to metamenth/energysystem/storage_system/immobile_storage_energy_system.py index edba6af..95b118d 100644 --- a/energysystem/storage_system/immobile_storage_energy_system.py +++ b/metamenth/energysystem/storage_system/immobile_storage_energy_system.py @@ -1,13 +1,13 @@ -from energysystem.interfaces.abstract_energy_system import AbstractEnergySystem -from energysystem.renewable_energy_system import RenewableEnergySystem -from enumerations import MeasurementUnit -from enumerations import EnergySource -from utils import EntityInsert -from utils import EntityRemover -from utils import StructureEntitySearch -from enumerations import BuildingEntity -from enumerations import BatteryTech -from enumerations import CapacitorTech +from metamenth.energysystem.interfaces.abstract_energy_system import AbstractEnergySystem +from metamenth.energysystem.renewable_energy_system import RenewableEnergySystem +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import EnergySource +from metamenth.utils import EntityInsert +from metamenth.utils import EntityRemover +from metamenth.utils import StructureEntitySearch +from metamenth.enumerations import BuildingEntity +from metamenth.enumerations import BatteryTech +from metamenth.enumerations import CapacitorTech from typing import Union diff --git a/energysystem/storage_system/mobile_storage_energy_system.py b/metamenth/energysystem/storage_system/mobile_storage_energy_system.py similarity index 55% rename from energysystem/storage_system/mobile_storage_energy_system.py rename to metamenth/energysystem/storage_system/mobile_storage_energy_system.py index d340a8f..0669c57 100644 --- a/energysystem/storage_system/mobile_storage_energy_system.py +++ b/metamenth/energysystem/storage_system/mobile_storage_energy_system.py @@ -1,5 +1,5 @@ -from energysystem.interfaces.abstract_energy_system import AbstractEnergySystem -from enumerations import MeasurementUnit +from metamenth.energysystem.interfaces.abstract_energy_system import AbstractEnergySystem +from metamenth.enumerations import MeasurementUnit class MobileStorageEnergySystem(AbstractEnergySystem): diff --git a/energysystem/storage_system/super_capacitor.py b/metamenth/energysystem/storage_system/super_capacitor.py similarity index 59% rename from energysystem/storage_system/super_capacitor.py rename to metamenth/energysystem/storage_system/super_capacitor.py index 79151af..b7bbf25 100644 --- a/energysystem/storage_system/super_capacitor.py +++ b/metamenth/energysystem/storage_system/super_capacitor.py @@ -1,7 +1,7 @@ -from energysystem.storage_system.immobile_storage_energy_system import ImmobileStorageEnergySystem -from enumerations import MeasurementUnit -from enumerations import EnergySource -from enumerations import CapacitorTech +from metamenth.energysystem.storage_system.immobile_storage_energy_system import ImmobileStorageEnergySystem +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import EnergySource +from metamenth.enumerations import CapacitorTech class SuperCapacitor(ImmobileStorageEnergySystem): diff --git a/energysystem/wind_mill.py b/metamenth/energysystem/wind_mill.py similarity index 87% rename from energysystem/wind_mill.py rename to metamenth/energysystem/wind_mill.py index 9c824f6..ab91d43 100644 --- a/energysystem/wind_mill.py +++ b/metamenth/energysystem/wind_mill.py @@ -1,6 +1,6 @@ -from energysystem.renewable_energy_system import RenewableEnergySystem -from enumerations import MeasurementUnit -from enumerations import WindTurbineType +from metamenth.energysystem.renewable_energy_system import RenewableEnergySystem +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import WindTurbineType class WindMill(RenewableEnergySystem): diff --git a/metamenth/enumerations/__init__.py b/metamenth/enumerations/__init__.py new file mode 100644 index 0000000..75c2663 --- /dev/null +++ b/metamenth/enumerations/__init__.py @@ -0,0 +1,62 @@ +from metamenth.enumerations.measurement_unit import MeasurementUnit +from metamenth.enumerations.building_type import BuildingType +from metamenth.enumerations.floor_type import FloorType +from metamenth.enumerations.meter_type import MeterType +from metamenth.enumerations.zone_type import ZoneType +from metamenth.enumerations.open_space_type import OpenSpaceType +from metamenth.enumerations.room_type import RoomType +from metamenth.enumerations.data_measurement_type import DataMeasurementType +from metamenth.enumerations.hvac_type import HVACType +from metamenth.enumerations.material_type import MaterialType +from metamenth.enumerations.cover_type import CoverType +from metamenth.enumerations.building_entity import BuildingEntity +from metamenth.enumerations.trigger_type import TriggerType +from metamenth.enumerations.sensor_measure_type import SensorMeasureType +from metamenth.enumerations.sensor_measure import SensorMeasure +from metamenth.enumerations.recording_types import RecordingType +from metamenth.enumerations.sensor_log_type import SensorLogType +from metamenth.enumerations.meter_measure_mode import MeterMeasureMode +from metamenth.enumerations.meter_accumulation_frequency import MeterAccumulationFrequency +from metamenth.enumerations.appliacne_category import ApplianceCategory +from metamenth.enumerations.appliance_type import ApplianceType +from metamenth.enumerations.waveform import WaveForm +from metamenth.enumerations.duct_type import DuctType +from metamenth.enumerations.duct_sub_type import DuctSubType +from metamenth.enumerations.heat_exchanger_flow_type import HeatExchangerFlowType +from metamenth.enumerations.heat_exchanger_type import HeatExchangerType +from metamenth.enumerations.power_state import PowerState +from metamenth.enumerations.damper_type import DamperType +from metamenth.enumerations.duct_connection_entity_type import DuctConnectionEntityType +from metamenth.enumerations.ventilation_type import VentilationType +from metamenth.enumerations.radiant_slab_type import RadiantSlabType +from metamenth.enumerations.heating_type import HeatingType +from metamenth.enumerations.compressor_type import CompressorType +from metamenth.enumerations.boiler_category import BoilerCategory +from metamenth.enumerations.refrigerant_type import RefrigerantType +from metamenth.enumerations.coil_material import CoilMaterial +from metamenth.enumerations.heat_source import HeatSource +from metamenth.enumerations.chiller_type import ChillerType +from metamenth.enumerations.circulation_pump_type import CirculationPumpType +from metamenth.enumerations.air_volume_type import AirVolumeType +from metamenth.enumerations.cell_type import CellType +from metamenth.enumerations.solar_pv_type import SolarPVType +from metamenth.enumerations.wind_turbine_type import WindTurbineType +from metamenth.enumerations.engine_type import EngineType +from metamenth.enumerations.engine_sub_type import EngineSubType +from metamenth.enumerations.engine_mode import EngineMode +from metamenth.enumerations.energy_source import EnergySource +from metamenth.enumerations.capacitor_tech import CapacitorTech +from metamenth.enumerations.battery_tech import BatteryTech +from metamenth.enumerations.v2g_mode import V2GMode +from metamenth.enumerations.ats_transition_type import ATSTransitionType +from metamenth.enumerations.ats_power_source_type import ATSPowerSourceType +from metamenth.enumerations.ats_operation_mode import ATSOperationMode +from metamenth.enumerations.ats_switching_mechanism import ATSSwitchingMechanism +from metamenth.enumerations.ups_phase import UPSPhase +from metamenth.enumerations.operation_type import OperationType +from metamenth.enumerations.filter_type import FilterType +from metamenth.enumerations.layer_roughness import LayerRoughness +from metamenth.enumerations.pump_type import PumpType +from metamenth.enumerations.terrain_type import TerrainType +from metamenth.enumerations.solar_distribution_type import SolarDistributionType +from metamenth.enumerations.relationship_name import RelationshipName diff --git a/enumerations/abstract_enum.py b/metamenth/enumerations/abstract_enum.py similarity index 100% rename from enumerations/abstract_enum.py rename to metamenth/enumerations/abstract_enum.py diff --git a/enumerations/air_volume_type.py b/metamenth/enumerations/air_volume_type.py similarity index 78% rename from enumerations/air_volume_type.py rename to metamenth/enumerations/air_volume_type.py index ab2a382..fcbbf73 100644 --- a/enumerations/air_volume_type.py +++ b/metamenth/enumerations/air_volume_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class AirVolumeType(AbstractEnum): diff --git a/enumerations/appliacne_category.py b/metamenth/enumerations/appliacne_category.py similarity index 80% rename from enumerations/appliacne_category.py rename to metamenth/enumerations/appliacne_category.py index 4bdf96b..97d5376 100644 --- a/enumerations/appliacne_category.py +++ b/metamenth/enumerations/appliacne_category.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class ApplianceCategory(AbstractEnum): diff --git a/enumerations/appliance_type.py b/metamenth/enumerations/appliance_type.py similarity index 95% rename from enumerations/appliance_type.py rename to metamenth/enumerations/appliance_type.py index 9fa1cb1..6b85b4e 100644 --- a/enumerations/appliance_type.py +++ b/metamenth/enumerations/appliance_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class ApplianceType(AbstractEnum): diff --git a/enumerations/ats_operation_mode.py b/metamenth/enumerations/ats_operation_mode.py similarity index 78% rename from enumerations/ats_operation_mode.py rename to metamenth/enumerations/ats_operation_mode.py index a59b62b..e01320c 100644 --- a/enumerations/ats_operation_mode.py +++ b/metamenth/enumerations/ats_operation_mode.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class ATSOperationMode(AbstractEnum): diff --git a/enumerations/ats_power_source_type.py b/metamenth/enumerations/ats_power_source_type.py similarity index 86% rename from enumerations/ats_power_source_type.py rename to metamenth/enumerations/ats_power_source_type.py index 388ee55..3453186 100644 --- a/enumerations/ats_power_source_type.py +++ b/metamenth/enumerations/ats_power_source_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class ATSPowerSourceType(AbstractEnum): diff --git a/enumerations/ats_switching_mechanism.py b/metamenth/enumerations/ats_switching_mechanism.py similarity index 79% rename from enumerations/ats_switching_mechanism.py rename to metamenth/enumerations/ats_switching_mechanism.py index 6612da8..528d75b 100644 --- a/enumerations/ats_switching_mechanism.py +++ b/metamenth/enumerations/ats_switching_mechanism.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class ATSSwitchingMechanism(AbstractEnum): diff --git a/enumerations/ats_transition_type.py b/metamenth/enumerations/ats_transition_type.py similarity index 73% rename from enumerations/ats_transition_type.py rename to metamenth/enumerations/ats_transition_type.py index a7bcdb5..25dc261 100644 --- a/enumerations/ats_transition_type.py +++ b/metamenth/enumerations/ats_transition_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class ATSTransitionType(AbstractEnum): diff --git a/enumerations/battery_tech.py b/metamenth/enumerations/battery_tech.py similarity index 78% rename from enumerations/battery_tech.py rename to metamenth/enumerations/battery_tech.py index 9ee7bef..fe9cf98 100644 --- a/enumerations/battery_tech.py +++ b/metamenth/enumerations/battery_tech.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class BatteryTech(AbstractEnum): diff --git a/enumerations/boiler_category.py b/metamenth/enumerations/boiler_category.py similarity index 83% rename from enumerations/boiler_category.py rename to metamenth/enumerations/boiler_category.py index 97eda6b..2bdaa46 100644 --- a/enumerations/boiler_category.py +++ b/metamenth/enumerations/boiler_category.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class BoilerCategory(AbstractEnum): diff --git a/enumerations/building_entity.py b/metamenth/enumerations/building_entity.py similarity index 100% rename from enumerations/building_entity.py rename to metamenth/enumerations/building_entity.py diff --git a/enumerations/building_type.py b/metamenth/enumerations/building_type.py similarity index 79% rename from enumerations/building_type.py rename to metamenth/enumerations/building_type.py index b91a85a..eca8baa 100644 --- a/enumerations/building_type.py +++ b/metamenth/enumerations/building_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class BuildingType(AbstractEnum): diff --git a/enumerations/capacitor_tech.py b/metamenth/enumerations/capacitor_tech.py similarity index 79% rename from enumerations/capacitor_tech.py rename to metamenth/enumerations/capacitor_tech.py index 7ccb43f..fa30425 100644 --- a/enumerations/capacitor_tech.py +++ b/metamenth/enumerations/capacitor_tech.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class CapacitorTech(AbstractEnum): diff --git a/enumerations/cell_type.py b/metamenth/enumerations/cell_type.py similarity index 80% rename from enumerations/cell_type.py rename to metamenth/enumerations/cell_type.py index cf04b54..3c16ab2 100644 --- a/enumerations/cell_type.py +++ b/metamenth/enumerations/cell_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class CellType(AbstractEnum): diff --git a/enumerations/chiller_type.py b/metamenth/enumerations/chiller_type.py similarity index 77% rename from enumerations/chiller_type.py rename to metamenth/enumerations/chiller_type.py index bc66329..0ebafbd 100644 --- a/enumerations/chiller_type.py +++ b/metamenth/enumerations/chiller_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class ChillerType(AbstractEnum): diff --git a/enumerations/circulation_pump_type.py b/metamenth/enumerations/circulation_pump_type.py similarity index 79% rename from enumerations/circulation_pump_type.py rename to metamenth/enumerations/circulation_pump_type.py index 6a8ef0e..42dbe3c 100644 --- a/enumerations/circulation_pump_type.py +++ b/metamenth/enumerations/circulation_pump_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class CirculationPumpType(AbstractEnum): diff --git a/enumerations/coil_material.py b/metamenth/enumerations/coil_material.py similarity index 67% rename from enumerations/coil_material.py rename to metamenth/enumerations/coil_material.py index fee07c2..6fa2d7e 100644 --- a/enumerations/coil_material.py +++ b/metamenth/enumerations/coil_material.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class CoilMaterial(AbstractEnum): diff --git a/enumerations/compressor_type.py b/metamenth/enumerations/compressor_type.py similarity index 87% rename from enumerations/compressor_type.py rename to metamenth/enumerations/compressor_type.py index 8a59de6..41e1c09 100644 --- a/enumerations/compressor_type.py +++ b/metamenth/enumerations/compressor_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class CompressorType(AbstractEnum): diff --git a/enumerations/cover_type.py b/metamenth/enumerations/cover_type.py similarity index 100% rename from enumerations/cover_type.py rename to metamenth/enumerations/cover_type.py diff --git a/enumerations/damper_type.py b/metamenth/enumerations/damper_type.py similarity index 82% rename from enumerations/damper_type.py rename to metamenth/enumerations/damper_type.py index b952178..ccead14 100644 --- a/enumerations/damper_type.py +++ b/metamenth/enumerations/damper_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class DamperType(AbstractEnum): diff --git a/enumerations/data_measurement_type.py b/metamenth/enumerations/data_measurement_type.py similarity index 100% rename from enumerations/data_measurement_type.py rename to metamenth/enumerations/data_measurement_type.py diff --git a/enumerations/duct_connection_entity_type.py b/metamenth/enumerations/duct_connection_entity_type.py similarity index 76% rename from enumerations/duct_connection_entity_type.py rename to metamenth/enumerations/duct_connection_entity_type.py index 4fa026e..dc268f4 100644 --- a/enumerations/duct_connection_entity_type.py +++ b/metamenth/enumerations/duct_connection_entity_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class DuctConnectionEntityType(AbstractEnum): diff --git a/enumerations/duct_sub_type.py b/metamenth/enumerations/duct_sub_type.py similarity index 83% rename from enumerations/duct_sub_type.py rename to metamenth/enumerations/duct_sub_type.py index 4fe0faf..bf79d2c 100644 --- a/enumerations/duct_sub_type.py +++ b/metamenth/enumerations/duct_sub_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class DuctSubType(AbstractEnum): diff --git a/enumerations/duct_type.py b/metamenth/enumerations/duct_type.py similarity index 80% rename from enumerations/duct_type.py rename to metamenth/enumerations/duct_type.py index 6e6803b..6772271 100644 --- a/enumerations/duct_type.py +++ b/metamenth/enumerations/duct_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class DuctType(AbstractEnum): diff --git a/enumerations/energy_source.py b/metamenth/enumerations/energy_source.py similarity index 74% rename from enumerations/energy_source.py rename to metamenth/enumerations/energy_source.py index be4e427..b5c170d 100644 --- a/enumerations/energy_source.py +++ b/metamenth/enumerations/energy_source.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class EnergySource(AbstractEnum): diff --git a/enumerations/engine_mode.py b/metamenth/enumerations/engine_mode.py similarity index 80% rename from enumerations/engine_mode.py rename to metamenth/enumerations/engine_mode.py index 731f328..0e4d16a 100644 --- a/enumerations/engine_mode.py +++ b/metamenth/enumerations/engine_mode.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class EngineMode(AbstractEnum): diff --git a/enumerations/engine_sub_type.py b/metamenth/enumerations/engine_sub_type.py similarity index 89% rename from enumerations/engine_sub_type.py rename to metamenth/enumerations/engine_sub_type.py index 51d9887..ab96783 100644 --- a/enumerations/engine_sub_type.py +++ b/metamenth/enumerations/engine_sub_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class EngineSubType(AbstractEnum): diff --git a/enumerations/engine_type.py b/metamenth/enumerations/engine_type.py similarity index 84% rename from enumerations/engine_type.py rename to metamenth/enumerations/engine_type.py index f3825ec..fc681f0 100644 --- a/enumerations/engine_type.py +++ b/metamenth/enumerations/engine_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class EngineType(AbstractEnum): diff --git a/enumerations/filter_type.py b/metamenth/enumerations/filter_type.py similarity index 87% rename from enumerations/filter_type.py rename to metamenth/enumerations/filter_type.py index a80a6c2..526c6ac 100644 --- a/enumerations/filter_type.py +++ b/metamenth/enumerations/filter_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class FilterType(AbstractEnum): diff --git a/enumerations/floor_type.py b/metamenth/enumerations/floor_type.py similarity index 78% rename from enumerations/floor_type.py rename to metamenth/enumerations/floor_type.py index 75f3f3c..5a700be 100644 --- a/enumerations/floor_type.py +++ b/metamenth/enumerations/floor_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class FloorType(AbstractEnum): diff --git a/enumerations/heat_exchanger_flow_type.py b/metamenth/enumerations/heat_exchanger_flow_type.py similarity index 77% rename from enumerations/heat_exchanger_flow_type.py rename to metamenth/enumerations/heat_exchanger_flow_type.py index ea2f3fc..8151541 100644 --- a/enumerations/heat_exchanger_flow_type.py +++ b/metamenth/enumerations/heat_exchanger_flow_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class HeatExchangerFlowType(AbstractEnum): diff --git a/enumerations/heat_exchanger_type.py b/metamenth/enumerations/heat_exchanger_type.py similarity index 81% rename from enumerations/heat_exchanger_type.py rename to metamenth/enumerations/heat_exchanger_type.py index a6539dc..0c5a966 100644 --- a/enumerations/heat_exchanger_type.py +++ b/metamenth/enumerations/heat_exchanger_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class HeatExchangerType(AbstractEnum): diff --git a/enumerations/heat_source.py b/metamenth/enumerations/heat_source.py similarity index 86% rename from enumerations/heat_source.py rename to metamenth/enumerations/heat_source.py index e311ac5..ac849d7 100644 --- a/enumerations/heat_source.py +++ b/metamenth/enumerations/heat_source.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class HeatSource(AbstractEnum): diff --git a/enumerations/heating_type.py b/metamenth/enumerations/heating_type.py similarity index 78% rename from enumerations/heating_type.py rename to metamenth/enumerations/heating_type.py index 2b6c9d3..42d42d4 100644 --- a/enumerations/heating_type.py +++ b/metamenth/enumerations/heating_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class HeatingType(AbstractEnum): diff --git a/enumerations/hvac_type.py b/metamenth/enumerations/hvac_type.py similarity index 100% rename from enumerations/hvac_type.py rename to metamenth/enumerations/hvac_type.py diff --git a/enumerations/layer_roughness.py b/metamenth/enumerations/layer_roughness.py similarity index 84% rename from enumerations/layer_roughness.py rename to metamenth/enumerations/layer_roughness.py index 8319726..6024b86 100644 --- a/enumerations/layer_roughness.py +++ b/metamenth/enumerations/layer_roughness.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class LayerRoughness(AbstractEnum): diff --git a/enumerations/material_type.py b/metamenth/enumerations/material_type.py similarity index 100% rename from enumerations/material_type.py rename to metamenth/enumerations/material_type.py diff --git a/enumerations/measurement_unit.py b/metamenth/enumerations/measurement_unit.py similarity index 96% rename from enumerations/measurement_unit.py rename to metamenth/enumerations/measurement_unit.py index 7a8bed0..9340147 100644 --- a/enumerations/measurement_unit.py +++ b/metamenth/enumerations/measurement_unit.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class MeasurementUnit(AbstractEnum): diff --git a/enumerations/meter_accumulation_frequency.py b/metamenth/enumerations/meter_accumulation_frequency.py similarity index 82% rename from enumerations/meter_accumulation_frequency.py rename to metamenth/enumerations/meter_accumulation_frequency.py index 46aaf50..2a377de 100644 --- a/enumerations/meter_accumulation_frequency.py +++ b/metamenth/enumerations/meter_accumulation_frequency.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class MeterAccumulationFrequency(AbstractEnum): diff --git a/enumerations/meter_measure_mode.py b/metamenth/enumerations/meter_measure_mode.py similarity index 76% rename from enumerations/meter_measure_mode.py rename to metamenth/enumerations/meter_measure_mode.py index d94d199..7b8458d 100644 --- a/enumerations/meter_measure_mode.py +++ b/metamenth/enumerations/meter_measure_mode.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class MeterMeasureMode(AbstractEnum): diff --git a/enumerations/meter_type.py b/metamenth/enumerations/meter_type.py similarity index 80% rename from enumerations/meter_type.py rename to metamenth/enumerations/meter_type.py index bbb7c3d..50ec437 100644 --- a/enumerations/meter_type.py +++ b/metamenth/enumerations/meter_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class MeterType(AbstractEnum): diff --git a/enumerations/open_space_type.py b/metamenth/enumerations/open_space_type.py similarity index 89% rename from enumerations/open_space_type.py rename to metamenth/enumerations/open_space_type.py index 2829155..e652ccd 100644 --- a/enumerations/open_space_type.py +++ b/metamenth/enumerations/open_space_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class OpenSpaceType(AbstractEnum): diff --git a/enumerations/operation_type.py b/metamenth/enumerations/operation_type.py similarity index 77% rename from enumerations/operation_type.py rename to metamenth/enumerations/operation_type.py index 268959c..38303ad 100644 --- a/enumerations/operation_type.py +++ b/metamenth/enumerations/operation_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class OperationType(AbstractEnum): diff --git a/enumerations/power_state.py b/metamenth/enumerations/power_state.py similarity index 86% rename from enumerations/power_state.py rename to metamenth/enumerations/power_state.py index e69acfd..a6288dd 100644 --- a/enumerations/power_state.py +++ b/metamenth/enumerations/power_state.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class PowerState(AbstractEnum): diff --git a/enumerations/pump_type.py b/metamenth/enumerations/pump_type.py similarity index 83% rename from enumerations/pump_type.py rename to metamenth/enumerations/pump_type.py index 3458e3d..207474a 100644 --- a/enumerations/pump_type.py +++ b/metamenth/enumerations/pump_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class PumpType(AbstractEnum): diff --git a/enumerations/radiant_slab_type.py b/metamenth/enumerations/radiant_slab_type.py similarity index 79% rename from enumerations/radiant_slab_type.py rename to metamenth/enumerations/radiant_slab_type.py index c271083..505866c 100644 --- a/enumerations/radiant_slab_type.py +++ b/metamenth/enumerations/radiant_slab_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class RadiantSlabType(AbstractEnum): diff --git a/enumerations/recording_types.py b/metamenth/enumerations/recording_types.py similarity index 100% rename from enumerations/recording_types.py rename to metamenth/enumerations/recording_types.py diff --git a/enumerations/refrigerant_type.py b/metamenth/enumerations/refrigerant_type.py similarity index 73% rename from enumerations/refrigerant_type.py rename to metamenth/enumerations/refrigerant_type.py index 20627ae..3d3644e 100644 --- a/enumerations/refrigerant_type.py +++ b/metamenth/enumerations/refrigerant_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class RefrigerantType(AbstractEnum): diff --git a/enumerations/relationship_name.py b/metamenth/enumerations/relationship_name.py similarity index 81% rename from enumerations/relationship_name.py rename to metamenth/enumerations/relationship_name.py index 7277c50..21f4d01 100644 --- a/enumerations/relationship_name.py +++ b/metamenth/enumerations/relationship_name.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class RelationshipName(AbstractEnum): diff --git a/enumerations/room_type.py b/metamenth/enumerations/room_type.py similarity index 95% rename from enumerations/room_type.py rename to metamenth/enumerations/room_type.py index bfd9743..dfed551 100644 --- a/enumerations/room_type.py +++ b/metamenth/enumerations/room_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class RoomType(AbstractEnum): diff --git a/enumerations/sensor_log_type.py b/metamenth/enumerations/sensor_log_type.py similarity index 77% rename from enumerations/sensor_log_type.py rename to metamenth/enumerations/sensor_log_type.py index 3e2e24a..b1dbc64 100644 --- a/enumerations/sensor_log_type.py +++ b/metamenth/enumerations/sensor_log_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class SensorLogType(AbstractEnum): diff --git a/enumerations/sensor_measure.py b/metamenth/enumerations/sensor_measure.py similarity index 91% rename from enumerations/sensor_measure.py rename to metamenth/enumerations/sensor_measure.py index 116659d..94192e4 100644 --- a/enumerations/sensor_measure.py +++ b/metamenth/enumerations/sensor_measure.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class SensorMeasure(AbstractEnum): diff --git a/enumerations/sensor_measure_type.py b/metamenth/enumerations/sensor_measure_type.py similarity index 100% rename from enumerations/sensor_measure_type.py rename to metamenth/enumerations/sensor_measure_type.py diff --git a/enumerations/solar_distribution_type.py b/metamenth/enumerations/solar_distribution_type.py similarity index 87% rename from enumerations/solar_distribution_type.py rename to metamenth/enumerations/solar_distribution_type.py index 23254ae..db50485 100644 --- a/enumerations/solar_distribution_type.py +++ b/metamenth/enumerations/solar_distribution_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class SolarDistributionType(AbstractEnum): diff --git a/enumerations/solar_pv_type.py b/metamenth/enumerations/solar_pv_type.py similarity index 80% rename from enumerations/solar_pv_type.py rename to metamenth/enumerations/solar_pv_type.py index fee9edd..5f89f84 100644 --- a/enumerations/solar_pv_type.py +++ b/metamenth/enumerations/solar_pv_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class SolarPVType(AbstractEnum): diff --git a/enumerations/terrain_type.py b/metamenth/enumerations/terrain_type.py similarity index 79% rename from enumerations/terrain_type.py rename to metamenth/enumerations/terrain_type.py index 7723238..b03b6c1 100644 --- a/enumerations/terrain_type.py +++ b/metamenth/enumerations/terrain_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class TerrainType(AbstractEnum): diff --git a/enumerations/trigger_type.py b/metamenth/enumerations/trigger_type.py similarity index 100% rename from enumerations/trigger_type.py rename to metamenth/enumerations/trigger_type.py diff --git a/enumerations/ups_phase.py b/metamenth/enumerations/ups_phase.py similarity index 77% rename from enumerations/ups_phase.py rename to metamenth/enumerations/ups_phase.py index 386c3a7..3496554 100644 --- a/enumerations/ups_phase.py +++ b/metamenth/enumerations/ups_phase.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class UPSPhase(AbstractEnum): diff --git a/enumerations/v2g_mode.py b/metamenth/enumerations/v2g_mode.py similarity index 82% rename from enumerations/v2g_mode.py rename to metamenth/enumerations/v2g_mode.py index bcc139a..7488145 100644 --- a/enumerations/v2g_mode.py +++ b/metamenth/enumerations/v2g_mode.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class V2GMode(AbstractEnum): diff --git a/enumerations/ventilation_type.py b/metamenth/enumerations/ventilation_type.py similarity index 75% rename from enumerations/ventilation_type.py rename to metamenth/enumerations/ventilation_type.py index 03b4a4f..805937e 100644 --- a/enumerations/ventilation_type.py +++ b/metamenth/enumerations/ventilation_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class VentilationType(AbstractEnum): diff --git a/enumerations/waveform.py b/metamenth/enumerations/waveform.py similarity index 79% rename from enumerations/waveform.py rename to metamenth/enumerations/waveform.py index 2526bf7..f398b63 100644 --- a/enumerations/waveform.py +++ b/metamenth/enumerations/waveform.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class WaveForm(AbstractEnum): diff --git a/enumerations/wind_turbine_type.py b/metamenth/enumerations/wind_turbine_type.py similarity index 86% rename from enumerations/wind_turbine_type.py rename to metamenth/enumerations/wind_turbine_type.py index 0da73a9..8dc6375 100644 --- a/enumerations/wind_turbine_type.py +++ b/metamenth/enumerations/wind_turbine_type.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class WindTurbineType(AbstractEnum): diff --git a/enumerations/zone_type.py b/metamenth/enumerations/zone_type.py similarity index 100% rename from enumerations/zone_type.py rename to metamenth/enumerations/zone_type.py diff --git a/measure_instruments/__init__.py b/metamenth/measure_instruments/__init__.py similarity index 100% rename from measure_instruments/__init__.py rename to metamenth/measure_instruments/__init__.py diff --git a/measure_instruments/damper_position.py b/metamenth/measure_instruments/damper_position.py similarity index 74% rename from measure_instruments/damper_position.py rename to metamenth/measure_instruments/damper_position.py index 3e3232d..d174251 100644 --- a/measure_instruments/damper_position.py +++ b/metamenth/measure_instruments/damper_position.py @@ -1,4 +1,4 @@ -from measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure +from metamenth.measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure class DamperPosition(AbstractDataMeasure): diff --git a/measure_instruments/electric_vehicle_connectivity.py b/metamenth/measure_instruments/electric_vehicle_connectivity.py similarity index 91% rename from measure_instruments/electric_vehicle_connectivity.py rename to metamenth/measure_instruments/electric_vehicle_connectivity.py index ab6a512..c37c74a 100644 --- a/measure_instruments/electric_vehicle_connectivity.py +++ b/metamenth/measure_instruments/electric_vehicle_connectivity.py @@ -1,6 +1,6 @@ -from measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure -from enumerations import OperationType -from misc import Validate +from metamenth.measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure +from metamenth.enumerations import OperationType +from metamenth.misc import Validate class ElectricVehicleConnectivity(AbstractDataMeasure): diff --git a/measure_instruments/ev_charging_meter.py b/metamenth/measure_instruments/ev_charging_meter.py similarity index 85% rename from measure_instruments/ev_charging_meter.py rename to metamenth/measure_instruments/ev_charging_meter.py index 10633e8..ccc5e7e 100644 --- a/measure_instruments/ev_charging_meter.py +++ b/metamenth/measure_instruments/ev_charging_meter.py @@ -1,10 +1,10 @@ -from enumerations import MeasurementUnit -from measure_instruments.interfaces.abstract_reader import AbstractReader -from measure_instruments.electric_vehicle_connectivity import ElectricVehicleConnectivity -from utils import EntityInsert -from utils import StructureEntitySearch +from metamenth.enumerations import MeasurementUnit +from metamenth.measure_instruments.interfaces.abstract_reader import AbstractReader +from metamenth.measure_instruments.electric_vehicle_connectivity import ElectricVehicleConnectivity +from metamenth.utils import EntityInsert +from metamenth.utils import StructureEntitySearch from typing import Dict -from enumerations import BuildingEntity +from metamenth.enumerations import BuildingEntity class EVChargingMeter(AbstractReader): diff --git a/observers/__init__.py b/metamenth/measure_instruments/interfaces/__init__.py similarity index 100% rename from observers/__init__.py rename to metamenth/measure_instruments/interfaces/__init__.py diff --git a/measure_instruments/interfaces/abstract_data_measure.py b/metamenth/measure_instruments/interfaces/abstract_data_measure.py similarity index 95% rename from measure_instruments/interfaces/abstract_data_measure.py rename to metamenth/measure_instruments/interfaces/abstract_data_measure.py index f0ee38e..b911dd9 100644 --- a/measure_instruments/interfaces/abstract_data_measure.py +++ b/metamenth/measure_instruments/interfaces/abstract_data_measure.py @@ -1,8 +1,8 @@ from datetime import datetime import uuid from abc import ABC -from misc import Validate -from enumerations import DataMeasurementType +from metamenth.misc import Validate +from metamenth.enumerations import DataMeasurementType from typing import Union diff --git a/measure_instruments/interfaces/abstract_reader.py b/metamenth/measure_instruments/interfaces/abstract_reader.py similarity index 96% rename from measure_instruments/interfaces/abstract_reader.py rename to metamenth/measure_instruments/interfaces/abstract_reader.py index 4cd639b..c821795 100644 --- a/measure_instruments/interfaces/abstract_reader.py +++ b/metamenth/measure_instruments/interfaces/abstract_reader.py @@ -1,6 +1,6 @@ import uuid -from enumerations import MeasurementUnit -from misc import Validate +from metamenth.enumerations import MeasurementUnit +from metamenth.misc import Validate from abc import ABC diff --git a/measure_instruments/meter.py b/metamenth/measure_instruments/meter.py similarity index 92% rename from measure_instruments/meter.py rename to metamenth/measure_instruments/meter.py index 647e31a..a57d9c3 100644 --- a/measure_instruments/meter.py +++ b/metamenth/measure_instruments/meter.py @@ -1,11 +1,11 @@ -from enumerations import MeterType -from enumerations import MeasurementUnit -from enumerations import MeterMeasureMode -from measure_instruments.meter_measure import MeterMeasure -from enumerations import MeterAccumulationFrequency +from metamenth.enumerations import MeterType +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import MeterMeasureMode +from metamenth.measure_instruments.meter_measure import MeterMeasure +from metamenth.enumerations import MeterAccumulationFrequency from typing import Dict -from utils import StructureEntitySearch -from measure_instruments.interfaces.abstract_reader import AbstractReader +from metamenth.utils import StructureEntitySearch +from metamenth.measure_instruments.interfaces.abstract_reader import AbstractReader class Meter(AbstractReader): diff --git a/measure_instruments/meter_measure.py b/metamenth/measure_instruments/meter_measure.py similarity index 81% rename from measure_instruments/meter_measure.py rename to metamenth/measure_instruments/meter_measure.py index dc3f2de..8eaf068 100644 --- a/measure_instruments/meter_measure.py +++ b/metamenth/measure_instruments/meter_measure.py @@ -1,5 +1,5 @@ -from measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure -from enumerations import DataMeasurementType +from metamenth.measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure +from metamenth.enumerations import DataMeasurementType class MeterMeasure(AbstractDataMeasure): diff --git a/measure_instruments/sensor_data.py b/metamenth/measure_instruments/sensor_data.py similarity index 74% rename from measure_instruments/sensor_data.py rename to metamenth/measure_instruments/sensor_data.py index 39fba14..88bb0e4 100644 --- a/measure_instruments/sensor_data.py +++ b/metamenth/measure_instruments/sensor_data.py @@ -1,4 +1,4 @@ -from measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure +from metamenth.measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure class SensorData(AbstractDataMeasure): diff --git a/measure_instruments/status_measure.py b/metamenth/measure_instruments/status_measure.py similarity index 74% rename from measure_instruments/status_measure.py rename to metamenth/measure_instruments/status_measure.py index ab84665..c9e3727 100644 --- a/measure_instruments/status_measure.py +++ b/metamenth/measure_instruments/status_measure.py @@ -1,4 +1,4 @@ -from measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure +from metamenth.measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure class StatusMeasure(AbstractDataMeasure): diff --git a/measure_instruments/trigger_history.py b/metamenth/measure_instruments/trigger_history.py similarity index 64% rename from measure_instruments/trigger_history.py rename to metamenth/measure_instruments/trigger_history.py index f09d837..452c5dd 100644 --- a/measure_instruments/trigger_history.py +++ b/metamenth/measure_instruments/trigger_history.py @@ -1,9 +1,5 @@ -from dataclasses import field -from uuid import uuid4 -from datetime import datetime -from enumerations import TriggerType -from misc import Validate -from measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure +from metamenth.enumerations import TriggerType +from metamenth.measure_instruments.interfaces.abstract_data_measure import AbstractDataMeasure class TriggerHistory(AbstractDataMeasure): diff --git a/measure_instruments/weather_data.py b/metamenth/measure_instruments/weather_data.py similarity index 91% rename from measure_instruments/weather_data.py rename to metamenth/measure_instruments/weather_data.py index 718c9bb..76d00d4 100644 --- a/measure_instruments/weather_data.py +++ b/metamenth/measure_instruments/weather_data.py @@ -1,7 +1,7 @@ from datetime import datetime from uuid import uuid4 -from datatypes.interfaces.abstract_measure import AbstractMeasure -from misc import Validate +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.misc import Validate class WeatherData: diff --git a/measure_instruments/weather_station.py b/metamenth/measure_instruments/weather_station.py similarity index 94% rename from measure_instruments/weather_station.py rename to metamenth/measure_instruments/weather_station.py index 7a00d87..292005f 100644 --- a/measure_instruments/weather_station.py +++ b/metamenth/measure_instruments/weather_station.py @@ -1,9 +1,9 @@ from uuid import uuid4 -from measure_instruments.weather_data import WeatherData +from metamenth.measure_instruments.weather_data import WeatherData from typing import List -from misc import Validate +from metamenth.misc import Validate from typing import Dict -from utils import StructureEntitySearch +from metamenth.utils import StructureEntitySearch class WeatherStation: diff --git a/misc/__init__.py b/metamenth/misc/__init__.py similarity index 100% rename from misc/__init__.py rename to metamenth/misc/__init__.py diff --git a/misc/measure_factory.py b/metamenth/misc/measure_factory.py similarity index 61% rename from misc/measure_factory.py rename to metamenth/misc/measure_factory.py index f8c31bd..e82fc2b 100644 --- a/misc/measure_factory.py +++ b/metamenth/misc/measure_factory.py @@ -1,9 +1,9 @@ -from datatypes.binary_measure import BinaryMeasure -from datatypes.linear_measure import LinearMeasure -from datatypes.continuous_measure import ContinuousMeasure -from datatypes.exponential_measure import ExponentialMeasure -from datatypes.interfaces.abstract_measure import AbstractMeasure -from datatypes.measure import Measure +from metamenth.datatypes.binary_measure import BinaryMeasure +from metamenth.datatypes.linear_measure import LinearMeasure +from metamenth.datatypes.continuous_measure import ContinuousMeasure +from metamenth.datatypes.exponential_measure import ExponentialMeasure +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.datatypes.measure import Measure class MeasureFactory: diff --git a/misc/state_track_decorator.py b/metamenth/misc/state_track_decorator.py similarity index 96% rename from misc/state_track_decorator.py rename to metamenth/misc/state_track_decorator.py index 78f4cb9..507fecf 100644 --- a/misc/state_track_decorator.py +++ b/metamenth/misc/state_track_decorator.py @@ -1,5 +1,5 @@ import sys -from datatypes.observable_message import ObservableMessage +from metamenth.datatypes.observable_message import ObservableMessage class StateTrackDecorator: diff --git a/misc/validate.py b/metamenth/misc/validate.py similarity index 93% rename from misc/validate.py rename to metamenth/misc/validate.py index a90c290..8d62f16 100644 --- a/misc/validate.py +++ b/metamenth/misc/validate.py @@ -1,12 +1,12 @@ from typing import Dict -from enumerations import SensorMeasure -from enumerations import MeasurementUnit +from metamenth.enumerations import SensorMeasure +from metamenth.enumerations import MeasurementUnit from datetime import datetime -from enumerations import EngineType -from enumerations import EngineSubType +from metamenth.enumerations import EngineType +from metamenth.enumerations import EngineSubType from typing import List from typing import Any -from enumerations import RoomType +from metamenth.enumerations import RoomType class Validate: @@ -184,12 +184,12 @@ def is_hvac_component_allowed_in_space(hvac_component, disallowed_entities: List :param disallowed_entities: the entities not allowed to be added :param space_entity: the space entity, e.g., room, open space """ - from structure.room import Room - from structure.open_space import OpenSpace - from subsystem.hvac_components.air_volume_box import AirVolumeBox - from subsystem.radiant_slab import RadiantSlab - from subsystem.baseboard_heater import BaseboardHeater - from subsystem.hvac_components.duct import Duct + from metamenth.structure.room import Room + from metamenth.structure.open_space import OpenSpace + from metamenth.subsystem.hvac_components.air_volume_box import AirVolumeBox + from metamenth.subsystem.radiant_slab import RadiantSlab + from metamenth.subsystem.baseboard_heater import BaseboardHeater + from metamenth.subsystem.hvac_components.duct import Duct if any(isinstance(hvac_component, cls) for cls in disallowed_entities): raise ValueError(f'{hvac_component.name} cannot be added to a space entity') diff --git a/observers/interfaces/__init__.py b/metamenth/observers/__init__.py similarity index 100% rename from observers/interfaces/__init__.py rename to metamenth/observers/__init__.py diff --git a/subsystem/__init__.py b/metamenth/observers/interfaces/__init__.py similarity index 100% rename from subsystem/__init__.py rename to metamenth/observers/interfaces/__init__.py diff --git a/observers/interfaces/observer.py b/metamenth/observers/interfaces/observer.py similarity index 86% rename from observers/interfaces/observer.py rename to metamenth/observers/interfaces/observer.py index 4ef323f..76d4605 100644 --- a/observers/interfaces/observer.py +++ b/metamenth/observers/interfaces/observer.py @@ -1,6 +1,6 @@ from abc import ABC from abc import abstractmethod -from datatypes.observable_message import ObservableMessage +from metamenth.datatypes.observable_message import ObservableMessage # Observer interface diff --git a/observers/observable.py b/metamenth/observers/observable.py similarity index 87% rename from observers/observable.py rename to metamenth/observers/observable.py index 28e8e1a..938b6a2 100644 --- a/observers/observable.py +++ b/metamenth/observers/observable.py @@ -1,4 +1,4 @@ -from datatypes.observable_message import ObservableMessage +from metamenth.datatypes.observable_message import ObservableMessage class Observable: diff --git a/observers/structure_state_change_logger.py b/metamenth/observers/structure_state_change_logger.py similarity index 74% rename from observers/structure_state_change_logger.py rename to metamenth/observers/structure_state_change_logger.py index 99d0f64..ef30903 100644 --- a/observers/structure_state_change_logger.py +++ b/metamenth/observers/structure_state_change_logger.py @@ -1,5 +1,5 @@ -from observers.interfaces.observer import Observer -from datatypes.observable_message import ObservableMessage +from metamenth.observers.interfaces.observer import Observer +from metamenth.datatypes.observable_message import ObservableMessage from dataclasses import asdict diff --git a/structure/__init__.py b/metamenth/structure/__init__.py similarity index 100% rename from structure/__init__.py rename to metamenth/structure/__init__.py diff --git a/structure/building.py b/metamenth/structure/building.py similarity index 93% rename from structure/building.py rename to metamenth/structure/building.py index b0b64d5..80830e7 100644 --- a/structure/building.py +++ b/metamenth/structure/building.py @@ -1,32 +1,32 @@ from uuid import uuid4 -from enumerations import BuildingType -from datatypes.address import Address +from metamenth.enumerations import BuildingType +from metamenth.datatypes.address import Address from typing import List from .floor import Floor from .room import Room from .open_space import OpenSpace from .envelope import Envelope from typing import Optional -from measure_instruments.weather_station import WeatherStation -from measure_instruments.meter import Meter -from measure_instruments.interfaces.abstract_reader import AbstractReader -from utils import EntityRemover -from utils import EntityInsert -from enumerations import BuildingEntity -from datatypes.interfaces.abstract_measure import AbstractMeasure -from virtual.zone import Zone -from utils import StructureSearch +from metamenth.measure_instruments.weather_station import WeatherStation +from metamenth.measure_instruments.meter import Meter +from metamenth.measure_instruments.interfaces.abstract_reader import AbstractReader +from metamenth.utils import EntityRemover +from metamenth.utils import EntityInsert +from metamenth.enumerations import BuildingEntity +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.virtual.zone import Zone +from metamenth.utils import StructureSearch from typing import Dict -from enumerations import RoomType -from enumerations import OpenSpaceType -from enumerations import TerrainType -from enumerations import SolarDistributionType -from observers.observable import Observable -from misc import StateTrackDecorator -from utils import StructureEntitySearch -from enumerations import MeterType -from subsystem.building_control_system import BuildingControlSystem -from datatypes.schedulable_entity import SchedulableEntity +from metamenth.enumerations import RoomType +from metamenth.enumerations import OpenSpaceType +from metamenth.enumerations import TerrainType +from metamenth.enumerations import SolarDistributionType +from metamenth.observers.observable import Observable +from metamenth.misc import StateTrackDecorator +from metamenth.utils import StructureEntitySearch +from metamenth.enumerations import MeterType +from metamenth.subsystem.building_control_system import BuildingControlSystem +from metamenth.datatypes.schedulable_entity import SchedulableEntity class Building(Observable): diff --git a/structure/cover.py b/metamenth/structure/cover.py similarity index 94% rename from structure/cover.py rename to metamenth/structure/cover.py index ed13778..90bbee8 100644 --- a/structure/cover.py +++ b/metamenth/structure/cover.py @@ -1,8 +1,8 @@ import uuid -from enumerations import CoverType -from structure.layer import Layer +from metamenth.enumerations import CoverType +from metamenth.structure.layer import Layer from typing import List -from utils import StructureSearch +from metamenth.utils import StructureSearch from typing import Dict diff --git a/structure/envelope.py b/metamenth/structure/envelope.py similarity index 94% rename from structure/envelope.py rename to metamenth/structure/envelope.py index d31cc9d..98dffec 100644 --- a/structure/envelope.py +++ b/metamenth/structure/envelope.py @@ -1,8 +1,8 @@ import uuid -from structure.cover import Cover +from metamenth.structure.cover import Cover from typing import List from typing import Dict -from utils import StructureSearch +from metamenth.utils import StructureSearch class Envelope: diff --git a/structure/floor.py b/metamenth/structure/floor.py similarity index 94% rename from structure/floor.py rename to metamenth/structure/floor.py index 7255a42..cdd57aa 100644 --- a/structure/floor.py +++ b/metamenth/structure/floor.py @@ -1,15 +1,13 @@ -from abc import ABC - -from structure.interfaces.abstract_space import AbstractSpace -from datatypes.interfaces.abstract_measure import AbstractMeasure -from enumerations import FloorType -from structure.open_space import OpenSpace -from structure.room import Room -from utils import EntityRemover -from enumerations import BuildingEntity -from utils import EntityInsert +from metamenth.structure.interfaces.abstract_space import AbstractSpace +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.enumerations import FloorType +from metamenth.structure.open_space import OpenSpace +from metamenth.structure.room import Room +from metamenth.utils import EntityRemover +from metamenth.enumerations import BuildingEntity +from metamenth.utils import EntityInsert from typing import Union -from utils import StructureSearch +from metamenth.utils import StructureSearch from typing import Dict from typing import List diff --git a/structure/interfaces/__init__.py b/metamenth/structure/interfaces/__init__.py similarity index 100% rename from structure/interfaces/__init__.py rename to metamenth/structure/interfaces/__init__.py diff --git a/structure/interfaces/abstract_floor_space.py b/metamenth/structure/interfaces/abstract_floor_space.py similarity index 86% rename from structure/interfaces/abstract_floor_space.py rename to metamenth/structure/interfaces/abstract_floor_space.py index c87c584..20d14b3 100644 --- a/structure/interfaces/abstract_floor_space.py +++ b/metamenth/structure/interfaces/abstract_floor_space.py @@ -1,27 +1,27 @@ from typing import List -from .abstract_space import AbstractSpace -from datatypes.interfaces.abstract_measure import AbstractMeasure -from utils import EntityRemover -from utils import EntityInsert -from measure_instruments.interfaces.abstract_reader import AbstractReader -from utils import StructureEntitySearch +from metamenth.structure.interfaces.abstract_space import AbstractSpace +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.utils import EntityRemover +from metamenth.utils import EntityInsert +from metamenth.measure_instruments.interfaces.abstract_reader import AbstractReader +from metamenth.utils import StructureEntitySearch from typing import Dict -from datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity -from enumerations import BuildingEntity -from subsystem.appliance import Appliance -from subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent -from subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent -from transducers.interfaces.abstract_transducer import AbstractTransducer -from transducers.sensor import Sensor -from transducers.actuator import Actuator +from metamenth.datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity +from metamenth.enumerations import BuildingEntity +from metamenth.subsystem.appliance import Appliance +from metamenth.subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent +from metamenth.subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent +from metamenth.transducers.interfaces.abstract_transducer import AbstractTransducer +from metamenth.transducers.sensor import Sensor +from metamenth.transducers.actuator import Actuator from typing import Union -from enumerations import SensorMeasure -from energysystem.interfaces.abstract_common_energy_system import AbstractCommonEnergySystem -from misc import Validate -from subsystem.hvac_components.fan import Fan -from subsystem.hvac_components.filter import Filter -from subsystem.hvac_components.damper import Damper -from subsystem.hvac_components.controller import Controller +from metamenth.enumerations import SensorMeasure +from metamenth.energysystem.interfaces.abstract_common_energy_system import AbstractCommonEnergySystem +from metamenth.misc import Validate +from metamenth.subsystem.hvac_components.fan import Fan +from metamenth.subsystem.hvac_components.filter import Filter +from metamenth.subsystem.hvac_components.damper import Damper +from metamenth.subsystem.hvac_components.controller import Controller class AbstractFloorSpace(AbstractSpace, AbstractDynamicEntity): diff --git a/structure/interfaces/abstract_space.py b/metamenth/structure/interfaces/abstract_space.py similarity index 87% rename from structure/interfaces/abstract_space.py rename to metamenth/structure/interfaces/abstract_space.py index d22515c..d66f84d 100644 --- a/structure/interfaces/abstract_space.py +++ b/metamenth/structure/interfaces/abstract_space.py @@ -1,9 +1,9 @@ import uuid -from datatypes.interfaces.abstract_measure import AbstractMeasure -from misc import Validate -from virtual.interfaces.abstract_zonal_entity import AbstractZonalEntity -from datatypes.schedulable_entity import SchedulableEntity -from structure.envelope import Envelope +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.misc import Validate +from metamenth.virtual.interfaces.abstract_zonal_entity import AbstractZonalEntity +from metamenth.datatypes.schedulable_entity import SchedulableEntity +from metamenth.structure.envelope import Envelope class AbstractSpace(AbstractZonalEntity): diff --git a/structure/layer.py b/metamenth/structure/layer.py similarity index 95% rename from structure/layer.py rename to metamenth/structure/layer.py index 61599ff..0096264 100644 --- a/structure/layer.py +++ b/metamenth/structure/layer.py @@ -1,7 +1,7 @@ import uuid -from datatypes.interfaces.abstract_measure import AbstractMeasure -from structure.material import Material -from enumerations import LayerRoughness +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.structure.material import Material +from metamenth.enumerations import LayerRoughness class Layer: diff --git a/structure/material.py b/metamenth/structure/material.py similarity index 97% rename from structure/material.py rename to metamenth/structure/material.py index 5c78783..120b975 100644 --- a/structure/material.py +++ b/metamenth/structure/material.py @@ -1,7 +1,7 @@ -from enumerations import MaterialType -from datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.enumerations import MaterialType +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure import uuid -from misc import Validate +from metamenth.misc import Validate class Material: diff --git a/structure/open_space.py b/metamenth/structure/open_space.py similarity index 85% rename from structure/open_space.py rename to metamenth/structure/open_space.py index 31f9695..18bf305 100644 --- a/structure/open_space.py +++ b/metamenth/structure/open_space.py @@ -1,6 +1,6 @@ -from structure.interfaces.abstract_floor_space import AbstractFloorSpace -from datatypes.interfaces.abstract_measure import AbstractMeasure -from enumerations import OpenSpaceType +from metamenth.structure.interfaces.abstract_floor_space import AbstractFloorSpace +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.enumerations import OpenSpaceType class OpenSpace(AbstractFloorSpace): diff --git a/structure/room.py b/metamenth/structure/room.py similarity index 87% rename from structure/room.py rename to metamenth/structure/room.py index cdd768c..e74ecb4 100644 --- a/structure/room.py +++ b/metamenth/structure/room.py @@ -1,7 +1,6 @@ -from abc import ABC -from datatypes.interfaces.abstract_measure import AbstractMeasure -from structure.interfaces.abstract_floor_space import AbstractFloorSpace -from enumerations import RoomType +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.structure.interfaces.abstract_floor_space import AbstractFloorSpace +from metamenth.enumerations import RoomType class Room(AbstractFloorSpace): diff --git a/subsystem/hvac_components/__init__.py b/metamenth/subsystem/__init__.py similarity index 100% rename from subsystem/hvac_components/__init__.py rename to metamenth/subsystem/__init__.py diff --git a/subsystem/appliance.py b/metamenth/subsystem/appliance.py similarity index 88% rename from subsystem/appliance.py rename to metamenth/subsystem/appliance.py index 884bd9c..4d574e0 100644 --- a/subsystem/appliance.py +++ b/metamenth/subsystem/appliance.py @@ -1,10 +1,10 @@ -from subsystem.interfaces.abstract_subsystem import AbstractSubsystem -from enumerations import ApplianceCategory -from enumerations import ApplianceType -from datatypes.interfaces.abstract_measure import AbstractMeasure -from datatypes.rated_device_measure import RatedDeviceMeasure -from datatypes.continuous_measure import ContinuousMeasure -from datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity +from metamenth.subsystem.interfaces.abstract_subsystem import AbstractSubsystem +from metamenth.enumerations import ApplianceCategory +from metamenth.enumerations import ApplianceType +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.datatypes.rated_device_measure import RatedDeviceMeasure +from metamenth.datatypes.continuous_measure import ContinuousMeasure +from metamenth.datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity class Appliance(AbstractSubsystem, AbstractDynamicEntity): diff --git a/subsystem/baseboard_heater.py b/metamenth/subsystem/baseboard_heater.py similarity index 85% rename from subsystem/baseboard_heater.py rename to metamenth/subsystem/baseboard_heater.py index 6e2bb63..a2a9e49 100644 --- a/subsystem/baseboard_heater.py +++ b/metamenth/subsystem/baseboard_heater.py @@ -1,6 +1,6 @@ -from subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent -from enumerations import HeatingType -from enumerations import PowerState +from metamenth.subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent +from metamenth.enumerations import HeatingType +from metamenth.enumerations import PowerState class BaseboardHeater(AbstractVentilationComponent): diff --git a/subsystem/building_control_system.py b/metamenth/subsystem/building_control_system.py similarity index 82% rename from subsystem/building_control_system.py rename to metamenth/subsystem/building_control_system.py index e99c35d..86843e2 100644 --- a/subsystem/building_control_system.py +++ b/metamenth/subsystem/building_control_system.py @@ -1,5 +1,5 @@ -from subsystem.interfaces.abstract_subsystem import AbstractSubsystem -from subsystem.hvac_system import HVACSystem +from metamenth.subsystem.interfaces.abstract_subsystem import AbstractSubsystem +from metamenth.subsystem.hvac_system import HVACSystem class BuildingControlSystem(AbstractSubsystem): diff --git a/subsystem/hvac_components/interfaces/__init__.py b/metamenth/subsystem/hvac_components/__init__.py similarity index 100% rename from subsystem/hvac_components/interfaces/__init__.py rename to metamenth/subsystem/hvac_components/__init__.py diff --git a/subsystem/hvac_components/air_volume_box.py b/metamenth/subsystem/hvac_components/air_volume_box.py similarity index 89% rename from subsystem/hvac_components/air_volume_box.py rename to metamenth/subsystem/hvac_components/air_volume_box.py index d9c0557..02e91fd 100644 --- a/subsystem/hvac_components/air_volume_box.py +++ b/metamenth/subsystem/hvac_components/air_volume_box.py @@ -1,7 +1,7 @@ -from subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent -from enumerations import AirVolumeType -from subsystem.hvac_components.duct import Damper -from datatypes.binary_measure import BinaryMeasure +from metamenth.subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent +from metamenth.enumerations import AirVolumeType +from metamenth.subsystem.hvac_components.duct import Damper +from metamenth.datatypes.binary_measure import BinaryMeasure class AirVolumeBox(AbstractDuctConnectedComponent): diff --git a/subsystem/hvac_components/boiler.py b/metamenth/subsystem/hvac_components/boiler.py similarity index 85% rename from subsystem/hvac_components/boiler.py rename to metamenth/subsystem/hvac_components/boiler.py index d054eff..8240b11 100644 --- a/subsystem/hvac_components/boiler.py +++ b/metamenth/subsystem/hvac_components/boiler.py @@ -1,6 +1,6 @@ -from subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent -from enumerations import BoilerCategory -from enumerations import PowerState +from metamenth.subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent +from metamenth.enumerations import BoilerCategory +from metamenth.enumerations import PowerState class Boiler(AbstractDuctConnectedComponent): diff --git a/subsystem/hvac_components/chiller.py b/metamenth/subsystem/hvac_components/chiller.py similarity index 86% rename from subsystem/hvac_components/chiller.py rename to metamenth/subsystem/hvac_components/chiller.py index 8220fac..9b2847d 100644 --- a/subsystem/hvac_components/chiller.py +++ b/metamenth/subsystem/hvac_components/chiller.py @@ -1,6 +1,6 @@ -from subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent -from enumerations import ChillerType -from enumerations import PowerState +from metamenth.subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent +from metamenth.enumerations import ChillerType +from metamenth.enumerations import PowerState class Chiller(AbstractDuctConnectedComponent): diff --git a/subsystem/hvac_components/circulation_pump.py b/metamenth/subsystem/hvac_components/circulation_pump.py similarity index 86% rename from subsystem/hvac_components/circulation_pump.py rename to metamenth/subsystem/hvac_components/circulation_pump.py index 6f74b8d..ea71aab 100644 --- a/subsystem/hvac_components/circulation_pump.py +++ b/metamenth/subsystem/hvac_components/circulation_pump.py @@ -1,6 +1,6 @@ -from subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent -from enumerations import PowerState -from enumerations import CirculationPumpType +from metamenth.subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent +from metamenth.enumerations import PowerState +from metamenth.enumerations import CirculationPumpType class CirculationPump(AbstractDuctConnectedComponent): diff --git a/subsystem/hvac_components/compressor.py b/metamenth/subsystem/hvac_components/compressor.py similarity index 83% rename from subsystem/hvac_components/compressor.py rename to metamenth/subsystem/hvac_components/compressor.py index 217a87b..03369ab 100644 --- a/subsystem/hvac_components/compressor.py +++ b/metamenth/subsystem/hvac_components/compressor.py @@ -1,5 +1,5 @@ -from subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent -from enumerations import CompressorType +from metamenth.subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent +from metamenth.enumerations import CompressorType class Compressor(AbstractDuctConnectedComponent): diff --git a/subsystem/hvac_components/condenser.py b/metamenth/subsystem/hvac_components/condenser.py similarity index 88% rename from subsystem/hvac_components/condenser.py rename to metamenth/subsystem/hvac_components/condenser.py index 861cc91..798497e 100644 --- a/subsystem/hvac_components/condenser.py +++ b/metamenth/subsystem/hvac_components/condenser.py @@ -1,7 +1,7 @@ -from subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent -from enumerations import CoilMaterial -from enumerations import RefrigerantType -from datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent +from metamenth.enumerations import CoilMaterial +from metamenth.enumerations import RefrigerantType +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure class Condenser(AbstractHVACComponent): diff --git a/subsystem/hvac_components/controller.py b/metamenth/subsystem/hvac_components/controller.py similarity index 89% rename from subsystem/hvac_components/controller.py rename to metamenth/subsystem/hvac_components/controller.py index 9d7f12c..ff8ccfd 100644 --- a/subsystem/hvac_components/controller.py +++ b/metamenth/subsystem/hvac_components/controller.py @@ -1,13 +1,13 @@ -from subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent +from metamenth.subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent from typing import Dict -from subsystem.appliance import Appliance +from metamenth.subsystem.appliance import Appliance from typing import Union -from utils import StructureEntitySearch -from utils import EntityRemover -from utils import EntityInsert -from enumerations import BuildingEntity -from datatypes.interfaces.abstract_measure import AbstractMeasure -from misc import Validate +from metamenth.utils import StructureEntitySearch +from metamenth.utils import EntityRemover +from metamenth.utils import EntityInsert +from metamenth.enumerations import BuildingEntity +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.misc import Validate class Controller(AbstractHVACComponent): diff --git a/subsystem/hvac_components/cooling_tower.py b/metamenth/subsystem/hvac_components/cooling_tower.py similarity index 74% rename from subsystem/hvac_components/cooling_tower.py rename to metamenth/subsystem/hvac_components/cooling_tower.py index b57b7ee..6461f9e 100644 --- a/subsystem/hvac_components/cooling_tower.py +++ b/metamenth/subsystem/hvac_components/cooling_tower.py @@ -1,4 +1,4 @@ -from subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent +from metamenth.subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent class CoolingTower(AbstractDuctConnectedComponent): diff --git a/subsystem/hvac_components/damper.py b/metamenth/subsystem/hvac_components/damper.py similarity index 88% rename from subsystem/hvac_components/damper.py rename to metamenth/subsystem/hvac_components/damper.py index a1d3abe..4c6e1c5 100644 --- a/subsystem/hvac_components/damper.py +++ b/metamenth/subsystem/hvac_components/damper.py @@ -1,9 +1,9 @@ -from subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent -from enumerations import DamperType -from measure_instruments.damper_position import DamperPosition +from metamenth.subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent +from metamenth.enumerations import DamperType +from metamenth.measure_instruments.damper_position import DamperPosition from typing import List from typing import Dict -from utils import StructureEntitySearch +from metamenth.utils import StructureEntitySearch class Damper(AbstractHVACComponent): diff --git a/subsystem/hvac_components/duct.py b/metamenth/subsystem/hvac_components/duct.py similarity index 89% rename from subsystem/hvac_components/duct.py rename to metamenth/subsystem/hvac_components/duct.py index 5318719..9bf57fa 100644 --- a/subsystem/hvac_components/duct.py +++ b/metamenth/subsystem/hvac_components/duct.py @@ -1,20 +1,20 @@ from uuid import uuid4 -from enumerations import DuctType -from enumerations import DuctSubType -from datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity -from virtual.interfaces.abstract_zonal_entity import AbstractZonalEntity -from subsystem.hvac_components.damper import Damper -from subsystem.hvac_components.fan import Fan -from subsystem.hvac_components.heat_exchanger import HeatExchanger +from metamenth.enumerations import DuctType +from metamenth.enumerations import DuctSubType +from metamenth.datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity +from metamenth.virtual.interfaces.abstract_zonal_entity import AbstractZonalEntity +from metamenth.subsystem.hvac_components.damper import Damper +from metamenth.subsystem.hvac_components.fan import Fan +from metamenth.subsystem.hvac_components.heat_exchanger import HeatExchanger from typing import List -from subsystem.hvac_components.duct_connection import DuctConnection -from utils import EntityInsert -from utils import EntityRemover -from enumerations import BuildingEntity +from metamenth.subsystem.hvac_components.duct_connection import DuctConnection +from metamenth.utils import EntityInsert +from metamenth.utils import EntityRemover +from metamenth.enumerations import BuildingEntity from typing import Dict -from utils import StructureEntitySearch -from subsystem.hvac_components.air_volume_box import AirVolumeBox -from subsystem.hvac_components.filter import Filter +from metamenth.utils import StructureEntitySearch +from metamenth.subsystem.hvac_components.air_volume_box import AirVolumeBox +from metamenth.subsystem.hvac_components.filter import Filter class Duct(AbstractDynamicEntity, AbstractZonalEntity): diff --git a/subsystem/hvac_components/duct_connection.py b/metamenth/subsystem/hvac_components/duct_connection.py similarity index 77% rename from subsystem/hvac_components/duct_connection.py rename to metamenth/subsystem/hvac_components/duct_connection.py index d4ce9d3..f19d05b 100644 --- a/subsystem/hvac_components/duct_connection.py +++ b/metamenth/subsystem/hvac_components/duct_connection.py @@ -1,17 +1,16 @@ -from structure.interfaces.abstract_space import AbstractSpace -from subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent -from enumerations import DuctConnectionEntityType -from subsystem.hvac_components.circulation_pump import CirculationPump -from subsystem.hvac_components.compressor import Compressor -from subsystem.hvac_components.pump import Pump -from subsystem.hvac_components.heat_pump import HeatPump -from subsystem.hvac_components.condenser import Condenser -from subsystem.hvac_components.heat_exchanger import HeatExchanger -from subsystem.hvac_components.air_volume_box import AirVolumeBox -from subsystem.hvac_components.cooling_tower import CoolingTower -from subsystem.hvac_components.chiller import Chiller -from subsystem.hvac_components.boiler import Boiler -from utils import StructureEntitySearch +from metamenth.structure.interfaces.abstract_space import AbstractSpace +from metamenth.enumerations import DuctConnectionEntityType +from metamenth.subsystem.hvac_components.circulation_pump import CirculationPump +from metamenth.subsystem.hvac_components.compressor import Compressor +from metamenth.subsystem.hvac_components.pump import Pump +from metamenth.subsystem.hvac_components.heat_pump import HeatPump +from metamenth.subsystem.hvac_components.condenser import Condenser +from metamenth.subsystem.hvac_components.heat_exchanger import HeatExchanger +from metamenth.subsystem.hvac_components.air_volume_box import AirVolumeBox +from metamenth.subsystem.hvac_components.cooling_tower import CoolingTower +from metamenth.subsystem.hvac_components.chiller import Chiller +from metamenth.subsystem.hvac_components.boiler import Boiler +from metamenth.utils import StructureEntitySearch from typing import Dict @@ -28,7 +27,7 @@ def add_entity(self, entity_type: DuctConnectionEntityType, duct_entity): :param duct_entity: the entity to add :return: """ - from subsystem.hvac_components.duct import Duct + from metamenth.subsystem.hvac_components.duct import Duct allowed_entity_types = [HeatExchanger, AbstractSpace, Duct, Boiler, Chiller, CirculationPump, Compressor, Pump, HeatPump, Condenser, AirVolumeBox, CoolingTower] diff --git a/subsystem/hvac_components/fan.py b/metamenth/subsystem/hvac_components/fan.py similarity index 81% rename from subsystem/hvac_components/fan.py rename to metamenth/subsystem/hvac_components/fan.py index edfbf6c..2fe2e6b 100644 --- a/subsystem/hvac_components/fan.py +++ b/metamenth/subsystem/hvac_components/fan.py @@ -1,7 +1,7 @@ -from subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent -from enumerations import PowerState +from metamenth.subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent +from metamenth.enumerations import PowerState -from subsystem.hvac_components.variable_frequency_drive import VariableFrequencyDrive +from metamenth.subsystem.hvac_components.variable_frequency_drive import VariableFrequencyDrive class Fan(AbstractHVACComponent): diff --git a/subsystem/hvac_components/filter.py b/metamenth/subsystem/hvac_components/filter.py similarity index 90% rename from subsystem/hvac_components/filter.py rename to metamenth/subsystem/hvac_components/filter.py index 17cbebd..76d04cd 100644 --- a/subsystem/hvac_components/filter.py +++ b/metamenth/subsystem/hvac_components/filter.py @@ -1,7 +1,7 @@ -from subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent -from enumerations import FilterType -from datatypes.binary_measure import BinaryMeasure -from misc import Validate +from metamenth.subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent +from metamenth.enumerations import FilterType +from metamenth.datatypes.binary_measure import BinaryMeasure +from metamenth.misc import Validate class Filter(AbstractHVACComponent): diff --git a/subsystem/hvac_components/heat_exchanger.py b/metamenth/subsystem/hvac_components/heat_exchanger.py similarity index 88% rename from subsystem/hvac_components/heat_exchanger.py rename to metamenth/subsystem/hvac_components/heat_exchanger.py index f2fec42..e2e107a 100644 --- a/subsystem/hvac_components/heat_exchanger.py +++ b/metamenth/subsystem/hvac_components/heat_exchanger.py @@ -1,6 +1,6 @@ -from subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent -from enumerations import HeatExchangerType -from enumerations import HeatExchangerFlowType +from metamenth.subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent +from metamenth.enumerations import HeatExchangerType +from metamenth.enumerations import HeatExchangerFlowType class HeatExchanger(AbstractDuctConnectedComponent): diff --git a/subsystem/hvac_components/heat_pump.py b/metamenth/subsystem/hvac_components/heat_pump.py similarity index 85% rename from subsystem/hvac_components/heat_pump.py rename to metamenth/subsystem/hvac_components/heat_pump.py index 72fb459..814f75e 100644 --- a/subsystem/hvac_components/heat_pump.py +++ b/metamenth/subsystem/hvac_components/heat_pump.py @@ -1,8 +1,8 @@ -from subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent -from enumerations import HeatSource -from subsystem.hvac_components.condenser import Condenser -from subsystem.hvac_components.heat_exchanger import HeatExchanger -from subsystem.hvac_components.compressor import Compressor +from metamenth.subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent +from metamenth.enumerations import HeatSource +from metamenth.subsystem.hvac_components.condenser import Condenser +from metamenth.subsystem.hvac_components.heat_exchanger import HeatExchanger +from metamenth.subsystem.hvac_components.compressor import Compressor class HeatPump(AbstractDuctConnectedComponent): diff --git a/subsystem/interfaces/__init__.py b/metamenth/subsystem/hvac_components/interfaces/__init__.py similarity index 100% rename from subsystem/interfaces/__init__.py rename to metamenth/subsystem/hvac_components/interfaces/__init__.py diff --git a/subsystem/hvac_components/interfaces/abstract_duct_connected_component.py b/metamenth/subsystem/hvac_components/interfaces/abstract_duct_connected_component.py similarity index 74% rename from subsystem/hvac_components/interfaces/abstract_duct_connected_component.py rename to metamenth/subsystem/hvac_components/interfaces/abstract_duct_connected_component.py index ba5f2c2..43fe03d 100644 --- a/subsystem/hvac_components/interfaces/abstract_duct_connected_component.py +++ b/metamenth/subsystem/hvac_components/interfaces/abstract_duct_connected_component.py @@ -1,5 +1,5 @@ -from subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent -from subsystem.hvac_components.variable_frequency_drive import VariableFrequencyDrive +from metamenth.subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent +from metamenth.subsystem.hvac_components.variable_frequency_drive import VariableFrequencyDrive class AbstractDuctConnectedComponent(AbstractHVACComponent): @@ -19,7 +19,7 @@ def vfd(self) -> VariableFrequencyDrive: return self._vfd def add_duct(self, duct): - from subsystem.hvac_components.duct import Duct + from metamenth.subsystem.hvac_components.duct import Duct if duct is not None and isinstance(duct, Duct): self._ducts.append(duct) else: diff --git a/subsystem/hvac_components/interfaces/abstract_hvac_component.py b/metamenth/subsystem/hvac_components/interfaces/abstract_hvac_component.py similarity index 89% rename from subsystem/hvac_components/interfaces/abstract_hvac_component.py rename to metamenth/subsystem/hvac_components/interfaces/abstract_hvac_component.py index de39002..6058043 100644 --- a/subsystem/hvac_components/interfaces/abstract_hvac_component.py +++ b/metamenth/subsystem/hvac_components/interfaces/abstract_hvac_component.py @@ -1,16 +1,16 @@ from uuid import uuid4 -from datatypes.rated_device_measure import RatedDeviceMeasure +from metamenth.datatypes.rated_device_measure import RatedDeviceMeasure from typing import List from typing import Dict -from datatypes.continuous_measure import ContinuousMeasure -from measure_instruments.meter import Meter -from utils import StructureEntitySearch -from utils import EntityRemover -from utils import EntityInsert -from datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity -from enumerations import BuildingEntity -from measure_instruments.status_measure import StatusMeasure -from datatypes.schedulable_entity import SchedulableEntity +from metamenth.datatypes.continuous_measure import ContinuousMeasure +from metamenth.measure_instruments.meter import Meter +from metamenth.utils import StructureEntitySearch +from metamenth.utils import EntityRemover +from metamenth.utils import EntityInsert +from metamenth.datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity +from metamenth.enumerations import BuildingEntity +from metamenth.measure_instruments.status_measure import StatusMeasure +from metamenth.datatypes.schedulable_entity import SchedulableEntity class AbstractHVACComponent(AbstractDynamicEntity): diff --git a/subsystem/hvac_components/pump.py b/metamenth/subsystem/hvac_components/pump.py similarity index 90% rename from subsystem/hvac_components/pump.py rename to metamenth/subsystem/hvac_components/pump.py index 3a6501c..6d69284 100644 --- a/subsystem/hvac_components/pump.py +++ b/metamenth/subsystem/hvac_components/pump.py @@ -1,7 +1,7 @@ -from subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent -from enumerations import PumpType -from datatypes.binary_measure import BinaryMeasure -from misc.validate import Validate +from metamenth.subsystem.hvac_components.interfaces.abstract_duct_connected_component import AbstractDuctConnectedComponent +from metamenth.enumerations import PumpType +from metamenth.datatypes.binary_measure import BinaryMeasure +from metamenth.misc.validate import Validate class Pump(AbstractDuctConnectedComponent): diff --git a/subsystem/hvac_components/variable_frequency_drive.py b/metamenth/subsystem/hvac_components/variable_frequency_drive.py similarity index 93% rename from subsystem/hvac_components/variable_frequency_drive.py rename to metamenth/subsystem/hvac_components/variable_frequency_drive.py index 7c33d45..f2bd47c 100644 --- a/subsystem/hvac_components/variable_frequency_drive.py +++ b/metamenth/subsystem/hvac_components/variable_frequency_drive.py @@ -1,5 +1,5 @@ -from subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent -from enumerations import MeasurementUnit +from metamenth.subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent +from metamenth.enumerations import MeasurementUnit class VariableFrequencyDrive(AbstractHVACComponent): diff --git a/subsystem/hvac_system.py b/metamenth/subsystem/hvac_system.py similarity index 92% rename from subsystem/hvac_system.py rename to metamenth/subsystem/hvac_system.py index f1d9da7..466fb0b 100644 --- a/subsystem/hvac_system.py +++ b/metamenth/subsystem/hvac_system.py @@ -1,6 +1,6 @@ from uuid import uuid4 from typing import List -from subsystem.ventilation_system import VentilationSystem +from metamenth.subsystem.ventilation_system import VentilationSystem class HVACSystem: diff --git a/transducers/interfaces/__init__.py b/metamenth/subsystem/interfaces/__init__.py similarity index 100% rename from transducers/interfaces/__init__.py rename to metamenth/subsystem/interfaces/__init__.py diff --git a/subsystem/interfaces/abstract_subsystem.py b/metamenth/subsystem/interfaces/abstract_subsystem.py similarity index 100% rename from subsystem/interfaces/abstract_subsystem.py rename to metamenth/subsystem/interfaces/abstract_subsystem.py diff --git a/subsystem/interfaces/abstract_ventilation_component.py b/metamenth/subsystem/interfaces/abstract_ventilation_component.py similarity index 90% rename from subsystem/interfaces/abstract_ventilation_component.py rename to metamenth/subsystem/interfaces/abstract_ventilation_component.py index 0a5a3f0..31a2b83 100644 --- a/subsystem/interfaces/abstract_ventilation_component.py +++ b/metamenth/subsystem/interfaces/abstract_ventilation_component.py @@ -1,7 +1,7 @@ from uuid import uuid4 from typing import List -from datatypes.continuous_measure import ContinuousMeasure -from datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity +from metamenth.datatypes.continuous_measure import ContinuousMeasure +from metamenth.datatypes.interfaces.abstract_dynamic_entity import AbstractDynamicEntity class AbstractVentilationComponent(AbstractDynamicEntity): diff --git a/subsystem/radiant_slab.py b/metamenth/subsystem/radiant_slab.py similarity index 83% rename from subsystem/radiant_slab.py rename to metamenth/subsystem/radiant_slab.py index 4683bbe..1f7a351 100644 --- a/subsystem/radiant_slab.py +++ b/metamenth/subsystem/radiant_slab.py @@ -1,5 +1,5 @@ -from subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent -from enumerations import RadiantSlabType +from metamenth.subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent +from metamenth.enumerations import RadiantSlabType class RadiantSlab(AbstractVentilationComponent): diff --git a/subsystem/thermal_storage.py b/metamenth/subsystem/thermal_storage.py similarity index 68% rename from subsystem/thermal_storage.py rename to metamenth/subsystem/thermal_storage.py index 629bfaa..6b2cb61 100644 --- a/subsystem/thermal_storage.py +++ b/metamenth/subsystem/thermal_storage.py @@ -1,4 +1,4 @@ -from subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent +from metamenth.subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent class ThermalStorage(AbstractVentilationComponent): diff --git a/subsystem/ventilation_system.py b/metamenth/subsystem/ventilation_system.py similarity index 88% rename from subsystem/ventilation_system.py rename to metamenth/subsystem/ventilation_system.py index 90efdba..3f3c98b 100644 --- a/subsystem/ventilation_system.py +++ b/metamenth/subsystem/ventilation_system.py @@ -1,13 +1,13 @@ from uuid import uuid4 -from enumerations import VentilationType -from subsystem.hvac_components.duct import Duct -from subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent -from utils import EntityRemover -from utils import EntityInsert -from utils import StructureEntitySearch +from metamenth.enumerations import VentilationType +from metamenth.subsystem.hvac_components.duct import Duct +from metamenth.subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent +from metamenth.utils import EntityRemover +from metamenth.utils import EntityInsert +from metamenth.utils import StructureEntitySearch from typing import Dict from typing import Union -from energysystem.engine import Engine +from metamenth.energysystem.engine import Engine from typing import List diff --git a/transducers/__init__.py b/metamenth/transducers/__init__.py similarity index 100% rename from transducers/__init__.py rename to metamenth/transducers/__init__.py diff --git a/transducers/actuator.py b/metamenth/transducers/actuator.py similarity index 87% rename from transducers/actuator.py rename to metamenth/transducers/actuator.py index ce62d28..b3821ca 100644 --- a/transducers/actuator.py +++ b/metamenth/transducers/actuator.py @@ -1,9 +1,9 @@ from abc import ABC -from transducers.interfaces.abstract_transducer import AbstractTransducer -from subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent -from subsystem.hvac_components.controller import Controller +from metamenth.transducers.interfaces.abstract_transducer import AbstractTransducer +from metamenth.subsystem.hvac_components.interfaces.abstract_hvac_component import AbstractHVACComponent +from metamenth.subsystem.hvac_components.controller import Controller from typing import Union -from subsystem.appliance import Appliance +from metamenth.subsystem.appliance import Appliance class Actuator(AbstractTransducer, ABC): diff --git a/virtual/__init__.py b/metamenth/transducers/interfaces/__init__.py similarity index 100% rename from virtual/__init__.py rename to metamenth/transducers/interfaces/__init__.py diff --git a/transducers/interfaces/abstract_transducer.py b/metamenth/transducers/interfaces/abstract_transducer.py similarity index 93% rename from transducers/interfaces/abstract_transducer.py rename to metamenth/transducers/interfaces/abstract_transducer.py index f152cd1..f02b3ce 100644 --- a/transducers/interfaces/abstract_transducer.py +++ b/metamenth/transducers/interfaces/abstract_transducer.py @@ -1,13 +1,13 @@ from abc import ABC from typing import Dict, Any -from datatypes.continuous_measure import ContinuousMeasure +from metamenth.datatypes.continuous_measure import ContinuousMeasure from uuid import uuid4 import sys -from utils import StructureEntitySearch +from metamenth.utils import StructureEntitySearch from typing import List from typing import Union -from measure_instruments.sensor_data import SensorData -from measure_instruments.trigger_history import TriggerHistory +from metamenth.measure_instruments.sensor_data import SensorData +from metamenth.measure_instruments.trigger_history import TriggerHistory class AbstractTransducer(ABC): diff --git a/transducers/sensor.py b/metamenth/transducers/sensor.py similarity index 90% rename from transducers/sensor.py rename to metamenth/transducers/sensor.py index b7bb628..5d56c19 100644 --- a/transducers/sensor.py +++ b/metamenth/transducers/sensor.py @@ -1,12 +1,12 @@ -from transducers.interfaces.abstract_transducer import AbstractTransducer +from metamenth.transducers.interfaces.abstract_transducer import AbstractTransducer from typing import Optional -from enumerations import SensorMeasure -from enumerations import MeasurementUnit -from enumerations import SensorMeasureType -from misc import Validate -from datatypes.interfaces.abstract_range_measure import AbstractRangeMeasure -from enumerations import SensorLogType -from datatypes.interfaces.abstract_measure import AbstractMeasure +from metamenth.enumerations import SensorMeasure +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import SensorMeasureType +from metamenth.misc import Validate +from metamenth.datatypes.interfaces.abstract_range_measure import AbstractRangeMeasure +from metamenth.enumerations import SensorLogType +from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure class Sensor(AbstractTransducer): diff --git a/utils/__init__.py b/metamenth/utils/__init__.py similarity index 100% rename from utils/__init__.py rename to metamenth/utils/__init__.py diff --git a/utils/entity_insert.py b/metamenth/utils/entity_insert.py similarity index 94% rename from utils/entity_insert.py rename to metamenth/utils/entity_insert.py index c8c38b6..8203de8 100644 --- a/utils/entity_insert.py +++ b/metamenth/utils/entity_insert.py @@ -1,4 +1,4 @@ -from enumerations import BuildingEntity +from metamenth.enumerations import BuildingEntity class EntityInsert: @@ -17,7 +17,7 @@ def insert_zone(entity, zone, building): if zone not in entity.zones: # add the space to the zone entity.zones.append(zone) - from structure.interfaces.abstract_space import AbstractSpace + from metamenth.structure.interfaces.abstract_space import AbstractSpace if isinstance(entity, AbstractSpace): zone.add_spaces([entity]) diff --git a/utils/entity_remover.py b/metamenth/utils/entity_remover.py similarity index 95% rename from utils/entity_remover.py rename to metamenth/utils/entity_remover.py index f0a3bf0..5b6472f 100644 --- a/utils/entity_remover.py +++ b/metamenth/utils/entity_remover.py @@ -1,4 +1,4 @@ -from enumerations import BuildingEntity +from metamenth.enumerations import BuildingEntity class EntityRemover: diff --git a/virtual/interfaces/__init__.py b/metamenth/utils/search/__init__.py similarity index 100% rename from virtual/interfaces/__init__.py rename to metamenth/utils/search/__init__.py diff --git a/utils/search/structure_entity_search.py b/metamenth/utils/search/structure_entity_search.py similarity index 91% rename from utils/search/structure_entity_search.py rename to metamenth/utils/search/structure_entity_search.py index dcb41bd..7673d33 100644 --- a/utils/search/structure_entity_search.py +++ b/metamenth/utils/search/structure_entity_search.py @@ -3,12 +3,12 @@ from datetime import datetime from typing import Union from typing import List -from measure_instruments.sensor_data import SensorData -from measure_instruments.trigger_history import TriggerHistory -from measure_instruments.meter_measure import MeterMeasure -from measure_instruments.weather_data import WeatherData -from misc import Validate -from enumerations.abstract_enum import AbstractEnum +from metamenth.measure_instruments.sensor_data import SensorData +from metamenth.measure_instruments.trigger_history import TriggerHistory +from metamenth.measure_instruments.meter_measure import MeterMeasure +from metamenth.measure_instruments.weather_data import WeatherData +from metamenth.misc import Validate +from metamenth.enumerations.abstract_enum import AbstractEnum class StructureEntitySearch: diff --git a/utils/search/structure_search.py b/metamenth/utils/search/structure_search.py similarity index 88% rename from utils/search/structure_search.py rename to metamenth/utils/search/structure_search.py index 8dae29f..329cae5 100644 --- a/utils/search/structure_search.py +++ b/metamenth/utils/search/structure_search.py @@ -1,6 +1,6 @@ from typing import Dict import sys -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum class StructureSearch: @@ -49,9 +49,9 @@ def search(structures, search_terms: Dict): :param search_terms: key value pair of attributes and their values :return: """ - from structure.interfaces.abstract_space import AbstractSpace - from structure.layer import Layer - from structure.cover import Cover + from metamenth.structure.interfaces.abstract_space import AbstractSpace + from metamenth.structure.layer import Layer + from metamenth.structure.cover import Cover if search_terms is None: return structures @@ -86,9 +86,9 @@ def search_structure(structures, search_field, search_value): :param search_value: the value to use in the search :return: """ - from structure.interfaces.abstract_space import AbstractSpace - from structure.layer import Layer - from structure.cover import Cover + from metamenth.structure.interfaces.abstract_space import AbstractSpace + from metamenth.structure.layer import Layer + from metamenth.structure.cover import Cover for structure in structures: if not isinstance(structure, AbstractSpace) and not isinstance(structure, Layer) and \ not isinstance(structure, Cover): diff --git a/visitors/__init__.py b/metamenth/virtual/__init__.py similarity index 100% rename from visitors/__init__.py rename to metamenth/virtual/__init__.py diff --git a/visitors/interfaces/__init__.py b/metamenth/virtual/interfaces/__init__.py similarity index 100% rename from visitors/interfaces/__init__.py rename to metamenth/virtual/interfaces/__init__.py diff --git a/virtual/interfaces/abstract_zonal_entity.py b/metamenth/virtual/interfaces/abstract_zonal_entity.py similarity index 90% rename from virtual/interfaces/abstract_zonal_entity.py rename to metamenth/virtual/interfaces/abstract_zonal_entity.py index 103c69e..72325d1 100644 --- a/virtual/interfaces/abstract_zonal_entity.py +++ b/metamenth/virtual/interfaces/abstract_zonal_entity.py @@ -1,9 +1,9 @@ from abc import ABC -from utils import EntityInsert -from utils import EntityRemover -from utils import StructureEntitySearch +from metamenth.utils import EntityInsert +from metamenth.utils import EntityRemover +from metamenth.utils import StructureEntitySearch from typing import Dict -from enumerations import BuildingEntity +from metamenth.enumerations import BuildingEntity class AbstractZonalEntity(ABC): diff --git a/virtual/zone.py b/metamenth/virtual/zone.py similarity index 95% rename from virtual/zone.py rename to metamenth/virtual/zone.py index 1fcccc4..8e84894 100644 --- a/virtual/zone.py +++ b/metamenth/virtual/zone.py @@ -1,13 +1,13 @@ -from enumerations import ZoneType -from enumerations import HVACType +from metamenth.enumerations import ZoneType +from metamenth.enumerations import HVACType from uuid import uuid4 from typing import List -from structure.interfaces.abstract_space import AbstractSpace -from utils import EntityRemover -from enumerations import BuildingEntity -from utils import EntityInsert -from utils import StructureEntitySearch -from utils import StructureSearch +from metamenth.structure.interfaces.abstract_space import AbstractSpace +from metamenth.utils import EntityRemover +from metamenth.enumerations import BuildingEntity +from metamenth.utils import EntityInsert +from metamenth.utils import StructureEntitySearch +from metamenth.utils import StructureSearch from typing import Dict diff --git a/metamenth/visitors/__init__.py b/metamenth/visitors/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/visitors/hvac_component_search_visitor.py b/metamenth/visitors/hvac_component_search_visitor.py similarity index 92% rename from visitors/hvac_component_search_visitor.py rename to metamenth/visitors/hvac_component_search_visitor.py index 54dcb99..f7d77e1 100644 --- a/visitors/hvac_component_search_visitor.py +++ b/metamenth/visitors/hvac_component_search_visitor.py @@ -1,7 +1,7 @@ -from visitors.interfaces.abstract_space_visitor import AbstractSpaceVisitor +from metamenth.visitors.interfaces.abstract_space_visitor import AbstractSpaceVisitor from typing import Dict -from subsystem.hvac_components.duct import Duct -from subsystem.hvac_components.air_volume_box import AirVolumeBox +from metamenth.subsystem.hvac_components.duct import Duct +from metamenth.subsystem.hvac_components.air_volume_box import AirVolumeBox import itertools diff --git a/metamenth/visitors/interfaces/__init__.py b/metamenth/visitors/interfaces/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/visitors/interfaces/abstract_space_visitor.py b/metamenth/visitors/interfaces/abstract_space_visitor.py similarity index 97% rename from visitors/interfaces/abstract_space_visitor.py rename to metamenth/visitors/interfaces/abstract_space_visitor.py index 373269f..09c5de1 100644 --- a/visitors/interfaces/abstract_space_visitor.py +++ b/metamenth/visitors/interfaces/abstract_space_visitor.py @@ -1,4 +1,4 @@ -from enumerations.abstract_enum import AbstractEnum +from metamenth.enumerations.abstract_enum import AbstractEnum from typing import Dict diff --git a/visitors/meter_search_visitor.py b/metamenth/visitors/meter_search_visitor.py similarity index 95% rename from visitors/meter_search_visitor.py rename to metamenth/visitors/meter_search_visitor.py index f757ecb..dcb1a4f 100644 --- a/visitors/meter_search_visitor.py +++ b/metamenth/visitors/meter_search_visitor.py @@ -1,4 +1,4 @@ -from visitors.interfaces.abstract_space_visitor import AbstractSpaceVisitor +from metamenth.visitors.interfaces.abstract_space_visitor import AbstractSpaceVisitor from typing import Dict diff --git a/visitors/sensor_search_visitor.py b/metamenth/visitors/sensor_search_visitor.py similarity index 95% rename from visitors/sensor_search_visitor.py rename to metamenth/visitors/sensor_search_visitor.py index 7f5ae98..c850d2e 100644 --- a/visitors/sensor_search_visitor.py +++ b/metamenth/visitors/sensor_search_visitor.py @@ -1,4 +1,4 @@ -from visitors.interfaces.abstract_space_visitor import AbstractSpaceVisitor +from metamenth.visitors.interfaces.abstract_space_visitor import AbstractSpaceVisitor from typing import Dict diff --git a/visitors/space_search_visitor.py b/metamenth/visitors/space_search_visitor.py similarity index 93% rename from visitors/space_search_visitor.py rename to metamenth/visitors/space_search_visitor.py index f6b23ee..4ea132a 100644 --- a/visitors/space_search_visitor.py +++ b/metamenth/visitors/space_search_visitor.py @@ -1,4 +1,4 @@ -from visitors.interfaces.abstract_space_visitor import AbstractSpaceVisitor +from metamenth.visitors.interfaces.abstract_space_visitor import AbstractSpaceVisitor from typing import Dict diff --git a/setup.py b/setup.py index 1a62251..32dc491 100644 --- a/setup.py +++ b/setup.py @@ -5,8 +5,8 @@ setup( name="metamenth", - version="1.0.2", - packages=find_packages(exclude=["venv", "venv.*", "tests", "tests.*", ".github", ".github.*"]), + version="1.0.2b1", + packages=find_packages(include=["metamenth", "metamenth.*"]), install_requires=requirements, entry_points={ 'console_scripts': [ @@ -20,7 +20,7 @@ "focuses on the relationships and interactions between mechanical, electrical, and plumbing (MEP) " "entities and their connections to sensors and spatial entities such as rooms and open spaces within " "buildings.", - long_description=open('readme.md').read(), + long_description=open('README.md').read(), long_description_content_type='text/markdown', url="https://github.com/peteryefi/metamenth", classifiers=[ diff --git a/tests/energy_system/test_energy_systems.py b/tests/energy_system/test_energy_systems.py index b389a1b..be3c4df 100644 --- a/tests/energy_system/test_energy_systems.py +++ b/tests/energy_system/test_energy_systems.py @@ -1,37 +1,37 @@ from unittest import TestCase -from energysystem.engine import Engine -from enumerations import MeterMeasureMode -from enumerations import EngineType -from enumerations import EngineSubType -from enumerations import EngineMode -from energysystem.solar_pv import SolarPV -from enumerations import SolarPVType -from enumerations import CellType -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure -from energysystem.wind_mill import WindMill -from enumerations import WindTurbineType -from datatypes.operational_schedule import OperationalSchedule +from metamenth.energysystem.engine import Engine +from metamenth.enumerations import MeterMeasureMode +from metamenth.enumerations import EngineType +from metamenth.enumerations import EngineSubType +from metamenth.enumerations import EngineMode +from metamenth.energysystem.solar_pv import SolarPV +from metamenth.enumerations import SolarPVType +from metamenth.enumerations import CellType +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes.measure import Measure +from metamenth.energysystem.wind_mill import WindMill +from metamenth.enumerations import WindTurbineType +from metamenth.datatypes.operational_schedule import OperationalSchedule from datetime import datetime from datetime import timedelta -from energysystem.storage_system.battery import Battery -from enumerations import BatteryTech -from enumerations import EnergySource -from energysystem.storage_system.electric_vehicle import ElectricVehicle -from energysystem.storage_system.super_capacitor import SuperCapacitor -from enumerations import V2GMode -from enumerations import CapacitorTech -from transducers.sensor import Sensor -from enumerations import SensorMeasure -from enumerations import SensorMeasureType -from enumerations import SensorLogType -from measure_instruments.meter import Meter -from enumerations import MeasurementUnit -from enumerations import MeterType -from energysystem.electricals.uninterruptible_power_supply import UninterruptiblePowerSupply -from enumerations import PowerState -from enumerations import UPSPhase +from metamenth.energysystem.storage_system.battery import Battery +from metamenth.enumerations import BatteryTech +from metamenth.enumerations import EnergySource +from metamenth.energysystem.storage_system.electric_vehicle import ElectricVehicle +from metamenth.energysystem.storage_system.super_capacitor import SuperCapacitor +from metamenth.enumerations import V2GMode +from metamenth.enumerations import CapacitorTech +from metamenth.transducers.sensor import Sensor +from metamenth.enumerations import SensorMeasure +from metamenth.enumerations import SensorMeasureType +from metamenth.enumerations import SensorLogType +from metamenth.measure_instruments.meter import Meter +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import MeterType +from metamenth.energysystem.electricals.uninterruptible_power_supply import UninterruptiblePowerSupply +from metamenth.enumerations import PowerState +from metamenth.enumerations import UPSPhase class TestEnergySystems(TestCase): diff --git a/tests/measurement_instruments/test_meter.py b/tests/measurement_instruments/test_meter.py index 1d61430..d4ce61d 100644 --- a/tests/measurement_instruments/test_meter.py +++ b/tests/measurement_instruments/test_meter.py @@ -1,13 +1,13 @@ from unittest import TestCase -from measure_instruments.meter import Meter -from enumerations import MeasurementUnit -from enumerations import MeterType -from enumerations import MeterMeasureMode -from enumerations import MeterAccumulationFrequency -from measure_instruments.meter import MeterMeasure -from measure_instruments.ev_charging_meter import EVChargingMeter -from measure_instruments.electric_vehicle_connectivity import ElectricVehicleConnectivity -from enumerations import OperationType +from metamenth.measure_instruments.meter import Meter +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import MeterType +from metamenth.enumerations import MeterMeasureMode +from metamenth.enumerations import MeterAccumulationFrequency +from metamenth.measure_instruments.meter_measure import MeterMeasure +from metamenth.measure_instruments.ev_charging_meter import EVChargingMeter +from metamenth.measure_instruments.electric_vehicle_connectivity import ElectricVehicleConnectivity +from metamenth.enumerations import OperationType from uuid import uuid4 diff --git a/tests/measurement_instruments/test_weather_station.py b/tests/measurement_instruments/test_weather_station.py index 1116a11..cc97039 100644 --- a/tests/measurement_instruments/test_weather_station.py +++ b/tests/measurement_instruments/test_weather_station.py @@ -1,11 +1,11 @@ from unittest import TestCase -from measure_instruments.weather_station import WeatherStation -from measure_instruments.weather_data import WeatherData -from enumerations import DataMeasurementType -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure -from enumerations import MeasurementUnit +from metamenth.measure_instruments.weather_station import WeatherStation +from metamenth.measure_instruments.weather_data import WeatherData +from metamenth.enumerations import DataMeasurementType +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes.measure import Measure +from metamenth.enumerations import MeasurementUnit import copy diff --git a/tests/structure/base_test.py b/tests/structure/base_test.py index fc6dd54..ff9fb42 100644 --- a/tests/structure/base_test.py +++ b/tests/structure/base_test.py @@ -1,28 +1,28 @@ from unittest import TestCase -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure -from enumerations import MeasurementUnit -from structure.open_space import OpenSpace -from enumerations import OpenSpaceType -from enumerations import RoomType -from structure.room import Room -from structure.floor import Floor -from enumerations import FloorType -from structure.building import Building -from enumerations import BuildingType -from datatypes.address import Address -from structure.layer import Layer -from structure.material import Material -from enumerations import MaterialType -from enumerations import ApplianceType -from enumerations import ApplianceCategory -from subsystem.appliance import Appliance -from enumerations import SensorLogType -from transducers.sensor import Sensor -from enumerations import SensorMeasure -from enumerations import SensorMeasureType -from enumerations import LayerRoughness +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes.measure import Measure +from metamenth.enumerations import MeasurementUnit +from metamenth.structure.open_space import OpenSpace +from metamenth.enumerations import OpenSpaceType +from metamenth.enumerations import RoomType +from metamenth.structure.room import Room +from metamenth.structure.floor import Floor +from metamenth.enumerations import FloorType +from metamenth.structure.building import Building +from metamenth.enumerations import BuildingType +from metamenth.datatypes.address import Address +from metamenth.structure.layer import Layer +from metamenth.structure.material import Material +from metamenth.enumerations import MaterialType +from metamenth.enumerations import ApplianceType +from metamenth.enumerations import ApplianceCategory +from metamenth.subsystem.appliance import Appliance +from metamenth.enumerations import SensorLogType +from metamenth.transducers.sensor import Sensor +from metamenth.enumerations import SensorMeasure +from metamenth.enumerations import SensorMeasureType +from metamenth.enumerations import LayerRoughness class BaseTest(TestCase): diff --git a/tests/structure/test_building.py b/tests/structure/test_building.py index 9aad9b5..3a97e3b 100644 --- a/tests/structure/test_building.py +++ b/tests/structure/test_building.py @@ -1,32 +1,32 @@ -from enumerations import OpenSpaceType -from structure.floor import Floor -from enumerations import FloorType -from structure.building import Building -from datatypes.operational_schedule import OperationalSchedule +from metamenth.enumerations import OpenSpaceType +from metamenth.structure.floor import Floor +from metamenth.enumerations import FloorType +from metamenth.structure.building import Building +from metamenth.datatypes.operational_schedule import OperationalSchedule from datetime import datetime from datetime import timedelta -from enumerations import BuildingType +from metamenth.enumerations import BuildingType import copy -from virtual.zone import Zone -from enumerations import ZoneType -from enumerations import HVACType -from measure_instruments.weather_station import WeatherStation +from metamenth.virtual.zone import Zone +from metamenth.enumerations import ZoneType +from metamenth.enumerations import HVACType +from metamenth.measure_instruments.weather_station import WeatherStation from tests.structure.base_test import BaseTest -from enumerations import MaterialType -from structure.cover import Cover -from structure.envelope import Envelope -from enumerations import CoverType -from enumerations import RoomType -from observers.structure_state_change_logger import StructureStateChangeLogger -from enumerations import MeterMeasureMode -from measure_instruments.ev_charging_meter import EVChargingMeter -from measure_instruments.electric_vehicle_connectivity import ElectricVehicleConnectivity -from enumerations import OperationType -from energysystem.storage_system.electric_vehicle import ElectricVehicle -from enumerations import V2GMode -from measure_instruments.meter import Meter -from enumerations import MeasurementUnit -from enumerations import MeterType +from metamenth.enumerations import MaterialType +from metamenth.structure.cover import Cover +from metamenth.structure.envelope import Envelope +from metamenth.enumerations import CoverType +from metamenth.enumerations import RoomType +from metamenth.observers.structure_state_change_logger import StructureStateChangeLogger +from metamenth.enumerations import MeterMeasureMode +from metamenth.measure_instruments.ev_charging_meter import EVChargingMeter +from metamenth.measure_instruments.electric_vehicle_connectivity import ElectricVehicleConnectivity +from metamenth.enumerations import OperationType +from metamenth.energysystem.storage_system.electric_vehicle import ElectricVehicle +from metamenth.enumerations import V2GMode +from metamenth.measure_instruments.meter import Meter +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import MeterType class TestBuilding(BaseTest): diff --git a/tests/structure/test_cover_and_envelope.py b/tests/structure/test_cover_and_envelope.py index 6dd92bb..f2a1312 100644 --- a/tests/structure/test_cover_and_envelope.py +++ b/tests/structure/test_cover_and_envelope.py @@ -1,11 +1,11 @@ -from structure.layer import Layer -from structure.cover import Cover -from structure.envelope import Envelope -from enumerations import CoverType +from metamenth.structure.layer import Layer +from metamenth.structure.cover import Cover +from metamenth.structure.envelope import Envelope +from metamenth.enumerations import CoverType import copy from tests.structure.base_test import BaseTest -from enumerations import MaterialType -from enumerations import LayerRoughness +from metamenth.enumerations import MaterialType +from metamenth.enumerations import LayerRoughness class TestCoverAndEnvelop(BaseTest): diff --git a/tests/structure/test_floor.py b/tests/structure/test_floor.py index fcb436d..dcf16b3 100644 --- a/tests/structure/test_floor.py +++ b/tests/structure/test_floor.py @@ -1,13 +1,13 @@ -from enumerations import OpenSpaceType -from structure.floor import Floor -from enumerations import FloorType -from datatypes.operational_schedule import OperationalSchedule +from metamenth.enumerations import OpenSpaceType +from metamenth.structure.floor import Floor +from metamenth.enumerations import FloorType +from metamenth.datatypes.operational_schedule import OperationalSchedule from datetime import datetime from datetime import timedelta from tests.structure.base_test import BaseTest -from structure.open_space import OpenSpace -from structure.room import Room -from enumerations import RoomType +from metamenth.structure.open_space import OpenSpace +from metamenth.structure.room import Room +from metamenth.enumerations import RoomType class TestFloor(BaseTest): diff --git a/tests/structure/test_layer.py b/tests/structure/test_layer.py index 615017e..ff15f55 100644 --- a/tests/structure/test_layer.py +++ b/tests/structure/test_layer.py @@ -1,12 +1,12 @@ from unittest import TestCase -from enumerations import MaterialType -from structure.material import Material -from structure.layer import Layer -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure -from enumerations import MeasurementUnit -from enumerations import LayerRoughness +from metamenth.enumerations import MaterialType +from metamenth.structure.material import Material +from metamenth.structure.layer import Layer +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes.measure import Measure +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import LayerRoughness class TestLayer(TestCase): diff --git a/tests/structure/test_material.py b/tests/structure/test_material.py index b08de02..1236408 100644 --- a/tests/structure/test_material.py +++ b/tests/structure/test_material.py @@ -1,10 +1,10 @@ from unittest import TestCase -from enumerations import MaterialType -from structure.material import Material -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure -from enumerations import MeasurementUnit +from metamenth.enumerations import MaterialType +from metamenth.structure.material import Material +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes.measure import Measure +from metamenth.enumerations import MeasurementUnit class TestMaterial(TestCase): diff --git a/tests/structure/test_open_space.py b/tests/structure/test_open_space.py index 3b437d1..c80aa30 100644 --- a/tests/structure/test_open_space.py +++ b/tests/structure/test_open_space.py @@ -1,15 +1,15 @@ -from enumerations import MeasurementUnit -from structure.open_space import OpenSpace -from enumerations import OpenSpaceType +from metamenth.enumerations import MeasurementUnit +from metamenth.structure.open_space import OpenSpace +from metamenth.enumerations import OpenSpaceType import copy from tests.structure.base_test import BaseTest -from transducers.sensor import Sensor -from enumerations import SensorMeasure -from enumerations import SensorMeasureType -from enumerations import ApplianceCategory -from enumerations import ApplianceType -from subsystem.appliance import Appliance -from enumerations import SensorLogType +from metamenth.transducers.sensor import Sensor +from metamenth.enumerations import SensorMeasure +from metamenth.enumerations import SensorMeasureType +from metamenth.enumerations import ApplianceCategory +from metamenth.enumerations import ApplianceType +from metamenth.subsystem.appliance import Appliance +from metamenth.enumerations import SensorLogType class TestOpenSpace(BaseTest): diff --git a/tests/structure/test_room.py b/tests/structure/test_room.py index 1efa32d..89d0721 100644 --- a/tests/structure/test_room.py +++ b/tests/structure/test_room.py @@ -1,36 +1,36 @@ -from enumerations import MeasurementUnit -from measure_instruments.meter import Meter -from structure.open_space import OpenSpace -from enumerations import OpenSpaceType -from enumerations import RoomType -from enumerations import MeterType -from transducers.sensor import Sensor -from enumerations import SensorMeasure -from enumerations import SensorMeasureType +from metamenth.enumerations import MeasurementUnit +from metamenth.measure_instruments.meter import Meter +from metamenth.structure.open_space import OpenSpace +from metamenth.enumerations import OpenSpaceType +from metamenth.enumerations import RoomType +from metamenth.enumerations import MeterType +from metamenth.transducers.sensor import Sensor +from metamenth.enumerations import SensorMeasure +from metamenth.enumerations import SensorMeasureType from tests.structure.base_test import BaseTest -from enumerations import MeterMeasureMode -from measure_instruments.meter_measure import MeterMeasure -from subsystem.appliance import Appliance -from enumerations import SensorLogType -from enumerations import ApplianceType -from enumerations import ApplianceCategory -from subsystem.hvac_components.damper import Damper -from enumerations import DamperType -from transducers.actuator import Actuator -from energysystem.electricals.uninterruptible_power_supply import UninterruptiblePowerSupply -from enumerations import UPSPhase -from enumerations import PowerState -from energysystem.storage_system.battery import Battery -from enumerations import BatteryTech -from enumerations import EnergySource -from energysystem.electricals.alternator import Alternator -from energysystem.electricals.automatic_transfer_switch import AutomaticTransferSwitch -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure +from metamenth.enumerations import MeterMeasureMode +from metamenth.measure_instruments.meter_measure import MeterMeasure +from metamenth.subsystem.appliance import Appliance +from metamenth.enumerations import SensorLogType +from metamenth.enumerations import ApplianceType +from metamenth.enumerations import ApplianceCategory +from metamenth.subsystem.hvac_components.damper import Damper +from metamenth.enumerations import DamperType +from metamenth.transducers.actuator import Actuator +from metamenth.energysystem.electricals.uninterruptible_power_supply import UninterruptiblePowerSupply +from metamenth.enumerations import UPSPhase +from metamenth.enumerations import PowerState +from metamenth.energysystem.storage_system.battery import Battery +from metamenth.enumerations import BatteryTech +from metamenth.enumerations import EnergySource +from metamenth.energysystem.electricals.alternator import Alternator +from metamenth.energysystem.electricals.automatic_transfer_switch import AutomaticTransferSwitch +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes.measure import Measure from datetime import datetime from datetime import timedelta -from datatypes.operational_schedule import OperationalSchedule +from metamenth.datatypes.operational_schedule import OperationalSchedule class TestRoom(BaseTest): diff --git a/tests/structure/test_zone.py b/tests/structure/test_zone.py index f5a79a9..aa26e78 100644 --- a/tests/structure/test_zone.py +++ b/tests/structure/test_zone.py @@ -1,17 +1,17 @@ from unittest import TestCase -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure -from enumerations import MeasurementUnit -from structure.open_space import OpenSpace -from enumerations import OpenSpaceType -from enumerations import RoomType -from structure.room import Room -from virtual.zone import Zone -from enumerations import ZoneType -from enumerations import HVACType -from structure.floor import Floor -from enumerations import FloorType +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes.measure import Measure +from metamenth.enumerations import MeasurementUnit +from metamenth.structure.open_space import OpenSpace +from metamenth.enumerations import OpenSpaceType +from metamenth.enumerations import RoomType +from metamenth.structure.room import Room +from metamenth.virtual.zone import Zone +from metamenth.enumerations import ZoneType +from metamenth.enumerations import HVACType +from metamenth.structure.floor import Floor +from metamenth.enumerations import FloorType class TestZone(TestCase): diff --git a/tests/subsystem/base_test.py b/tests/subsystem/base_test.py index 70671d8..673a7ef 100644 --- a/tests/subsystem/base_test.py +++ b/tests/subsystem/base_test.py @@ -1,21 +1,21 @@ from unittest import TestCase -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure -from enumerations import MeasurementUnit -from structure.open_space import OpenSpace -from enumerations import OpenSpaceType -from enumerations import RoomType -from structure.room import Room -from structure.floor import Floor -from enumerations import FloorType -from structure.building import Building -from enumerations import BuildingType -from datatypes.address import Address -from enumerations import SensorLogType -from transducers.sensor import Sensor -from enumerations import SensorMeasure -from enumerations import SensorMeasureType +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes.measure import Measure +from metamenth.enumerations import MeasurementUnit +from metamenth.structure.open_space import OpenSpace +from metamenth.enumerations import OpenSpaceType +from metamenth.enumerations import RoomType +from metamenth.structure.room import Room +from metamenth.structure.floor import Floor +from metamenth.enumerations import FloorType +from metamenth.structure.building import Building +from metamenth.enumerations import BuildingType +from metamenth.datatypes.address import Address +from metamenth.enumerations import SensorLogType +from metamenth.transducers.sensor import Sensor +from metamenth.enumerations import SensorMeasure +from metamenth.enumerations import SensorMeasureType class BaseTest(TestCase): diff --git a/tests/subsystem/test_appliance.py b/tests/subsystem/test_appliance.py index c5825a8..46f5812 100644 --- a/tests/subsystem/test_appliance.py +++ b/tests/subsystem/test_appliance.py @@ -1,16 +1,16 @@ from unittest import TestCase -from enumerations import MeasurementUnit -from transducers.sensor import Sensor -from enumerations import SensorMeasure -from enumerations import SensorMeasureType -from enumerations import SensorLogType -from measure_instruments.sensor_data import SensorData -from subsystem.appliance import Appliance -from enumerations import ApplianceType -from enumerations import ApplianceCategory -from datatypes.rated_device_measure import RatedDeviceMeasure -from misc import MeasureFactory -from datatypes.measure import Measure +from metamenth.enumerations import MeasurementUnit +from metamenth.transducers.sensor import Sensor +from metamenth.enumerations import SensorMeasure +from metamenth.enumerations import SensorMeasureType +from metamenth.enumerations import SensorLogType +from metamenth.measure_instruments.sensor_data import SensorData +from metamenth.subsystem.appliance import Appliance +from metamenth.enumerations import ApplianceType +from metamenth.enumerations import ApplianceCategory +from metamenth.datatypes.rated_device_measure import RatedDeviceMeasure +from metamenth.misc import MeasureFactory +from metamenth.datatypes.measure import Measure class TestAppliance(TestCase): diff --git a/tests/subsystem/test_building_control_system.py b/tests/subsystem/test_building_control_system.py index dff640d..dcb5e50 100644 --- a/tests/subsystem/test_building_control_system.py +++ b/tests/subsystem/test_building_control_system.py @@ -1,60 +1,60 @@ -from enumerations import SensorMeasure -from subsystem.building_control_system import BuildingControlSystem -from subsystem.interfaces.abstract_subsystem import AbstractSubsystem -from subsystem.hvac_system import HVACSystem -from subsystem.hvac_components.duct import Duct -from subsystem.hvac_components.filter import Filter -from enumerations import DuctType -from enumerations import DuctSubType -from subsystem.hvac_components.fan import Fan -from measure_instruments.status_measure import StatusMeasure -from subsystem.hvac_components.heat_exchanger import HeatExchanger -from enumerations import HeatExchangerType -from enumerations import HeatExchangerFlowType -from subsystem.hvac_components.damper import Damper -from enumerations import DamperType -from subsystem.hvac_components.duct_connection import DuctConnection +from metamenth.enumerations import SensorMeasure +from metamenth.subsystem.building_control_system import BuildingControlSystem +from metamenth.subsystem.interfaces.abstract_subsystem import AbstractSubsystem +from metamenth.subsystem.hvac_system import HVACSystem +from metamenth.subsystem.hvac_components.duct import Duct +from metamenth.subsystem.hvac_components.filter import Filter +from metamenth.enumerations import DuctType +from metamenth.enumerations import DuctSubType +from metamenth.subsystem.hvac_components.fan import Fan +from metamenth.measure_instruments.status_measure import StatusMeasure +from metamenth.subsystem.hvac_components.heat_exchanger import HeatExchanger +from metamenth.enumerations import HeatExchangerType +from metamenth.enumerations import HeatExchangerFlowType +from metamenth.subsystem.hvac_components.damper import Damper +from metamenth.enumerations import DamperType +from metamenth.subsystem.hvac_components.duct_connection import DuctConnection from tests.subsystem.base_test import BaseTest -from enumerations import DuctConnectionEntityType -from subsystem.hvac_components.boiler import Boiler -from enumerations import BoilerCategory -from subsystem.hvac_components.chiller import Chiller -from enumerations import ChillerType -from measure_instruments.meter import Meter -from enumerations import MeterType -from enumerations import MeterMeasureMode -from enumerations import MeasurementUnit -from subsystem.hvac_components.cooling_tower import CoolingTower -from subsystem.hvac_components.air_volume_box import AirVolumeBox -from enumerations import AirVolumeType -from subsystem.hvac_components.variable_frequency_drive import VariableFrequencyDrive -from enumerations import ZoneType -from enumerations import HVACType -from virtual.zone import Zone -from subsystem.ventilation_system import VentilationSystem -from enumerations import VentilationType -from subsystem.thermal_storage import ThermalStorage -from subsystem.radiant_slab import RadiantSlab -from subsystem.baseboard_heater import BaseboardHeater -from enumerations import RadiantSlabType -from enumerations import HeatingType -from subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent -from subsystem.hvac_components.heat_pump import HeatPump -from enumerations import HeatSource -from subsystem.hvac_components.condenser import Condenser -from subsystem.hvac_components.compressor import Compressor -from enumerations import RefrigerantType -from enumerations import CoilMaterial -from enumerations import CompressorType -from datatypes.operational_schedule import OperationalSchedule +from metamenth.enumerations import DuctConnectionEntityType +from metamenth.subsystem.hvac_components.boiler import Boiler +from metamenth.enumerations import BoilerCategory +from metamenth.subsystem.hvac_components.chiller import Chiller +from metamenth.enumerations import ChillerType +from metamenth.measure_instruments.meter import Meter +from metamenth.enumerations import MeterType +from metamenth.enumerations import MeterMeasureMode +from metamenth.enumerations import MeasurementUnit +from metamenth.subsystem.hvac_components.cooling_tower import CoolingTower +from metamenth.subsystem.hvac_components.air_volume_box import AirVolumeBox +from metamenth.enumerations import AirVolumeType +from metamenth.subsystem.hvac_components.variable_frequency_drive import VariableFrequencyDrive +from metamenth.enumerations import ZoneType +from metamenth.enumerations import HVACType +from metamenth.virtual.zone import Zone +from metamenth.subsystem.ventilation_system import VentilationSystem +from metamenth.enumerations import VentilationType +from metamenth.subsystem.thermal_storage import ThermalStorage +from metamenth.subsystem.radiant_slab import RadiantSlab +from metamenth.subsystem.baseboard_heater import BaseboardHeater +from metamenth.enumerations import RadiantSlabType +from metamenth.enumerations import HeatingType +from metamenth.subsystem.interfaces.abstract_ventilation_component import AbstractVentilationComponent +from metamenth.subsystem.hvac_components.heat_pump import HeatPump +from metamenth.enumerations import HeatSource +from metamenth.subsystem.hvac_components.condenser import Condenser +from metamenth.subsystem.hvac_components.compressor import Compressor +from metamenth.enumerations import RefrigerantType +from metamenth.enumerations import CoilMaterial +from metamenth.enumerations import CompressorType +from metamenth.datatypes.operational_schedule import OperationalSchedule from datetime import datetime from datetime import timedelta -from enumerations import PowerState -from measure_instruments.damper_position import DamperPosition -from enumerations import FilterType -from enumerations import PumpType -from subsystem.hvac_components.pump import Pump -from enumerations import RoomType +from metamenth.enumerations import PowerState +from metamenth.measure_instruments.damper_position import DamperPosition +from metamenth.enumerations import FilterType +from metamenth.enumerations import PumpType +from metamenth.subsystem.hvac_components.pump import Pump +from metamenth.enumerations import RoomType class TestBuildingControlSystem(BaseTest): diff --git a/tests/transducer/test_actuator.py b/tests/transducer/test_actuator.py index 6246a7e..3caa42b 100644 --- a/tests/transducer/test_actuator.py +++ b/tests/transducer/test_actuator.py @@ -1,20 +1,20 @@ from unittest import TestCase -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure -from enumerations import MeasurementUnit -from transducers.sensor import Sensor -from enumerations import SensorMeasure -from enumerations import SensorMeasureType -from transducers.actuator import Actuator -from measure_instruments.trigger_history import TriggerHistory -from enumerations import TriggerType -from subsystem.hvac_components.damper import Damper -from subsystem.hvac_components.fan import Fan -from subsystem.hvac_components.variable_frequency_drive import VariableFrequencyDrive -from enumerations import DamperType -from enumerations import PowerState -from subsystem.hvac_components.controller import Controller +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes.measure import Measure +from metamenth.enumerations import MeasurementUnit +from metamenth.transducers.sensor import Sensor +from metamenth.enumerations import SensorMeasure +from metamenth.enumerations import SensorMeasureType +from metamenth.transducers.actuator import Actuator +from metamenth.measure_instruments.trigger_history import TriggerHistory +from metamenth.enumerations import TriggerType +from metamenth.subsystem.hvac_components.damper import Damper +from metamenth.subsystem.hvac_components.fan import Fan +from metamenth.subsystem.hvac_components.variable_frequency_drive import VariableFrequencyDrive +from metamenth.enumerations import DamperType +from metamenth.enumerations import PowerState +from metamenth.subsystem.hvac_components.controller import Controller class TestActuator(TestCase): diff --git a/tests/transducer/test_sensor.py b/tests/transducer/test_sensor.py index 295063e..ede0b96 100644 --- a/tests/transducer/test_sensor.py +++ b/tests/transducer/test_sensor.py @@ -1,13 +1,13 @@ from unittest import TestCase -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure -from enumerations import MeasurementUnit -from transducers.sensor import Sensor -from enumerations import SensorMeasure -from enumerations import SensorMeasureType -from enumerations import SensorLogType -from measure_instruments.sensor_data import SensorData +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes.measure import Measure +from metamenth.enumerations import MeasurementUnit +from metamenth.transducers.sensor import Sensor +from metamenth.enumerations import SensorMeasure +from metamenth.enumerations import SensorMeasureType +from metamenth.enumerations import SensorLogType +from metamenth.measure_instruments.sensor_data import SensorData from time import sleep from datetime import datetime, timedelta diff --git a/tests/visitors/test_hvac_component_search_visitor.py b/tests/visitors/test_hvac_component_search_visitor.py index 6575922..43785df 100644 --- a/tests/visitors/test_hvac_component_search_visitor.py +++ b/tests/visitors/test_hvac_component_search_visitor.py @@ -1,25 +1,25 @@ -from structure.floor import Floor -from enumerations import FloorType -from virtual.zone import Zone -from enumerations import ZoneType -from enumerations import HVACType -from enumerations import RoomType -from enumerations import PowerState -from subsystem.hvac_components.heat_exchanger import HeatExchanger -from enumerations import HeatExchangerType -from enumerations import HeatExchangerFlowType -from subsystem.hvac_components.damper import Damper -from enumerations import DamperType +from metamenth.structure.floor import Floor +from metamenth.enumerations import FloorType +from metamenth.virtual.zone import Zone +from metamenth.enumerations import ZoneType +from metamenth.enumerations import HVACType +from metamenth.enumerations import RoomType +from metamenth.enumerations import PowerState +from metamenth.subsystem.hvac_components.heat_exchanger import HeatExchanger +from metamenth.enumerations import HeatExchangerType +from metamenth.enumerations import HeatExchangerFlowType +from metamenth.subsystem.hvac_components.damper import Damper +from metamenth.enumerations import DamperType from tests.subsystem.base_test import BaseTest -from subsystem.hvac_components.boiler import Boiler -from enumerations import BoilerCategory -from subsystem.hvac_components.air_volume_box import AirVolumeBox -from enumerations import AirVolumeType -from visitors.hvac_component_search_visitor import HVACComponentSearchVisitor -from subsystem.hvac_components.duct import Duct -from enumerations import DuctType -from enumerations import DuctSubType -from measure_instruments.damper_position import DamperPosition +from metamenth.subsystem.hvac_components.boiler import Boiler +from metamenth.enumerations import BoilerCategory +from metamenth.subsystem.hvac_components.air_volume_box import AirVolumeBox +from metamenth.enumerations import AirVolumeType +from metamenth.visitors.hvac_component_search_visitor import HVACComponentSearchVisitor +from metamenth.subsystem.hvac_components.duct import Duct +from metamenth.enumerations import DuctType +from metamenth.enumerations import DuctSubType +from metamenth.measure_instruments.damper_position import DamperPosition class TestHVACComponentSearchVisitor(BaseTest): diff --git a/tests/visitors/test_meter_search_visitor.py b/tests/visitors/test_meter_search_visitor.py index 24c93ef..c15f1a8 100644 --- a/tests/visitors/test_meter_search_visitor.py +++ b/tests/visitors/test_meter_search_visitor.py @@ -1,23 +1,23 @@ -from structure.floor import Floor -from enumerations import FloorType -from structure.building import Building -from enumerations import BuildingType -from virtual.zone import Zone -from enumerations import ZoneType -from enumerations import HVACType +from metamenth.structure.floor import Floor +from metamenth.enumerations import FloorType +from metamenth.structure.building import Building +from metamenth.enumerations import BuildingType +from metamenth.virtual.zone import Zone +from metamenth.enumerations import ZoneType +from metamenth.enumerations import HVACType from tests.structure.base_test import BaseTest -from visitors.meter_search_visitor import MeterSearchVisitor -from enumerations import BoilerCategory -from subsystem.hvac_components.boiler import Boiler -from measure_instruments.meter import Meter -from enumerations import MeasurementUnit -from enumerations import MeterType -from energysystem.electricals.uninterruptible_power_supply import UninterruptiblePowerSupply -from enumerations import PowerState -from enumerations import UPSPhase -from enumerations import MeterMeasureMode +from metamenth.visitors.meter_search_visitor import MeterSearchVisitor +from metamenth.enumerations import BoilerCategory +from metamenth.subsystem.hvac_components.boiler import Boiler +from metamenth.measure_instruments.meter import Meter +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import MeterType +from metamenth.energysystem.electricals.uninterruptible_power_supply import UninterruptiblePowerSupply +from metamenth.enumerations import PowerState +from metamenth.enumerations import UPSPhase +from metamenth.enumerations import MeterMeasureMode import copy -from enumerations import RoomType +from metamenth.enumerations import RoomType class TestSensorSearchVisitor(BaseTest): diff --git a/tests/visitors/test_sensor_search_visitor.py b/tests/visitors/test_sensor_search_visitor.py index ed76620..7656a45 100644 --- a/tests/visitors/test_sensor_search_visitor.py +++ b/tests/visitors/test_sensor_search_visitor.py @@ -1,31 +1,31 @@ -from enumerations import OpenSpaceType -from structure.floor import Floor -from enumerations import FloorType -from structure.building import Building -from enumerations import BuildingType -from virtual.zone import Zone -from enumerations import ZoneType -from enumerations import HVACType +from metamenth.enumerations import OpenSpaceType +from metamenth.structure.floor import Floor +from metamenth.enumerations import FloorType +from metamenth.structure.building import Building +from metamenth.enumerations import BuildingType +from metamenth.virtual.zone import Zone +from metamenth.enumerations import ZoneType +from metamenth.enumerations import HVACType from tests.structure.base_test import BaseTest -from enumerations import RoomType -from visitors.sensor_search_visitor import SensorSearchVisitor -from enumerations import BoilerCategory -from subsystem.hvac_components.boiler import Boiler -from subsystem.appliance import Appliance -from enumerations import ApplianceType -from enumerations import ApplianceCategory -from enumerations import MeasurementUnit -from enumerations import PowerState -from subsystem.hvac_components.heat_exchanger import HeatExchanger -from enumerations import HeatExchangerType -from enumerations import HeatExchangerFlowType -from energysystem.solar_pv import SolarPV -from enumerations import SolarPVType -from enumerations import CellType -from transducers.sensor import Sensor -from enumerations import SensorMeasure -from enumerations import SensorMeasureType -from enumerations import SensorLogType +from metamenth.enumerations import RoomType +from metamenth.visitors.sensor_search_visitor import SensorSearchVisitor +from metamenth.enumerations import BoilerCategory +from metamenth.subsystem.hvac_components.boiler import Boiler +from metamenth.subsystem.appliance import Appliance +from metamenth.enumerations import ApplianceType +from metamenth.enumerations import ApplianceCategory +from metamenth.enumerations import MeasurementUnit +from metamenth.enumerations import PowerState +from metamenth.subsystem.hvac_components.heat_exchanger import HeatExchanger +from metamenth.enumerations import HeatExchangerType +from metamenth.enumerations import HeatExchangerFlowType +from metamenth.energysystem.solar_pv import SolarPV +from metamenth.enumerations import SolarPVType +from metamenth.enumerations import CellType +from metamenth.transducers.sensor import Sensor +from metamenth.enumerations import SensorMeasure +from metamenth.enumerations import SensorMeasureType +from metamenth.enumerations import SensorLogType import copy diff --git a/tests/visitors/test_space_search_visitor.py b/tests/visitors/test_space_search_visitor.py index 024f520..80b091b 100644 --- a/tests/visitors/test_space_search_visitor.py +++ b/tests/visitors/test_space_search_visitor.py @@ -1,20 +1,20 @@ -from enumerations import OpenSpaceType -from structure.floor import Floor -from enumerations import FloorType -from structure.building import Building -from enumerations import BuildingType -from virtual.zone import Zone -from enumerations import ZoneType -from enumerations import HVACType +from metamenth.enumerations import OpenSpaceType +from metamenth.structure.floor import Floor +from metamenth.enumerations import FloorType +from metamenth.structure.building import Building +from metamenth.enumerations import BuildingType +from metamenth.virtual.zone import Zone +from metamenth.enumerations import ZoneType +from metamenth.enumerations import HVACType from tests.structure.base_test import BaseTest -from enumerations import RoomType -from visitors.space_search_visitor import SpaceSearchVisitor -from enumerations import MeasurementUnit -from misc import MeasureFactory -from enumerations import RecordingType -from datatypes.measure import Measure -from structure.room import Room -from structure.open_space import OpenSpace +from metamenth.enumerations import RoomType +from metamenth.visitors.space_search_visitor import SpaceSearchVisitor +from metamenth.enumerations import MeasurementUnit +from metamenth.misc import MeasureFactory +from metamenth.enumerations import RecordingType +from metamenth.datatypes.measure import Measure +from metamenth.structure.room import Room +from metamenth.structure.open_space import OpenSpace class TestSpaceSearchVisitor(BaseTest): From be06016e55dff3845ebb470e0650496a5a26b868 Mon Sep 17 00:00:00 2001 From: peteryefi Date: Tue, 22 Oct 2024 11:28:24 -0400 Subject: [PATCH 2/3] fixed importation error --- metamenth/datatypes/address.py | 2 +- metamenth/datatypes/binary_measure.py | 2 +- metamenth/datatypes/continuous_measure.py | 2 +- metamenth/datatypes/exponential_measure.py | 2 +- metamenth/datatypes/linear_measure.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/metamenth/datatypes/address.py b/metamenth/datatypes/address.py index 2fc8f22..ce3ca9d 100644 --- a/metamenth/datatypes/address.py +++ b/metamenth/datatypes/address.py @@ -1,4 +1,4 @@ -from .point import Point +from metamenth.datatypes.point import Point from metamenth.datatypes.binary_measure import BinaryMeasure from metamenth.misc import Validate diff --git a/metamenth/datatypes/binary_measure.py b/metamenth/datatypes/binary_measure.py index d111574..51f81c2 100644 --- a/metamenth/datatypes/binary_measure.py +++ b/metamenth/datatypes/binary_measure.py @@ -1,5 +1,5 @@ from metamenth.datatypes.interfaces.abstract_measure import AbstractMeasure -from .measure import Measure +from metamenth.datatypes.measure import Measure from metamenth.enumerations import DataMeasurementType diff --git a/metamenth/datatypes/continuous_measure.py b/metamenth/datatypes/continuous_measure.py index af7871d..61ca049 100644 --- a/metamenth/datatypes/continuous_measure.py +++ b/metamenth/datatypes/continuous_measure.py @@ -1,5 +1,5 @@ from metamenth.datatypes.interfaces.abstract_range_measure import AbstractRangeMeasure -from .measure import Measure +from metamenth.datatypes.measure import Measure class ContinuousMeasure(AbstractRangeMeasure): diff --git a/metamenth/datatypes/exponential_measure.py b/metamenth/datatypes/exponential_measure.py index 3ea3b03..8ea9594 100644 --- a/metamenth/datatypes/exponential_measure.py +++ b/metamenth/datatypes/exponential_measure.py @@ -1,5 +1,5 @@ from metamenth.datatypes.interfaces.abstract_range_measure import AbstractRangeMeasure -from .measure import Measure +from metamenth.datatypes.measure import Measure class ExponentialMeasure(AbstractRangeMeasure): diff --git a/metamenth/datatypes/linear_measure.py b/metamenth/datatypes/linear_measure.py index 8ed5903..8694639 100644 --- a/metamenth/datatypes/linear_measure.py +++ b/metamenth/datatypes/linear_measure.py @@ -1,5 +1,5 @@ from metamenth.datatypes.interfaces.abstract_range_measure import AbstractRangeMeasure -from .measure import Measure +from metamenth.datatypes.measure import Measure class LinearMeasure(AbstractRangeMeasure): From 4c81d25d6290c844499e6b1f1bd0e7154c4044b7 Mon Sep 17 00:00:00 2001 From: peteryefi Date: Tue, 22 Oct 2024 11:30:39 -0400 Subject: [PATCH 3/3] Fixed code in readme --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9330e96..7b75973 100644 --- a/README.md +++ b/README.md @@ -40,22 +40,21 @@ Read the documentation here: [MetamEnTh Documentation](https://github.com/petery ### Example usage ```python -from unittest import TestCase from metamenth.misc import MeasureFactory from metamenth.enumerations import RecordingType -from metamenth.datatypes import Measure +from metamenth.datatypes.measure import Measure from metamenth.enumerations import MeasurementUnit from metamenth.structure.open_space import OpenSpace from metamenth.enumerations import OpenSpaceType from metamenth.enumerations import RoomType from metamenth.structure.room import Room -from metamenth.structure import Floor +from metamenth.structure.floor import Floor from metamenth.enumerations import FloorType from metamenth.structure.building import Building from metamenth.enumerations import BuildingType from metamenth.datatypes.address import Address -from metamenth.structure import Layer -from metamenth.structure import Material +from metamenth.structure.layer import Layer +from metamenth.structure.material import Material from metamenth.enumerations import MaterialType from metamenth.enumerations import LayerRoughness from metamenth.structure.cover import Cover