Commit 91363a40 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Merged remainder of control directory from v006LibrariesV2 to ipce. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7139 41f8697f-d340-4b68-9986-7bafba869bb8
parent d5e1abc0

isis/src/control/objs/BundleAdjust/BundleAdjust.cpp

+6 −6
Original line number Diff line number Diff line
@@ -1517,7 +1517,7 @@ namespace Isis { 
      return;

    }



    register int i,j,k,kk;

    int i,j,k,kk;

    double d;



    int nRowsB = B.size1();
@@ -1569,7 +1569,7 @@ namespace Isis { 
    if ( alpha == 0.0 )

      return;



    register int i,j,k,kk;

    int i,j,k,kk;

    double d;



    int nRowsA = A.size1();
@@ -1641,7 +1641,7 @@ namespace Isis { 


    // check for "matrix not positive definite" error

    if (m_cm.status == CHOLMOD_NOT_POSDEF) {

      QString msg = QString("matrix NOT positive-definite: failure at column %1").arg(m_L->minor);

      QString msg = "Matrix NOT positive-definite: failure at column " + toString(m_L->minor);

//    throw IException(IException::User, msg, _FILEINFO_);

      error(msg);

      emit(finished());

isis/src/control/objs/BundleAdjust/BundleAdjust.h

+5 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ namespace Isis { 
   *                           the prefix can be used to specify the path of the location where the

   *                           matrix file should be written. Some improvements made to comply with

   *                           coding standards.

   *   @history 2015-09-10 Ian Humphrey - Fixed include for cholmod header after updating v005

   *                           libraries.

   *   @history 2016-07-11 Jesse Mapel - Changed m_bundleControlPoints to be a vector of

   *                           QSharedPointers to BundleControlPoints instead of a

   *                           BundleControlPointVector.  Fixes #4099.
@@ -227,6 +229,9 @@ namespace Isis { 
   *                           Fixes #4279.

   *   @history 2016-09-22 Ian Humphrey - Modified validateNetwork() so that validation status

   *                           messages are logged to stdout. Fixes #4313.

   *   @history 2016-08-28 Kelvin Rodriguez - Remvoed useless register keywords to squash warnigns

   *                         in clang. Part of porting to OS X 10.11. 



   */

  class BundleAdjust : public QObject {

      Q_OBJECT