Commit 75183e72 authored by Ken Edmundson's avatar Ken Edmundson
Browse files

bugs after fixing merge conflicts

parent cd6113b5

isis/src/control/objs/BundleUtilities/BundleControlPoint.cpp

+1 −32
Original line number Diff line number Diff line
@@ -348,36 +348,6 @@ namespace Isis { 
   }





  /**

   * Perform the matrix multiplication v2 = alpha ( Q x v1 ).

   *

   * @param alpha A constant multiplier.

   * @param sparseNormals The sparse block normal equations matrix.

   * @param v2 The output vector.

   * @param Q A sparse block matrix.

   * @param v1 A vector.

   */

  void BundleControlPoint::productAlphaAV(double alpha,

                                    SparseBlockMatrix &sparseNormals,

                                    LinearAlgebra::Vector &v1) {



    QMapIterator< int, LinearAlgebra::Matrix * > Qit(m_cholmodQMatrix);



    int subrangeStart, subrangeEnd;

    

    while ( Qit.hasNext() ) {

      Qit.next();



      int columnIndex = Qit.key();



      subrangeStart = sparseNormals.at(columnIndex)->startColumn();

      subrangeEnd = subrangeStart + Qit.value()->size2();

      

      m_nicVector += alpha * prod(*(Qit.value()),subrange(v1,subrangeStart,subrangeEnd));

    }

  }





  /**

   * Apply the parameter corrections to the bundle control point.

   *
@@ -1265,8 +1235,7 @@ QString BundleControlPoint::formatCoordAprioriSigmaString(SurfacePoint::CoordInd 
   * Perform the matrix multiplication v2 = alpha ( Q x v1 ).

   *

   * @param alpha A constant multiplier.

   * @param v2 The output vector.

   * @param Q A sparse block matrix.

   * @param sparseMatrix Sparse input matrix

   * @param v1 A vector.

   */

  void BundleControlPoint::productAlphaAV(double alpha,

isis/src/control/objs/BundleUtilities/BundleControlPoint.h

+1 −8
Original line number Diff line number Diff line
@@ -135,11 +135,7 @@ namespace Isis { 
      void setSigmaWeightFromGlobals(double gSigma, int index); 

      void setSigmaWeightFromGlobals(double gSigma, int index, double cFactor); 

      void zeroNumberOfRejectedMeasures();

      void productAlphaAV(double alpha,

                          SparseBlockMatrix &sparseNormals,

                          // boost::numeric::ublas::bounded_vector< double, 3 >  &v2,

                          // SparseBlockRowMatrix                                &Q,

                          LinearAlgebra::Vector                               &v1);

      void productAlphaAV(double alpha, SparseBlockMatrix &sparseMatrix, LinearAlgebra::Vector &v1);

      void applyParameterCorrections(LinearAlgebra::Vector imageSolution,

           SparseBlockMatrix &sparseNormals, const BundleTargetBodyQsp target);
@@ -192,9 +188,6 @@ namespace Isis { 


      virtual double vtpvRangeContribution();



      void productAlphaAV(double alpha, SparseBlockMatrix &sparseMatrix,

                          LinearAlgebra::Vector &v1);



      double vtpv();

      double vtpvMeasures();