Final Changes

Author: allywarner

src/Core/Algorithms/Math/ComputeSVD.cc

@@ -42,6 +42,10 @@ using namespace SCIRun::Core::Algorithms::Math;
 
 void ComputeSVDAlgo::run(MatrixHandle input, DenseMatrixHandle& LeftSingMat, DenseMatrixHandle& SingVals, DenseMatrixHandle& RightSingMat) const
 {
+  if (input->nrows() == 0 || input->ncols() == 0){
+        
+    THROW_ALGORITHM_INPUT_ERROR("Input has a zero dimension.");
+}
   if (matrix_is::dense(input))
   {
     auto denseInput = matrix_cast::as_dense(input);

src/Modules/Math/Tests/ComputePCAtest.cc

@@ -26,6 +26,7 @@
  DEALINGS IN THE SOFTWARE.
  */
 
+//ComputePCA module test.
 #include <Testing/ModuleTestBase/ModuleTestBase.h>
 #include <Modules/Math/ComputePCA.h>
 #include <Core/Datatypes/DenseColumnMatrix.h>
@@ -43,6 +44,7 @@ class ComputePCAtest : public ModuleTest
 {
 };
 
+//Checks for null input.
 TEST_F(ComputePCAtest, CheckInputNull)
 {
     auto pcaMod = makeModule("ComputePCA");
@@ -52,25 +54,30 @@ TEST_F(ComputePCAtest, CheckInputNull)
     EXPECT_THROW(pcaMod -> execute(), NullHandleOnPortException);
 }
 
-TEST_F(ComputePCAtest, CheckInputColumn)
+//Checks for dense input.
+TEST_F(ComputePCAtest, CheckInputDense)
 {
     auto pcaMod = makeModule("ComputePCA");
-    DenseColumnMatrixHandle columnInput(new DenseColumnMatrix(5));
-    (*columnInput) << 1,2,3,4,5;
-    stubPortNWithThisData(pcaMod, 0, columnInput);
+    MatrixHandle denseMatrix = MAKE_DENSE_MATRIX_HANDLE((1,2,5,6)(3,4,7,9)(7,8,9,1)(2,3,5,9));
+    stubPortNWithThisData(pcaMod, 0, denseMatrix);
 
     EXPECT_NO_THROW(pcaMod -> execute());
 }
 
-TEST_F(ComputePCAtest, CheckInputDense)
+//ComputePCA currently only supports dense input, but we will leave these if we want to change it later.
+//There is a check for this in the algorithm.
+//Checks for column input.
+TEST_F(ComputePCAtest, CheckInputColumn)
 {
     auto pcaMod = makeModule("ComputePCA");
-    MatrixHandle denseMatrix = MAKE_DENSE_MATRIX_HANDLE((1,2,5,6)(3,4,7,9)(7,8,9,1)(2,3,5,9));
-    stubPortNWithThisData(pcaMod, 0, denseMatrix);
+    DenseColumnMatrixHandle columnInput(new DenseColumnMatrix(5));
+    (*columnInput) << 1,2,3,4,5;
+    stubPortNWithThisData(pcaMod, 0, columnInput);
 
     EXPECT_NO_THROW(pcaMod -> execute());
 }
 
+//Checks for sparse input.
 TEST_F(ComputePCAtest, CheckInputSparse)
 {
     auto pcaMod = makeModule("ComputePCA");