Merge pull request #115 from aimclub/develop

Develop
aimclub · Oct 3, 2024 · 47c6483 · 47c6483
2 parents 5b9867f + 4b51648
commit 47c6483
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 209 deletions.
diff --git a/blocksnet/method/provision.py b/blocksnet/method/provision.py
@@ -105,7 +105,7 @@ def _get_blocks_gdf(self, service_type: ServiceType, update_df: pd.DataFrame | N
             if "population" in update_df.columns:
                 gdf["population"] = gdf["population"].add(update_df["population"].fillna(0), fill_value=0)
             if service_type.name in update_df.columns:
-                gdf["capacity"] += gdf["capacity"].add(update_df[service_type.name].fillna(0), fill_value=0)
+                gdf["capacity"] = gdf["capacity"].add(update_df[service_type.name].fillna(0), fill_value=0)
         gdf["population"] = gdf["population"].apply(service_type.calculate_in_need)
         gdf = gdf.rename(columns={"population": "demand"})
         gdf["capacity_left"] = gdf["capacity"]

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -25,7 +25,7 @@
 author = "IDU"
 
 # The full version, including alpha/beta/rc tags
-release = "0.0.9"
+release = "0.0.11"
 # -- General configuration ---------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be

diff --git a/examples/methods/annealing_optimizer.ipynb b/examples/methods/annealing_optimizer.ipynb
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "blocksnet"
-version = "0.0.9"
+version = "0.0.11"
 authors = [
     # { name = "", email = "" }, # TODO add authors
 ]
@@ -16,7 +16,6 @@ license = { file = "LICENCE.md" }
 dependencies = [
     "geopandas>=0.13.0,<1.0.0",
     "loguru>=0.7.0,<1.0.0",
-    "requests==2.31.0",                    #remove later
     "matplotlib==3.7.1",
     "networkit>=11.0,<12.0",
     "networkx>=3.1,<4.0",
@@ -27,7 +26,6 @@ dependencies = [
     "PuLP==2.7.0",
     "pyarrow==12.0.0",
     "pydantic>=2.0.0,<3.0.0",
-    "pygad>=3.2.0",
     "scikit-learn==1.2.2",
     "scipy>=1.10.1,<2.0.0",
     "shapely==2.0.1",
@@ -62,8 +60,11 @@ dev = [
     "pre-commit>=3.1",
     "pytest==7.4.3",
     "pytest-cov==4.1.0",
+    "build",
+    "twine"
 ]
 docs = [
+    "docutils>=0.18.1,<0.19",
     "sphinx==6.2.1",
     "sphinx-book-theme==1.0.1",
     "nbsphinx==0.9.3",