ObjectNat 0.2.2__py3-none-any.whl → 0.2.3__py3-none-any.whl

objectnat/_config.py

@@ -44,6 +44,7 @@ class Config:
         self.enable_tqdm_bar = enable_tqdm_bar
         self.logger = logger
         self.iduedu_config = iduedu_config
+        self.pandarallel_use_file_system = False
 
     def change_logger_lvl(self, lvl: Literal["TRACE", "DEBUG", "INFO", "WARN", "ERROR"]):
         self.logger.remove()
@@ -62,6 +63,9 @@ class Config:
         self.enable_tqdm_bar = enable
         self.iduedu_config.set_enable_tqdm(enable)
 
+    def set_pandarallel_use_file_system(self, enable: bool):
+        self.pandarallel_use_file_system = enable
+
 
 config = Config()
 config.change_logger_lvl("INFO")

objectnat/_version.py

@@ -1 +1 @@
-VERSION = "0.2.2"
+VERSION = "0.2.3"

objectnat/methods/provision/provision.py

@@ -4,7 +4,7 @@ import geopandas as gpd
 import numpy as np
 import pandas as pd
 
-from .city_provision import CityProvision
+from .provision_model import Provision
 
 
 def get_service_provision(
@@ -34,7 +34,7 @@ def get_service_provision(
     buildings["demand"] = buildings[buildings_demand_column]
     services["capacity"] = services[services_capacity_column]
 
-    provision_buildings, provision_services, provision_links = CityProvision(
+    provision_buildings, provision_services, provision_links = Provision(
         services=services,
         demanded_buildings=buildings,
         adjacency_matrix=adjacency_matrix,

objectnat/methods/provision/{city_provision.py → provision_model.py}

@@ -13,7 +13,7 @@ from .provision_exceptions import CapacityKeyError, DemandKeyError
 logger = config.logger
 
 
-class CityProvision:
+class Provision:
     """
     Represents the logic for city provision calculations using a gravity or linear model.
 
@@ -25,7 +25,7 @@ class CityProvision:
         calculation_type (str, optional): Type of calculation ("gravity" or "linear"). Defaults to "gravity".
 
     Returns:
-        CityProvision: The CityProvision object.
+        Provision: The CityProvision object.
 
     Raises: KeyError: If the 'demand' column is missing in the provided 'demanded_buildings' GeoDataFrame,
     or if the 'capacity' column is missing in the provided 'services' GeoDataFrame. ValueError: If the 'capacity'
@@ -46,7 +46,8 @@ class CityProvision:
         self.adjacency_matrix = self.delete_useless_matrix_rows_columns(adjacency_matrix, demanded_buildings, services)
         self.threshold = threshold
         self.check_crs(self.demanded_buildings, self.services)
-        pandarallel.initialize(progress_bar=False, verbose=0)
+        print(config.pandarallel_use_file_system)
+        pandarallel.initialize(progress_bar=False, verbose=0, use_memory_fs=config.pandarallel_use_file_system)
 
     @staticmethod
     def ensure_buildings(v: gpd.GeoDataFrame) -> gpd.GeoDataFrame:

{objectnat-0.2.2.dist-info → objectnat-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ObjectNat
-Version: 0.2.2
+Version: 0.2.3
 Summary: ObjectNat is an open-source library created for geospatial analysis created by IDU team
 License: BSD-3-Clause
 Author: DDonnyy
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: geopandas (>=0.14.3,<0.15.0)
 Requires-Dist: iduedu (>=0.1.4,<0.2.0)
 Requires-Dist: joblib (>=1.4.2,<2.0.0)
+Requires-Dist: jupyter (>=1.1.1,<2.0.0)
 Requires-Dist: networkit (>=11.0,<12.0)
 Requires-Dist: networkx (>=3.2.1,<4.0.0)
 Requires-Dist: numpy (>=1.23.5,<2.0.0)

{objectnat-0.2.2.dist-info → objectnat-0.2.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 objectnat/__init__.py,sha256=OnDvrLPLEeYIE_9qOVYgMc-PkRzIqShtGxirguEXiRU,260
 objectnat/_api.py,sha256=oiEO2P-tv6AMDdNoT8d0BWMmgeUJa4bhzGDTU2BWTXI,704
-objectnat/_config.py,sha256=t4nv83Tj4fwYjdzwUh0bA8b_12DqL-GlEVfKaG_hccg,2107
-objectnat/_version.py,sha256=qleN2zQctO8stGYcfqFUyavqMP9pxdKBbwgZWyKxPWQ,18
+objectnat/_config.py,sha256=sv13J3yMw1cmmkgPMf08zinLwPKYwXHJGfchqmurSg8,2268
+objectnat/_version.py,sha256=b-Z-6_UwMK_FEiFRkdRlWa4UpfELs391bZgkMRRJkm0,18
 objectnat/methods/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 objectnat/methods/balanced_buildings.py,sha256=hLT2QgmGWpROtnL8SJQIujeP6q9ou15yIdHpv66CfMs,2892
 objectnat/methods/cluster_points_in_polygons.py,sha256=ANoPHB89Ih6SYUTs0VoYqW7zi9GVIytSOGySoQ3vby4,5073
@@ -9,13 +9,13 @@ objectnat/methods/coverage_zones.py,sha256=yMeK1DjneMAxxKv9busEKdAsP25xiJMcPCixl
 objectnat/methods/isochrones.py,sha256=CBJprxcyPIYC4RJizqJ1MJL-Zkea4iyr7wHTOOQ7DC8,6146
 objectnat/methods/living_buildings_osm.py,sha256=v0rC8xaqibZq9jZm5HVonmmC9VFXzgZwhqsxHA3sPlc,5904
 objectnat/methods/provision/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-objectnat/methods/provision/city_provision.py,sha256=cFmJJVb0qLR7yCILP9S5cS8fx136EsCUmjbmT0HQA6U,13264
-objectnat/methods/provision/provision.py,sha256=lKgROkj1EmRgk9nLEQ0jGuQcY6BFnkG3oBuhHrRFbno,4619
+objectnat/methods/provision/provision.py,sha256=jYPcqX-_TBFlUQq0bWK2uuvH6AWMXv8E5mjTeHjchS8,4612
 objectnat/methods/provision/provision_exceptions.py,sha256=-TK4A-vacUuzlPJGSt2YyawRwKDLCZFlAbuIvIf1FnY,1723
+objectnat/methods/provision/provision_model.py,sha256=BXRRkeDToeL9MzswGpmlfK7wqHjVDRbpMCEPZGIDup0,13356
 objectnat/methods/visibility_analysis.py,sha256=__S01m4YcIZbUcr6Umzvr4NpaCsajXxKNcfJm3zquVY,20690
 objectnat/utils/__init__.py,sha256=w8R5V_Ws_GUt4hLwpudMgjXvocG4vCxWSzVw_jTReQ4,44
 objectnat/utils/utils.py,sha256=_vbCW-XTHwZOR3yNlzf_vgNwbYwonhGlduSznGufEgs,638
-objectnat-0.2.2.dist-info/LICENSE.txt,sha256=yPEioMfTd7JAQgAU6J13inS1BSjwd82HFlRSoIb4My8,1498
-objectnat-0.2.2.dist-info/METADATA,sha256=ROkC-bO-4ZWFHfsmL6mLSHza9lXdbT8Aj8FaHMFtmik,5881
-objectnat-0.2.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-objectnat-0.2.2.dist-info/RECORD,,
+objectnat-0.2.3.dist-info/LICENSE.txt,sha256=yPEioMfTd7JAQgAU6J13inS1BSjwd82HFlRSoIb4My8,1498
+objectnat-0.2.3.dist-info/METADATA,sha256=eoRAOVNi8t_DrCuCTU1qEp6P2Eoee7aA1ODCdsmvJr4,5921
+objectnat-0.2.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+objectnat-0.2.3.dist-info/RECORD,,