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.

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

Fix findfeatures matrix inversion issues and improve FastGeom performance #4772

Merged
merged 26 commits into from
Aug 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8597b14
findfeatures bug fixes and improvements
KrisBecker Feb 2, 2022
3dbd3e9
findfeatures - add Grid algorithm to FastGeom
KrisBecker Feb 3, 2022
e0a36a9
Merge branch 'USGS-Astrogeology:dev' into findfeatures_matrix_fix_mods
KrisBecker Feb 4, 2022
70b49bf
findfeatures modifications after Astro code review
KrisBecker Feb 11, 2022
b14b889
Merge branch 'findfeatures_matrix_fix_mods' of https://github.com/Kri…
KrisBecker Feb 11, 2022
fb4fcb3
Merge remote-tracking branch 'origin/dev' into findfeatures_matrix_fi…
KrisBecker Jan 17, 2023
57d32d8
Merge branch 'USGS-Astrogeology:dev' into findfeatures_matrix_fix_mods
KrisBecker Jan 17, 2023
4ca9030
Fixed existing findfeatures test - error text
KrisBecker Jan 23, 2023
07e348c
Merge branch 'findfeatures_matrix_fix_mods' of https://github.com/Kri…
KrisBecker Jan 23, 2023
0fb37ab
FastGeom.cpp updated to better accomodate testing
KrisBecker Jan 24, 2023
954db66
Add findfeatures Radial/Grid config files for test
KrisBecker Jan 24, 2023
82d98ea
Updated findfeatures test for Grid/Radial algos
KrisBecker Jan 24, 2023
8262206
Fixed cnetwinnow test that created misplaced files
KrisBecker Jan 24, 2023
858ad4f
Small adjustment to new findfeatures tests
KrisBecker Jan 24, 2023
9234b7c
Merge branch 'dev' of https://github.com/KrisBecker/ISIS3 into findfe…
KrisBecker Mar 27, 2023
056f549
Merge remote-tracking branch 'origin/dev' into findfeatures_matrix_fi…
KrisBecker Jun 2, 2023
a18130f
Merge branch 'DOI-USGS:dev' into findfeatures_matrix_fix_mods
KrisBecker Jun 13, 2023
5b5f9fd
Merge branch 'findfeatures_matrix_fix_mods' of https://github.com/Kri…
KrisBecker Jun 13, 2023
7665e46
Fixes/improvements to findfeature code
KrisBecker Jun 22, 2023
4b76416
Significant modifications/improvements to docs
KrisBecker Jun 22, 2023
4af690e
Updated the change log
KrisBecker Jun 22, 2023
3058977
Updates to findfeatures PR #4772
KrisBecker Aug 6, 2023
86989d1
Merge remote-tracking branch 'origin/dev' into findfeatures_matrix_fi…
KrisBecker Aug 6, 2023
a298105
Removed scripts in example 4 of findfeatures docs
KrisBecker Aug 16, 2023
230c2b7
Merge remote-tracking branch 'origin/dev' into findfeatures_matrix_fi…
KrisBecker Aug 16, 2023
2b2a613
Merge branch 'DOI-USGS:dev' into findfeatures_matrix_fix_mods
KrisBecker Aug 16, 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
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,20 @@ release.

## [Unreleased]


### Changed
- Removed the `.py` extention from the _isisdataeval_ tool `isisdata_mockup` for consistency and install it in $ISISROOT/bin; added the `--tojson` and `--hasher` option to _isisdata_mockup_ tool improve utility; updated the tool `README.md` documentation to reflect this change, removed help output and trimmed example results; fixed paths to test data in `make_isisdata_mockup.sh`. [#5163](https://github.com/DOI-USGS/ISIS3/pull/5163)
- Significantly refactored FASTGEOM processing in <i>findfeatures</i> to accommodate stability and functionality. The scope of the algorithm was taken out of the ImageSource class and isolated to support this feature. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Report better information regarding the behavior of <i>findfeatures</i>, FASTGEOM algorithms, and creation of the output network. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)

### Added
- Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183)
- Add new program option <b>TONOGEOM</b> to <i>findfeatures</i> that logs captures geometry errors in the FASTGEOM algorithm and records them to the file provided in this parameter. These images are excluded from the matching process. References [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Added a new Radial FASTGEOM transform mapping algorithm to <i>findfeatures</i> to address performance problems with the Grid algorithm. This is now the default algorithm if none are selected by the user (see the new <b>GLOBALS</b> parameter to specify the algorithm) [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Added new parameter <b>GLOBALS</b> to make parameterization of <i>findfeatures</i> behavior significantly easier and convenient. Wrote significant documentation for the parameter and provide several examples showing its use. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Added two new examples demonstrating/documenting the use of FASTGEOM algorithm, parameterization using <b>GLOBALS</b> and creation of a regional mosaic using <i>findfeatures</i>. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Added new option <b>GEOMSOURCE=BOTH</b> to <i>findfeatures</i> to check both the MATCH and FROM/FROMLIST images for valid control measure geometry to produce better networks and prevent downstream processing errors. Ignore points that end up with no valid measures (but can be retained with use of <b>PreserveIgnoredControl</b> via GLOBALS parameterization). [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Added new gtests for <i>findfeatures</i> that replaces all the old application tests. These tests are <i>FunctionalTestFindfeaturesFastGeomDefault</i>, <i>FunctionalTestFindfeaturesFastGeomRadialConfig</i>, <i>FunctionalTestFindfeaturesFastGeomGridDefault</i> and <i>FunctionalTestFindfeaturesFastGeomGridConfig</i>. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)

### Deprecated

Expand All @@ -49,6 +58,10 @@ release.
- Updated History constructor to check for invalid BLOB before copying History BLOB to output cube [#4966](https://github.com/DOI-USGS/ISIS3/issues/4966)
- Updated photomet MinnaertEmpirical model to support photemplate-style PVL format [#3621](https://github.com/DOI-USGS/ISIS3/issues/3621)
- Fixed gaussstretch segmentation fault error and refactored gaussstretch files/tests to use gtest [#5240](https://github.com/DOI-USGS/ISIS3/issues/5240)
- Fix matrix inversion errors in <i>findfeatures</i> due to bad FASTGEOM matrix transforms using a more robust implementation to detect these errors and throw exceptions. Images with these errors are captured and logged to the <b>TONOTMATCHED</b> file. Fixes [#4639](https://github.com/DOI-USGS/ISIS3/issues/4639)
- Fixed <i>findfeatures</i> use of projected mosaics with correct check for <b>TargetName</b> in the Mapping labels. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Fixed a bug in the <i>cnetwinnow</i> test that did not clean/remove it during test runs.
- Fixed <i>findfeatures</i> instantiation and use of projection classes to correctly return geometry data from projected images and mosaics. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)

## [8.0.0] - 2023-04-19

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Group = FastGeomCommonParameters
# Defaults used for findfeatures FastGeom Algorithms

# FastGeomAlgorithm = radial
FastGeomPoints = 25
FastGeomTolerance = 3
# GeomType = camera

FastGeomQuerySampleTolerance = 0
FastGeomQueryLineTolerance = 0
FastGeomTrainSampleTolerance = 0
FastGeomTrainLineTolerance = 0

FastGeomDumpMapping = false
EndGroup = FastGeomCommonParameters


Group = FastGeomGridParameters
# FastGeomAlgorithm = grid

FastGeomGridStartIteration = 0
# FastGeomGridStopIteration = 1 to N
FastGeomGridIterationStep = 1

FastGeomTotalGridIterations = 1

FastGeomGridSaveAllPoints = false
EndGroup = FastGeomGridParameters


Group = FastGeomRadialParameters
# FastGeomAlgorithm = radial

FastGeomRadialSegmentLength = 25
FastGeomRadialPointCount = 5
FastGeomRadialPointFactor = 1.0

# FastGeomRadialSegments = N
EndGroup = FastGeomRadialParameters
End
Loading