Skip to content

ENH: Improve itkEuclideanDistancePointMetric coverage. #113

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.

Sign up for GitHub

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

Merged
hjmjohnson merged 1 commit into from
Nov 10, 2018
Merged

ENH: Improve itkEuclideanDistancePointMetric coverage. #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions Modules/Registration/Common/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,5 +221,7 @@ DATA{${ITK_DATA_ROOT}/Input/HeadMRVolume.mha} ${ITK_TEST_OUTPUT_DIR}/itkBlockMat

itk_add_test(NAME itkImageRegistrationMethodTest_17
COMMAND ITKRegistrationCommonTestDriver itkImageRegistrationMethodTest_17)
itk_add_test(NAME itkEuclideanDistancePointMetricTest
COMMAND ITKRegistrationCommonTestDriver itkEuclideanDistancePointMetricTest)
itk_add_test(NAME itkEuclideanDistancePointMetricTestSquaredDistanceOff
COMMAND ITKRegistrationCommonTestDriver itkEuclideanDistancePointMetricTest 0)
itk_add_test(NAME itkEuclideanDistancePointMetricTestSquaredDistanceOn
COMMAND ITKRegistrationCommonTestDriver itkEuclideanDistancePointMetricTest 1)
55 changes: 44 additions & 11 deletions Modules/Registration/Common/test/itkEuclideanDistancePointMetricTest.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@
#include "itkQuadEdgeMesh.h"
#include "itkRegularSphereMeshSource.h"
#include "itkEuclideanDistancePointMetric.h"
#include "itkTestingMacros.h"

/**
* This test uses EuclideanDistancePointMetric to compare a Mesh and a
* QuadEdgeMesh. The purpose of the test is to expose a bug caused by using
* QuadEdgeMesh. The purpose of the test is to expose a bug caused by using
* the same iterator for both fixed and moving point sets in the parent class.
*
*/

template< class TFixedMesh, class TMovingMesh >
template< typename TFixedMesh, typename TMovingMesh >
double
CompareMeshSources()
CompareMeshSources( bool computeSquaredDistance )
{

using FixedSourceType = itk::RegularSphereMeshSource< TFixedMesh >;
Expand All @@ -50,12 +51,27 @@ CompareMeshSources()
typename IdentityType::Pointer identity = IdentityType::New();

typename MetricType::Pointer metric = MetricType::New();

metric->SetComputeSquaredDistance( computeSquaredDistance );
TEST_SET_GET_VALUE( computeSquaredDistance, metric->GetComputeSquaredDistance() );

if( computeSquaredDistance )
{
metric->ComputeSquaredDistanceOn();
TEST_EXPECT_TRUE( metric->GetComputeSquaredDistance() );
}
else
{
metric->ComputeSquaredDistanceOff();
TEST_EXPECT_TRUE( !metric->GetComputeSquaredDistance() );
}

metric->SetFixedPointSet( fixed->GetOutput() );
metric->SetMovingPointSet( moving->GetOutput() );
metric->SetTransform( identity );

typename MetricType::MeasureType measure;
measure = metric->GetValue(identity->GetParameters());
measure = metric->GetValue( identity->GetParameters() );

double sum = 0;
for( unsigned int i = 0; i < measure.Size(); ++i )
Expand All @@ -67,41 +83,59 @@ CompareMeshSources()

}

int itkEuclideanDistancePointMetricTest(int, char* [] )
int itkEuclideanDistancePointMetricTest( int argc, char* argv [] )
{

if ( argc < 2 )
{
std::cout << "Usage: " << argv[0]
<< " computeSquaredDistance " << std::endl;
return EXIT_FAILURE;
}

constexpr unsigned int Dimension = 3;
using ScalarType = double;
const double Epsilon = 10e-6;
constexpr double Epsilon = 10e-6;

using MeshType = itk::Mesh< ScalarType, Dimension >;
using QuadEdgeMeshType = itk::QuadEdgeMesh< ScalarType, Dimension >;

if ( CompareMeshSources< MeshType, MeshType >() > Epsilon )

typedef itk::EuclideanDistancePointMetric< MeshType,
QuadEdgeMeshType > MetricType;

MetricType::Pointer metric = MetricType::New();

EXERCISE_BASIC_OBJECT_METHODS( metric, EuclideanDistancePointMetric,
PointSetToPointSetMetric );

bool computeSquaredDistance = static_cast< bool >( std::stoi( argv[1] ) );

if( CompareMeshSources< MeshType, MeshType >( computeSquaredDistance ) > Epsilon )
{
std::cerr << "Comparison between the following was nonzero:" << std::endl;
std::cerr << "Fixed: itk::Mesh" << std::endl;
std::cerr << "Moving: itk::Mesh" << std::endl;
return EXIT_FAILURE;
}

if ( CompareMeshSources< MeshType, QuadEdgeMeshType >() > Epsilon )
if( CompareMeshSources< MeshType, QuadEdgeMeshType >( computeSquaredDistance ) > Epsilon )
{
std::cerr << "Comparison between the following was nonzero:" << std::endl;
std::cerr << "Fixed: itk::Mesh" << std::endl;
std::cerr << "Moving: itk::QuadEdgeMesh" << std::endl;
return EXIT_FAILURE;
}

if ( CompareMeshSources< QuadEdgeMeshType, MeshType >() > Epsilon )
if( CompareMeshSources< QuadEdgeMeshType, MeshType >( computeSquaredDistance ) > Epsilon )
{
std::cerr << "Comparison between the following was nonzero:" << std::endl;
std::cerr << "Fixed: itk::QuadEdgeMesh" << std::endl;
std::cerr << "Moving: itk::Mesh" << std::endl;
return EXIT_FAILURE;
}

if ( CompareMeshSources< QuadEdgeMeshType, QuadEdgeMeshType >() > Epsilon )
if ( CompareMeshSources< QuadEdgeMeshType, QuadEdgeMeshType >( computeSquaredDistance ) > Epsilon )
{
std::cerr << "Comparison between the following was nonzero:" << std::endl;
std::cerr << "Fixed: itk::QuadEdgeMesh" << std::endl;
Expand All @@ -110,5 +144,4 @@ int itkEuclideanDistancePointMetricTest(int, char* [] )
}

return EXIT_SUCCESS;

}