Commit f3df16dc authored by Adam Goins's avatar Adam Goins Committed by Makayla Shepherd
Browse files

Fixed ControlMeasure unitTests

parent e529d8cf

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

+7 −7
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ int main() { 
    qDebug() << "Measure1 != Measure2   FALSE";

  }





  try {

    m.SetLogData(ControlMeasureLogData());

  }
@@ -219,16 +218,17 @@ int main() { 
//    qDebug() << "LineResidual: " << m.GetLineResidual();

//  }

//

//  qDebug() << "Log Size: " << m.LogSize();



  if (m.IsRejected()) {

    if (m.JigsawRejected()) {

  //  if (m.JigsawRejected()) {

      qDebug() << "Measure was rejected by Jigsaw.";

  }

  else {

      qDebug() << "Measure was not rejected by Jigsaw.";

  }

  }

  //}



  qDebug() << "Log Size: " << m.LogSize();

}



void outit(ControlMeasure &m) {
@@ -244,6 +244,6 @@ void outit(ControlMeasure &m) { 
  net.SetModifiedDate("Yesterday");

  net.Write("./tmp.net", true);

  Pvl tmp("./tmp.net");

  qDebug() << "Printing measure:\n" << tmp << "\nDone printing measure.";

  std::cout << "Printing measure:\n" << tmp << "\nDone printing measure." << std::endl;

  remove("./tmp.net");

}

isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp

+2 −1
Original line number Diff line number Diff line
@@ -501,7 +501,8 @@ namespace Isis { 
        }



        if ( controlPoint->HasRefMeasure() &&

           controlPoint->IndexOfRefMeasure() == j ) {

           controlPoint->IndexOfRefMeasure() == j &&

           controlPoint->IsReferenceExplicit() ) {

          pvlMeasure += PvlKeyword("Reference", "True");

        }

        pvlPoint.addGroup(pvlMeasure);