ObjectNat 0.2.2__tar.gz → 0.2.4__tar.gz

{objectnat-0.2.2 → objectnat-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ObjectNat
-Version: 0.2.2
+Version: 0.2.4
 Summary: ObjectNat is an open-source library created for geospatial analysis created by IDU team
 License: BSD-3-Clause
 Author: DDonnyy
@@ -12,9 +12,9 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 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: iduedu (>=0.2.0,<0.3.0)
 Requires-Dist: joblib (>=1.4.2,<2.0.0)
-Requires-Dist: networkit (>=11.0,<12.0)
+Requires-Dist: jupyter (>=1.1.1,<2.0.0)
 Requires-Dist: networkx (>=3.2.1,<4.0.0)
 Requires-Dist: numpy (>=1.23.5,<2.0.0)
 Requires-Dist: pandarallel (>=1.6.5,<2.0.0)

{objectnat-0.2.2 → objectnat-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ObjectNat"
-version = "0.2.2"
+version = "0.2.4"
 description = "ObjectNat is an open-source library created for geospatial analysis created by IDU team"
 license = "BSD-3-Clause"
 authors = ["DDonnyy <63115678+DDonnyy@users.noreply.github.com>"]
@@ -16,12 +16,12 @@ geopandas = "^0.14.3"
 tqdm = "^4.66.2"
 pandarallel = "^1.6.5"
 networkx = "^3.2.1"
-networkit = "^11.0"
 pulp = "^2.8.0"
 population-restorator = "^0.2.3"
-iduedu = "^0.1.4"
+iduedu = "^0.2.0"
 joblib = "^1.4.2"
 scikit-learn = "^1.4.0"
+jupyter = "^1.1.1"
 
 
 [tool.poetry.group.dev.dependencies]

{objectnat-0.2.2 → objectnat-0.2.4}/src/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-0.2.4/src/objectnat/_version.py

@@ -0,0 +1 @@
+VERSION = "0.2.4"

{objectnat-0.2.2 → objectnat-0.2.4}/src/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-0.2.2/src/objectnat/methods/provision/city_provision.py → objectnat-0.2.4/src/objectnat/methods/provision/provision_model.py

@@ -4,8 +4,9 @@ from typing import Tuple
 import geopandas as gpd
 import numpy as np
 import pandas as pd
-from shapely import LineString
 from pandarallel import pandarallel
+from shapely import LineString
+
 from objectnat import config
 
 from .provision_exceptions import CapacityKeyError, DemandKeyError
@@ -13,7 +14,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 +26,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 +47,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:
@@ -112,9 +114,6 @@ class CityProvision:
             self.threshold,
         )
 
-        # self.demanded_buildings['provision_value'] = self.demanded_buildings['provision_value'].fillna(0)
-        # self.services = self.services.fillna(0)
-
         return (
             self.demanded_buildings,
             self.services,

objectnat-0.2.2/src/objectnat/_version.py

@@ -1 +0,0 @@
-VERSION = "0.2.2"