Commit 5a36a43a authored by Ian Humphrey's avatar Ian Humphrey
Browse files

The inverse correlation matrix file, inverseMatrix.dat, is no longer generated...

The inverse correlation matrix file, inverseMatrix.dat, is no longer generated when running jigsaw. Fixes #4315.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7152 41f8697f-d340-4b68-9986-7bafba869bb8
parent 66058b55
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -167,6 +167,9 @@ BundleSettingsQsp bundleSettings(UserInterface &ui) {
                            longitudeSigma, 
                            radiusSigma);

  // Don't create the inverse correlation matrix file
  settings->setCreateInverseMatrix(false);

  settings->setOutlierRejection(ui.GetBoolean("OUTLIER_REJECTION"),
                               ui.GetDouble("REJECTION_MULTIPLIER"));

+5 −1
Original line number Diff line number Diff line
@@ -206,7 +206,11 @@
    </change>
    <change name="Ian Humphrey" date="2016-09-22">
      Output from jigsaw will again provide "Validating network" and "Validation complete" messages
      to inform user that their control network has been validated. Fixes #4313."
      to inform user that their control network has been validated. Fixes #4313.
    </change>
    <change name="Ian Humphrey" date="2016-10-05">
      When running jigsaw with error propagation turned on, the correlation matrix file,
      inverseMatrix.dat, is no longer generated. Fixes #4315.
    </change>
  </history>

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ APPNAME = jigsaw
#                is turned on and we do not have a way to compare this file type.
# 2016-08-11 Jeannie Backer - Removed specialk test since we have removed this solve method from 
#                the bundle adjustment. Updated documentation
# 2016-10-05 Ian Humphrey - Removed no longer relevant RM command for inverseMatrix.dat, as it is
#                no longer generated from jigsaw during error propagation. References #4315.

# The "cat bundleout.txt" command in these tests uses sed to do the following (in order):
# 1. remove cube filename paths
@@ -55,5 +57,4 @@ commands:
	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/apollo_bundleout_points.csv > /dev/null;
	$(RM) $(OUTPUT)/bundleout.txt print.prt > /dev/null;
	$(RM) $(OUTPUT)/residuals.csv > /dev/null;
	$(RM) $(OUTPUT)/inverseMatrix.dat > /dev/null;
	$(RM) $(OUTPUT)/cube.lis print.prt > /dev/null;
+3 −1
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ APPNAME = jigsaw
# 2014-07-23 Jeannie Backer - Commented out references to bundleout_images.csv.  
#                Removed default parameters.
# 2016-08-11 Jeannie Backer - Updated documentation
# 2016-10-05 Ian Humphrey - Removed no longer relevant RM command to remove inverseMatrix.dat
#                as jigsaw no longer generates this file during error propagation.
#                References #4315.

include $(ISISROOT)/make/isismake.tsts

@@ -64,4 +67,3 @@ commands:
	$(RM) $(OUTPUT)/cube.lis > /dev/null;
	$(RM) bundleout.txt print.prt > /dev/null;
	$(RM) residuals.csv  > /dev/null;
	$(RM) inverseMatrix.dat > /dev/null;
+21 −8
Original line number Diff line number Diff line
@@ -2714,6 +2714,10 @@ namespace Isis {

  /**
   * error propagation for CHOLMOD solution.
   * 
   * @internal
   *   @history 2016-10-05 Ian Humphrey - Updated to check to see if bundle settings is allowing
   *                           us to create the inverse matrix correlation file. References #4315.
   */
  bool BundleAdjust::errorPropagation_CHOLMOD() {

@@ -2756,8 +2760,12 @@ namespace Isis {
    //???                                               + "inverseMatrix.dat");
    // Create file handle
    QFile matrixOutput(matrixFile.expanded());

    // Check to see if creating the inverse correlation matrix is turned on
    if (m_bundleSettings->createInverseMatrix()) {
      // Open file to write to
      matrixOutput.open(QIODevice::WriteOnly);
    }
    QDataStream outStream(&matrixOutput);

    int i, j, k;
@@ -2850,8 +2858,10 @@ namespace Isis {
      }


      if (m_bundleSettings->createInverseMatrix()) {
        // Output inverse matrix to the open file.
        outStream << sbcMatrix;
      }

      // now loop over all object points to sum contributions into 3x3 point covariance matrix
      int nPointIndex = 0;
@@ -2930,10 +2940,13 @@ namespace Isis {
        nPointIndex++;
      }
    }

    if (m_bundleSettings->createInverseMatrix()) {
      // Close the file.
      matrixOutput.close();
      // Save the location of the "covariance" matrix
      m_bundleResults.setCorrMatCovFileName(matrixFile);
    }

    // can free sparse normals now
    m_SparseNormals.wipe();
Loading