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

Functional density #586

Merged
merged 6 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions momepy/functional/tests/test_diversity.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,29 @@ def test_na_results(self):

assert_frame_equal(pandas_agg_vals, numba_agg_vals)

def test_density(self):
graph = (
Graph.build_contiguity(self.df_tessellation, rook=False)
.higher_order(k=3, lower_order=True)
.assign_self_weight()
)
fl_area = graph.describe(self.df_buildings["fl_area"])["sum"]
tess_area = graph.describe(self.df_tessellation["area"])["sum"]
dens_new = fl_area / tess_area
dens_expected = {
"count": 144,
"mean": 1.6615871155383324,
"max": 2.450536855278486,
"min": 0.9746481727569978,
}
assert_result(
dens_new,
dens_expected,
self.df_tessellation,
exact=False,
check_names=False,
)

@pytest.mark.skipif(
not PD_210, reason="aggregation is different in previous pandas versions"
)
Expand Down
28 changes: 28 additions & 0 deletions momepy/functional/tests/test_intensity.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,34 @@ def test_courtyards(self):
new_courtyards, old_courtyards, check_names=False, check_dtype=False
)

def test_density(self):
sw = mm.sw_high(k=3, gdf=self.df_tessellation, ids="uID")
graph = (
Graph.build_contiguity(self.df_tessellation, rook=False)
.higher_order(k=3, lower_order=True)
.assign_self_weight()
)

fl_area = graph.describe(self.df_buildings["fl_area"])["sum"]
tess_area = graph.describe(self.df_tessellation["area"])["sum"]
dens_new = fl_area / tess_area

dens_old = mm.Density(
self.df_tessellation,
self.df_buildings["fl_area"],
sw,
"uID",
self.df_tessellation.area,
).series

assert_series_equal(
dens_new,
dens_old,
check_names=False,
check_dtype=False,
check_index_type=False,
)

def test_node_density(self):
nx = mm.gdf_to_nx(self.df_streets, integer_labels=True)
nx = mm.node_degree(nx)
Expand Down