chore: re-ran all locate notebooks

pysal · Jun 2, 2022 · f11a334 · f11a334
1 parent 7bcb353
commit f11a334
Show file tree

Hide file tree

Showing 7 changed files with 434 additions and 9,689 deletions.
diff --git a/notebooks/facloc-real-world.ipynb b/notebooks/facloc-real-world.ipynb
diff --git a/notebooks/lscp.ipynb b/notebooks/lscp.ipynb
@@ -79,7 +79,7 @@
     "CLIENT_COUNT = 100 # quantity demand points\n",
     "FACILITY_COUNT = 5 # quantity supply points\n",
     "\n",
-    "MAX_COVERAGE = 8 # maximum service radius in meters\n",
+    "SERVICE_RADIUS = 8 # maximum service radius in meters\n",
     "\n",
     "# Random seeds for reproducibility\n",
     "CLIENT_SEED = 5 \n",
@@ -210,7 +210,7 @@
     {
      "data": {
       "text/plain": [
-       "<matplotlib.legend.Legend at 0x7f80e3aeb970>"
+       "<matplotlib.legend.Legend at 0x7fb35ddcffa0>"
       ]
      },
      "execution_count": 7,
@@ -292,7 +292,7 @@
     {
      "data": {
       "text/plain": [
-       "<matplotlib.legend.Legend at 0x7f80e3b029a0>"
+       "<matplotlib.legend.Legend at 0x7fb36771a400>"
       ]
      },
      "execution_count": 9,
@@ -485,7 +485,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lscp_from_cost_matrix = LSCP.from_cost_matrix(cost_matrix, MAX_COVERAGE)\n",
+    "lscp_from_cost_matrix = LSCP.from_cost_matrix(cost_matrix, SERVICE_RADIUS)\n",
     "lscp_from_cost_matrix = lscp_from_cost_matrix.solve(solver)"
    ]
   },
@@ -504,7 +504,7 @@
     {
      "data": {
       "text/plain": [
-       "<spopt.locate.coverage.LSCP at 0x7f80db871dc0>"
+       "<spopt.locate.coverage.LSCP at 0x7fb35db4d3a0>"
       ]
      },
      "execution_count": 13,
@@ -635,7 +635,7 @@
    "outputs": [],
    "source": [
     "lscp_from_geodataframe = LSCP.from_geodataframe(\n",
-    "    clients_snapped, facilities_snapped, \"geometry\", \"geometry\", MAX_COVERAGE, distance_metric=\"euclidean\"\n",
+    "    clients_snapped, facilities_snapped, \"geometry\", \"geometry\", SERVICE_RADIUS, distance_metric=\"euclidean\"\n",
     ")\n",
     "lscp_from_geodataframe = lscp_from_geodataframe.solve(solver)"
    ]
@@ -655,7 +655,7 @@
     {
      "data": {
       "text/plain": [
-       "<spopt.locate.coverage.LSCP at 0x7f80db8cee20>"
+       "<spopt.locate.coverage.LSCP at 0x7fb35db3a040>"
       ]
      },
      "execution_count": 16,
@@ -681,7 +681,7 @@
    "outputs": [],
    "source": [
     "lscp_preselected_from_geodataframe = LSCP.from_geodataframe(\n",
-    "    clients_snapped, facilities_snapped, \"geometry\", \"geometry\", MAX_COVERAGE, predefined_facility_col=\"predefined_loc\", distance_metric=\"euclidean\"\n",
+    "    clients_snapped, facilities_snapped, \"geometry\", \"geometry\", SERVICE_RADIUS, predefined_facility_col=\"predefined_loc\", distance_metric=\"euclidean\"\n",
     ")\n",
     "lscp_preselected_from_geodataframe = lscp_preselected_from_geodataframe.solve(solver)"
    ]
@@ -906,10 +906,10 @@
  ],
  "metadata": {
   "interpreter": {
-   "hash": "9f3289f6e4e90b4baed353b79a064837546fd68cb0fc59ed00ca81208aac8b4f"
+   "hash": "31b88bb145573cdebdaa7fd72fef7949ecb3dda26d5e10d4ccc660a5d07787a7"
   },
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3.9.9 ('spopt')",
    "language": "python",
    "name": "python3"
   },

diff --git a/notebooks/lscp_gis.ipynb b/notebooks/lscp_gis.ipynb