Unverified Commit 802f50a6 authored by Kaitlyn Lee's avatar Kaitlyn Lee Committed by GitHub
Browse files

Refactored and added cnetstats tests (#3702) 



* Abstracted cnetstats.

* Added default test for cnetstats and cleaned up imports.

* Added more tests.

* Added exception tests.

* Removed unnecessary tests.

* Removed old makefiles.

* Added docstrings and renamed test.

* Added temp dir for test files (#3692)

* Added temp dir for test files

* Moved to fixture inheritance

* Added valid check

* Updated tests to use new fixtures

* Fixed build errors

* Fixed build warning

* Updated winnow test

* updated tests to pass

Co-authored-by: default avatarJesse Mapel <jam826@nau.edu>
Co-authored-by: default avatarKelvin Rodriguez <kr788@nau.edu>
parent 25a59eeb

isis/src/base/objs/Spice/Spice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1376,7 +1376,7 @@ namespace Isis { 
      return;

    }



    if (m_usingAle || !m_usingNaif) {

    if (m_usingAle) {

      double og_time = m_bodyRotation->EphemerisTime();  

      m_bodyRotation->SetEphemerisTime(et.Et());

      m_sunPosition->SetEphemerisTime(et.Et());

isis/src/control/apps/cnetstats/cnetstats.cpp

0 → 100644
+233 −0
Original line number Diff line number Diff line 
#include "IsisDebug.h"



#include "cnetstats.h"

#include "ControlNetFilter.h"

#include "ControlNetStatistics.h"

#include "IException.h"

#include "PvlGroup.h"

#include "Progress.h"



using namespace std;

namespace Isis{

  void ReadDefFile(ControlNetFilter & pcNetFilter, Pvl & pvlDefFile);

  void (ControlNetFilter::*GetPtr2Filter(const QString sFilter)) (const PvlGroup & pvlGrp, bool pbLastFilter);



    /**

    * Default method for cnetstats that takes a UI object from the

    * application, parses the necessary UI elements and prints stats

    * on the control network.

    *

    *

    * @param ui UserInterface object generated using the cnetstats.xml file.

    *

    * @param progress A progress object for the UI to get progress reports

    *                 through.

    */

  void cnetstats(UserInterface &ui, Pvl *log) {

    ControlNet innet(ui.GetFileName("CNET"));

    QString inlist(ui.GetFileName("FROMLIST"));



    cnetstats(innet, inlist, ui, log);

  }



  /**

    * Given some control network and criteria passed in through the UI, 

    * return some stats on the control network and its images.

    *

    * @param net A control network object.

    *

    * @param serialNumFile A QString of the name of the file containing the serial

    *        numbers for all cubes within the network often generated from

    *        a filelist.

    *

    * @param ui UserInterface object generated using the cnetwinnow.xml file.

    *

    * @param log A pvl object used to store log information.

    *

    */

  void cnetstats(ControlNet &innet, QString &serialNumFile, UserInterface &ui, Pvl *log) {

    try {

      // Get the DefFile

      QString sDefFile = "";

      QString sOutFile = "";

      Pvl pvlDefFile;

      if (ui.WasEntered("DEFFILE")) {

        sDefFile = ui.GetFileName("DEFFILE");

        sOutFile = ui.GetFileName("FLATFILE");

        pvlDefFile = Pvl(sDefFile);



        // Log the DefFile - Cannot log Object... only by Group

        for (int i=0; i<pvlDefFile.objects(); i++) {

          PvlObject pvlObj = pvlDefFile.object(i);

          for (int j=0; j<pvlObj.groups(); j++) {

            log->addGroup(pvlObj.group(j));

          }

        }



        // Verify DefFile comparing with the Template

        Pvl pvlTemplate("$ISIS3DATA/base/templates/cnetstats/cnetstats.def");

        Pvl pvlResults;

        pvlTemplate.validatePvl(pvlDefFile, pvlResults);

        if(pvlResults.objects() != 0 || pvlResults.groups() != 0 || pvlResults.keywords() != 0){

          for (int i=0; i<pvlResults.objects(); i++) {

            PvlObject pvlObj = pvlResults.object(i);

            for (int j=0; j<pvlObj.groups(); j++) {

              log->addGroup(pvlObj.group(j));

            }

          }

          QString sErrMsg = "Invalid Deffile\n";

          throw IException(IException::User, sErrMsg, _FILEINFO_);

        }

      }



      // Get the Image Stats File

      QString sImageFile= "";

      if (ui.WasEntered("CREATE_IMAGE_STATS") && ui.GetBoolean("CREATE_IMAGE_STATS")) {

        sImageFile = ui.GetFileName("IMAGE_STATS_FILE");

      }



      // Get the Point Stats File

      QString sPointFile="";

      if (ui.WasEntered("CREATE_POINT_STATS") && ui.GetBoolean("CREATE_POINT_STATS")) {

        sPointFile = ui.GetFileName("POINT_STATS_FILE");

      }



       // Get the original control net internalized

      Progress progress;

      // ControlNet cNet(ui.GetFileName("CNET"), &progress);



      Progress statsProgress;

      ControlNetFilter cNetFilter(&innet, serialNumFile, &statsProgress);



      // Log the summary of the input Control Network

      PvlGroup statsGrp;

      cNetFilter.GenerateControlNetStats(statsGrp);

      log->addGroup(statsGrp);



      // Run Filters using Deffile

      if (ui.WasEntered("DEFFILE")) {

        cNetFilter.SetOutputFile(sOutFile);

        ReadDefFile(cNetFilter, pvlDefFile);

      }



      // Run Image Stats

      if (ui.WasEntered("CREATE_IMAGE_STATS") && ui.GetBoolean("CREATE_IMAGE_STATS")) {

        cNetFilter.GenerateImageStats();

        cNetFilter.PrintImageStats(sImageFile);

      }



      // Run Point Stats

      if (ui.WasEntered("CREATE_POINT_STATS") && ui.GetBoolean("CREATE_POINT_STATS")) {

        cNetFilter.GeneratePointStats(sPointFile);

      }

    } // REFORMAT THESE ERRORS INTO ISIS TYPES AND RETHROW

    catch(IException &) {

      throw;

    }

  }



  /**

   * Reads the DefFile having info about the different filters to

   * be used on the Control Network.

   *

   * @author Sharmila Prasad (9/7/2010)

   *

   * @param pcNetFilter

   * @param pvlDefFile

   */

  void ReadDefFile(ControlNetFilter & pcNetFilter, Pvl & pvlDefFile)

  {

    // prototype to ControlNetFilter member function

    void (ControlNetFilter::*pt2Filter)(const PvlGroup & pvlGrp, bool pbLastFilter);



    // Parse the Groups in Point Object

    PvlObject filtersObj = pvlDefFile.findObject("Filters", Pvl::Traverse);

    int iNumGroups = filtersObj.groups();



    for (int i=0; i<iNumGroups; i++) {

      PvlGroup pvlGrp = filtersObj.group(i);

      // Get the pointer to ControlNetFilter member function based on Group name

      pt2Filter=GetPtr2Filter(pvlGrp.name());

      if (pt2Filter != NULL) {

        (pcNetFilter.*pt2Filter)(pvlGrp, ((i==(iNumGroups-1)) ? true : false));

      }

    }

  }



  /**

   * Returns the pointer to filter function based on the Group name QString

   *

   * @author Sharmila Prasad (8/11/2010)

   *

   * @return void(ControlNetFilter::*GetPtr2Filter)(const PvlGroup&pvlGrp)

   */

  void (ControlNetFilter::*GetPtr2Filter(const QString psFilter)) (const PvlGroup & pvlGrp, bool pbLastFilter)

  {

    // Point Filters

    if (psFilter == "Point_PixelShift") {

      return &ControlNetFilter::PointPixelShiftFilter;

    }

    if (psFilter == "Point_EditLock")

      return &ControlNetFilter::PointEditLockFilter;



    if (psFilter == "Point_NumMeasuresEditLock") {

      return &ControlNetFilter::PointNumMeasuresEditLockFilter;

    }



    if (psFilter == "Point_ResidualMagnitude"){

      return &ControlNetFilter::PointResMagnitudeFilter;

    }



    if (psFilter == "Point_GoodnessOfFit") {

      return &ControlNetFilter::PointGoodnessOfFitFilter;

    }



    if (psFilter == "Point_IdExpression") {

      return &ControlNetFilter::PointIDFilter;

    }



    if (psFilter == "Point_NumMeasures"){

      return &ControlNetFilter::PointMeasuresFilter;

    }



    if (psFilter == "Point_Properties") {

      return &ControlNetFilter::PointPropertiesFilter;

    }



    if (psFilter == "Point_LatLon") {

      return &ControlNetFilter::PointLatLonFilter;

    }



    if (psFilter == "Point_Distance") {

      return &ControlNetFilter::PointDistanceFilter;

    }



    if (psFilter == "Point_MeasureProperties") {

      return &ControlNetFilter::PointMeasurePropertiesFilter;

    }



    if (psFilter == "Point_CubeNames") {

      return &ControlNetFilter::PointCubeNamesFilter;

    }



    // Cube Filters

    if (psFilter == "Cube_NameExpression") {

      return &ControlNetFilter::CubeNameExpressionFilter;

    }



    if (psFilter == "Cube_NumPoints") {

      return &ControlNetFilter::CubeNumPointsFilter;

    }



    if (psFilter == "Cube_Distance") {

      return &ControlNetFilter::CubeDistanceFilter;

    }



    if (psFilter == "Cube_ConvexHullRatio") {

      return &ControlNetFilter::CubeConvexHullFilter;

    }



    return NULL;

  }

}

isis/src/control/apps/cnetstats/cnetstats.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
#ifndef cnetstats_h

#define cnetstats_h



#include <QString>



#include "ControlNet.h"

#include "Pvl.h"

#include "UserInterface.h"



namespace Isis{

  extern void cnetstats(ControlNet &innet, QString &serialNumFile, UserInterface &ui, Pvl *log=NULL);

  extern void cnetstats(UserInterface &ui, Pvl *log=NULL);

}



#endif

isis/src/control/apps/cnetstats/main.cpp

+16 −198
Original line number Diff line number Diff line 
#include "Isis.h"

#include "IsisDebug.h"

#include "IException.h"

#include "Pvl.h"

#include "ControlNet.h"

#include "ControlNetFilter.h"

#include "ControlNetStatistics.h"

#include "PvlGroup.h"

#include "Progress.h"



using namespace Isis;

using namespace std;

#include "cnetstats.h"



void ReadDefFile(ControlNetFilter & pcNetFilter, Pvl & pvlDefFile);

void (ControlNetFilter::*GetPtr2Filter(const QString sFilter)) (const PvlGroup & pvlGrp, bool pbLastFilter);

#include "Application.h"



void IsisMain() {

using namespace std;

using namespace Isis;



  try {

    // Process all the inputs first, for errors and to satisfy requirements

void IsisMain() {

  UserInterface &ui = Application::GetUserInterface();

    QString sSerialNumFile = ui.GetFileName("FROMLIST");



    // Get the DefFile

    QString sDefFile = "";

    QString sOutFile = "";

    Pvl pvlDefFile;

    if (ui.WasEntered("DEFFILE")) {

      sDefFile = ui.GetFileName("DEFFILE");

      sOutFile = ui.GetFileName("FLATFILE");

      pvlDefFile = Pvl(sDefFile);



      // Log the DefFile - Cannot log Object... only by Group

      for (int i=0; i<pvlDefFile.objects(); i++) {

        PvlObject pvlObj = pvlDefFile.object(i);

        for (int j=0; j<pvlObj.groups(); j++) {

          Application::Log(pvlObj.group(j));

        }

      }



      // Verify DefFile comparing with the Template

      Pvl pvlTemplate("$ISIS3DATA/base/templates/cnetstats/cnetstats.def");

      //Pvl pvlTemplate("/home/sprasad/isis3/isis/src/control/apps/cnetstats/cnetstats.def");

      Pvl pvlResults;

      pvlTemplate.validatePvl(pvlDefFile, pvlResults);

      if(pvlResults.objects() != 0 || pvlResults.groups() != 0 || pvlResults.keywords() != 0){

        for (int i=0; i<pvlResults.objects(); i++) {

          PvlObject pvlObj = pvlResults.object(i);

          for (int j=0; j<pvlObj.groups(); j++) {

            Application::Log(pvlObj.group(j));

          }

        }

        QString sErrMsg = "Invalid Deffile\n";

        throw IException(IException::User, sErrMsg, _FILEINFO_);

      }

    }



    // Get the Image Stats File

    QString sImageFile= "";

    if (ui.WasEntered("CREATE_IMAGE_STATS") && ui.GetBoolean("CREATE_IMAGE_STATS")) {

      sImageFile = ui.GetFileName("IMAGE_STATS_FILE");

    }



    // Get the Point Stats File

    QString sPointFile="";

    if (ui.WasEntered("CREATE_POINT_STATS") && ui.GetBoolean("CREATE_POINT_STATS")) {

      sPointFile = ui.GetFileName("POINT_STATS_FILE");

    }



     // Get the original control net internalized

    Progress progress;

    ControlNet cNet(ui.GetFileName("CNET"), &progress);



    Progress statsProgress;

    ControlNetFilter cNetFilter(&cNet, sSerialNumFile, &statsProgress);



    // Log the summary of the input Control Network

    PvlGroup statsGrp;

    cNetFilter.GenerateControlNetStats(statsGrp);

    Application::Log(statsGrp);



    // Run Filters using Deffile

    if (ui.WasEntered("DEFFILE")) {

      cNetFilter.SetOutputFile(sOutFile);

      ReadDefFile(cNetFilter, pvlDefFile);

    }



    // Run Image Stats

    if (ui.WasEntered("CREATE_IMAGE_STATS") && ui.GetBoolean("CREATE_IMAGE_STATS")) {

      cNetFilter.GenerateImageStats();

      cNetFilter.PrintImageStats(sImageFile);

  Pvl appLog;

  try {

    cnetstats(ui, &appLog);

  }



    // Run Point Stats

    if (ui.WasEntered("CREATE_POINT_STATS") && ui.GetBoolean("CREATE_POINT_STATS")) {

      cNetFilter.GeneratePointStats(sPointFile);

  catch (...) {

    for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {

      Application::Log(*grpIt);

    }

  } // REFORMAT THESE ERRORS INTO ISIS TYPES AND RETHROW

  catch(IException &) {

    throw;

  }

}



/**

 * Reads the DefFile having info about the different filters to

 * be used on the Control Network.

 *

 * @author Sharmila Prasad (9/7/2010)

 *

 * @param pcNetFilter

 * @param pvlDefFile

 */

void ReadDefFile(ControlNetFilter & pcNetFilter, Pvl & pvlDefFile)

{

  // prototype to ControlNetFilter member function

  void (ControlNetFilter::*pt2Filter)(const PvlGroup & pvlGrp, bool pbLastFilter);



  // Parse the Groups in Point Object

  PvlObject filtersObj = pvlDefFile.findObject("Filters", Pvl::Traverse);

  int iNumGroups = filtersObj.groups();



  for (int i=0; i<iNumGroups; i++) {

    PvlGroup pvlGrp = filtersObj.group(i);

    // Get the pointer to ControlNetFilter member function based on Group name

    pt2Filter=GetPtr2Filter(pvlGrp.name());

    if (pt2Filter != NULL) {

      (pcNetFilter.*pt2Filter)(pvlGrp, ((i==(iNumGroups-1)) ? true : false));

    }

  }

}

  

/**

 * Returns the pointer to filter function based on the Group name QString

 *

 * @author Sharmila Prasad (8/11/2010)

 *

 * @return void(ControlNetFilter::*GetPtr2Filter)(const PvlGroup&pvlGrp)

 */

void (ControlNetFilter::*GetPtr2Filter(const QString psFilter)) (const PvlGroup & pvlGrp, bool pbLastFilter)

{

  // Point Filters

  if (psFilter == "Point_PixelShift") {

    return &ControlNetFilter::PointPixelShiftFilter;

  for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {

    Application::Log(*grpIt);

  }

  if (psFilter == "Point_EditLock")

    return &ControlNetFilter::PointEditLockFilter;



  if (psFilter == "Point_NumMeasuresEditLock") {

    return &ControlNetFilter::PointNumMeasuresEditLockFilter;

  }



  if (psFilter == "Point_ResidualMagnitude"){

    return &ControlNetFilter::PointResMagnitudeFilter;

  }



  if (psFilter == "Point_GoodnessOfFit") {

    return &ControlNetFilter::PointGoodnessOfFitFilter;

  }



  if (psFilter == "Point_IdExpression") {

    return &ControlNetFilter::PointIDFilter;

  }



  if (psFilter == "Point_NumMeasures"){

    return &ControlNetFilter::PointMeasuresFilter;

  }



  if (psFilter == "Point_Properties") {

    return &ControlNetFilter::PointPropertiesFilter;

  }



  if (psFilter == "Point_LatLon") {

    return &ControlNetFilter::PointLatLonFilter;

  }



  if (psFilter == "Point_Distance") {

    return &ControlNetFilter::PointDistanceFilter;

}
 
 No newline at end of file
 


  if (psFilter == "Point_MeasureProperties") {

    return &ControlNetFilter::PointMeasurePropertiesFilter;

  }



  if (psFilter == "Point_CubeNames") {

    return &ControlNetFilter::PointCubeNamesFilter;

  }



  // Cube Filters

  if (psFilter == "Cube_NameExpression") {

    return &ControlNetFilter::CubeNameExpressionFilter;

  }



  if (psFilter == "Cube_NumPoints") {

    return &ControlNetFilter::CubeNumPointsFilter;

  }



  if (psFilter == "Cube_Distance") {

    return &ControlNetFilter::CubeDistanceFilter;

  }



  if (psFilter == "Cube_ConvexHullRatio") {

    return &ControlNetFilter::CubeConvexHullFilter;

  }



  return NULL;

}

isis/src/control/apps/cnetstats/tsts/Makefile

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
BLANKS = "%-6s"    

LENGTH = "%-40s"



include $(ISISROOT)/make/isismake.tststree