Commit f8679759 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Updated from trunk. 

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

isis/src/base/objs/Statistics/Statistics.cpp

+30 −15
Original line number Diff line number Diff line
@@ -874,49 +874,64 @@ namespace Isis { 
    size_t offset = 0;

    compoundDataType.insertMember("Sum", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_sum);

    // offset += sizeof(m_sum);

    offset += sizeof(double);

    compoundDataType.insertMember("SumSquared", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_sumsum);

    // offset += sizeof(m_sumsum);

    offset += sizeof(double);

    compoundDataType.insertMember("Minimum", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_minimum);

    // offset += sizeof(m_minimum);

    offset += sizeof(double);

    compoundDataType.insertMember("Maximum", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_maximum);

    // offset += sizeof(m_maximum);

    offset += sizeof(double);

    compoundDataType.insertMember("ValidMinimum", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_validMinimum);

    // offset += sizeof(m_validMinimum);

    offset += sizeof(double);

    compoundDataType.insertMember("ValidMaximum", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_validMaximum);

    // offset += sizeof(m_validMaximum);

    offset += sizeof(double);

    compoundDataType.insertMember("TotalPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_totalPixels);

    // offset += sizeof(m_totalPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("ValidPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_validPixels);

    // offset += sizeof(m_validPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("NullPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_nullPixels);

    // offset += sizeof(m_nullPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("LRSPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_lrsPixels);

    // offset += sizeof(m_lrsPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("LISPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_lisPixels);

    // offset += sizeof(m_lisPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("HRSPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_hrsPixels);

    // offset += sizeof(m_hrsPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("HISPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_hisPixels);

    // offset += sizeof(m_hisPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("UnderRangePixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_underRangePixels);

    // offset += sizeof(m_underRangePixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("OverRangePixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_overRangePixels);

    // offset += sizeof(m_overRangePixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("RemovedData", offset, H5::PredType::NATIVE_HBOOL);



    return compoundDataType;

isis/src/base/objs/Statistics/Statistics.h

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ namespace Isis { 
   *                           code closer to standards.

   *   @history 2015-09-03 Jeannie Backer - Added hdf5 read/write capabilities by adding

   *                           compoundH5DataType() static method.

   *   @history 2015-12-21 Jeannie Backer - Changed compoundH5DataType() method to update offset by

   *                           using member variabl datatypes directly. This was done so that MAC

   *                           OSX will compile.

   *

   *

   *   @todo 2005-02-07 Deborah Lee Soltesz - add example using cube data to the class documentation

   *   @todo 2015-08-13 Jeannie Backer - Clean up header and implementation files once

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

+10 −10
Original line number Diff line number Diff line
@@ -1069,7 +1069,7 @@ namespace Isis { 
      N11 = prod(trans(coeff_target), coeff_target);



      // insert submatrix at column, row

      m_SparseNormals.InsertMatrixBlock(0, 0, nTargetPartials, nTargetPartials);

      m_SparseNormals.insertMatrixBlock(0, 0, nTargetPartials, nTargetPartials);



//std::cout << "SparseNormals: " << 0 << std::endl << N11 << std::endl;
@@ -1082,7 +1082,7 @@ namespace Isis { 
      NTargetImage.clear();

      NTargetImage = prod(trans(coeff_target),coeff_image);



      m_SparseNormals.InsertMatrixBlock(observationIndex+1, 0, nTargetPartials, coeff_image.size2());

      m_SparseNormals.insertMatrixBlock(observationIndex+1, 0, nTargetPartials, coeff_image.size2());

      (*(*m_SparseNormals[observationIndex+1])[0]) += NTargetImage;



      // form N12_Target
@@ -1095,7 +1095,7 @@ namespace Isis { 
//std::cout << N12_Target << std::endl;



      // insert N12_Target into N12

      N12.InsertMatrixBlock(0, nTargetPartials, 3);

      N12.insertMatrixBlock(0, nTargetPartials, 3);

      *N12[0] += N12_Target;



      // form n1
@@ -1142,7 +1142,7 @@ namespace Isis { 
    t += nTargetPartials;



    // insert submatrix at column, row

    m_SparseNormals.InsertMatrixBlock(blockIndex, blockIndex, nImagePartials,

    m_SparseNormals.insertMatrixBlock(blockIndex, blockIndex, nImagePartials,

                                      nImagePartials);



//std::cout << "SparseNormals: " << blockIndex << std::endl << N11 << std::endl;
@@ -1164,7 +1164,7 @@ namespace Isis { 
//std::cout << "N12_Image" << std::endl << N12_Image << std::endl;



    // insert N12_Image into N12

    N12.InsertMatrixBlock(blockIndex, nImagePartials, 3);

    N12.insertMatrixBlock(blockIndex, nImagePartials, 3);

    *N12[blockIndex] += N12_Image;



//printf("N12\n");
@@ -1761,7 +1761,7 @@ namespace Isis { 
      int ncol = iN12.key();



      // insert submatrix in Q at block "ncol"

      Q.InsertMatrixBlock(ncol, 3, iN12.value()->size1());

      Q.insertMatrixBlock(ncol, 3, iN12.value()->size1());



      *(Q[ncol]) = prod(N22,trans(*(iN12.value())));

    }
@@ -1807,7 +1807,7 @@ namespace Isis { 
        boost::numeric::ublas::matrix<double> *iq = iQ.value();



        // insert submatrix at column, row

        m_SparseNormals.InsertMatrixBlock(ncol, nrow,

        m_SparseNormals.insertMatrixBlock(ncol, nrow,

            in12->size1(), iq->size2());



        (*(*m_SparseNormals[ncol])[nrow]) -= prod(*in12,*iq);
@@ -3755,13 +3755,13 @@ namespace Isis { 
      if (i == 0) {

        ncolsCurrentBlockColumn = normalsColumn->numberOfColumns();

        int nRows = m_SparseNormals.at(i)->numberOfRows();

        sbcMatrix.InsertMatrixBlock(i, nRows, ncolsCurrentBlockColumn);

        sbcMatrix.insertMatrixBlock(i, nRows, ncolsCurrentBlockColumn);

        sbcMatrix.zeroBlocks();

      }

      else {

        if (normalsColumn->numberOfColumns() == ncolsCurrentBlockColumn) {

          int nRows = m_SparseNormals.at(i)->numberOfRows();

          sbcMatrix.InsertMatrixBlock(i, nRows, ncolsCurrentBlockColumn);

          sbcMatrix.insertMatrixBlock(i, nRows, ncolsCurrentBlockColumn);

          sbcMatrix.zeroBlocks();

        }

        else {
@@ -3775,7 +3775,7 @@ namespace Isis { 
            SparseBlockColumnMatrix* normalsRow = m_SparseNormals.at(j);

            int nRows = normalsRow->numberOfRows();



            sbcMatrix.InsertMatrixBlock(j, nRows, ncolsCurrentBlockColumn);

            sbcMatrix.insertMatrixBlock(j, nRows, ncolsCurrentBlockColumn);

          }

        }

      }