Secondary locations #41

Hussein-Mahfouz · 2024-08-28T12:46:42Z

Assigning secondary locations using pam
Restructuring scripts

…dary_locations_add_pam Add PAM as dependency

Hussein-Mahfouz · 2024-09-16T13:13:09Z

src/acbm/assigning/plots.py

@@ -229,7 +230,7 @@ def plot_desire_lines(
    bin_size: int,
    boundaries: gpd.GeoDataFrame,
    sample_size: Optional[int] = None,
-    save_dir: Optional[str] = None,
+    save_dir: str | None | Path = None,


How do I use pathlib for this now? Do we need to edit the scripts? Currently, this is how we pass the save_dir: link

I think it's since we added acbm.root_path (as this is a Path) and when this combines with a str (with the /) it also returns a Path.

Yeah good point on the other scripts. I updated the other save_dir in plots.py ce523a8 since also called with Path arg in the scripts. It might be worth adding a type checker at some point for this to the pre-commit/actions too (e.g. mypy/pyright) - I'll open an issue (see #47).

Hussein-Mahfouz and others added 30 commits August 9, 2024 20:05

failed attempts at pam

f8d79a9

progress on pam but need more data cleaning

7f06e23

clear output

55692e8

new pam

a6d0739

edit secondary logger

370ead7

if no matching activity, use all activities in zone

43af35f

assigning locations after pam - needs edit

18467be

removing point locations

b7c6b66

start removing point locations

a508681

update location assignment logic

079498e

editing plot code for new data columns

f08f9c8

all location assignment in one go

d11934e

rename scripts

1d42e35

secondary zone assignment

2071381

secondary zones using pam

1d97b59

assign all facility locations

d4da468

removing assignment logic

362c29c

Add cml-pam 0.3.2 dep

66ebc82

Fixes for pre-commit

2a4ff39

edit notebook names

cf86193

all notebooks

a556587

updated scripts

11d1c8f

update modeule names

82f2972

update module names

08140b1

logger update

67f35ad

update script name

2e878dd

rename to avoid conflict

3eb937d

Merge branch 'secondary_locations' into secondary_locations_add_pam

700db56

fix gdal version

e0107fc

gdal version <=3.8 in pyproject

b67e563

Hussein-Mahfouz and others added 9 commits August 29, 2024 16:20

Merge pull request #42 from Urban-Analytics-Technology-Platform/secon…

d974f3c

…dary_locations_add_pam Add PAM as dependency

Fix change in logger name

b321802

Update GDAL dep to be <=3.8.4

d89f941

remove redundant lines

c08ee46

Pre-commit hook fix, update function return type

9ed42f5

Fix function arg types

55f5971

Write points as wkt

214326c

Update CI to install GDAL

3640723

Fix CI

4161542

sgreenbury force-pushed the secondary_locations branch from e07fdeb to 4161542 Compare September 13, 2024 07:50

Fix import in test_assigning

68bfcf6

sgreenbury force-pushed the secondary_locations branch from 1db184d to 68bfcf6 Compare September 16, 2024 10:36

sgreenbury added 2 commits September 16, 2024 11:51

Add bool to make plot display optional

426ab06

Refine formatting of scatter points

96fe6e1

Hussein-Mahfouz commented Sep 16, 2024

View reviewed changes

Update type for all save_dir in plots

ce523a8

sgreenbury mentioned this pull request Sep 16, 2024

Add a type checker to pre-commit/actions #47

Open

Hussein-Mahfouz merged commit 9f36bf3 into main Sep 17, 2024
4 checks passed

Hussein-Mahfouz deleted the secondary_locations branch October 14, 2024 15:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Secondary locations #41

Secondary locations #41

Hussein-Mahfouz commented Aug 28, 2024

Hussein-Mahfouz Sep 16, 2024

sgreenbury Sep 16, 2024

sgreenbury Sep 16, 2024 •

edited

Loading

Secondary locations #41

Secondary locations #41

Conversation

Hussein-Mahfouz commented Aug 28, 2024

Hussein-Mahfouz Sep 16, 2024

Choose a reason for hiding this comment

sgreenbury Sep 16, 2024

Choose a reason for hiding this comment

sgreenbury Sep 16, 2024 • edited Loading

Choose a reason for hiding this comment

sgreenbury Sep 16, 2024 •

edited

Loading