Commit 8fdaa11e authored by Jeannie Backer's avatar Jeannie Backer Committed by Makayla Shepherd
Browse files

Updating SymmetricMatrix to UpperSymmetricMatrix.

parent b2a3b5b9

isis/src/base/objs/LinearAlgebra/LinearAlgebra.h

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ namespace Isis { 
   *   @history 2016-08-16 Jesse Mapel - Added BOOST_UBLAS_NO_STD_CERR definition to

   *                           prevent Boost from outputing debug information to standard out

   *                           when throwing exceptions.  Fixes #2302.

   *   @history 2017-12-12 Jeannie Backer - Added SymmetricMatrix typedef.

   *   @history 2017-12-12 Jeannie Backer - Added SymmetricMatrix and UpperSymmetricMatrix typedef.

   *  

   *  

   *   @todo document methods (a) add naif routine names to documentation where appropriate,
@@ -122,7 +122,7 @@ namespace Isis { 
       * we are using without changing all references to this type in the ISIS

       * API. 

       */

      typedef boost::numeric::ublas::symmetric_matrix<double, upper> SymmetricMatrix;

      typedef boost::numeric::ublas::symmetric_matrix<double, upper> UpperSymmetricMatrix;

      /**

       * Definition for an Isis::LinearAlgebra::Vector of doubles. This is a 

       * typedef for a boost vector.

isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp

+2 −2
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ namespace Isis { 
                                       Displacement(point.aprioriy(), Displacement::Meters),

                                       Displacement(point.aprioriz(), Displacement::Meters));

      if (point.aprioricovar_size() > 0) {

        SymmetricMatrix aprioriCovarianceMatrix;

        LinearAlgebra::UpperSymmetricMatrix aprioriCovarianceMatrix;

        aprioriCovarianceMatrix.resize(3);

        aprioriCovarianceMatrix.clear();

        aprioriCovarianceMatrix(0, 0) = point.aprioricovar(0);
@@ -897,7 +897,7 @@ namespace Isis { 
                                        Displacement(point.adjustedz(), Displacement::Meters));



      if (point.adjustedcovar_size() > 0) {

        SymmetricMatrix adjustedCovarianceMatrix;

        LinearAlgebra::UpperSymmetricMatrix adjustedCovarianceMatrix;

        adjustedCovarianceMatrix.resize(3);

        adjustedCovarianceMatrix.clear();

        adjustedCovarianceMatrix(0, 0) = point.adjustedcovar(0);