From 4e45e54f6a004087a11c02d84f9c47a0721d96ef Mon Sep 17 00:00:00 2001 From: Krasen Samardzhiev Date: Fri, 19 Jul 2024 21:40:53 +0200 Subject: [PATCH] TST: Fix expected test values when using higher_order (#648) Co-authored-by: Martin Fleischmann --- momepy/functional/tests/test_diversity.py | 4 ++-- momepy/weights.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/momepy/functional/tests/test_diversity.py b/momepy/functional/tests/test_diversity.py index 1f882fa0..f8392116 100644 --- a/momepy/functional/tests/test_diversity.py +++ b/momepy/functional/tests/test_diversity.py @@ -490,7 +490,7 @@ def test_describe_reached_agg(self): df_sw = mm.describe_reached_agg( self.df_buildings["fl_area"], self.df_buildings["nID"], graph=self.graph_sw ) - expected = {"min": 6, "max": 138, "count": 35, "mean": 67.8} + expected = {"min": 6, "max": 138, "count": 35, "mean": 67.82857} assert_result(df_sw["count"], expected, self.df_streets, check_names=False) df_sw_dummy_filtration = mm.describe_reached_agg( @@ -510,7 +510,7 @@ def test_describe_reached_agg(self): q=(10, 90), statistics=["count"], ) - filtered_expected = {"min": 4, "max": 110, "count": 35, "mean": 53.4571428} + filtered_expected = {"min": 4, "max": 110, "count": 35, "mean": 53.48571} assert_result( filtered_df["count"], filtered_expected, self.df_streets, check_names=False ) diff --git a/momepy/weights.py b/momepy/weights.py index 3a189554..b0c73dc3 100644 --- a/momepy/weights.py +++ b/momepy/weights.py @@ -155,7 +155,7 @@ def sw_high(k, gdf=None, weights=None, ids=None, contiguity="queen", silent=True if k > 1: id_order = first_order.id_order w = first_order.sparse - wk = sum(w**x for x in range(2, k + 1)) + wk = sum(w**x for x in range(1, k + 1)) rk, ck = wk.nonzero() sk = set(zip(rk, ck, strict=True)) sk = {(i, j) for i, j in sk if i != j}