Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STYLE: Fix style in miscellaneous FEM tests #4418

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ int
itkFEMElement2DC0LinearQuadrilateralStrainItpackTest(int argc, char * argv[])
{
// Need to register default FEM object types,
// and setup SpatialReader to recognize FEM types
// and setup spatialReader to recognize FEM types
// which is all currently done as a HACK in
// the initialization of the itk::FEMFactoryBase::GetFactory()
itk::FEMFactoryBase::GetFactory()->RegisterDefaultTypes();
Expand Down
22 changes: 10 additions & 12 deletions Modules/Numerics/FEM/test/itkFEMElement2DC0LinearLineStressTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ itkFEMElement2DC0LinearLineStressTest(int argc, char * argv[])
return EXIT_FAILURE;
}
// Need to register default FEM object types,
// and setup SpatialReader to recognize FEM types
// and setup spatialReader to recognize FEM types
// which is all currently done as a HACK in
// the initialization of the itk::FEMFactoryBase::GetFactory()
itk::FEMFactoryBase::GetFactory()->RegisterDefaultTypes();
Expand All @@ -40,12 +40,11 @@ itkFEMElement2DC0LinearLineStressTest(int argc, char * argv[])

using FEMSpatialObjectReaderType = itk::FEMSpatialObjectReader<2>;
using FEMSpatialObjectReaderPointer = FEMSpatialObjectReaderType::Pointer;
FEMSpatialObjectReaderPointer SpatialReader = FEMSpatialObjectReaderType::New();
SpatialReader->SetFileName(argv[1]);
// SpatialReader->SetFileName("C:/Research/ITKGit/ITK/Testing/Data/Input/FEM/2DC0LinearLineStressTest.meta");
SpatialReader->Update();
FEMSpatialObjectReaderPointer spatialReader = FEMSpatialObjectReaderType::New();
spatialReader->SetFileName(argv[1]);
spatialReader->Update();

FEMSpatialObjectReaderType::GroupPointer myGroup = SpatialReader->GetGroup();
FEMSpatialObjectReaderType::GroupPointer myGroup = spatialReader->GetGroup();
if (!myGroup)
{
std::cout << "No Group : [FAILED]" << std::endl;
Expand All @@ -56,7 +55,7 @@ itkFEMElement2DC0LinearLineStressTest(int argc, char * argv[])
// Testing the fe mesh validity
using FEMObjectSpatialObjectType = itk::FEMObjectSpatialObject<2>;

FEMObjectSpatialObjectType::ChildrenListType * children = SpatialReader->GetGroup()->GetChildren();
FEMObjectSpatialObjectType::ChildrenListType * children = spatialReader->GetGroup()->GetChildren();
if (children->front()->GetTypeName() != "FEMObjectSpatialObject")
{
std::cout << " [FAILED]" << std::endl;
Expand Down Expand Up @@ -103,11 +102,10 @@ itkFEMElement2DC0LinearLineStressTest(int argc, char * argv[])
femSODef->SetFEMObject(solver->GetOutput());
using FEMSpatialObjectWriterType = itk::FEMSpatialObjectWriter<2>;
using FEMSpatialObjectWriterPointer = FEMSpatialObjectWriterType::Pointer;
FEMSpatialObjectWriterPointer SpatialWriter = FEMSpatialObjectWriterType::New();
SpatialWriter->SetInput(femSODef);
// SpatialWriter->SetFileName("C:/Research/ITKGit/ITK/Testing/Data/Input/FEM/2DC0LinearLineStressTestWrite.meta");
SpatialWriter->SetFileName(argv[2]);
SpatialWriter->Update();
FEMSpatialObjectWriterPointer spatialWriter = FEMSpatialObjectWriterType::New();
spatialWriter->SetInput(femSODef);
spatialWriter->SetFileName(argv[2]);
spatialWriter->Update();

std::cout << "Test PASSED!" << std::endl;
return EXIT_SUCCESS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ itkFEMElement2DC0LinearQuadrilateralMembraneTest(int argc, char * argv[])
return EXIT_FAILURE;
}
// Need to register default FEM object types,
// and setup SpatialReader to recognize FEM types
// and setup spatialReader to recognize FEM types
// which is all currently done as a HACK in
// the initialization of the itk::FEMFactoryBase::GetFactory()
itk::FEMFactoryBase::GetFactory()->RegisterDefaultTypes();
Expand All @@ -40,11 +40,11 @@ itkFEMElement2DC0LinearQuadrilateralMembraneTest(int argc, char * argv[])

using FEMSpatialObjectReaderType = itk::FEMSpatialObjectReader<2>;
using FEMSpatialObjectReaderPointer = FEMSpatialObjectReaderType::Pointer;
FEMSpatialObjectReaderPointer SpatialReader = FEMSpatialObjectReaderType::New();
SpatialReader->SetFileName(argv[1]);
SpatialReader->Update();
FEMSpatialObjectReaderPointer spatialReader = FEMSpatialObjectReaderType::New();
spatialReader->SetFileName(argv[1]);
spatialReader->Update();

FEMSpatialObjectReaderType::GroupPointer myGroup = SpatialReader->GetGroup();
FEMSpatialObjectReaderType::GroupPointer myGroup = spatialReader->GetGroup();
if (!myGroup)
{
std::cout << "No Group : [FAILED]" << std::endl;
Expand All @@ -55,7 +55,7 @@ itkFEMElement2DC0LinearQuadrilateralMembraneTest(int argc, char * argv[])
// Testing the fe mesh validity
using FEMObjectSpatialObjectType = itk::FEMObjectSpatialObject<2>;

FEMObjectSpatialObjectType::ChildrenListType * children = SpatialReader->GetGroup()->GetChildren();
FEMObjectSpatialObjectType::ChildrenListType * children = spatialReader->GetGroup()->GetChildren();
if (children->front()->GetTypeName() != "FEMObjectSpatialObject")
{
std::cout << " [FAILED]" << std::endl;
Expand All @@ -82,10 +82,10 @@ itkFEMElement2DC0LinearQuadrilateralMembraneTest(int argc, char * argv[])
femSODef->SetFEMObject(solver->GetOutput());
using FEMSpatialObjectWriterType = itk::FEMSpatialObjectWriter<2>;
using FEMSpatialObjectWriterPointer = FEMSpatialObjectWriterType::Pointer;
FEMSpatialObjectWriterPointer SpatialWriter = FEMSpatialObjectWriterType::New();
SpatialWriter->SetInput(femSODef);
SpatialWriter->SetFileName(argv[2]);
SpatialWriter->Update();
FEMSpatialObjectWriterPointer spatialWriter = FEMSpatialObjectWriterType::New();
spatialWriter->SetInput(femSODef);
spatialWriter->SetFileName(argv[2]);
spatialWriter->Update();

std::cout << "Test PASSED!" << std::endl;
return EXIT_SUCCESS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ itkFEMElement2DC0LinearQuadrilateralStrainItpackTest(int argc, char * argv[])
return EXIT_FAILURE;
}
// Need to register default FEM object types,
// and setup SpatialReader to recognize FEM types
// and setup spatialReader to recognize FEM types
// which is all currently done as a HACK in
// the initialization of the itk::FEMFactoryBase::GetFactory()
itk::FEMFactoryBase::GetFactory()->RegisterDefaultTypes();
Expand All @@ -49,11 +49,11 @@ itkFEMElement2DC0LinearQuadrilateralStrainItpackTest(int argc, char * argv[])

using FEMSpatialObjectReaderType = itk::FEMSpatialObjectReader<2>;
using FEMSpatialObjectReaderPointer = FEMSpatialObjectReaderType::Pointer;
FEMSpatialObjectReaderPointer SpatialReader = FEMSpatialObjectReaderType::New();
SpatialReader->SetFileName(argv[1]);
SpatialReader->Update();
FEMSpatialObjectReaderPointer spatialReader = FEMSpatialObjectReaderType::New();
spatialReader->SetFileName(argv[1]);
spatialReader->Update();

FEMSpatialObjectReaderType::GroupPointer myGroup = SpatialReader->GetGroup();
FEMSpatialObjectReaderType::GroupPointer myGroup = spatialReader->GetGroup();
if (!myGroup)
{
std::cout << "No Group : [FAILED]" << std::endl;
Expand All @@ -64,7 +64,7 @@ itkFEMElement2DC0LinearQuadrilateralStrainItpackTest(int argc, char * argv[])
// Testing the fe mesh validity
using FEMObjectSpatialObjectType = itk::FEMObjectSpatialObject<2>;

FEMObjectSpatialObjectType::ChildrenListType * children = SpatialReader->GetGroup()->GetChildren();
FEMObjectSpatialObjectType::ChildrenListType * children = spatialReader->GetGroup()->GetChildren();

itk::fem::LinearSystemWrapperItpack WrapperItpack;
WrapperItpack.SetMaximumNonZeroValuesInMatrix(1000);
Expand Down Expand Up @@ -119,10 +119,10 @@ itkFEMElement2DC0LinearQuadrilateralStrainItpackTest(int argc, char * argv[])
femSODef->SetFEMObject(solver->GetOutput());
using FEMSpatialObjectWriterType = itk::FEMSpatialObjectWriter<2>;
using FEMSpatialObjectWriterPointer = FEMSpatialObjectWriterType::Pointer;
FEMSpatialObjectWriterPointer SpatialWriter = FEMSpatialObjectWriterType::New();
SpatialWriter->SetInput(femSODef);
SpatialWriter->SetFileName(argv[2]);
SpatialWriter->Update();
FEMSpatialObjectWriterPointer spatialWriter = FEMSpatialObjectWriterType::New();
spatialWriter->SetInput(femSODef);
spatialWriter->SetFileName(argv[2]);
spatialWriter->Update();

std::cout << "Test PASSED!" << std::endl;
return EXIT_SUCCESS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ itkFEMElement2DC0LinearQuadrilateralStrainTest(int argc, char * argv[])
return EXIT_FAILURE;
}
// Need to register default FEM object types,
// and setup SpatialReader to recognize FEM types
// and setup spatialReader to recognize FEM types
// which is all currently done as a HACK in
// the initialization of the itk::FEMFactoryBase::GetFactory()
itk::FEMFactoryBase::GetFactory()->RegisterDefaultTypes();
Expand All @@ -40,11 +40,11 @@ itkFEMElement2DC0LinearQuadrilateralStrainTest(int argc, char * argv[])

using FEMSpatialObjectReaderType = itk::FEMSpatialObjectReader<2>;
using FEMSpatialObjectReaderPointer = FEMSpatialObjectReaderType::Pointer;
FEMSpatialObjectReaderPointer SpatialReader = FEMSpatialObjectReaderType::New();
SpatialReader->SetFileName(argv[1]);
SpatialReader->Update();
FEMSpatialObjectReaderPointer spatialReader = FEMSpatialObjectReaderType::New();
spatialReader->SetFileName(argv[1]);
spatialReader->Update();

FEMSpatialObjectReaderType::GroupPointer myGroup = SpatialReader->GetGroup();
FEMSpatialObjectReaderType::GroupPointer myGroup = spatialReader->GetGroup();
if (!myGroup)
{
std::cout << "No Group : [FAILED]" << std::endl;
Expand All @@ -55,7 +55,7 @@ itkFEMElement2DC0LinearQuadrilateralStrainTest(int argc, char * argv[])
// Testing the fe mesh validity
using FEMObjectSpatialObjectType = itk::FEMObjectSpatialObject<2>;

FEMObjectSpatialObjectType::ChildrenListType * children = SpatialReader->GetGroup()->GetChildren();
FEMObjectSpatialObjectType::ChildrenListType * children = spatialReader->GetGroup()->GetChildren();

if (children->front()->GetTypeName() != "FEMObjectSpatialObject")
{
Expand All @@ -82,10 +82,10 @@ itkFEMElement2DC0LinearQuadrilateralStrainTest(int argc, char * argv[])
femSODef->SetFEMObject(solver->GetOutput());
using FEMSpatialObjectWriterType = itk::FEMSpatialObjectWriter<2>;
using FEMSpatialObjectWriterPointer = FEMSpatialObjectWriterType::Pointer;
FEMSpatialObjectWriterPointer SpatialWriter = FEMSpatialObjectWriterType::New();
SpatialWriter->SetInput(femSODef);
SpatialWriter->SetFileName(argv[2]);
SpatialWriter->Update();
FEMSpatialObjectWriterPointer spatialWriter = FEMSpatialObjectWriterType::New();
spatialWriter->SetInput(femSODef);
spatialWriter->SetFileName(argv[2]);
spatialWriter->Update();

std::cout << "Test PASSED!" << std::endl;
return EXIT_SUCCESS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ itkFEMElement2DC0LinearQuadrilateralStressTest(int argc, char * argv[])

using FEMSpatialObjectWriterType = itk::FEMSpatialObjectWriter<Dimension>;
using FEMSpatialObjectWriterPointer = FEMSpatialObjectWriterType::Pointer;
FEMSpatialObjectWriterPointer SpatialWriter = FEMSpatialObjectWriterType::New();
SpatialWriter->SetInput(femSODef);
SpatialWriter->SetFileName(argv[1]);
SpatialWriter->Update();
FEMSpatialObjectWriterPointer spatialWriter = FEMSpatialObjectWriterType::New();
spatialWriter->SetInput(femSODef);
spatialWriter->SetFileName(argv[1]);
spatialWriter->Update();

std::cout << "Test PASSED!" << std::endl;
return EXIT_SUCCESS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ int
itkFEMElement2DC0LinearQuadrilateralStressTestFEMObject(int argc, char * argv[])
{
// Need to register default FEM object types,
// and setup SpatialReader to recognize FEM types
// and setup spatialReader to recognize FEM types
// which is all currently done as a HACK in
// the initialization of the itk::FEMFactoryBase::GetFactory()
itk::FEMFactoryBase::GetFactory()->RegisterDefaultTypes();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ int
itkFEMElement2DC0LinearQuadrilateralStressTestFEMObjectReader(int argc, char * argv[])
{
// Need to register default FEM object types,
// and setup SpatialReader to recognize FEM types
// and setup spatialReader to recognize FEM types
// which is all currently done as a HACK in
// the initialization of the itk::FEMFactoryBase::GetFactory()
itk::FEMFactoryBase::GetFactory()->RegisterDefaultTypes();
Expand All @@ -42,19 +42,18 @@ itkFEMElement2DC0LinearQuadrilateralStressTestFEMObjectReader(int argc, char * a

using FEMSpatialObjectReaderType = itk::FEMSpatialObjectReader<2>;
using FEMSpatialObjectReaderPointer = FEMSpatialObjectReaderType::Pointer;
FEMSpatialObjectReaderPointer SpatialReader = FEMSpatialObjectReaderType::New();
// SpatialReader->SetFileName("C:/Research/ITKGit/ITK/Testing/Data/Input/FEM/SpatialObjects.meta");
SpatialReader->SetFileName("C:/Research/ITKGit/ITK/Testing/Data/Input/FEM/Trial.meta");
SpatialReader->Update();
FEMSpatialObjectReaderPointer spatialReader = FEMSpatialObjectReaderType::New();
spatialReader->SetFileName("C:/Research/ITKGit/ITK/Testing/Data/Input/FEM/Trial.meta");
spatialReader->Update();

using FEMSpatialObjectWriterType = itk::FEMSpatialObjectWriter<2>;
using FEMSpatialObjectWriterPointer = FEMSpatialObjectWriterType::Pointer;
FEMSpatialObjectWriterPointer SpatialWriter = FEMSpatialObjectWriterType::New();
SpatialWriter->SetInput(SpatialReader->GetScene());
SpatialWriter->SetFileName("C:/Research/ITKGit/ITK/Testing/Data/Input/FEM/TrialWrite.meta");
SpatialWriter->Update();
FEMSpatialObjectWriterPointer spatialWriter = FEMSpatialObjectWriterType::New();
spatialWriter->SetInput(spatialReader->GetScene());
spatialWriter->SetFileName("C:/Research/ITKGit/ITK/Testing/Data/Input/FEM/TrialWrite.meta");
spatialWriter->Update();

FEMSpatialObjectReaderType::ScenePointer myScene = SpatialReader->GetScene();
FEMSpatialObjectReaderType::ScenePointer myScene = spatialReader->GetScene();
if (!myScene)
{
std::cout << "No Scene : [FAILED]" << std::endl;
Expand All @@ -66,7 +65,7 @@ itkFEMElement2DC0LinearQuadrilateralStressTestFEMObjectReader(int argc, char * a
using FEMObjectSpatialObjectType = itk::FEMObjectSpatialObject<2>;
using FEMObjectSpatialObjectPointer = FEMObjectSpatialObjectType::Pointer;

FEMObjectSpatialObjectType::ChildrenListType * children = SpatialReader->GetGroup()->GetChildren();
FEMObjectSpatialObjectType::ChildrenListType * children = spatialReader->GetGroup()->GetChildren();
if (strcmp((*(children->begin()))->GetTypeName(), "FEMObjectSpatialObject"))
{
std::cout << " [FAILED]" << std::endl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ itkFEMElement2DC0LinearTriangleMembraneTest(int argc, char * argv[])
return EXIT_FAILURE;
}
// Need to register default FEM object types,
// and setup SpatialReader to recognize FEM types
// and setup spatialReader to recognize FEM types
// which is all currently done as a HACK in
// the initialization of the itk::FEMFactoryBase::GetFactory()
itk::FEMFactoryBase::GetFactory()->RegisterDefaultTypes();
Expand All @@ -40,11 +40,11 @@ itkFEMElement2DC0LinearTriangleMembraneTest(int argc, char * argv[])

using FEMSpatialObjectReaderType = itk::FEMSpatialObjectReader<2>;
using FEMSpatialObjectReaderPointer = FEMSpatialObjectReaderType::Pointer;
FEMSpatialObjectReaderPointer SpatialReader = FEMSpatialObjectReaderType::New();
SpatialReader->SetFileName(argv[1]);
SpatialReader->Update();
FEMSpatialObjectReaderPointer spatialReader = FEMSpatialObjectReaderType::New();
spatialReader->SetFileName(argv[1]);
spatialReader->Update();

FEMSpatialObjectReaderType::GroupPointer myGroup = SpatialReader->GetGroup();
FEMSpatialObjectReaderType::GroupPointer myGroup = spatialReader->GetGroup();
if (!myGroup)
{
std::cout << "No Group : [FAILED]" << std::endl;
Expand All @@ -55,7 +55,7 @@ itkFEMElement2DC0LinearTriangleMembraneTest(int argc, char * argv[])
// Testing the fe mesh validity
using FEMObjectSpatialObjectType = itk::FEMObjectSpatialObject<2>;

FEMObjectSpatialObjectType::ChildrenListType * children = SpatialReader->GetGroup()->GetChildren();
FEMObjectSpatialObjectType::ChildrenListType * children = spatialReader->GetGroup()->GetChildren();

if (children->front()->GetTypeName() != "FEMObjectSpatialObject")
{
Expand All @@ -82,10 +82,10 @@ itkFEMElement2DC0LinearTriangleMembraneTest(int argc, char * argv[])
femSODef->SetFEMObject(solver->GetOutput());
using FEMSpatialObjectWriterType = itk::FEMSpatialObjectWriter<2>;
using FEMSpatialObjectWriterPointer = FEMSpatialObjectWriterType::Pointer;
FEMSpatialObjectWriterPointer SpatialWriter = FEMSpatialObjectWriterType::New();
SpatialWriter->SetInput(femSODef);
SpatialWriter->SetFileName(argv[2]);
SpatialWriter->Update();
FEMSpatialObjectWriterPointer spatialWriter = FEMSpatialObjectWriterType::New();
spatialWriter->SetInput(femSODef);
spatialWriter->SetFileName(argv[2]);
spatialWriter->Update();

std::cout << "Test PASSED!" << std::endl;
return EXIT_SUCCESS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ itkFEMElement2DC0LinearTriangleStrainTest(int argc, char * argv[])
return EXIT_FAILURE;
}
// Need to register default FEM object types,
// and setup SpatialReader to recognize FEM types
// and setup spatialReader to recognize FEM types
// which is all currently done as a HACK in
// the initialization of the itk::FEMFactoryBase::GetFactory()
itk::FEMFactoryBase::GetFactory()->RegisterDefaultTypes();
Expand All @@ -40,11 +40,11 @@ itkFEMElement2DC0LinearTriangleStrainTest(int argc, char * argv[])

using FEMSpatialObjectReaderType = itk::FEMSpatialObjectReader<2>;
using FEMSpatialObjectReaderPointer = FEMSpatialObjectReaderType::Pointer;
FEMSpatialObjectReaderPointer SpatialReader = FEMSpatialObjectReaderType::New();
SpatialReader->SetFileName(argv[1]);
SpatialReader->Update();
FEMSpatialObjectReaderPointer spatialReader = FEMSpatialObjectReaderType::New();
spatialReader->SetFileName(argv[1]);
spatialReader->Update();

FEMSpatialObjectReaderType::GroupPointer myGroup = SpatialReader->GetGroup();
FEMSpatialObjectReaderType::GroupPointer myGroup = spatialReader->GetGroup();
if (!myGroup)
{
std::cout << "No Group : [FAILED]" << std::endl;
Expand All @@ -55,7 +55,7 @@ itkFEMElement2DC0LinearTriangleStrainTest(int argc, char * argv[])
// Testing the fe mesh validity
using FEMObjectSpatialObjectType = itk::FEMObjectSpatialObject<2>;

FEMObjectSpatialObjectType::ChildrenListType * children = SpatialReader->GetGroup()->GetChildren();
FEMObjectSpatialObjectType::ChildrenListType * children = spatialReader->GetGroup()->GetChildren();

if (children->front()->GetTypeName() != "FEMObjectSpatialObject")
{
Expand Down Expand Up @@ -83,10 +83,10 @@ itkFEMElement2DC0LinearTriangleStrainTest(int argc, char * argv[])
femSODef->SetFEMObject(solver->GetOutput());
using FEMSpatialObjectWriterType = itk::FEMSpatialObjectWriter<2>;
using FEMSpatialObjectWriterPointer = FEMSpatialObjectWriterType::Pointer;
FEMSpatialObjectWriterPointer SpatialWriter = FEMSpatialObjectWriterType::New();
SpatialWriter->SetInput(femSODef);
SpatialWriter->SetFileName(argv[2]);
SpatialWriter->Update();
FEMSpatialObjectWriterPointer spatialWriter = FEMSpatialObjectWriterType::New();
spatialWriter->SetInput(femSODef);
spatialWriter->SetFileName(argv[2]);
spatialWriter->Update();

std::cout << "Test PASSED!" << std::endl;
return EXIT_SUCCESS;
Expand Down
Loading