Commit afd5a1e8 authored by AustinSanders's avatar AustinSanders Committed by Jesse Mapel
Browse files

Added and tested functionality for 'N/A' stats calculation. (#3895) 

* Added and tested functionality for 'N/A' stats calculation.

* Added changelog and updated style to conform with isis standards.
parent 38ac58de

isis/src/base/apps/stats/stats.cpp

+15 −4
Original line number Diff line number Diff line
@@ -134,6 +134,17 @@ namespace Isis { 
        results += PvlKeyword("Maximum", toString(stats->Maximum()));

        results += PvlKeyword("Sum", toString(stats->Sum()));

      }

      else {

        results += PvlKeyword("Average", "N/A");

        results += PvlKeyword("StandardDeviation", "N/A");

        results += PvlKeyword("Variance", "N/A");

        results += PvlKeyword("Median", "N/A");

        results += PvlKeyword("Mode", "N/A");

        results += PvlKeyword("Skew", "N/A");

        results += PvlKeyword("Minimum", "N/A");

        results += PvlKeyword("Maximum", "N/A");

        results += PvlKeyword("Sum", "N/A");

      }

      results += PvlKeyword("TotalPixels", toString(stats->TotalPixels()));

      results += PvlKeyword("ValidPixels", toString(stats->ValidPixels()));

      results += PvlKeyword("OverValidMaximumPixels", toString(stats->OverRangePixels()));

isis/src/base/apps/stats/stats.xml

+43 −40
Original line number Diff line number Diff line
@@ -140,6 +140,9 @@ Sum High instrument saturation (HIS) pixels 
      general edits for clarity. Also added undocumented output statistics

      to the list in the description.

    </change>

    <change name="Austin Sanders" date="2020-06-04">

      Updated to fill columns with N/A in cases where images contained only

      special or invalid pixels.

  </history>



  <oldName>

isis/tests/statsTests.cpp

+9 −0
Original line number Diff line number Diff line
@@ -134,6 +134,15 @@ TEST_F(stats_MockHist, TestStats) { 
  EXPECT_EQ(1, (int) (band2Stats.findKeyword("LrsPixels")));

  EXPECT_EQ(1, (int) (band2Stats.findKeyword("HisPixels")));

  EXPECT_EQ(1, (int) (band2Stats.findKeyword("HrsPixels")));

  EXPECT_TRUE("N/A" == (band2Stats.findKeyword("Average")));

  EXPECT_TRUE("N/A" == (band2Stats.findKeyword("StandardDeviation")));

  EXPECT_TRUE("N/A" == (band2Stats.findKeyword("Variance")));

  EXPECT_TRUE("N/A" == (band2Stats.findKeyword("Median")));

  EXPECT_TRUE("N/A" == (band2Stats.findKeyword("Mode")));

  EXPECT_TRUE("N/A" == (band2Stats.findKeyword("Skew")));

  EXPECT_TRUE("N/A" == (band2Stats.findKeyword("Minimum")));

  EXPECT_TRUE("N/A" == (band2Stats.findKeyword("Maximum")));

  EXPECT_TRUE("N/A" == (band2Stats.findKeyword("Sum")));

}



TEST(stats, ValidMinimum) {