Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. #5356
Conversation
This file contains 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
…etthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses DOI-USGS#5354.
|
I think one of the implications of #5308 is that when doing app conversions, they would have to be done separately from a bug fix for consistency. As this is technically two adds: app conversion + bug fix. It'll be adopted next week so we dont have to split this one up ASAP. Just know in the future we would reject the PR and request that the changes are split. |
Kelvinrr
approved these changes
Dec 1, 2023
AustinSanders
added a commit
that referenced
this pull request
Dec 6, 2023
* Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (#5356) * Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses #5354. * Updated CHANGELOG.md. Addresses #5354. * Minor change to cnetthinner.xml. Addresses #5354. * Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format. Fixes #3621. (#5175) * Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format * Updated CHANGELOG * Dawn Target Translation Fix (#5294) * Fixes dawn target translation for CERES images * Added Changelog entry * CSM Camera Qview Try Catches (#5295) * Fix errors when using CSM camera in qview * Added Changelog entry * Fixes CSV parsing in shadowtau (#5316) * Fixes CSV parsing in shadowtau * Addressed PR feedback * Error Report Fix for Program Launcher (#5331) * Removed line that gets class, it is derived from the code * Added more detailed error around itime not finding the leapsecond kernel * Added changelog entry * Updated trimfilter to correctly use high/low filters (#5340) * Added high/low filters to trimfilter * Updated changelog * Updated changelog --------- Co-authored-by: acpaquette <[email protected]> * corrected calibration inclusion filter (needed ,) (#5357) * corrected calibration inclusion filter (needed ,) * changelog entry downloadIsisData fix * Updated changelog * Updated changelog * Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (#5356) * Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses #5354. * Updated CHANGELOG.md. Addresses #5354. * Minor change to cnetthinner.xml. Addresses #5354. * The cnetedit application has been refactored to be callable; Makefile tests have been removed and replaced by gtests (#5348) * The cnetedit application has been refactored to be callable; Makefile tests have been migrated to gtest format. Addresses #5346. * Removed extraneous variables from FunctionalTestsCnetedit.cpp. Addresses #5346. * Updated gtests; replace cubes with labels. Addresses #5346. * Per review cleaned up sloppy spacing; made global variables static in cnetedit.cpp to avoid issues when linking libisis. Addresses #5346. * The cnetdiff application has been refactored to be callable; Makefile tests have been removed and replaced by gtests. (#5323) * The cnetedit applciation has been refactored to be callable; Makefile tests have been removed and replace by gtests. Addresses #5322. * Moved CHANGELOG.md entry for cnetdiff changes from "Added" section to "Changed" section per reviewer suggestion. Addresses #5322. * Reverted back to original ControlNetDiff source and header files per reviewer suggestion. Addresses #5322. * Changes to cnetdiff.cpp and main.cpp to use the addLogGroup method to add PvlGroups to Pvl. Per reviewer suggestion. Addresses #5322. * Put back line erroneously removed in CHANGELOG.md, per review. Addresses #5322. * Version ticks * Updated changelog * Updated changelog --------- Co-authored-by: kledmundson <[email protected]> Co-authored-by: Christine Kim <[email protected]> Co-authored-by: acpaquette <[email protected]> Co-authored-by: Jacob Cain <[email protected]>
acpaquette
added a commit
to acpaquette/ISIS3
that referenced
this pull request
Mar 29, 2024
* Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (DOI-USGS#5356) * Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses DOI-USGS#5354. * Updated CHANGELOG.md. Addresses DOI-USGS#5354. * Minor change to cnetthinner.xml. Addresses DOI-USGS#5354. * Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format. Fixes DOI-USGS#3621. (DOI-USGS#5175) * Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format * Updated CHANGELOG * Dawn Target Translation Fix (DOI-USGS#5294) * Fixes dawn target translation for CERES images * Added Changelog entry * CSM Camera Qview Try Catches (DOI-USGS#5295) * Fix errors when using CSM camera in qview * Added Changelog entry * Fixes CSV parsing in shadowtau (DOI-USGS#5316) * Fixes CSV parsing in shadowtau * Addressed PR feedback * Error Report Fix for Program Launcher (DOI-USGS#5331) * Removed line that gets class, it is derived from the code * Added more detailed error around itime not finding the leapsecond kernel * Added changelog entry * Updated trimfilter to correctly use high/low filters (DOI-USGS#5340) * Added high/low filters to trimfilter * Updated changelog * Updated changelog --------- Co-authored-by: acpaquette <[email protected]> * corrected calibration inclusion filter (needed ,) (DOI-USGS#5357) * corrected calibration inclusion filter (needed ,) * changelog entry downloadIsisData fix * Updated changelog * Updated changelog * Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (DOI-USGS#5356) * Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses DOI-USGS#5354. * Updated CHANGELOG.md. Addresses DOI-USGS#5354. * Minor change to cnetthinner.xml. Addresses DOI-USGS#5354. * The cnetedit application has been refactored to be callable; Makefile tests have been removed and replaced by gtests (DOI-USGS#5348) * The cnetedit application has been refactored to be callable; Makefile tests have been migrated to gtest format. Addresses DOI-USGS#5346. * Removed extraneous variables from FunctionalTestsCnetedit.cpp. Addresses DOI-USGS#5346. * Updated gtests; replace cubes with labels. Addresses DOI-USGS#5346. * Per review cleaned up sloppy spacing; made global variables static in cnetedit.cpp to avoid issues when linking libisis. Addresses DOI-USGS#5346. * The cnetdiff application has been refactored to be callable; Makefile tests have been removed and replaced by gtests. (DOI-USGS#5323) * The cnetedit applciation has been refactored to be callable; Makefile tests have been removed and replace by gtests. Addresses DOI-USGS#5322. * Moved CHANGELOG.md entry for cnetdiff changes from "Added" section to "Changed" section per reviewer suggestion. Addresses DOI-USGS#5322. * Reverted back to original ControlNetDiff source and header files per reviewer suggestion. Addresses DOI-USGS#5322. * Changes to cnetdiff.cpp and main.cpp to use the addLogGroup method to add PvlGroups to Pvl. Per reviewer suggestion. Addresses DOI-USGS#5322. * Put back line erroneously removed in CHANGELOG.md, per review. Addresses DOI-USGS#5322. * Version ticks * Updated changelog * Updated changelog --------- Co-authored-by: kledmundson <[email protected]> Co-authored-by: Christine Kim <[email protected]> Co-authored-by: acpaquette <[email protected]> Co-authored-by: Jacob Cain <[email protected]>
acpaquette
added a commit
that referenced
this pull request
Mar 29, 2024
* Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (#5356) * Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses #5354. * Updated CHANGELOG.md. Addresses #5354. * Minor change to cnetthinner.xml. Addresses #5354. * Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format. Fixes #3621. (#5175) * Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format * Updated CHANGELOG * Dawn Target Translation Fix (#5294) * Fixes dawn target translation for CERES images * Added Changelog entry * CSM Camera Qview Try Catches (#5295) * Fix errors when using CSM camera in qview * Added Changelog entry * Fixes CSV parsing in shadowtau (#5316) * Fixes CSV parsing in shadowtau * Addressed PR feedback * Error Report Fix for Program Launcher (#5331) * Removed line that gets class, it is derived from the code * Added more detailed error around itime not finding the leapsecond kernel * Added changelog entry * Updated trimfilter to correctly use high/low filters (#5340) * Added high/low filters to trimfilter * Updated changelog * Updated changelog --------- Co-authored-by: acpaquette <[email protected]> * corrected calibration inclusion filter (needed ,) (#5357) * corrected calibration inclusion filter (needed ,) * changelog entry downloadIsisData fix * Updated changelog * Updated changelog * Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (#5356) * Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses #5354. * Updated CHANGELOG.md. Addresses #5354. * Minor change to cnetthinner.xml. Addresses #5354. * The cnetedit application has been refactored to be callable; Makefile tests have been removed and replaced by gtests (#5348) * The cnetedit application has been refactored to be callable; Makefile tests have been migrated to gtest format. Addresses #5346. * Removed extraneous variables from FunctionalTestsCnetedit.cpp. Addresses #5346. * Updated gtests; replace cubes with labels. Addresses #5346. * Per review cleaned up sloppy spacing; made global variables static in cnetedit.cpp to avoid issues when linking libisis. Addresses #5346. * The cnetdiff application has been refactored to be callable; Makefile tests have been removed and replaced by gtests. (#5323) * The cnetedit applciation has been refactored to be callable; Makefile tests have been removed and replace by gtests. Addresses #5322. * Moved CHANGELOG.md entry for cnetdiff changes from "Added" section to "Changed" section per reviewer suggestion. Addresses #5322. * Reverted back to original ControlNetDiff source and header files per reviewer suggestion. Addresses #5322. * Changes to cnetdiff.cpp and main.cpp to use the addLogGroup method to add PvlGroups to Pvl. Per reviewer suggestion. Addresses #5322. * Put back line erroneously removed in CHANGELOG.md, per review. Addresses #5322. * Version ticks * Updated changelog * Updated changelog --------- Co-authored-by: kledmundson <[email protected]> Co-authored-by: Christine Kim <[email protected]> Co-authored-by: acpaquette <[email protected]> Co-authored-by: Jacob Cain <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
The calculateStrength method in CnetManager.cpp computes point strength as the sum of all the points' measures "goodness of fit" values divided by the number of measures with "goodness of fit" values. Strength is not computed at all for points with less than two unignored measures, not including the reference measure. If all unignored measures have no "goodness of fit" values, then the strength computation results in a divide by zero. This change fixes the divide by zero.Further, cnetthinner has been converted to a callable application; old-style ISIS Makefile tests have been removed and replaced with google tests; and test data has been moved to the /isis/tests/data/cnetthinner folder.
Related Issue
https://github.com//issues/5354How Has This Been Validated?
ISIS make file tests have been replaced with the following gtests.
Results of ctest suite...
ctest -R Cnetthinner --output-on-failure
Test project /Users/kledmundson/ISISDev/cnetthinner/Aug032023/ISIS3/build
Start 1800: Cnetthinner.FunctionalTestCnetthinnerEmptyControlNet
1/6 Test #1800: Cnetthinner.FunctionalTestCnetthinnerEmptyControlNet ... Passed 1.24 sec
Start 1801: Cnetthinner.FunctionalTestCnetthinnerDefault
2/6 Test #1801: Cnetthinner.FunctionalTestCnetthinnerDefault ........... Passed 1.52 sec
Start 1802: Cnetthinner.FunctionalTestCnetthinnerIgnoreOrRemove
3/6 Test #1802: Cnetthinner.FunctionalTestCnetthinnerIgnoreOrRemove .... Passed 3.03 sec
Start 1803: Cnetthinner.FunctionalTestCnetthinnerMinMaxPoints
4/6 Test #1803: Cnetthinner.FunctionalTestCnetthinnerMinMaxPoints ...... Passed 3.53 sec
Start 1804: Cnetthinner.FunctionalTestCnetthinnerTolerance
5/6 Test #1804: Cnetthinner.FunctionalTestCnetthinnerTolerance ......... Passed 3.54 sec
Start 1805: Cnetthinner.FunctionalTestCnetthinnerWeight
6/6 Test #1805: Cnetthinner.FunctionalTestCnetthinnerWeight ............ Passed 4.54 sec
100% tests passed, 0 tests failed out of 6
Total Test time (real) = 17.60 sec
Types of changes
Checklist:
Licensing
This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words: