Unverified Commit b96d6b20 authored by Tim Giroux's avatar Tim Giroux Committed by GitHub
Browse files

fix extra comma and update tests (#4398)

parent b5720312

isis/src/control/objs/ControlNetFilter/ControlNetFilter.cpp

+5 −5
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ namespace Isis { 
   * @author Sharmila Prasad (8/31/2010)

   */

  void ControlNetFilter::CubeStatsHeader(void) {

    mOstm << "FileName, SerialNumber, ImageTotalPoints, ImagePointsIgnored, ImagePointsEditLocked, ImagePointsFixed, ImagePointsConstrained, ImagePointsFree, ImageConvexHullRatio,";

    mOstm << "FileName, SerialNumber, ImageTotalPoints, ImagePointsIgnored, ImagePointsEditLocked, ImagePointsFixed, ImagePointsConstrained, ImagePointsFree, ImageConvexHullRatio";

  }



  /**
@@ -198,7 +198,7 @@ namespace Isis { 
    }



    if (pbLastFilter) {

      mOstm << "PointID, PointType, PointIgnored, PointEditLocked, FileName, SerialNumber, PixelShift, MeasureType, MeasureIgnored, MeasureEditLocked, Reference, ";

      mOstm << "PointID, PointType, PointIgnored, PointEditLocked, FileName, SerialNumber, PixelShift, MeasureType, MeasureIgnored, MeasureEditLocked, Reference";

      mOstm << endl;

    }
@@ -386,7 +386,7 @@ namespace Isis { 
    }



    if (pbLastFilter) {

      mOstm << "PointID, PointType, PointIgnored, PointEditLocked, FileName, SerialNumber, ResidualMagnitude, MeasureType, MeasureIgnored, MeasureEditLocked, Reference, ";

      mOstm << "PointID, PointType, PointIgnored, PointEditLocked, FileName, SerialNumber, ResidualMagnitude, MeasureType, MeasureIgnored, MeasureEditLocked, Reference";

      mOstm << endl;

    }
@@ -1037,7 +1037,7 @@ namespace Isis { 
    if (pbLastFilter) {

      PointStatsHeader();

      CubeStatsHeader();

      mOstm << "ImageMeasureIgnored, ImageMeasureEditLocked, ";

      mOstm << ", ImageMeasureIgnored, ImageMeasureEditLocked";

      mOstm << endl;

    }
@@ -1314,7 +1314,7 @@ namespace Isis { 


    if (pbLastFilter) {

      CubeStatsHeader();

      mOstm << "Distance_PointIDs >>, " << endl;

      mOstm << ", Distance_PointIDs >>, " << endl;

    }



    int iNumCubes = mSerialNumFilter.size();

isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ namespace Isis { 
      throw IException(IException::Io, msg, _FILEINFO_);

    }



    ostm << " PointId, PointType, PointIgnore, PointEditLock, TotalMeasures, MeasuresValid, MeasuresIgnore, MeasuresEditLock," << endl;

    ostm << " PointId, PointType, PointIgnore, PointEditLock, TotalMeasures, MeasuresValid, MeasuresIgnore, MeasuresEditLock" << endl;



    int iNumPoints = mCNet->GetNumPoints();

isis/tests/FunctionalTestsCnetstats.cpp

+2 −6
Original line number Diff line number Diff line
@@ -109,9 +109,7 @@ TEST_F(ThreeImageNetwork, FunctionalTestCnetstatsPointStats) { 
    QStringList values = line.split(",");



    if(lineNumber == 0) {

      // The output adds a comma at the end of the first line, increasing the size by 1.

      // This is a bug in ControlNetStatistics. Once that is fixed, this test wil fail.

      ASSERT_DOUBLE_EQ(values.size() - 1, 8);

      ASSERT_DOUBLE_EQ(values.size() - 1, 7);

    }

    else {

      ASSERT_DOUBLE_EQ(values.size(), 8);
@@ -151,9 +149,7 @@ TEST_F(ThreeImageNetwork, FunctionalTestCnetstatsCubeFilter) { 
    QStringList values = line.split(",");



    if(lineNumber == 0) {

      // The output adds a comma at the end of the first line, increasing the size by 1.

      // This is a bug in ControlNetFilter. Once that is fixed, this test wil fail.

      ASSERT_DOUBLE_EQ(values.size() - 1, 9);

      ASSERT_DOUBLE_EQ(values.size() - 1, 8);

    }

    else {

      ASSERT_DOUBLE_EQ(values.size(), 9);