Get jigsaw tests passing on csmbundle branch #4413

kberryUSGS · 2021-04-21T20:08:28Z

Description

With this update all old-format jigsaw app tests pass and also the new-format jigsaw tests pass.
One Bundle-class unit test is still failing:

isis_unit_test_BundleSolutionInfo (Failed)

Notes:

I left the corrections, weights, adjustedsigmas, and apriorisigmas in BundleObservation for now. I think eventually they can probably come out and remain only in the parent class, but I didn't get around to getting this working.
I removed all the large blocks of code that were already commented out in the Bundle classes I updated. My feeling was that if we we want to ultimately keep these sections of commented-out code, we can add them back in when the re-designed code is a bit more mature.
Needed to keep SolveSettings in AbstractBundleObservation for BundleMeasure to compile, but I ultimately think it only belongs in the child classes.
I left comments in BundleObservationVector about things that need to be changed for ISIS vs. CSM observations, but these changes are not implemented.

Related Issue

#4410

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Documentation change (update to the documentation; no code change)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

I have read and agree to abide by the Code of Conduct
I have read the CONTRIBUTING document.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have added tests to cover my changes.
All new and existing tests passed.
I have added myself to the .zenodo.json document.
I have added any user impacting changes to the CHANGELOG.md document.

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:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

kberryUSGS · 2021-04-21T20:12:26Z

isis/src/control/objs/BundleUtilities/AbstractBundleObservation.cpp

@@ -345,6 +330,8 @@ QString AbstractBundleObservation::formatBundleOutputString(bool errorPropagatio
   */
  QString AbstractBundleObservation::bundleOutputCSV(bool errorPropagation) {
    // different in both
+    // TODO: either remove or update. 
+    return "Test";


Do you think it's at all realistic to have something working for this at the parent class level, or should I just pull these out of this class?

We can just make these functions pure virtual in the parent

kberryUSGS · 2021-04-21T20:12:36Z

isis/src/control/objs/BundleUtilities/AbstractBundleObservation.cpp

@@ -317,6 +300,8 @@ namespace Isis {
 */
 QString AbstractBundleObservation::formatBundleOutputString(bool errorPropagation, bool imageCSV) {
  // different for both
+  // TODO: either remove or update. 
+  return "Test";


Do you think it's at all realistic to have something working for this at the parent class level, or should I just pull these out of this class?

Same as CSV output, we can just make these pure virtual

* Add virtuals to AbstractBundleObservation and get compiling again * Remove function from parent * Get existing jigsaw tests passing * Remove unneeded functions from BundleObservation * Clean up a bit more * Clean up BundleObservation and AbstractBundleObservation more * Remove unneeded BodyRotation * Add target body solve back into bundle adjusment calc * Remove debug output * Removed unneeded memeber variables BundleObservation Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov>

* copylab * Initial work toward a working AbstractBundleObservation class * Fix accidentl add of temporary changes from another project * Trial 2 on fixing my accidental changes * csm bundle building properly (#4409) * Updates for linking and compiling * Starting virtual functions * Add virtuals to AbstractBundleObservation and get compiling again * Remove function from parent * Get jigsaw tests passing on csmbundle branch (#4413) * Add virtuals to AbstractBundleObservation and get compiling again * Remove function from parent * Get existing jigsaw tests passing * Remove unneeded functions from BundleObservation * Clean up a bit more * Clean up BundleObservation and AbstractBundleObservation more * Remove unneeded BodyRotation * Add target body solve back into bundle adjusment calc * Remove debug output * Removed unneeded memeber variables BundleObservation Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Move some functions to pure virtual * Csmobservation (#4419) * Now compiling * Updated CSMCamera tests and docs * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Added required headers from removed ground map header (#4427) * last missing header (#4428) * Moved CSM settings into BOSS * Generates Serial Numbers using CSM label information (#4437) * Creates Serial Numbers using CSM label information * Updated second SerialNumberList:add function to accommodate CSM label * Add hooks for csm bundle settings to jigsaw (#4438) * In progress * Added tests and Pvl support * Add missing 'y' to docs Co-authored-by: Kristin Berry <kberry@usgs.gov> * Moves partial calculation into CSM and ISIS observation classes. (#4436) * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Imagecoeff migrated into BundleObservation class working * Get base level working for all coeffs in ISIS * Fix accidental move into if statement to get tests passing again * Updated RHS for CsmBundleObservation to work * Adds point3D support to CSM Camera observations and also adds ground Partials member function to CSMCamera * Draft of sensor partials code * Add docs, some fixes based on review requests * move computation of weights and observation values to bundle observations * Add observationvalue function to CsmBundleObservation and move the weighting that it is possible to to the observation classes * Make CSMSolveSet an optional parameter to get jigsaw tests passing again * cleanup * Move observation weights into MLE if block Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Implemented bundleOutputString for CSM (#4444) * Added test for CSM bundleOutputString * Passing unit test and updates to bundleOutputString * Addressed PR feedback * Csmcsv (#4446) * CSM CSV output * Small test clean-up * typo fix * obs header fix * Remove param list from bo * Added debug output * Now reurning * Fixed unit test * xml save test update * Clean up bundleresults unit test output * Fixed qfile member * Fixed old path * Changed header to use param names * Making separate csvs * Added reverse on obs by instId * Trying to fix multiple sensors * Fixed images header * More debug * removed debug outs * Added terrible imageindex search * Added held config fix * Updated for observation test * Updated jigsaw test makefiles * Updated with new tests * Updates Bundle Observation Vector to support Csm observations. (#4457) * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Imagecoeff migrated into BundleObservation class working * Get base level working for all coeffs in ISIS * Fix accidental move into if statement to get tests passing again * Updated RHS for CsmBundleObservation to work * Adds point3D support to CSM Camera observations and also adds ground Partials member function to CSMCamera * Draft of sensor partials code * Add docs, some fixes based on review requests * move computation of weights and observation values to bundle observations * Add observationvalue function to CsmBundleObservation and move the weighting that it is possible to to the observation classes * Make CSMSolveSet an optional parameter to get jigsaw tests passing again * cleanup * Move observation weights into MLE if block * Added isis vs. csm support to Bundle Observation Vector class to allow jigsaw to proceed past the setup stage for csm networks * Comment cleanup * Fix failing unit tests * Add docs * Updated based on feedback with potentially temporary fix to get unit tests passing * Update tests a bit * Aligned signature definitions and cleaned up * remove unneeded functions * More comment cleanup Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Jigsaw Test Conversions (sccconfig, scconfigHeld, radar) (#4463) * Converted jigsaw scconfig tests. * Added jigsaw radar test * Updated tests to reflect PR #4446 changes & removed makefile tests * Updates to scconfig tests * Gets csm bundle converging (#4464) * Added cam type checks * checking csm partials * Debug partials * debug corrections * Fixed index * Scaled ground partials * Updated param comparison * Removed debug out * Fixes spacing issue in CSM bundleout.txt (#4465) * Update csm bundlout to have correct spacing for paramter names * Reverted unintential change Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Removed unit-test specific changes I made to the code instead of the unit test * Add latitudinal partials for CSM (#4468) * Add latitudinal partials for CSM * Added test Co-authored-by: Jesse Mapel <jmapel@usgs.gov> * Csm clean up (#4483) * Added cms index list error * Added CSMCameraTests for partials * Observation clean-up * Cleaned up vector * Rename BundleObservation classes (#4518) * rename BundleObservation classes * omit changes to sip wrappers * Adds more capabilities to TestCsmModel (#4527) * Updated to get new isd/state form to test jigsaw parsing * Add functional image-to-ground, ground-to-image, and isd-parsing to TestCsmModel * Remove temporary csminit test changes * Updated variable name for clarity * add csm info to app docs for csminit and jigsaw * Csmbundle - remove SIP wrappers and deprecated formatBundleOutputString (#4526) * remove sip wrappers * remove deprecated formatBundleOutputString * remove more sip code and formatBundleOutputString * Fix functional tests to work with updated TestCsmModel (#4534) * Tests + test data for CSM jigsaw (#4530) * Removed debug couts * Added csmnetwork test fixture * Added a test for CSM test network * Adjusted trig functions + added deg/rad conversions * Initial CSMNetwork data * Uncommented code * Removed network path and control network from CSMNetwork fixture * Removed temporary path from csv comparison * Adjusted spacing + responded to PR feedback Co-authored-by: Austin Sanders <arsanders@ugs.gov> * Added the ability to update CSM model state in jigsaw (#4529) * Added the ability to update CSM model state in jigsaw * Added missing function docs * Updated CSM jigsaw test to check apply * Wrangled up an F * Added changelog entry * General clean-up * Changed Camera local photometric calculations to not use bodyrotation * Changed csm camera to save look on non-intersection * Fixed docs typos Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> Co-authored-by: Kristin Berry <kberry@usgs.gov> Co-authored-by: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com> Co-authored-by: Tim Giroux <62255438+tgiroux@users.noreply.github.com> Co-authored-by: Tim Giroux <tgiroux@contractor.usgs.gov> Co-authored-by: AustinSanders <arsanders@usgs.gov> Co-authored-by: Austin Sanders <arsanders@ugs.gov>

Kristin Berry added 3 commits April 20, 2021 09:47

Add virtuals to AbstractBundleObservation and get compiling again

7e07b61

Remove function from parent

5fc2366

Get existing jigsaw tests passing

6b4352f

kberryUSGS requested a review from jessemapel April 21, 2021 20:08

kberryUSGS commented Apr 21, 2021

View reviewed changes

Kristin Berry added 8 commits April 21, 2021 13:20

Remove unneeded functions from BundleObservation

0b589b4

Try to fix weird merge issue

8b755a4

Clean up a bit more

7efccba

Clean up BundleObservation and AbstractBundleObservation more

70c0303

Remove unneeded BodyRotation

fb4dbc9

Add target body solve back into bundle adjusment calc

9a48568

Remove debug output

f3f3696

Removed unneeded memeber variables BundleObservation

dbfc467

kberryUSGS changed the title ~~Get (most of) jigsaw tests passing~~ Get jigsaw tests passing on csmbundle branch Apr 22, 2021

jessemapel approved these changes Apr 22, 2021

View reviewed changes

jessemapel merged commit 7c4eb80 into DOI-USGS:csmbundle Apr 22, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Get jigsaw tests passing on csmbundle branch #4413

Get jigsaw tests passing on csmbundle branch #4413

kberryUSGS commented Apr 21, 2021 •

edited

Loading

kberryUSGS Apr 21, 2021

jessemapel Apr 22, 2021

kberryUSGS Apr 21, 2021

jessemapel Apr 22, 2021

Get jigsaw tests passing on csmbundle branch #4413

Get jigsaw tests passing on csmbundle branch #4413

Conversation

kberryUSGS commented Apr 21, 2021 • edited Loading

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

Licensing

kberryUSGS Apr 21, 2021

Choose a reason for hiding this comment

jessemapel Apr 22, 2021

Choose a reason for hiding this comment

kberryUSGS Apr 21, 2021

Choose a reason for hiding this comment

jessemapel Apr 22, 2021

Choose a reason for hiding this comment

kberryUSGS commented Apr 21, 2021 •

edited

Loading