Commit 61f83db4 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Update from trunk. 

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

isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.truth

+8 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Covariance Matrix: 
Testing Compute Correlation Matrix Method.

Tesing Exception in Compute Correlation Matrix Method

Exception 1:

"**PROGRAMMER ERROR** Cannot compute correlation matrix without a specified file name. Use setCorrelationFileName(FileName) before calling computeCorrelationMatrix()."

**PROGRAMMER ERROR** Cannot compute correlation matrix without a specified file name. Use setCorrelationFileName(FileName) before calling computeCorrelationMatrix().

Correlation Matrix:

 New Block 

       1           1
@@ -65,13 +65,16 @@ Images and Parameters: 
		 "Y"

Testing CorrelationMatrix(PvlObject storedMatrixData)

Exception 1

"**USER ERROR** This Pvl Object does not have the correct correlation information. The Object you are looking for is called CorrelationMatrixData."

**USER ERROR** This Pvl Object does not have the correct correlation information. The Object you are looking for is called CorrelationMatrixData.

Exception 2

"**USER ERROR** Could not find the Covariance Matrix .dat file name.\n**ERROR** PVL Keyword [CovarianceMatrixFileName] does not exist in [Object = CorrelationMatrixData]."

**USER ERROR** Could not find the Covariance Matrix .dat file name.

**ERROR** PVL Keyword [CovarianceMatrixFileName] does not exist in [Object = CorrelationMatrixData].

Exception 3

"**USER ERROR** Could not find the Correlation Matrix .dat file name.\n**ERROR** PVL Keyword [CorrelationMatrixFileName] does not exist in [Object = CorrelationMatrixData]."

**USER ERROR** Could not find the Correlation Matrix .dat file name.

**ERROR** PVL Keyword [CorrelationMatrixFileName] does not exist in [Object = CorrelationMatrixData].

Exception 4

"**USER ERROR** Could not get Images and Parameters from ImagesAndParameters group.\n**ERROR** Unable to find PVL group [ImagesAndParameters]."

**USER ERROR** Could not get Images and Parameters from ImagesAndParameters group.

**ERROR** Unable to find PVL group [ImagesAndParameters].

Object = CorrelationMatrixData

  CovarianceMatrixFileName  = covMat.dat

  CorrelationMatrixFileName = corrMat.dat

isis/src/control/objs/CorrelationMatrix/unitTest.cpp

+5 −5
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int main() { 
  }

  catch (IException &e) {

    qDebug() << "Exception 1:";

    qDebug() << e.toString();

    qDebug().noquote() << e.toString();



  }
@@ -191,7 +191,7 @@ int main() { 


   catch (IException &e) {

     qDebug() << "Exception 1";

     qDebug() << e.toString();

     qDebug().noquote() << e.toString();

   }



   try {
@@ -200,7 +200,7 @@ int main() { 


   catch (IException &e) {

     qDebug() << "Exception 2";

     qDebug() << e.toString();

     qDebug().noquote() << e.toString();

   }



   try {
@@ -209,7 +209,7 @@ int main() { 


   catch (IException &e) {

     qDebug() << "Exception 3";

     qDebug() << e.toString();

     qDebug().noquote() << e.toString();

   }



   try {
@@ -218,7 +218,7 @@ int main() { 


   catch (IException &e) {

     qDebug() << "Exception 4";

     qDebug() << e.toString();

     qDebug().noquote() << e.toString();

   }