Merge branch 'master' into ospray-features

Author: dcwhite

src/Core/Algorithms/Describe/DescribeDatatype.cc

@@ -72,6 +72,15 @@ std::string DescribeDatatype::describe(const DatatypeHandle& data) const
     return "[Complex Matrix Data] Info:\n" + ReportComplexMatrixInfoAlgo::summarize(info);
   }
 
+  auto cmatsp = boost::dynamic_pointer_cast<ComplexSparseRowMatrix>(data);
+  if (cmatsp)
+  {
+    ReportComplexMatrixInfoAlgo algo;
+    auto info = algo.runImpl(cmatsp);
+
+    return "[Complex Matrix Data] Info:\n" + ReportComplexMatrixInfoAlgo::summarize(info);
+  }
+
   auto field = boost::dynamic_pointer_cast<Field>(data);
   if (field)
   {

src/Core/Algorithms/Describe/Tests/DescribeDatatypeTests.cc

@@ -32,6 +32,7 @@
 #include <Testing/Utils/MatrixTestUtilities.h>
 #include <Testing/Utils/SCIRunUnitTests.h>
 #include <Testing/ModuleTestBase/ModuleTestBase.h>
+#include <Core/Datatypes/MatrixTypeConversions.h>
 
 
 using namespace SCIRun;
@@ -70,3 +71,28 @@ TEST(DescribeDatatypeAlgorithmTests, CanDescribeField)
 
   EXPECT_EQ("[Field Data] Info:\nType: GenericField<LatVolMesh<HexTrilinearLgn<Point> > ,HexTrilinearLgn<double> ,FData3d<double,LatVolMesh<HexTrilinearLgn<Point> > > > \nCenter: [0 0 0]\nSize: [2 2 2]\nData min,max: 0 , 0\n# nodes: 60\n# elements: 24\n# data: 60\nData location: Nodes (linear basis)\nDims (x,y,z): [3 4 5]\nGeometric size: 8\n", desc);
 }
+
+TEST(DescribeDatatypeAlgorithmTests, CanDescribeComplexDenseMatrix)
+{
+  DescribeDatatype algo;
+
+  auto m = boost::make_shared<ComplexDenseMatrix>(2, 2);
+  *m << complex{ 1, 2 }, complex{ 3, -1 }, complex{ 0, 1 }, complex{ -2, -1 };
+
+  auto desc = algo.describe(m);
+
+  EXPECT_EQ("[Complex Matrix Data] Info:\nType:\t\tComplexDenseMatrix\n# Rows:\t\t2\n# Columns:\t\t2\n# Elements:\t\t4\nMinimum (by norm):\t(0,1)\nMaximum (by norm):\t(3,-1)\n", desc);
+}
+
+TEST(DescribeDatatypeAlgorithmTests, CanDescribeComplexSparseMatrix)
+{
+  DescribeDatatype algo;
+
+  ComplexDenseMatrix m(2, 2);
+  m << complex{ 1, 2 }, complex{ 3, -1 }, complex{ 0, 1 }, complex{ -2, -1 };
+  auto s = convertMatrix::fromDenseToSparse(m);
+
+  auto desc = algo.describe(s);
+
+  EXPECT_EQ("[Complex Matrix Data] Info:\nType:\t\tComplexSparseRowMatrix\n# Rows:\t\t2\n# Columns:\t\t2\n# Elements:\t\t4\nMinimum (by norm):\t(0,1)\nMaximum (by norm):\t(3,-1)\n", desc);
+}

src/Core/Algorithms/Legacy/Fields/FieldData/BuildMatrixOfSurfaceNormalsAlgo.cc

@@ -26,28 +26,21 @@
    DEALINGS IN THE SOFTWARE.
 */
 
-#include <Core/Algorithms/Legacy/Fields/FieldData/BuildMatrixOfSurfaceNormalsAlgo.h> 
+#include <Core/Algorithms/Legacy/Fields/FieldData/BuildMatrixOfSurfaceNormalsAlgo.h>
 #include <Core/Algorithms/Base/AlgorithmPreconditions.h>
 #include <Core/Algorithms/Base/AlgorithmVariableNames.h>
-//#include <Core/GeometryPrimitives/Vector.h>
 #include <Core/Datatypes/Legacy/Field/Field.h>
 #include <Core/Datatypes/Legacy/Field/VField.h>
-#include <Core/Datatypes/DenseMatrix.h> 
+#include <Core/Datatypes/DenseMatrix.h>
 #include <Core/GeometryPrimitives/Vector.h>
-#include <Core/Datatypes/Legacy/Matrix/Matrix.h> 
 #include <Core/Datatypes/Legacy/Field/FieldInformation.h> 
 
-//#include <Core/Datatypes/DenseMatrix.h> 
-//#include <Core/Datatypes/Legacy/Field/VMesh.h>
-
-//#include <iostream>
-
 using namespace SCIRun::Core::Algorithms;
 using namespace SCIRun::Core::Algorithms::Fields;
 using namespace SCIRun::Core::Datatypes;
 using namespace SCIRun::Core::Geometry;
-using namespace SCIRun::Core::Logging; 
-using namespace SCIRun::Core::Utility; 
+using namespace SCIRun::Core::Logging;
+using namespace SCIRun::Core::Utility;
 using namespace SCIRun;
 
 BuildMatrixOfSurfaceNormalsAlgo::BuildMatrixOfSurfaceNormalsAlgo() {}
@@ -61,19 +54,19 @@ bool BuildMatrixOfSurfaceNormalsAlgo::runImpl(FieldHandle input, DenseMatrixHand
     error("No input source field");
     return (false);
   }
-  
-  FieldInformation fi(input);  
+
+  FieldInformation fi(input);
   if (!(fi.is_surface()))
   {
     error("This algorithm only works on a surface mesh");
     return (false);
   }
-  
+
   VMesh* vmesh = input->vmesh();
   vmesh->synchronize(Mesh::NORMALS_E);
   VMesh::size_type num_nodes = vmesh->num_nodes();
 
-  output.reset(new DenseMatrix(num_nodes, 3)); 
+  output.reset(new DenseMatrix(num_nodes, 3));
 
   if (!output)
   {
@@ -86,10 +79,10 @@ bool BuildMatrixOfSurfaceNormalsAlgo::runImpl(FieldHandle input, DenseMatrixHand
   Vector norm;
   for (VMesh::Node::index_type i=0; i<num_nodes; ++i)
   {
-    vmesh->get_normal(norm,i); 
+    vmesh->get_normal(norm,i);
     (*output)(k) = norm.x();
 		(*output)(k+1) = norm.y();
-		(*output)(k+2) = norm.z(); 
+		(*output)(k+2) = norm.z();
     k += 3;
     cnt++; if (cnt == 400) {cnt=0; update_progress_max(i,num_nodes); }
   }
@@ -99,12 +92,12 @@ bool BuildMatrixOfSurfaceNormalsAlgo::runImpl(FieldHandle input, DenseMatrixHand
 AlgorithmOutput BuildMatrixOfSurfaceNormalsAlgo::run(const AlgorithmInput& input) const
 {
   auto field = input.get<Field>(Variables::InputField);
-	DenseMatrixHandle outputMatrix; 
+	DenseMatrixHandle outputMatrix;
 
 	if(!runImpl(field, outputMatrix))
-			THROW_ALGORITHM_PROCESSING_ERROR("False returned on legacy call."); 
+			THROW_ALGORITHM_PROCESSING_ERROR("False returned on legacy call.");
 
   AlgorithmOutput output;
   output[Variables::OutputMatrix] = outputMatrix;
   return output;
-}
+}

src/Core/Algorithms/Legacy/Fields/FieldData/SetFieldData.cc

@@ -399,7 +399,7 @@ FieldHandle SetFieldDataAlgo::runImplRealComplex(FieldHandle input_field, DenseM
     found = verify_input_data(input_field, realData->nrows(), realData->ncols(), numvals, fi);
   else if (complexData)
   {
-    found = verify_input_data(input_field, complexData->nrows(), complexData->ncols(), numvals, fi, "std::complex<double>");
+    found = verify_input_data(input_field, complexData->nrows(), complexData->ncols(), numvals, fi, "complex");
   }
 
   if (!found)