[GRASS-SVN] r67928 - grass/trunk/raster/r.in.xyz
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Feb 23 13:19:45 PST 2016
Author: mmetz
Date: 2016-02-23 13:19:45 -0800 (Tue, 23 Feb 2016)
New Revision: 67928
Modified:
grass/trunk/raster/r.in.xyz/main.c
grass/trunk/raster/r.in.xyz/r.in.xyz.html
Log:
r.in.xyz: bugfix for percent < 100 and other fp precision management errors
Modified: grass/trunk/raster/r.in.xyz/main.c
===================================================================
--- grass/trunk/raster/r.in.xyz/main.c 2016-02-23 17:33:25 UTC (rev 67927)
+++ grass/trunk/raster/r.in.xyz/main.c 2016-02-23 21:19:45 UTC (rev 67928)
@@ -116,7 +116,7 @@
*index_array;
void *raster_row, *ptr;
struct Cell_head region;
- int rows, cols; /* scan box size */
+ int rows, last_rows, row0, cols; /* scan box size */
int row, col; /* counters */
int pass, npasses;
@@ -124,7 +124,6 @@
double x, y, z;
char **tokens;
int ntokens; /* number of tokens */
- double pass_north, pass_south;
int arr_row, arr_col;
unsigned long count, count_total;
@@ -476,7 +475,18 @@
G_get_window(®ion);
- rows = (int)(region.rows * (percent / 100.0));
+ rows = last_rows = region.rows;
+ npasses = 1;
+ if (percent < 100) {
+ rows = (int)(region.rows * (percent / 100.0));
+ npasses = region.rows / rows;
+ last_rows = region.rows - npasses * rows;
+ if (last_rows)
+ npasses++;
+ else
+ last_rows = rows;
+
+ }
cols = region.cols;
G_debug(2, "region.n=%f region.s=%f region.ns_res=%f", region.north,
@@ -614,15 +624,13 @@
}
/* figure out segmentation */
- pass_north = region.north - (pass - 1) * rows * region.ns_res;
- if (pass == npasses)
- rows = region.rows - (pass - 1) * rows;
- pass_south = pass_north - rows * region.ns_res;
+ row0 = (pass - 1) * rows;
+ if (pass == npasses) {
+ rows = last_rows;
+ }
- G_debug(2, "pass=%d/%d pass_n=%f pass_s=%f rows=%d",
- pass, npasses, pass_north, pass_south, rows);
+ G_debug(2, "pass=%d/%d rows=%d", pass, npasses, rows);
-
if (bin_n) {
G_debug(2, "allocating n_array");
n_array = G_calloc((size_t)rows * (cols + 1), Rast_cell_size(CELL_TYPE));
@@ -704,17 +712,28 @@
if (1 != sscanf(tokens[ycol - 1], "%lf", &y))
G_fatal_error(_("Bad y-coordinate line %lu column %d. <%s>"),
line, ycol, tokens[ycol - 1]);
- if (y <= pass_south || y > pass_north) {
+ if (y <= region.south || y > region.north) {
G_free_tokens(tokens);
continue;
}
if (1 != sscanf(tokens[xcol - 1], "%lf", &x))
G_fatal_error(_("Bad x-coordinate line %lu column %d. <%s>"),
line, xcol, tokens[xcol - 1]);
- if (x < region.west || x > region.east) {
+ if (x < region.west || x >= region.east) {
G_free_tokens(tokens);
continue;
}
+
+ /* find the bin in the current array box */
+ arr_row = (int)((region.north - y) / region.ns_res) - row0;
+ if (arr_row < 0 || arr_row >= rows) {
+ G_free_tokens(tokens);
+ continue;
+ }
+ arr_col = (int)((x - region.west) / region.ew_res);
+
+ /* G_debug(5, "arr_row: %d arr_col: %d", arr_row, arr_col); */
+
if (1 != sscanf(tokens[zcol - 1], "%lf", &z))
G_fatal_error(_("Bad z-coordinate line %lu column %d. <%s>"),
line, zcol, tokens[zcol - 1]);
@@ -746,33 +765,6 @@
/* G_debug(5, "x: %f, y: %f, z: %f", x, y, z); */
G_free_tokens(tokens);
- /* find the bin in the current array box */
- arr_row = (int)((pass_north - y) / region.ns_res);
- arr_col = (int)((x - region.west) / region.ew_res);
-
- /* G_debug(5, "arr_row: %d arr_col: %d", arr_row, arr_col); */
-
- /* The range should be [0,cols-1]. We use (int) to round down,
- but if the point exactly on eastern edge arr_col will be /just/
- on the max edge .0000000 and end up on the next row.
- We could make above bounds check "if(x>=region.east) continue;"
- But instead we go to all sorts of trouble so that not one single
- data point is lost. GE is too small to catch them all.
- We don't try to make y happy as percent segmenting will make some
- points happen twice that way; so instead we use the y<= test above.
- */
- if (arr_col >= cols) {
- if (((x - region.west) / region.ew_res) - cols <
- 10 * GRASS_EPSILON)
- arr_col--;
- else { /* oh well, we tried. */
- G_debug(3,
- "skipping extraneous data point [%.3f], column %d of %d",
- x, arr_col, cols);
- continue;
- }
- }
-
if (bin_n)
update_n(n_array, cols, arr_row, arr_col);
if (bin_min)
Modified: grass/trunk/raster/r.in.xyz/r.in.xyz.html
===================================================================
--- grass/trunk/raster/r.in.xyz/r.in.xyz.html 2016-02-23 17:33:25 UTC (rev 67927)
+++ grass/trunk/raster/r.in.xyz/r.in.xyz.html 2016-02-23 21:19:45 UTC (rev 67928)
@@ -264,11 +264,6 @@
with e.g. <tt>percent=10</tt> or less.
<br>Cause unknown.
-<li> <em>n</em> map <tt>percent=100</tt> and <tt>percent=xx</tt> maps
- differ slightly (point will fall above/below the segmentation line)
- <br>Investigate with "<tt>r.mapcalc diff = bin_n.100 - bin_n.33</tt>" etc.
- <br>Cause unknown.
-
<li> "<tt>nan</tt>" can leak into <em>coeff_var</em> maps.
<br>Cause unknown. Possible work-around: "<tt>r.null setnull=nan</tt>"
<!-- Another method: r.mapcalc 'No_nan = if(map == map, map, null() )' -->
More information about the grass-commit
mailing list