erased folders in factories

factories/geometry_factory.py

@@ -5,8 +5,8 @@ Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@conc
 """
 from city_model_structure.city import City
 from city_model_structure.city_object import CityObject
-from factories.geometry.geometry_feeders.city_gml import CityGml
-from factories.geometry.geometry_feeders.osm_subway import OsmSubway
+from factories.geometry_feeders.city_gml import CityGml
+from factories.geometry_feeders.osm_subway import OsmSubway
 
 
 class GeometryFactory:

factories/occupancy_factory.py

@@ -5,7 +5,7 @@ Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@conc
 """
 
 from pathlib import Path
-from factories.occupancy.occupancy_feeders.demo_occupancy_parameters import DemoOccupancyParameters
+from factories.occupancy_feeders.demo_occupancy_parameters import DemoOccupancyParameters
 
 
 class OccupancyFactory:

factories/occupancy_feeders/demo_occupancy_parameters.py

@@ -4,7 +4,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 import pandas as pd
-from factories.occupancy.occupancy_feeders.helpers.occupancy_helper import OccupancyHelper
+from factories.occupancy_feeders.helpers.occupancy_helper import OccupancyHelper
 
 
 class DemoOccupancyParameters:

factories/physics_factory.py

@@ -3,8 +3,8 @@ PhysicsFactory retrieve the specific physics module for the given region
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
-from factories.physics.physics_feeders.us_new_york_city_physics_parameters import UsNewYorkCityPhysicsParameters
-from factories.physics.physics_feeders.us_physics_parameters import UsPhysicsParameters
+from factories.physics_feeders.us_new_york_city_physics_parameters import UsNewYorkCityPhysicsParameters
+from factories.physics_feeders.us_physics_parameters import UsPhysicsParameters
 from pathlib import Path
 
 

factories/physics_feeders/us_base_physics_parameters.py

@@ -8,7 +8,7 @@ import xmltodict
 
 from city_model_structure.attributes.layer import Layer
 from city_model_structure.attributes.material import Material
-from factories.physics.physics_feeders.helpers.us_to_library_types import UsToLibraryTypes
+from factories.physics_feeders.helpers.us_to_library_types import UsToLibraryTypes
 
 
 class UsBasePhysicsParameters:

factories/physics_feeders/us_new_york_city_physics_parameters.py

@@ -3,8 +3,8 @@ UsNewYorkCityPhysicsParameters import the construction and material information
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
-from factories.physics.physics_feeders.helpers.us_pluto_to_function import UsPlutoToFunction as Pf
-from factories.physics.physics_feeders.us_base_physics_parameters import UsBasePhysicsParameters
+from factories.physics_feeders.helpers.us_pluto_to_function import UsPlutoToFunction as Pf
+from factories.physics_feeders.us_base_physics_parameters import UsBasePhysicsParameters
 
 
 class UsNewYorkCityPhysicsParameters(UsBasePhysicsParameters):

factories/physics_feeders/us_physics_parameters.py

@@ -3,8 +3,8 @@ UsPhysicsParameters import the construction and material information for US
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
-from factories.physics.physics_feeders.helpers.us_to_library_types import UsToLibraryTypes
-from factories.physics.physics_feeders.us_base_physics_parameters import UsBasePhysicsParameters
+from factories.physics_feeders.helpers.us_to_library_types import UsToLibraryTypes
+from factories.physics_feeders.us_base_physics_parameters import UsBasePhysicsParameters
 
 
 class UsPhysicsParameters(UsBasePhysicsParameters):

factories/usage_factory.py

@@ -3,8 +3,8 @@ UsageFactory retrieve the specific usage module for the given region
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
-from factories.usage.usage_feeders.de_usage_parameters import DeUsageParameters
-from factories.usage.usage_feeders.us_new_york_city_usage_parameters import UsNewYorkCityUsageParameters
+from factories.usage_feeders.de_usage_parameters import DeUsageParameters
+from factories.usage_feeders.us_new_york_city_usage_parameters import UsNewYorkCityUsageParameters
 
 
 class UsageFactory:

factories/usage_feeders/de_usage_parameters.py

@@ -7,7 +7,7 @@ from pathlib import Path
 
 import xmltodict
 
-from factories.usage.usage_feeders.helpers.us_function_to_usage import UsFunctionToUsage
+from factories.usage_feeders.helpers.us_function_to_usage import UsFunctionToUsage
 
 
 class DeUsageParameters:

factories/usage_feeders/helpers/us_pluto_to_usage.py

@@ -3,7 +3,7 @@ UsPlutoToUsage helper
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
-from factories.usage.usage_feeders.helpers.us_function_to_usage import UsFunctionToUsage
+from factories.usage_feeders.helpers.us_function_to_usage import UsFunctionToUsage
 
 
 class UsPlutoToUsage:

factories/usage_feeders/us_new_york_city_usage_parameters.py

@@ -3,8 +3,8 @@ UsNewYorkCityUsageParameters model the usage properties for a NYC building
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
-from factories.usage.usage_feeders.helpers.us_pluto_to_usage import UsPlutoToUsage as Pu
-from factories.usage.usage_feeders.us_base_usage_parameters import UsBaseUsageParameters
+from factories.usage_feeders.helpers.us_pluto_to_usage import UsPlutoToUsage as Pu
+from factories.usage_feeders.us_base_usage_parameters import UsBaseUsageParameters
 
 
 class UsNewYorkCityUsageParameters(UsBaseUsageParameters):

factories/usage_feeders/us_usage_parameters.py

@@ -3,8 +3,8 @@ UsUsageParameters model the usage properties for a Us building
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
-from factories.usage.usage_feeders.helpers.us_function_to_usage import UsFunctionToUsage
-from factories.usage.usage_feeders.us_base_usage_parameters import UsBaseUsageParameters
+from factories.usage_feeders.helpers.us_function_to_usage import UsFunctionToUsage
+from factories.usage_feeders.us_base_usage_parameters import UsBaseUsageParameters
 
 
 class UsUsageParameters(UsBaseUsageParameters):

factories/weather_factory.py

@@ -5,7 +5,7 @@ Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
 """
 
 from pathlib import Path
-from factories.weather.weather_feeders.dat_weather_parameters import DatWeatherParameters
+from factories.weather_feeders.dat_weather_parameters import DatWeatherParameters
 
 
 class WeatherFactory:

tests/test_geometry_factory.py

@@ -7,7 +7,7 @@ import os
 from pathlib import Path
 from unittest import TestCase
 
-from factories.geometry.geometry_factory import GeometryFactory
+from factories.geometry_factory import GeometryFactory
 
 
 class TestGeometryFactory(TestCase):

tests/test_idf.py

@@ -5,9 +5,9 @@ Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@conc
 """
 from pathlib import Path
 from unittest import TestCase
-from factories.geometry.geometry_factory import GeometryFactory
-from factories.physics.physics_factory import PhysicsFactory
-from factories.usage.usage_factory import UsageFactory
+from factories.geometry_factory import GeometryFactory
+from factories.physics_factory import PhysicsFactory
+from factories.usage_factory import UsageFactory
 from helpers.idf_helper import IdfHelper
 from geomeppy import IDF
 

tests/test_occupancy_factory.py

@@ -6,9 +6,9 @@ Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@conc
 from pathlib import Path
 from unittest import TestCase
 
-from factories.geometry.geometry_factory import GeometryFactory
-from factories.usage.usage_factory import UsageFactory
-from factories.occupancy.occupancy_factory import OccupancyFactory
+from factories.geometry_factory import GeometryFactory
+from factories.usage_factory import UsageFactory
+from factories.occupancy_factory import OccupancyFactory
 
 
 class TestOccupancyFactory(TestCase):

tests/test_physics_factory.py

@@ -6,8 +6,8 @@ Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@conc
 from pathlib import Path
 from unittest import TestCase
 
-from factories.geometry.geometry_factory import GeometryFactory
-from factories.physics.physics_factory import PhysicsFactory
+from factories.geometry_factory import GeometryFactory
+from factories.physics_factory import PhysicsFactory
 
 
 class TestPhysicsFactory(TestCase):