Paths

Author: dcwhite

src/Core/Algorithms/Math/Tests/SolveLinearSystemAlgoTestsParameterized.cc

@@ -50,13 +50,13 @@ using namespace SCIRun::TestUtils;
 using namespace SCIRun;
 using namespace ::testing;
 
-#if GTEST_HAS_COMBINE 
+#if GTEST_HAS_COMBINE
 
 using ::testing::Values;
 using ::testing::Combine;
-using ::testing::Range; 
+using ::testing::Range;
 
-class SolveLinearSystemTestsAlgoParameterized : public ::testing::TestWithParam < ::std::tr1::tuple<const char*, const char*, int> > 
+class SolveLinearSystemTestsAlgoParameterized : public ::testing::TestWithParam < ::std::tr1::tuple<const char*, const char*, int> >
 {
 public:
 	ReadMatrixAlgorithm reader;
@@ -70,9 +70,9 @@ class SolveLinearSystemTestsAlgoParameterized : public ::testing::TestWithParam
 protected:
 	virtual void SetUp()
 	{
-		auto Afile = TestResources::rootDir() /  "moritz_A.mat";
+		auto Afile = TestResources::rootDir() / "Matrices" /  "moritz_A.mat";
 
-		auto rhsFile = TestResources::rootDir() / "moritz_b.mat";
+		auto rhsFile = TestResources::rootDir() / "Matrices" / "moritz_b.mat";
 		if (!boost::filesystem::exists(Afile) || !boost::filesystem::exists(rhsFile))
 		{
 			FAIL() << "TODO: Issue #142 will standardize these file locations other than being on Dan's hard drive." << std::endl
@@ -89,7 +89,7 @@ class SolveLinearSystemTestsAlgoParameterized : public ::testing::TestWithParam
 		}
 		 // algo object will initialize x0 to the zero vector
 
-		algo.set(Variables::Preconditioner, ::std::tr1::get<1>(GetParam())); 
+		algo.set(Variables::Preconditioner, ::std::tr1::get<1>(GetParam()));
 		algo.set(Variables::MaxIterations, 670);
 		algo.set(Variables::TargetError, ::std::tr1::get<2>(GetParam()));
 
@@ -101,9 +101,9 @@ class SolveLinearSystemTestsAlgoParameterized : public ::testing::TestWithParam
 
 		/*
 		{
-			ScopedTimer t("Running solver");			
+			ScopedTimer t("Running solver");
 		}
-        const std::string& c = ::std::tr1::get<0>(GetParam()); 
+        const std::string& c = ::std::tr1::get<0>(GetParam());
 
 		auto solutionFile = TestResources::rootDir() / ("dan_sol_" + c + ".mat");
 
@@ -139,7 +139,7 @@ TEST_P(SolveLinearSystemTestsAlgoParameterized, CanSolveDarrellParameterized)
 		ASSERT_FALSE(x0);
 
 		ASSERT_TRUE(algo.run(A, matrix_convert::to_column(rhs), x0, solution));
-		
+
 		ASSERT_TRUE(solution.get() != nullptr);
 		EXPECT_EQ(10149, solution->nrows());
 		EXPECT_EQ(1, solution->ncols());
@@ -159,4 +159,4 @@ INSTANTIATE_TEST_CASE_P(
 	);
 #else
 TEST(DummyTest, CombineIsNotSupportedOnThisPlatform(){}
-#endif 
+#endif

src/Modules/Math/Tests/AddKnownsToLinearSystemTests.cc

@@ -62,17 +62,17 @@ namespace
 {
   FieldHandle CreateTriSurfScalarOnNode()
   {
-    return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tri_surf/data_defined_on_node/scalar/tri_scalar_on_node.fld");
+    return loadFieldFromFile(TestResources::rootDir() / "Fields/tri_surf/data_defined_on_node/scalar/tri_scalar_on_node.fld");
   }
   FieldHandle CreateTetMeshScalarOnNode()
   {
-    return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/tet_mesh/data_defined_on_node/scalar/tet_scalar_on_node.fld");
+    return loadFieldFromFile(TestResources::rootDir() / "Fields/tet_mesh/data_defined_on_node/scalar/tet_scalar_on_node.fld");
   }
   FieldHandle CreatePointCloudeScalar()
   {
-    return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/point_cloud/scalar/pts_scalar.fld");
+    return loadFieldFromFile(TestResources::rootDir() / "Fields/point_cloud/scalar/pts_scalar.fld");
   }
-  
+
 	// x vector [1; 2; ... n]
 	DenseMatrixHandle x_num(int rows)
 	{
@@ -90,7 +90,7 @@ namespace
 		(*m)(2, 0) = std::numeric_limits<double>::quiet_NaN();
 		return m;
 	}
-	
+
 	// symmetric LHS (stiff) matrix
 	SparseRowMatrixHandle lhs()
 	{
@@ -107,7 +107,7 @@ namespace
 		m->makeCompressed();
 		return m;
 	}
-	
+
 	// RHS vector of zeros
 	DenseMatrixHandle rhs_zero(int rows)
 	{
@@ -165,11 +165,11 @@ TEST_F(AddKnownsToLinearSystemTests, ThrowsForFieldInputOnPortZero)
   FieldHandle             stiff = CreatePointCloudeScalar();
   DenseMatrixHandle bvect = rhs_zero(3);
   DenseMatrixHandle       known = x_num(3);
-  
+
   stubPortNWithThisData(test, 0, stiff);
   stubPortNWithThisData(test, 1, bvect);
   stubPortNWithThisData(test, 2, known);
-  
+
   EXPECT_THROW(test->execute(), DataPortException);
 }
 
@@ -179,11 +179,11 @@ TEST_F(AddKnownsToLinearSystemTests, ThrowsForFieldInputOnPortOne)
   SparseRowMatrixHandle   stiff = lhs();
   FieldHandle             bvect = CreateTetMeshScalarOnNode();
   DenseMatrixHandle       known = x_num(3);
-  
+
   stubPortNWithThisData(test, 0, stiff);
   stubPortNWithThisData(test, 1, bvect);
   stubPortNWithThisData(test, 2, known);
-  
+
   EXPECT_THROW(test->execute(), DataPortException);
 }
 
@@ -193,11 +193,11 @@ TEST_F(AddKnownsToLinearSystemTests, ThrowsForFieldInputOnPortTwo)
   SparseRowMatrixHandle   stiff = lhs();
   DenseMatrixHandle bvect = rhs_zero(3);
   FieldHandle             known = CreateTriSurfScalarOnNode();
-  
+
   stubPortNWithThisData(test, 0, stiff);
   stubPortNWithThisData(test, 1, bvect);
   stubPortNWithThisData(test, 2, known);
-  
+
   EXPECT_THROW(test->execute(), DataPortException);
 }
 
@@ -212,4 +212,3 @@ TEST_F(AddKnownsToLinearSystemTests, ThrowsForNullInput)
 
   EXPECT_THROW(csdf->execute(), NullHandleOnPortException);
 }
-