Commit 9a7ebd95 authored by Jesse Mapel's avatar Jesse Mapel
Browse files

PROG: Updated unit tests for BundleResults, BundleSettings, and... 

PROG: Updated unit tests for BundleResults, BundleSettings, and BundleSolutionInfo.  References #4192.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7022 41f8697f-d340-4b68-9986-7bafba869bb8
parent d8fdaf1d

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

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ int main(int argc, char *argv[]) { 
    observationVector.addnew(BundleImageQsp(new BundleImage(bundleImage)),

                             "ObservationNumber1",

                             "InstrumentId1",

                             BundleSettingsQsp(new BundleSettings(parent)));

                             BundleSettingsQsp(new BundleSettings()));



    results.setBundleControlPoints(bundleControlPointVector);

    results.setOutputControlNet(ControlNetQsp(new ControlNet(outNet)));

isis/src/control/objs/BundleSettings/BundleSettings.cpp

+2 −6
Original line number Diff line number Diff line
@@ -111,16 +111,13 @@ namespace Isis { 
   *

   * @param bundleSettingsFolder Where this settings XML resides - /work/.../projectRoot/images/import1

   * @param xmlReader An XML reader that's up to an <bundleSettings/> tag.

   * @param parent The Qt-relationship parent

   * 

   * @throw

   * @throw

   */

  BundleSettings::BundleSettings(FileName xmlFile,

                                 Project *project, 

                                 XmlStackedHandlerReader *xmlReader,

                                 QObject *parent)

      : QObject(parent) {

                                 XmlStackedHandlerReader *xmlReader) {





    m_id = NULL;
@@ -150,9 +147,8 @@ namespace Isis { 
  /** 

   * TODO

   * @param xmlReader An XML reader that's up to an <bundleSettings/> tag.

   * @param parent The Qt-relationship parent

   */

  BundleSettings::BundleSettings(XmlStackedHandlerReader *xmlReader, QObject *parent) {

  BundleSettings::BundleSettings(XmlStackedHandlerReader *xmlReader) {

    m_id = NULL;

    xmlReader->pushContentHandler(new XmlHandler(this));

    xmlReader->setErrorHandler(new XmlHandler(this));

isis/src/control/objs/BundleSettings/BundleSettings.h

+2 −4
Original line number Diff line number Diff line
@@ -113,10 +113,8 @@ namespace Isis { 
#if 0

      BundleSettings(FileName xmlFile,

                     Project *project, 

                     XmlStackedHandlerReader *xmlReader, 

                     QObject *parent = NULL);

      BundleSettings(XmlStackedHandlerReader *xmlReader, 

                     QObject *parent = NULL);

                     XmlStackedHandlerReader *xmlReader);

      BundleSettings(XmlStackedHandlerReader *xmlReader);

#endif

      ~BundleSettings();

      BundleSettings &operator=(const BundleSettings &other);

isis/src/control/objs/BundleSettings/BundleSettings.truth

+3 −2
Original line number Diff line number Diff line
@@ -590,12 +590,13 @@ Object = DefaultBundleSettingsFromEmptyXml 
  NetworkValidated                     = Yes

  SolveMethod                          = Sparse

  SolveObservationMode                 = No

  SolveRadius                          = No

  UpdateCubeLabel                      = No

  SolveRadius                          = Yes

  UpdateCubeLabel                      = Yes

  ErrorPropagation                     = No

  OutlierRejection                     = No

  GlobalLatitudeAprioriSigma           = None

  GlobalLongitudeAprioriSigma          = None

  GlobalRadiiAprioriSigma              = None

  ConvergenceCriteria                  = Sigma0

  ConvergenceCriteriaThreshold         = 1.0e-10

  ConvergenceCriteriaMaximumIterations = 50

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

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ int main(int argc, char *argv[]) { 
  try {

    qDebug() << "Unit test for BundleSettings...";

    qDebug() << "Printing PVL group with settings from the default constructor...";

    QObject *parent = NULL;

    BundleSettings settings(parent);

    BundleSettings settings;

    // tested fully by each call to pvlObject()

    //      bool validateNetwork() const;

    //      SolveMethod solveMethod() const;