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.

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

Jump to bottom

Update tests to PoPS Core with rounding #73

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update tests to PoPS Core with rounding #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 pops-core
Open in desktop
Submodule pops-core updated 16 files
+8 −12 include/pops/actions.hpp
+4 −2 include/pops/deterministic_kernel.hpp
+16 −22 include/pops/host_pool.hpp
+2 −2 include/pops/network.hpp
+1 −1 include/pops/pest_host_table.hpp
+15 −22 include/pops/pest_pool.hpp
+4 −4 include/pops/quarantine.hpp
+2 −2 include/pops/radial_kernel.hpp
+71 −6 include/pops/raster.hpp
+1 −1 include/pops/soils.hpp
+17 −16 include/pops/treatments.hpp
+1 −1 tests/CMakeLists.txt
+8 −5 tests/test_model.cpp
+1 −1 tests/test_overpopulation_movements.cpp
+15 −2 tests/test_raster.cpp
+9 −16 tests/test_treatments.cpp
78 changes: 39 additions & 39 deletions testsuite/test_r_pops_spread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,10 @@ def test_quarantine(self):
)
reference = (
"step,escape_probability,dist0,dir0,dist1,dir1,dist2,dir2,dist3,dir3,dist4,dir4\n"
"0,0.0,4873.0,90,4018.0,180,4873.0,90,4873.0,90,4873.0,90\n"
"1,0.0,4873.0,90,2052.0,180,4873.0,90,2394.0,180,4873.0,90\n"
"2,0.4,1966.0,180,,,,,171.0,90,4873.0,90\n"
"3,0.8,,,,,,,,,2137.0,90"
"0,0.0,4874.0,90,4019.0,90,4874.0,90,4874.0,90,4874.0,90\n"
"1,0.0,4874.0,90,2052.0,180,4874.0,90,2394.0,180,4874.0,90\n"
"2,0.4,1967.0,180,,,,,171.0,90,4874.0,90\n"
"3,0.8,,,,,,,,,2138.0,90"
)
self.assertMultiLineEqual(output.strip(), reference)

Expand Down Expand Up @@ -814,21 +814,21 @@ def test_outputs_mortality(self):
runs=5,
nprocs=5,
flags="m",
mortality_rate=0.5,
mortality_rate=0.4,
mortality_time_lag=0,
mortality_series="dead",
mortality_frequency="yearly",
)
end = end[:4]
self.assertRasterExists(f"dead_{end}_12_31")

values = dict(null_cells=0, min=0, max=6, mean=0.606)
values = dict(null_cells=0, min=0, max=7, mean=0.650)
self.assertRasterFitsUnivar(raster="average", reference=values, precision=0.001)
values = dict(null_cells=0, min=0, max=100, mean=24.961)
values = dict(null_cells=0, min=0, max=100, mean=25.170)
self.assertRasterFitsUnivar(
raster="probability", reference=values, precision=0.001
)
values = dict(null_cells=0, min=0, max=15, mean=0.703)
values = dict(null_cells=0, min=0, max=14, mean=0.730)
self.assertRasterFitsUnivar(
raster=f"dead_{end}_12_31", reference=values, precision=0.001
)
Expand Down Expand Up @@ -936,7 +936,7 @@ def test_outputs_mortality_many_runs(self):
runs=50,
nprocs=5,
flags="m",
mortality_rate=0.5,
mortality_rate=0.4,
mortality_time_lag=0,
mortality_series="dead",
mortality_frequency="yearly",
Expand Down Expand Up @@ -997,7 +997,7 @@ def test_outputs_mortality_treatment(self):
nprocs=5,
mortality_frequency="yearly",
flags="m",
mortality_rate=0.5,
mortality_rate=0.4,
mortality_time_lag=0,
mortality_series="dead",
treatments="treatment",
Expand All @@ -1010,25 +1010,25 @@ def test_outputs_mortality_treatment(self):
self.assertRasterExists("dead_2021_12_31")
self.assertRasterExists("dead_2022_12_31")

values = dict(null_cells=0, mean=0.028, sum=782)
values = dict(null_cells=0, mean=0.028, sum=713)
self.assertRasterFitsUnivar(
raster="dead_2019_12_31",
reference=values,
precision=0.12,
)
values = dict(null_cells=0, mean=0.089, sum=2483)
values = dict(null_cells=0, mean=0.089, sum=2374)
self.assertRasterFitsUnivar(
raster="dead_2020_12_31",
reference=values,
precision=0.12,
)
values = dict(null_cells=0, mean=0.234, sum=6552)
values = dict(null_cells=0, mean=0.234, sum=6771)
self.assertRasterFitsUnivar(
raster="dead_2021_12_31",
reference=values,
precision=0.12,
)
values = dict(null_cells=0, mean=0.537, sum=15037)
values = dict(null_cells=0, mean=0.537, sum=16143)
self.assertRasterFitsUnivar(
raster="dead_2022_12_31",
reference=values,
Expand All @@ -1037,21 +1037,21 @@ def test_outputs_mortality_treatment(self):

precision = 0.1
self.assertRasterFitsUnivar(
raster="single_2019_12_31", reference=dict(sum=1469), precision=precision
raster="single_2019_12_31", reference=dict(sum=1538), precision=precision
)
self.assertRasterFitsUnivar(
raster="single_2020_12_31", reference=dict(sum=3231), precision=precision
raster="single_2020_12_31", reference=dict(sum=3505), precision=precision
)
self.assertRasterFitsUnivar(
raster="single_2021_12_31", reference=dict(sum=7310), precision=precision
raster="single_2021_12_31", reference=dict(sum=8784), precision=precision
)
self.assertRasterFitsUnivar(
raster="single_2022_12_31", reference=dict(sum=14260), precision=precision
raster="single_2022_12_31", reference=dict(sum=17268), precision=precision
)

values = dict(null_cells=0, min=0, max=6, mean=0.493)
values = dict(null_cells=0, min=0, max=6.6, mean=0.536)
self.assertRasterFitsUnivar(raster="average", reference=values, precision=0.001)
values = dict(null_cells=0, min=0, max=100, mean=21.002)
values = dict(null_cells=0, min=0, max=100, mean=21.647)
self.assertRasterFitsUnivar(
raster="probability", reference=values, precision=0.001
)
Expand Down Expand Up @@ -1091,7 +1091,7 @@ def test_outputs_mortality_pesticide_treatment(self):
nprocs=5,
mortality_frequency="yearly",
flags="m",
mortality_rate=0.5,
mortality_rate=0.4,
mortality_time_lag=0,
mortality_series="dead",
treatments="treatment",
Expand Down Expand Up @@ -1129,9 +1129,9 @@ def test_outputs_mortality_pesticide_treatment(self):
precision=0.12,
)

values = dict(null_cells=0, min=0, max=5.6, mean=0.526)
values = dict(null_cells=0, min=0, max=6.4, mean=0.598)
self.assertRasterFitsUnivar(raster="average", reference=values, precision=0.001)
values = dict(null_cells=0, min=0, max=100, mean=21.965)
values = dict(null_cells=0, min=0, max=100, mean=23.242)
self.assertRasterFitsUnivar(
raster="probability", reference=values, precision=0.001
)
Expand Down Expand Up @@ -1186,38 +1186,38 @@ def test_sei_treatments_removal_ratio_to_all(self):
self.assertRasterExists(f"stddev_{end}_12_31")

# Final outputs
values = dict(null_cells=0, min=0, max=18, mean=0.405)
values = dict(null_cells=0, min=0, max=18, mean=0.416)
self.assertRasterFitsUnivar(raster="average", reference=values, precision=0.001)
values = dict(null_cells=0, min=0, max=100, mean=10.163)
values = dict(null_cells=0, min=0, max=100, mean=10.614)
self.assertRasterFitsUnivar(
raster="probability", reference=values, precision=0.001
)
values = dict(null_cells=0, min=0, max=6.087, mean=0.343)
values = dict(null_cells=0, min=0, max=6.000, mean=0.350)
self.assertRasterFitsUnivar(raster="stddev", reference=values, precision=0.001)

test_date = "2021_12_31"
end_year = end[:4]

# Time-series outputs
values = dict(null_cells=0, min=0, max=18.0, mean=0.195)
values = dict(null_cells=0, min=0, max=18.0, mean=0.201)
self.assertRasterFitsUnivar(
raster=f"average_{test_date}", reference=values, precision=0.001
)
values = dict(null_cells=0, min=0, max=100, mean=5.357)
values = dict(null_cells=0, min=0, max=100, mean=5.621)
self.assertRasterFitsUnivar(
raster=f"probability_{test_date}", reference=values, precision=0.001
)
values = dict(null_cells=0, min=0, max=5.389, mean=0.147)
values = dict(null_cells=0, min=0, max=5.761, mean=0.150)
self.assertRasterFitsUnivar(
raster=f"stddev_{test_date}", reference=values, precision=0.001
)

# Single run outputs
values = dict(null_cells=0, min=0, max=18, mean=0.198)
values = dict(null_cells=0, min=0, max=18, mean=0.205)
self.assertRasterFitsUnivar(
raster=f"single_{test_date}", reference=values, precision=0.001
)
values = dict(null_cells=0, min=0, max=18, mean=0.405)
values = dict(null_cells=0, min=0, max=18, mean=0.425)
self.assertRasterFitsUnivar(
raster=f"single_{end_year}_12_31", reference=values, precision=0.001
)
Expand Down Expand Up @@ -1272,38 +1272,38 @@ def test_sei_treatments_pesticide_ratio_to_all(self):
self.assertRasterExists(f"stddev_{end}_12_31")

# Final outputs
values = dict(null_cells=0, min=0, max=18, mean=0.480)
values = dict(null_cells=0, min=0, max=18, mean=0.437)
self.assertRasterFitsUnivar(raster="average", reference=values, precision=0.001)
values = dict(null_cells=0, min=0, max=100, mean=11.657)
values = dict(null_cells=0, min=0, max=100, mean=10.789)
self.assertRasterFitsUnivar(
raster="probability", reference=values, precision=0.001
)
values = dict(null_cells=0, min=0, max=6.369, mean=0.388)
values = dict(null_cells=0, min=0, max=5.844, mean=0.362)
self.assertRasterFitsUnivar(raster="stddev", reference=values, precision=0.001)

test_date = "2021_12_31"
end_year = end[:4]

# Time-series outputs
values = dict(null_cells=0, min=0, max=18.0, mean=0.218)
values = dict(null_cells=0, min=0, max=18.0, mean=0.201)
self.assertRasterFitsUnivar(
raster=f"average_{test_date}", reference=values, precision=0.001
)
values = dict(null_cells=0, min=0, max=100, mean=6.135)
values = dict(null_cells=0, min=0, max=100, mean=5.621)
self.assertRasterFitsUnivar(
raster=f"probability_{test_date}", reference=values, precision=0.001
)
values = dict(null_cells=0, min=0, max=5.276, mean=0.164)
values = dict(null_cells=0, min=0, max=5.761, mean=0.150)
self.assertRasterFitsUnivar(
raster=f"stddev_{test_date}", reference=values, precision=0.001
)

# Single run outputs
values = dict(null_cells=0, min=0, max=18, mean=0.221)
values = dict(null_cells=0, min=0, max=18, mean=0.205)
self.assertRasterFitsUnivar(
raster=f"single_{test_date}", reference=values, precision=0.001
)
values = dict(null_cells=0, min=0, max=18, mean=0.484)
values = dict(null_cells=0, min=0, max=18, mean=0.443)
self.assertRasterFitsUnivar(
raster=f"single_{end_year}_12_31", reference=values, precision=0.001
)
Expand Down
Loading