Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

12 task 2b primary locations work #15

Merged
merged 49 commits into from
Jul 31, 2024
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
778f04f
add seaborn
Hussein-Mahfouz Apr 17, 2024
6da1bab
start on primary locations notebook
Hussein-Mahfouz Apr 17, 2024
b8bcc7f
start on primary locations notebook
Hussein-Mahfouz Apr 17, 2024
ae9d1c7
primary locations: distance per age group
Hussein-Mahfouz Apr 18, 2024
5e060e9
example config file for osmox
Hussein-Mahfouz Apr 19, 2024
9d25499
filtering spc to study area
Hussein-Mahfouz Apr 25, 2024
1feda70
filtering spc to study area
Hussein-Mahfouz Apr 25, 2024
97a0d8b
move exploratory plots to different notebook
Hussein-Mahfouz Apr 25, 2024
a97e8d4
first pass at assigning edu to zones
Hussein-Mahfouz Apr 25, 2024
6615879
speed up get_possible_zones()
Hussein-Mahfouz Apr 26, 2024
89bcc83
updating files before merging incoming pr
Hussein-Mahfouz Apr 30, 2024
e51a04e
first test :)
Hussein-Mahfouz Apr 30, 2024
4a47e54
remove placeholder
Hussein-Mahfouz Apr 30, 2024
86ff56d
activities per zone for sampling
Hussein-Mahfouz May 2, 2024
e6617cf
Merge branch 'main' into 12-task-2b-primary-locations-work
sgreenbury May 3, 2024
fab0d2b
fix typo
Hussein-Mahfouz May 3, 2024
6e2e9a4
initial logic for zone sampling
Hussein-Mahfouz May 3, 2024
1261627
editing get_possible_zones to ensure all shortlisted zones have the d…
Hussein-Mahfouz May 7, 2024
09f61c1
almost assigning a zone
Hussein-Mahfouz May 7, 2024
c548fa7
functions to assign activities to specific zones
Hussein-Mahfouz May 8, 2024
3d1dc9b
draft assignment to specific location
Hussein-Mahfouz May 8, 2024
0f759f9
edits to activity assignment
Hussein-Mahfouz May 9, 2024
5c08cfd
edits to activity assignment 2
Hussein-Mahfouz May 9, 2024
300a02a
fix hard coded parameter
Hussein-Mahfouz May 10, 2024
8459a66
exploring pam, ref #18
Hussein-Mahfouz May 13, 2024
79bbfee
removing old get_possible_zones function
Hussein-Mahfouz May 13, 2024
6acecb9
move education_type logic upstream to get_possible_zones
Hussein-Mahfouz May 13, 2024
10ae82b
ensuring all activities have a location
Hussein-Mahfouz May 14, 2024
264416d
maps for education trips
Hussein-Mahfouz May 17, 2024
5bb4ac5
import numpy
Hussein-Mahfouz May 22, 2024
d45fc0d
remove long console outputs
Hussein-Mahfouz May 22, 2024
bb3b388
Exclude G004, exclude notebooks from pre-commit
sgreenbury Jul 17, 2024
b61db0e
Lints
sgreenbury Jul 17, 2024
3e7f8d3
Complete fixing lints
sgreenbury Jul 17, 2024
b44e4ac
Add script version of notebook
sgreenbury Jul 17, 2024
2bbe1a3
Formatting
sgreenbury Jul 17, 2024
addd3f7
Update location with external centroids data
sgreenbury Jul 17, 2024
3cdb29c
Update location with external centroids data
sgreenbury Jul 17, 2024
99b9e8f
Update to prep script and notebook to Leeds
sgreenbury Jul 27, 2024
c17612b
Parallelise matching, fix typo, use sample instead of head
sgreenbury Jul 27, 2024
fc124fe
Add transformation between CRS, remove category recoding
sgreenbury Jul 27, 2024
44381f3
Update deps
sgreenbury Jul 27, 2024
e857dd7
Update notebook
sgreenbury Jul 29, 2024
dce764d
Lints
sgreenbury Jul 31, 2024
0153e84
Remove select_activity since now included as library function
sgreenbury Jul 31, 2024
9e83df0
Lints
sgreenbury Jul 31, 2024
3b565f4
Update gitignore
sgreenbury Jul 31, 2024
4405cd2
Merge remote-tracking branch 'origin/main' into 12-task-2b-primary-lo…
sgreenbury Jul 31, 2024
914882b
Apply pre-commit
sgreenbury Jul 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove placeholder
Hussein-Mahfouz committed Apr 30, 2024
commit 4a47e54220a97b89800d9c53f0624370b0b6ad98
5 changes: 0 additions & 5 deletions tests/test_dummy.py

This file was deleted.