Thanks to visit codestin.com
Credit goes to github.com

Skip to content

store tests & testing data by subpackage #495

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.

Sign up for GitHub

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

Merged
jGaboardi merged 9 commits into from
Jul 12, 2025
Merged

store tests & testing data by subpackage #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0a96d3a
bump ruff version in pre-commit
jGaboardi Apr 6, 2025
da56f4a
reup ruff formatting
jGaboardi Apr 6, 2025
d6a640a
Merge remote-tracking branch 'upstream/main'
jGaboardi Apr 6, 2025
131483a
Merge remote-tracking branch 'upstream/main'
jGaboardi Apr 7, 2025
7046752
Merge remote-tracking branch 'upstream/main'
jGaboardi Apr 8, 2025
bdad2de
Merge remote-tracking branch 'upstream/main'
jGaboardi Jun 11, 2025
309945f
Merge remote-tracking branch 'upstream/main'
jGaboardi Jun 11, 2025
397936b
bump ruff + pre-commit
jGaboardi Jul 6, 2025
d14f0be
hierarchical testin data storage
jGaboardi Jul 6, 2025
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
files: "spopt\/|notebooks\/"
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.11.13"
rev: "v0.12.2"
hooks:
- id: ruff-check
- id: ruff-format
Expand Down
12 changes: 6 additions & 6 deletions spopt/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
GPD_GE_10 = Version(geopandas.__version__) >= Version("1.0")


def dirpath() -> pathlib.Path:
"""Path to test data directory"""
return pathlib.Path(__file__).absolute().parent / "data"
def locate_dirpath() -> pathlib.Path:
"""Path to locate test data directory"""
return pathlib.Path(__file__).absolute().parent / "test_locate" / "data"


@pytest.fixture
def load_test_data():
def load_locate_test_data():
"""Load test data for the ``locate`` module."""

def _load_test_data(_file: str) -> dict | pandas.DataFrame:
if _file.endswith(".pkl"):
with open(dirpath() / _file, "rb") as f:
with open(locate_dirpath() / _file, "rb") as f:
test_data = pickle.load(f)
elif _file.endswith(".csv"):
test_data = pandas.read_csv(dirpath() / _file)
test_data = pandas.read_csv(locate_dirpath() / _file)
else:
raise FileNotFoundError(f"`{_file}` does not exist.")

Expand Down
1 change: 0 additions & 1 deletion spopt/tests/data/model_output.json
View file
Open in desktop

This file was deleted.

0 ...SF_demand_205_centroid_uniform_weight.csv → ...SF_demand_205_centroid_uniform_weight.csv
View file
Open in desktop
File renamed without changes.
0 ...candidateStore_16_censusTract_205_new.csv → ...candidateStore_16_censusTract_205_new.csv
View file
Open in desktop
File renamed without changes.
0 ...t/tests/data/SF_store_site_16_longlat.csv → ..._locate/data/SF_store_site_16_longlat.csv
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/ServiceAreas_4.shp → ...tests/test_locate/data/ServiceAreas_4.shp
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/ServiceAreas_4.shx → ...tests/test_locate/data/ServiceAreas_4.shx
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/example_subject_schools.csv → ...t_locate/data/example_subject_schools.csv
View file
Open in desktop
File renamed without changes.
0 ...ample_subject_student_school_journeys.csv → ...ample_subject_student_school_journeys.csv
View file
Open in desktop
File renamed without changes.
0 ...t/tests/data/example_subject_students.csv → ..._locate/data/example_subject_students.csv
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/lscp_cli2fac.pkl → ...t/tests/test_locate/data/lscp_cli2fac.pkl
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/lscp_fac2cli.pkl → ...t/tests/test_locate/data/lscp_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 .../tests/data/lscp_geodataframe_cli2fac.pkl → ...locate/data/lscp_geodataframe_cli2fac.pkl
View file
Open in desktop
File renamed without changes.
0 .../tests/data/lscp_geodataframe_fac2cli.pkl → ...locate/data/lscp_geodataframe_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 ..._preselected_loc_geodataframe_fac2cli.pkl → ..._preselected_loc_geodataframe_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/lscpb_cli2fac.pkl → .../tests/test_locate/data/lscpb_cli2fac.pkl
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/lscpb_fac2cli.pkl → .../tests/test_locate/data/lscpb_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 ...tests/data/lscpb_geodataframe_cli2fac.pkl → ...ocate/data/lscpb_geodataframe_cli2fac.pkl
View file
Open in desktop
File renamed without changes.
0 ...tests/data/lscpb_geodataframe_fac2cli.pkl → ...ocate/data/lscpb_geodataframe_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 ..._preselected_loc_geodataframe_fac2cli.pkl → ..._preselected_loc_geodataframe_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/mclp_cli2fac.pkl → ...t/tests/test_locate/data/mclp_cli2fac.pkl
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/mclp_fac2cli.pkl → ...t/tests/test_locate/data/mclp_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 .../tests/data/mclp_geodataframe_cli2fac.pkl → ...locate/data/mclp_geodataframe_cli2fac.pkl
View file
Open in desktop
File renamed without changes.
0 .../tests/data/mclp_geodataframe_fac2cli.pkl → ...locate/data/mclp_geodataframe_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 ..._preselected_loc_geodataframe_fac2cli.pkl → ..._preselected_loc_geodataframe_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/pcenter_cli2fac.pkl → ...ests/test_locate/data/pcenter_cli2fac.pkl
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/pcenter_fac2cli.pkl → ...ests/test_locate/data/pcenter_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 ...sts/data/pcenter_geodataframe_cli2fac.pkl → ...ate/data/pcenter_geodataframe_cli2fac.pkl
View file
Open in desktop
File renamed without changes.
0 ...sts/data/pcenter_geodataframe_fac2cli.pkl → ...ate/data/pcenter_geodataframe_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/pmedian_cli2fac.pkl → ...ests/test_locate/data/pmedian_cli2fac.pkl
View file
Open in desktop
File renamed without changes.
0 spopt/tests/data/pmedian_fac2cli.pkl → ...ests/test_locate/data/pmedian_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
0 ...sts/data/pmedian_geodataframe_cli2fac.pkl → ...ate/data/pmedian_geodataframe_cli2fac.pkl
View file
Open in desktop
File renamed without changes.
0 ...sts/data/pmedian_geodataframe_fac2cli.pkl → ...ate/data/pmedian_geodataframe_fac2cli.pkl
View file
Open in desktop
File renamed without changes.
10 changes: 6 additions & 4 deletions spopt/tests/test_c_p_median.py → spopt/tests/test_locate/test_c_p_median.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,10 @@ def test_c_p_median_with_predefined_facilities_infeasible(

class TestRealWorldLocate:
@pytest.fixture(autouse=True)
def setup_method(self, load_test_data) -> None:
time_table = load_test_data("example_subject_student_school_journeys.csv")
def setup_method(self, load_locate_test_data) -> None:
time_table = load_locate_test_data(
"example_subject_student_school_journeys.csv"
)

self.cost_matrix = (
time_table.pivot_table(
Expand All @@ -94,8 +96,8 @@ def setup_method(self, load_test_data) -> None:
.values
)

self.demand_points = load_test_data("example_subject_students.csv")
self.facility_points = load_test_data("example_subject_schools.csv")
self.demand_points = load_locate_test_data("example_subject_students.csv")
self.facility_points = load_locate_test_data("example_subject_schools.csv")

self.p_facility = 10
self.demand = numpy.ones(len(self.demand_points))
Expand Down
0 spopt/tests/test_clscp-so.py → spopt/tests/test_locate/test_clscp-so.py
View file
Open in desktop
File renamed without changes.
0 spopt/tests/test_knearest_p_median.py → ...sts/test_locate/test_knearest_p_median.py
View file
Open in desktop
File renamed without changes.
0 spopt/tests/test_locate_util.py → spopt/tests/test_locate/test_locate_util.py
View file
Open in desktop
File renamed without changes.
32 changes: 18 additions & 14 deletions spopt/tests/test_lscp.py → spopt/tests/test_locate/test_lscp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ def test_lscp_from_cost_matrix_no_results(self):
with pytest.raises(AttributeError):
result.fac2cli # noqa: B018

def test_lscp_facility_client_array_from_cost_matrix(self, load_test_data):
lscp_objective = load_test_data("lscp_fac2cli.pkl")
def test_lscp_facility_client_array_from_cost_matrix(self, load_locate_test_data):
lscp_objective = load_locate_test_data("lscp_fac2cli.pkl")

lscp = LSCP.from_cost_matrix(self.cost_matrix, 8)
lscp = lscp.solve(pulp.PULP_CBC_CMD(msg=False))
Expand All @@ -43,8 +43,8 @@ def test_lscp_facility_client_array_from_cost_matrix(self, load_test_data):
numpy.array(lscp_objective, dtype=object),
)

def test_lscp_client_facility_array_from_cost_matrix(self, load_test_data):
lscp_objective = load_test_data("lscp_cli2fac.pkl")
def test_lscp_client_facility_array_from_cost_matrix(self, load_locate_test_data):
lscp_objective = load_locate_test_data("lscp_cli2fac.pkl")

lscp = LSCP.from_cost_matrix(self.cost_matrix, 8)
lscp = lscp.solve(pulp.PULP_CBC_CMD(msg=False))
Expand All @@ -61,8 +61,8 @@ def test_lscp_from_geodataframe(self):
result = lscp.solve(pulp.PULP_CBC_CMD(msg=False))
assert isinstance(result, LSCP)

def test_lscp_facility_client_array_from_geodataframe(self, load_test_data):
lscp_objective = load_test_data("lscp_geodataframe_fac2cli.pkl")
def test_lscp_facility_client_array_from_geodataframe(self, load_locate_test_data):
lscp_objective = load_locate_test_data("lscp_geodataframe_fac2cli.pkl")

lscp = LSCP.from_geodataframe(
self.clients_snapped,
Expand All @@ -78,8 +78,8 @@ def test_lscp_facility_client_array_from_geodataframe(self, load_test_data):
numpy.array(lscp_objective, dtype=object),
)

def test_lscp_client_facility_array_from_geodataframe(self, load_test_data):
lscp_objective = load_test_data("lscp_geodataframe_cli2fac.pkl")
def test_lscp_client_facility_array_from_geodataframe(self, load_locate_test_data):
lscp_objective = load_locate_test_data("lscp_geodataframe_cli2fac.pkl")

lscp = LSCP.from_geodataframe(
self.clients_snapped,
Expand All @@ -96,9 +96,11 @@ def test_lscp_client_facility_array_from_geodataframe(self, load_test_data):
)

def test_lscp_preselected_facility_client_array_from_geodataframe(
self, load_test_data
self, load_locate_test_data
):
lscp_objective = load_test_data("lscp_preselected_loc_geodataframe_fac2cli.pkl")
lscp_objective = load_locate_test_data(
"lscp_preselected_loc_geodataframe_fac2cli.pkl"
)

fac_snapped = self.facilities_snapped.copy()

Expand All @@ -122,8 +124,8 @@ def test_lscp_preselected_facility_client_array_from_geodataframe(

class TestRealWorldLSCP:
@pytest.fixture(autouse=True)
def setup_method(self, load_test_data) -> None:
network_distance = load_test_data(
def setup_method(self, load_locate_test_data) -> None:
network_distance = load_locate_test_data(
"SF_network_distance_candidateStore_16_censusTract_205_new.csv"
)

Expand All @@ -133,8 +135,10 @@ def setup_method(self, load_test_data) -> None:

self.cost_matrix = ntw_dist_piv.to_numpy()

demand_points = load_test_data("SF_demand_205_centroid_uniform_weight.csv")
facility_points = load_test_data("SF_store_site_16_longlat.csv")
demand_points = load_locate_test_data(
"SF_demand_205_centroid_uniform_weight.csv"
)
facility_points = load_locate_test_data("SF_store_site_16_longlat.csv")

self.facility_points_gdf = (
geopandas.GeoDataFrame(
Expand Down
30 changes: 16 additions & 14 deletions spopt/tests/test_lscpb.py → spopt/tests/test_locate/test_lscpb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ def test_lscpb_from_cost_matrix_no_results(self):
with pytest.raises(AttributeError):
result.backup_perc # noqa: B018

def test_lscpb_facility_client_array_from_cost_matrix(self, load_test_data):
lscpb_objective = load_test_data("lscpb_fac2cli.pkl")
def test_lscpb_facility_client_array_from_cost_matrix(self, load_locate_test_data):
lscpb_objective = load_locate_test_data("lscpb_fac2cli.pkl")

lscpb = LSCPB.from_cost_matrix(
self.cost_matrix, 8, pulp.PULP_CBC_CMD(msg=False)
Expand All @@ -56,8 +56,8 @@ def test_lscpb_facility_client_array_from_cost_matrix(self, load_test_data):
numpy.array(lscpb_objective, dtype=object),
)

def test_lscpb_client_facility_array_from_cost_matrix(self, load_test_data):
lscpb_objective = load_test_data("lscpb_cli2fac.pkl")
def test_lscpb_client_facility_array_from_cost_matrix(self, load_locate_test_data):
lscpb_objective = load_locate_test_data("lscpb_cli2fac.pkl")

lscpb = LSCPB.from_cost_matrix(
self.cost_matrix, 8, pulp.PULP_CBC_CMD(msg=False)
Expand All @@ -82,8 +82,8 @@ def test_lscpb_from_geodataframe(self):

assert isinstance(result, LSCPB)

def test_lscpb_facility_client_array_from_geodataframe(self, load_test_data):
lscpb_objective = load_test_data("lscpb_geodataframe_fac2cli.pkl")
def test_lscpb_facility_client_array_from_geodataframe(self, load_locate_test_data):
lscpb_objective = load_locate_test_data("lscpb_geodataframe_fac2cli.pkl")

lscpb = LSCPB.from_geodataframe(
self.clients_snapped,
Expand All @@ -100,8 +100,8 @@ def test_lscpb_facility_client_array_from_geodataframe(self, load_test_data):
numpy.array(lscpb_objective, dtype=object),
)

def test_lscpb_client_facility_array_from_geodataframe(self, load_test_data):
lscpb_objective = load_test_data("lscpb_geodataframe_cli2fac.pkl")
def test_lscpb_client_facility_array_from_geodataframe(self, load_locate_test_data):
lscpb_objective = load_locate_test_data("lscpb_geodataframe_cli2fac.pkl")

lscpb = LSCPB.from_geodataframe(
self.clients_snapped,
Expand All @@ -119,9 +119,9 @@ def test_lscpb_client_facility_array_from_geodataframe(self, load_test_data):
)

def test_lscpb_preselected_facility_client_array_from_geodataframe(
self, load_test_data
self, load_locate_test_data
):
lscpb_objective = load_test_data(
lscpb_objective = load_locate_test_data(
"lscpb_preselected_loc_geodataframe_fac2cli.pkl"
)

Expand All @@ -147,8 +147,8 @@ def test_lscpb_preselected_facility_client_array_from_geodataframe(

class TestRealWorldLocate:
@pytest.fixture(autouse=True)
def setup_method(self, load_test_data) -> None:
network_distance = load_test_data(
def setup_method(self, load_locate_test_data) -> None:
network_distance = load_locate_test_data(
"SF_network_distance_candidateStore_16_censusTract_205_new.csv"
)

Expand All @@ -158,8 +158,10 @@ def setup_method(self, load_test_data) -> None:

self.cost_matrix = ntw_dist_piv.to_numpy()

demand_points = load_test_data("SF_demand_205_centroid_uniform_weight.csv")
facility_points = load_test_data("SF_store_site_16_longlat.csv")
demand_points = load_locate_test_data(
"SF_demand_205_centroid_uniform_weight.csv"
)
facility_points = load_locate_test_data("SF_store_site_16_longlat.csv")

self.facility_points_gdf = (
geopandas.GeoDataFrame(
Expand Down
32 changes: 18 additions & 14 deletions spopt/tests/test_mclp.py → spopt/tests/test_locate/test_mclp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ def test_mclp_from_cost_matrix_no_results(self):
with pytest.raises(AttributeError):
result.perc_cov # noqa: B018

def test_mclp_facility_client_array_from_cost_matrix(self, load_test_data):
mclp_objective = load_test_data("mclp_fac2cli.pkl")
def test_mclp_facility_client_array_from_cost_matrix(self, load_locate_test_data):
mclp_objective = load_locate_test_data("mclp_fac2cli.pkl")

mclp = MCLP.from_cost_matrix(
self.cost_matrix,
Expand All @@ -64,8 +64,8 @@ def test_mclp_facility_client_array_from_cost_matrix(self, load_test_data):
numpy.array(mclp_objective, dtype=object),
)

def test_mclp_client_facility_array_from_cost_matrix(self, load_test_data):
mclp_objective = load_test_data("mclp_cli2fac.pkl")
def test_mclp_client_facility_array_from_cost_matrix(self, load_locate_test_data):
mclp_objective = load_locate_test_data("mclp_cli2fac.pkl")

mclp = MCLP.from_cost_matrix(
self.cost_matrix,
Expand Down Expand Up @@ -93,8 +93,8 @@ def test_mclp_from_geodataframe(self):
result = mclp.solve(pulp.PULP_CBC_CMD(msg=False))
assert isinstance(result, MCLP)

def test_mclp_facility_client_array_from_geodataframe(self, load_test_data):
mclp_objective = load_test_data("mclp_geodataframe_fac2cli.pkl")
def test_mclp_facility_client_array_from_geodataframe(self, load_locate_test_data):
mclp_objective = load_locate_test_data("mclp_geodataframe_fac2cli.pkl")

mclp = MCLP.from_geodataframe(
self.clients_snapped,
Expand All @@ -113,9 +113,11 @@ def test_mclp_facility_client_array_from_geodataframe(self, load_test_data):
)

def test_mclp_preselected_facility_client_array_from_geodataframe(
self, load_test_data
self, load_locate_test_data
):
mclp_objective = load_test_data("mclp_preselected_loc_geodataframe_fac2cli.pkl")
mclp_objective = load_locate_test_data(
"mclp_preselected_loc_geodataframe_fac2cli.pkl"
)

fac_snapped = self.facilities_snapped.copy()

Expand All @@ -138,8 +140,8 @@ def test_mclp_preselected_facility_client_array_from_geodataframe(
numpy.array(mclp_objective, dtype=object),
)

def test_mclp_client_facility_array_from_geodataframe(self, load_test_data):
mclp_objective = load_test_data("mclp_geodataframe_cli2fac.pkl")
def test_mclp_client_facility_array_from_geodataframe(self, load_locate_test_data):
mclp_objective = load_locate_test_data("mclp_geodataframe_cli2fac.pkl")

mclp = MCLP.from_geodataframe(
self.clients_snapped,
Expand All @@ -160,8 +162,8 @@ def test_mclp_client_facility_array_from_geodataframe(self, load_test_data):

class TestRealWorldLocate:
@pytest.fixture(autouse=True)
def setup_method(self, load_test_data) -> None:
network_distance = load_test_data(
def setup_method(self, load_locate_test_data) -> None:
network_distance = load_locate_test_data(
"SF_network_distance_candidateStore_16_censusTract_205_new.csv"
)

Expand All @@ -171,8 +173,10 @@ def setup_method(self, load_test_data) -> None:

self.cost_matrix = ntw_dist_piv.to_numpy()

demand_points = load_test_data("SF_demand_205_centroid_uniform_weight.csv")
facility_points = load_test_data("SF_store_site_16_longlat.csv")
demand_points = load_locate_test_data(
"SF_demand_205_centroid_uniform_weight.csv"
)
facility_points = load_locate_test_data("SF_store_site_16_longlat.csv")

self.facility_points_gdf = (
geopandas.GeoDataFrame(
Expand Down
28 changes: 18 additions & 10 deletions spopt/tests/test_p_center.py → spopt/tests/test_locate/test_p_center.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ def test_p_center_from_cost_matrix_no_results(self):
with pytest.raises(AttributeError):
result.fac2cli # noqa: B018

def test_pcenter_facility_client_array_from_cost_matrix(self, load_test_data):
pcenter_objective = load_test_data("pcenter_fac2cli.pkl")
def test_pcenter_facility_client_array_from_cost_matrix(
self, load_locate_test_data
):
pcenter_objective = load_locate_test_data("pcenter_fac2cli.pkl")

pcenter = PCenter.from_cost_matrix(self.cost_matrix, p_facilities=4)
pcenter = pcenter.solve(pulp.PULP_CBC_CMD(msg=False))
Expand All @@ -54,8 +56,10 @@ def test_p_center_from_geodataframe(self):
result = p_center.solve(pulp.PULP_CBC_CMD(msg=False))
assert isinstance(result, PCenter)

def test_pcenter_facility_client_array_from_geodataframe(self, load_test_data):
pcenter_objective = load_test_data("pcenter_geodataframe_fac2cli.pkl")
def test_pcenter_facility_client_array_from_geodataframe(
self, load_locate_test_data
):
pcenter_objective = load_locate_test_data("pcenter_geodataframe_fac2cli.pkl")

pcenter = PCenter.from_geodataframe(
self.clients_snapped,
Expand All @@ -71,8 +75,10 @@ def test_pcenter_facility_client_array_from_geodataframe(self, load_test_data):
numpy.array(pcenter_objective, dtype=object),
)

def test_pcenter_client_facility_array_from_geodataframe(self, load_test_data):
pcenter_objective = load_test_data("pcenter_geodataframe_cli2fac.pkl")
def test_pcenter_client_facility_array_from_geodataframe(
self, load_locate_test_data
):
pcenter_objective = load_locate_test_data("pcenter_geodataframe_cli2fac.pkl")

pcenter = PCenter.from_geodataframe(
self.clients_snapped,
Expand Down Expand Up @@ -117,8 +123,8 @@ def test_pcenter_preselected_facility_client_array_from_geodataframe(self):

class TestRealWorldLocate:
@pytest.fixture(autouse=True)
def setup_method(self, load_test_data) -> None:
network_distance = load_test_data(
def setup_method(self, load_locate_test_data) -> None:
network_distance = load_locate_test_data(
"SF_network_distance_candidateStore_16_censusTract_205_new.csv"
)

Expand All @@ -128,8 +134,10 @@ def setup_method(self, load_test_data) -> None:

self.cost_matrix = ntw_dist_piv.to_numpy()

demand_points = load_test_data("SF_demand_205_centroid_uniform_weight.csv")
facility_points = load_test_data("SF_store_site_16_longlat.csv")
demand_points = load_locate_test_data(
"SF_demand_205_centroid_uniform_weight.csv"
)
facility_points = load_locate_test_data("SF_store_site_16_longlat.csv")

self.facility_points_gdf = (
geopandas.GeoDataFrame(
Expand Down
6 changes: 3 additions & 3 deletions spopt/tests/test_p_dispersion.py → spopt/tests/test_locate/test_p_dispersion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ def test_p_dispersion_preselected_facility_array_from_geodataframe(self):

class TestRealWorldLocate:
@pytest.fixture(autouse=True)
def setup_method(self, load_test_data) -> None:
network_distance = load_test_data(
def setup_method(self, load_locate_test_data) -> None:
network_distance = load_locate_test_data(
"SF_network_distance_candidateStore_16_censusTract_205_new.csv"
)

Expand All @@ -80,7 +80,7 @@ def setup_method(self, load_test_data) -> None:

self.cost_matrix = ntw_dist_piv.to_numpy()

facility_points = load_test_data("SF_store_site_16_longlat.csv")
facility_points = load_locate_test_data("SF_store_site_16_longlat.csv")

self.facility_points_gdf = (
geopandas.GeoDataFrame(
Expand Down
Loading