Commit a8ad01f4 authored by Ken Edmundson's avatar Ken Edmundson
Browse files

mods to unit tests and removall of setRadii calls

parent 96316417

isis/src/base/objs/LidarData/unitTest.cpp

+0 −4
Original line number Diff line number Diff line
@@ -109,12 +109,8 @@ int main(int argc, char *argv[]) { 
    SurfacePoint sp2(Latitude(latAd, Angle::Units::Degrees),

                    Longitude(lonAd, Angle::Units::Degrees),

                    Distance(radAd, Distance::Units::Kilometers));

    sp.SetRadii(Distance(1000.0, Distance::Meters), Distance(1000.0, Distance::Meters),

                Distance(1000.0, Distance::Meters));

    sp.SetSphericalMatrix(aprioriMatrix);

    lcp->SetAprioriSurfacePoint(sp);

    sp2.SetRadii(Distance(1000.0, Distance::Meters), Distance(1000.0, Distance::Meters),

                Distance(1000.0, Distance::Meters));

    sp2.SetSphericalMatrix(adjustedMatrix);

    lcp->SetAdjustedSurfacePoint(sp2);

    for (int j = 0; j < 2; j++) {

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

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ void outputConstraint(BundlePolynomialContinuityConstraint &constraint) { 
             << constraint.numberConstraintEquations();

    qDebug() << "";

    qDebug() << "Normals matrix: ";

    qDebug() << constraint.normalsMatrix();

    qDebug() << constraint.normalsCkMatrix();

    qDebug() << "";

    qDebug() << "Right hand side vector: ";

    qDebug() << constraint.rightHandSideVector();

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

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


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

    qDebug() << "XML from the default constructor...";

    QObject *parent = NULL;

    BundleResults results(parent);

    BundleResults results;



    printXml(results);

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp

+27 −1
Original line number Diff line number Diff line
@@ -30,6 +30,32 @@ 


namespace Isis {



  /**

   * Constructor. Creates a BundleSolutionInfo.

   *

   * @param inputSettings The settings saved in BundleSolutionInfo

   * @param controlNetworkFileName The file name and path of the control network

   * @param outputStatistics The results of the BundleAdjust

   * @param parent The Qt-relationship parent

   */

  BundleSolutionInfo::BundleSolutionInfo(BundleSettingsQsp inputSettings,

                                         FileName controlNetworkFileName,

                                         BundleResults outputStatistics,

                                         QList<ImageList *> imgList,

                                         QObject *parent) : QObject(parent) {

    m_id = new QUuid(QUuid::createUuid());

    m_runTime = "";

    m_name = m_runTime;

    m_inputControlNetFileName = new FileName(controlNetworkFileName);

    m_outputControl = NULL;

    m_outputLidarDataSet = NULL;

    m_settings = inputSettings;

    m_statisticsResults = new BundleResults(outputStatistics);

    m_images = new QList<ImageList *>(imgList);

    m_adjustedImages = new QList<ImageList *>;

  }





  /**

   * Constructor. Creates a BundleSolutionInfo.

   *

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h

+5 −0
Original line number Diff line number Diff line
@@ -159,6 +159,11 @@ namespace Isis { 
  class BundleSolutionInfo : public QObject {

    Q_OBJECT

    public:

      BundleSolutionInfo(BundleSettingsQsp inputSettings,

                    FileName controlNetworkFileName,

                    BundleResults outputStatistics,

                    QList<ImageList *> imgList,

                    QObject *parent = 0);

      BundleSolutionInfo(BundleSettingsQsp inputSettings,

                    FileName controlNetworkFileName,

                    FileName lidarDataFileName,