Added new module i.spec.convexhull #1433
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit
clang-format
[clang-format] reported by reviewdog 🐶
[clang-format] reported by reviewdog 🐶
[clang-format] reported by reviewdog 🐶
grass-addons/src/imagery/i.spec.convexhull/main.c
Lines 155 to 156 in 31455c3
| double y; | ||
| } Point; | ||
|
|
||
|
|
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
|
|
||
|
|
||
| // Function to calculate the orientation of three points (p, q, r) | ||
| double orientation(Point p, Point q, Point r) { |
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| double orientation(Point p, Point q, Point r) { | |
| double orientation(Point p, Point q, Point r) | |
| { |
| } | ||
|
|
||
| // Function to find the convex hull of a set of points | ||
| void convexHull(Point *points, int n, Point *hull, int *hullSize) { |
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| void convexHull(Point *points, int n, Point *hull, int *hullSize) { | |
| void convexHull(Point *points, int n, Point *hull, int *hullSize) | |
| { |
| // Storage for the convex hull | ||
| *hullSize = 0; | ||
|
|
||
| // Start from the leftmost point and move clockwise until the point with maximum x-coordinate |
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| // Start from the leftmost point and move clockwise until the point with maximum x-coordinate | |
| // Start from the leftmost point and move clockwise until the point with | |
| // maximum x-coordinate |
| // Add the current point to the result | ||
| hull[(*hullSize)++] = points[p]; | ||
|
|
||
| // Search for a point 'q' such that orientation(p, q, x) is clockwise for all points 'x' |
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| // Search for a point 'q' such that orientation(p, q, x) is clockwise for all points 'x' | |
| // Search for a point 'q' such that orientation(p, q, x) is clockwise | |
| // for all points 'x' |
| // Load nrows and ncols | ||
| nrows = Rast_window_rows(); | ||
| ncols = Rast_window_cols(); | ||
|
|
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| Rast_get_row(infd[i], inbuf[i], row, DCELL_TYPE); | ||
| } | ||
| // Process each column (pixel spectrum reconstitution) | ||
| //#pragma omp parallel for private(i, din, dout) |
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| //#pragma omp parallel for private(i, din, dout) | |
| // #pragma omp parallel for private(i, din, dout) |
| din[i] = ((double *)inbuf[i])[col]; | ||
| } | ||
| // Process convex hull per spectrum | ||
| convexhull(din, dout, ref.nfiles); |
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| convexhull(din, dout, ref.nfiles); | |
| convexhull(din, dout, ref.nfiles); |
| // Clean the output_group from any pre-existing list | ||
| if (I_find_group(output_group->answer)) { | ||
| if (!G_check_overwrite(argc, argv)) { | ||
| G_fatal_error(_("Group <%s> exists. Use --overwrite to replace."), output_group->answer); |
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| G_fatal_error(_("Group <%s> exists. Use --overwrite to replace."), output_group->answer); | |
| G_fatal_error(_("Group <%s> exists. Use --overwrite to replace."), | |
| output_group->answer); |
Comment on lines
+144
to
+145
| create_group(output_group->answer); | ||
| } else { |
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| create_group(output_group->answer); | |
| } else { | |
| create_group(output_group->answer); | |
| } | |
| else { |
Comment on lines
+17
to
+57
| #%module | ||
| #% description: Export moving window samples from an imagery group and two rasters. | ||
| #% keyword: imagery | ||
| #% keyword: ANN | ||
| #% keyword: training | ||
| #% keyword: export | ||
| #%end | ||
| #%option G_OPT_I_GROUP | ||
| #% description: Imagery group name | ||
| #% required: yes | ||
| #%end | ||
| #%option G_OPT_R_INPUT | ||
| #% key: raster1 | ||
| #% description: First raster input (clump) | ||
| #% required: yes | ||
| #%end | ||
| #%option G_OPT_R_INPUT | ||
| #% key: raster2 | ||
| #% description: Second raster input (value) | ||
| #% required: yes | ||
| #%end | ||
| #%option | ||
| #% key: output_directory | ||
| #% type: string | ||
| #% description: Output directory | ||
| #% required: yes | ||
| #%end | ||
| #%option | ||
| #% key: window_width | ||
| #% type: integer | ||
| #% description: Moving window width in cells | ||
| #% required: yes | ||
| #% answer: 128 | ||
| #%end | ||
| #%option | ||
| #% key: window_height | ||
| #% type: integer | ||
| #% description: Moving window height in cells | ||
| #% required: yes | ||
| #% answer: 128 | ||
| #%end |
Contributor
There was a problem hiding this comment.
[ruff] reported by reviewdog 🐶
Suggested change
| #%module | |
| #% description: Export moving window samples from an imagery group and two rasters. | |
| #% keyword: imagery | |
| #% keyword: ANN | |
| #% keyword: training | |
| #% keyword: export | |
| #%end | |
| #%option G_OPT_I_GROUP | |
| #% description: Imagery group name | |
| #% required: yes | |
| #%end | |
| #%option G_OPT_R_INPUT | |
| #% key: raster1 | |
| #% description: First raster input (clump) | |
| #% required: yes | |
| #%end | |
| #%option G_OPT_R_INPUT | |
| #% key: raster2 | |
| #% description: Second raster input (value) | |
| #% required: yes | |
| #%end | |
| #%option | |
| #% key: output_directory | |
| #% type: string | |
| #% description: Output directory | |
| #% required: yes | |
| #%end | |
| #%option | |
| #% key: window_width | |
| #% type: integer | |
| #% description: Moving window width in cells | |
| #% required: yes | |
| #% answer: 128 | |
| #%end | |
| #%option | |
| #% key: window_height | |
| #% type: integer | |
| #% description: Moving window height in cells | |
| #% required: yes | |
| #% answer: 128 | |
| #%end | |
| # %module | |
| # % description: Export moving window samples from an imagery group and two rasters. | |
| # % keyword: imagery | |
| # % keyword: ANN | |
| # % keyword: training | |
| # % keyword: export | |
| # %end | |
| # %option G_OPT_I_GROUP | |
| # % description: Imagery group name | |
| # % required: yes | |
| # %end | |
| # %option G_OPT_R_INPUT | |
| # % key: raster1 | |
| # % description: First raster input (clump) | |
| # % required: yes | |
| # %end | |
| # %option G_OPT_R_INPUT | |
| # % key: raster2 | |
| # % description: Second raster input (value) | |
| # % required: yes | |
| # %end | |
| # %option | |
| # % key: output_directory | |
| # % type: string | |
| # % description: Output directory | |
| # % required: yes | |
| # %end | |
| # %option | |
| # % key: window_width | |
| # % type: integer | |
| # % description: Moving window width in cells | |
| # % required: yes | |
| # % answer: 128 | |
| # %end | |
| # %option | |
| # % key: window_height | |
| # % type: integer | |
| # % description: Moving window height in cells | |
| # % required: yes | |
| # % answer: 128 | |
| # %end |
| import grass.script as gs | ||
| from grass.script import array as garray | ||
|
|
||
| def read_group_bands(group_name): |
Contributor
There was a problem hiding this comment.
[ruff] reported by reviewdog 🐶
Suggested change
| def read_group_bands(group_name): | |
| def read_group_bands(group_name): |
| from grass.script import array as garray | ||
|
|
||
| def read_group_bands(group_name): | ||
| bands = gs.read_command('i.group', group=group_name, format='shell').splitlines() |
Contributor
There was a problem hiding this comment.
[ruff] reported by reviewdog 🐶
Suggested change
| bands = gs.read_command('i.group', group=group_name, format='shell').splitlines() | |
| bands = gs.read_command("i.group", group=group_name, format="shell").splitlines() |
| bands = gs.read_command('i.group', group=group_name, format='shell').splitlines() | ||
| return bands | ||
|
|
||
| def extract_window(array, row_off, col_off, height, width): |
Contributor
There was a problem hiding this comment.
[ruff] reported by reviewdog 🐶
Suggested change
| def extract_window(array, row_off, col_off, height, width): | |
| def extract_window(array, row_off, col_off, height, width): |
| return bands | ||
|
|
||
| def extract_window(array, row_off, col_off, height, width): | ||
| return array[row_off:row_off+height, col_off:col_off+width] |
Contributor
There was a problem hiding this comment.
[ruff] reported by reviewdog 🐶
Suggested change
| return array[row_off:row_off+height, col_off:col_off+width] | |
| return array[row_off : row_off + height, col_off : col_off + width] | |
Comment on lines
+150
to
+151
| xres = (region['e'] - region['w']) / ncols | ||
| yres = (region['n'] - region['s']) / nrows |
Contributor
There was a problem hiding this comment.
[ruff] reported by reviewdog 🐶
Suggested change
| xres = (region['e'] - region['w']) / ncols | |
| yres = (region['n'] - region['s']) / nrows | |
| xres = (region["e"] - region["w"]) / ncols | |
| yres = (region["n"] - region["s"]) / nrows |
Comment on lines
+153
to
+154
| transform = from_origin(region['w'], region['n'], xres, yres) | ||
| wkt = gs.read_command('g.proj', flags='w').strip() |
Contributor
There was a problem hiding this comment.
[ruff] reported by reviewdog 🐶
Suggested change
| transform = from_origin(region['w'], region['n'], xres, yres) | |
| wkt = gs.read_command('g.proj', flags='w').strip() | |
| transform = from_origin(region["w"], region["n"], xres, yres) | |
| wkt = gs.read_command("g.proj", flags="w").strip() |
| idx = 0 | ||
| for row in range(0, nrows - window_height + 1, window_height): | ||
| for col in range(0, ncols - window_width + 1, window_width): | ||
| window_bands = [extract_window(b, row, col, window_height, window_width) for b in band_arrays] |
Contributor
There was a problem hiding this comment.
[ruff] reported by reviewdog 🐶
Suggested change
| window_bands = [extract_window(b, row, col, window_height, window_width) for b in band_arrays] | |
| window_bands = [ | |
| extract_window(b, row, col, window_height, window_width) | |
| for b in band_arrays | |
| ] |
| for clump_id in clump_ids: | ||
| if clump_id == 0: | ||
| continue | ||
| mask = (win1 == clump_id) |
Contributor
There was a problem hiding this comment.
[ruff] reported by reviewdog 🐶
Suggested change
| mask = (win1 == clump_id) | |
| mask = win1 == clump_id |
Comment on lines
+177
to
+179
| out_group = os.path.join(out_subdir, f"group_{clump_id}_{corresponding_value}.tif") | ||
| export_multiband_geotiff([b * mask for b in window_bands], out_group, transform, crs) | ||
| out_r = os.path.join(out_subdir, f"{raster1}_clump{clump_id}_val{corresponding_value}.tif") |
Contributor
There was a problem hiding this comment.
[ruff] reported by reviewdog 🐶
Suggested change
| out_group = os.path.join(out_subdir, f"group_{clump_id}_{corresponding_value}.tif") | |
| export_multiband_geotiff([b * mask for b in window_bands], out_group, transform, crs) | |
| out_r = os.path.join(out_subdir, f"{raster1}_clump{clump_id}_val{corresponding_value}.tif") | |
| out_group = os.path.join( | |
| out_subdir, f"group_{clump_id}_{corresponding_value}.tif" | |
| ) | |
| export_multiband_geotiff( | |
| [b * mask for b in window_bands], out_group, transform, crs | |
| ) | |
| out_r = os.path.join( | |
| out_subdir, | |
| f"{raster1}_clump{clump_id}_val{corresponding_value}.tif", | |
| ) |
| create_group(output_group->answer); | ||
| } else { | ||
| // Proceed to create | ||
| create_group(output_group->answer); |
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| create_group(output_group->answer); | |
| create_group(output_group->answer); |
|
|
||
| // Close files and add to group | ||
| for (i = 0; i < ref.nfiles; i++) { | ||
| add_file_to_group(output_group->answer, outname[i], G_mapset()); |
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| add_file_to_group(output_group->answer, outname[i], G_mapset()); | |
| add_file_to_group(output_group->answer, outname[i], G_mapset()); |
Comment on lines
+155
to
+156
| if (infd[i] >= 0) Rast_close(infd[i]); | ||
| if (outfd[i] >= 0) Rast_close(outfd[i]); |
Contributor
There was a problem hiding this comment.
[clang-format] reported by reviewdog 🐶
Suggested change
| if (infd[i] >= 0) Rast_close(infd[i]); | |
| if (outfd[i] >= 0) Rast_close(outfd[i]); | |
| if (infd[i] >= 0) | |
| Rast_close(infd[i]); | |
| if (outfd[i] >= 0) | |
| Rast_close(outfd[i]); |
neteler
reviewed
Jul 2, 2025
| @@ -0,0 +1,7 @@ | |||
| MODULE_TOPDIR = ../.. | |||
|
|
|||
| PGM = i.ann.mktrainset | |||
Member
There was a problem hiding this comment.
Hi @YannChemin Please consider to submit the new i.ann.mktrainset addon as a separate pull request.
Member
There was a problem hiding this comment.
He is submitting PRs with the default branch, so that's what is happening. There isn't a branch for each of the PRs (and we get notified of his CI failures as that branch is involved in a PR we are involved in)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
i.spec.convexhull
This module processes all raster bands in a GRASS imagery group, performing continuum removal via convex hull analysis on the spectral profile of each pixel. The result is a new group of raster maps, each corresponding to an input band, with the continuum-removed spectra.
This functionality is very commonly used in mineral mapping in specific parts of hyperspectral SWIR ranges.
Original Signatures
Convexhull applied to signatures
