Skip to content

Commit 4e45e54

Browse files
u3ksmartinfleis
andauthored
TST: Fix expected test values when using higher_order (#648)
Co-authored-by: Martin Fleischmann <martin@martinfleischmann.net>
1 parent cbdac20 commit 4e45e54

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

momepy/functional/tests/test_diversity.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ def test_describe_reached_agg(self):
490490
df_sw = mm.describe_reached_agg(
491491
self.df_buildings["fl_area"], self.df_buildings["nID"], graph=self.graph_sw
492492
)
493-
expected = {"min": 6, "max": 138, "count": 35, "mean": 67.8}
493+
expected = {"min": 6, "max": 138, "count": 35, "mean": 67.82857}
494494
assert_result(df_sw["count"], expected, self.df_streets, check_names=False)
495495

496496
df_sw_dummy_filtration = mm.describe_reached_agg(
@@ -510,7 +510,7 @@ def test_describe_reached_agg(self):
510510
q=(10, 90),
511511
statistics=["count"],
512512
)
513-
filtered_expected = {"min": 4, "max": 110, "count": 35, "mean": 53.4571428}
513+
filtered_expected = {"min": 4, "max": 110, "count": 35, "mean": 53.48571}
514514
assert_result(
515515
filtered_df["count"], filtered_expected, self.df_streets, check_names=False
516516
)

momepy/weights.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def sw_high(k, gdf=None, weights=None, ids=None, contiguity="queen", silent=True
155155
if k > 1:
156156
id_order = first_order.id_order
157157
w = first_order.sparse
158-
wk = sum(w**x for x in range(2, k + 1))
158+
wk = sum(w**x for x in range(1, k + 1))
159159
rk, ck = wk.nonzero()
160160
sk = set(zip(rk, ck, strict=True))
161161
sk = {(i, j) for i, j in sk if i != j}

0 commit comments

Comments
 (0)