Commit 6ca95649 authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Updated BundleResults unitTest. Attempting to initialize the exterior... 

Updated BundleResults unitTest. Attempting to initialize the exterior orientation for an image without a camera will now return false, instead of seg faulting.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/PiecewisePolynomials@8251 41f8697f-d340-4b68-9986-7bafba869bb8
parent 0acc110b

isis/src/control/objs/BundleResults/BundleResults.truth

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ Testing mutator methods... 
</bundleResults> 





Number of continuity constraints: 3



Testing more computation methods...

sigma0 =  "1.2139539573338"

isis/src/control/objs/BundleResults/unitTest.cpp

+6 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ int main(int argc, char *argv[]) { 
    results.incrementNumberConstrainedImageParameters(10);

    results.resetNumberConstrainedTargetParameters();

    results.incrementNumberConstrainedTargetParameters(2);

    results.setNumberContinuityConstraintEquations(3);

    results.setNumberUnknownParameters(13);

    results.setDegreesOfFreedom(14.0);

    results.setSigma0(15.0);
@@ -190,8 +191,13 @@ int main(int argc, char *argv[]) { 
    results.setRadiansToMeters(23.68);

    results.setIterations(6);

    printXml(results);

    qDebug() << "Number of continuity constraints:"

             << results.numberContinuityConstraintEquations();

    qDebug() << "";



    // Reset this back to 0 for computation methods

    results.setNumberContinuityConstraintEquations(0);



    qDebug() << "Testing more computation methods...";

    results.computeSigma0(28.0, BundleSettings::Sigma0);

    // 28 / 14

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

+7 −1
Original line number Diff line number Diff line
@@ -400,6 +400,9 @@ namespace Isis { 
      // loop over images in this observation

      for (int i = 0; i < size(); i++) {

        BundleImageQsp image = at(i);

        if ( !image->camera() ) {

          return false;

        }

        SpicePosition *spicePosition = image->camera()->instrumentPosition();



        // set number of position segments in images spice position
@@ -455,6 +458,9 @@ namespace Isis { 
      // loop over images in this observation

      for (int i = 0; i < size(); i++) {

        BundleImageQsp image = at(i);

        if ( !image->camera() ) {

          return false;

        }

        SpiceRotation *spiceRotation = image->camera()->instrumentRotation();



        // set number of rotation segments in images spice position

isis/src/control/objs/BundleUtilities/BundleObservation.h

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ namespace Isis { 
   *                               void applyContinuityConstraints

   *   @history 2017-10-11 Jesse Mapel - Modified output string methods to account for

   *                           piecewise polynomials.

   *   @history 2017-10-12 Jesse Mapel - Initialize exterior orientation will now return false

   *                           if one of the images has a null camera pointer.

   *

   */

  class BundleObservation : public QVector<QSharedPointer<BundleImage> > {