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

r.univar: print only statistics for existing zones #2957

Merged
merged 2 commits into from
May 15, 2023
Merged

r.univar: print only statistics for existing zones #2957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
360dc14
skip zones without pixels
ninsbl May 12, 2023
126bab6
add test for zones with gaps
ninsbl May 15, 2023
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
4 changes: 4 additions & 0 deletions raster/r.univar/stats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ int print_stats(univar_stat *stats)
unsigned int i;
size_t qpos_25, qpos_75, *qpos_perc;

/* stats collected for this zone? */
if (stats[z].size == 0)
continue;

/* all these calculations get promoted to doubles, so any DIV0 becomes
* nan */
mean = stats[z].sum / stats[z].n;
Expand Down
70 changes: 69 additions & 1 deletion raster/r.univar/testsuite/test_r_univar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ def tearDown(self):
self.runModule("g.remove", flags="f", type="raster", name="map_a")
self.runModule("g.remove", flags="f", type="raster", name="map_b")
self.runModule("g.remove", flags="f", type="raster", name="zone_map")
self.runModule("g.remove", flags="f", type="raster", name="zone_map_with_gap")

def setUp(self):
"""Create input data"""
Expand All @@ -31,7 +32,12 @@ def setUp(self):
"r.mapcalc", expression="map_b = 200 + row() + col()", overwrite=True
)
self.runModule(
"r.mapcalc", expression="zone_map = if(row() < 20, 1,2)", overwrite=True
"r.mapcalc", expression="zone_map = if(row() < 20, 1, 2)", overwrite=True
)
self.runModule(
"r.mapcalc",
expression="zone_map_with_gap = if(row()> 20, 2, 9)",
overwrite=True,
)

def test_1(self):
Expand Down Expand Up @@ -382,6 +388,68 @@ def test_3_zone(self):
sep="=",
)

def test_zone_with_gap_in_cats(self):
"""
test if gaps in categories in a map are not included in the output
:return:
"""

# Output of r.univar
univar_string = """zone=2;
n=12600
null_cells=0
cells=12600
min=122
max=380
range=258
mean=251
mean_of_abs=251
stddev=59.8595578555895
variance=3583.16666666667
coeff_var=23.8484294245376
sum=3162600
first_quartile=201
median=251
third_quartile=301
percentile_90=331
zone=9;
n=3600
null_cells=0
cells=12600
min=102
max=310
range=208
mean=206
mean_of_abs=206
stddev=56.6406803160649
variance=3208.16666666667
coeff_var=27.4954758815849
sum=741600
first_quartile=156
median=206
third_quartile=256
percentile_90=283"""

self.assertModuleKeyValue(
module="r.univar",
map=["map_a", "map_b"],
zones="zone_map_with_gap",
flags="ge",
reference=univar_string,
precision=6,
sep="=",
)
self.assertModuleKeyValue(
module="r.univar",
map=["map_a", "map_b"],
zones="zone_map_with_gap",
flags="ge",
nprocs=4,
reference=univar_string,
precision=6,
sep="=",
)


class TestAccumulateFails(TestCase):
def test_error_handling(self):
Expand Down