Commit 47f4c1b8 authored by Floris Berendsen's avatar Floris Berendsen
Browse files

ENH: corrected name

selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent
parent c2f98b59
......@@ -17,8 +17,8 @@
*
*=========================================================================*/
#ifndef selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent_h
#define selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent_h
#ifndef selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent_h
#define selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent_h
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
......@@ -37,31 +37,31 @@
namespace selx
{
template< int Dimensionality, class TransformInternalComputationValueType >
class ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent :
class ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent :
public SuperElastixComponent<
Accepting< itkImageDomainFixedInterface< Dimensionality >
>,
Providing< itkTransformParametersAdaptorInterface< TransformInternalComputationValueType, Dimensionality>
Providing< itkTransformParametersAdaptorsContainerInterface< TransformInternalComputationValueType, Dimensionality>
>
>
{
public:
selxNewMacro( ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent, ComponentBase );
selxNewMacro( ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent, ComponentBase );
//itkStaticConstMacro(Dimensionality, unsigned int, Dimensionality);
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent();
virtual ~ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent();
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent();
virtual ~ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent();
// Get the type definitions from the interfaces
typedef typename itkImageDomainFixedInterface< Dimensionality >::ItkImageDomainType FixedImageDomainType;
using itkTransformParametersAdaptorInterfaceType = itkTransformParametersAdaptorInterface< TransformInternalComputationValueType, Dimensionality >;
using TransformParametersAdaptorsContainerType = typename itkTransformParametersAdaptorInterfaceType::TransformParametersAdaptorsContainerType;
using itkTransformParametersAdaptorsContainerInterfaceType = itkTransformParametersAdaptorsContainerInterface< TransformInternalComputationValueType, Dimensionality >;
using TransformParametersAdaptorsContainerType = typename itkTransformParametersAdaptorsContainerInterfaceType::TransformParametersAdaptorsContainerType;
// Since the itkTransformParametersAdaptorInterface is only defined by BaseType Adaptors and Transforms, we cannot use the ItkTransformParametersAdaptorInterfaceType::TransformParametersAdaptorBaseType;
// Since the itkTransformParametersAdaptorsContainerInterface is only defined by BaseType Adaptors and Transforms, we cannot use the ItkTransformParametersAdaptorsContainerInterfaceType::TransformParametersAdaptorBaseType;
// Specific to this componenent is the full definition of TransformParametersAdaptorType being GaussianExponentialDiffeomorphic
using TransformParametersAdaptorType = itk::GaussianExponentialDiffeomorphicTransformParametersAdaptor< itk::GaussianExponentialDiffeomorphicTransform<TransformInternalComputationValueType, Dimensionality> >;
......@@ -106,6 +106,6 @@ protected:
} //end namespace selx
#ifndef ITK_MANUAL_INSTANTIATION
#include "selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent.hxx"
#include "selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent.hxx"
#endif
#endif // #define GDOptimizer3rdPartyComponent_h
......@@ -17,26 +17,26 @@
*
*=========================================================================*/
#include "selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent.h"
#include "selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent.h"
namespace selx
{
template< int Dimensionality, class TransformInternalComputationValueType >
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent< Dimensionality, TransformInternalComputationValueType >::ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent()
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent< Dimensionality, TransformInternalComputationValueType >::ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent()
{
}
template< int Dimensionality, class TransformInternalComputationValueType >
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent< Dimensionality, TransformInternalComputationValueType >::~ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent()
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent< Dimensionality, TransformInternalComputationValueType >::~ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent()
{
}
template< int Dimensionality, class TransformInternalComputationValueType >
int
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent< Dimensionality, TransformInternalComputationValueType >
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent< Dimensionality, TransformInternalComputationValueType >
::Set( itkImageDomainFixedInterface< Dimensionality > * component )
{
auto fixedImageDomain = component->GetItkImageDomainFixed();
......@@ -74,8 +74,8 @@ ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent< Dimensio
template< int Dimensionality, class TransformInternalComputationValueType >
typename ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent<Dimensionality, TransformInternalComputationValueType >::TransformParametersAdaptorsContainerType
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent< Dimensionality, TransformInternalComputationValueType >
typename ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent<Dimensionality, TransformInternalComputationValueType >::TransformParametersAdaptorsContainerType
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent< Dimensionality, TransformInternalComputationValueType >
::GetItkTransformParametersAdaptorsContainer()
{
return this->m_adaptors;
......@@ -84,7 +84,7 @@ ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent< Dimensio
template< int Dimensionality, class TransformInternalComputationValueType >
bool
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent< Dimensionality, TransformInternalComputationValueType >
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent< Dimensionality, TransformInternalComputationValueType >
::MeetsCriterion( const ComponentBase::CriterionType & criterion )
{
bool hasUndefinedCriteria( false );
......
......@@ -39,7 +39,7 @@ class ItkImageRegistrationMethodv4Component :
Accepting< itkImageFixedInterface< Dimensionality, TPixel >,
itkImageMovingInterface< Dimensionality, TPixel >,
itkTransformInterface< double, Dimensionality >,
itkTransformParametersAdaptorInterface< double, Dimensionality>,
itkTransformParametersAdaptorsContainerInterface< double, Dimensionality>,
itkMetricv4Interface< Dimensionality, TPixel >,
itkOptimizerv4Interface< double >
>,
......@@ -69,7 +69,7 @@ public:
typedef typename itkTransformInterface< TransformInternalComputationValueType, Dimensionality >::TransformType TransformType;
typedef typename itkTransformInterface< TransformInternalComputationValueType, Dimensionality >::TransformPointer TransformPointer;
using TransformParametersAdaptorInterfaceType = itkTransformParametersAdaptorInterface< TransformInternalComputationValueType, Dimensionality>;
using TransformParametersAdaptorsContainerInterfaceType = itkTransformParametersAdaptorsContainerInterface< TransformInternalComputationValueType, Dimensionality>;
typedef itk::ImageRegistrationMethodv4< FixedImageType, MovingImageType > TheItkFilterType;
typedef typename TheItkFilterType::ImageMetricType ImageMetricType;
......@@ -82,7 +82,7 @@ public:
virtual int Set( itkTransformInterface< TransformInternalComputationValueType, Dimensionality > * ) override;
virtual int Set( TransformParametersAdaptorInterfaceType *) override;
virtual int Set( TransformParametersAdaptorsContainerInterfaceType *) override;
virtual int Set( itkMetricv4Interface< Dimensionality, TPixel > * ) override;
......@@ -106,7 +106,7 @@ private:
// The settings SmoothingSigmas and ShrinkFactors imply NumberOfLevels, if the user
// provides inconsistent numbers we should detect that and report about it.
std::string m_NumberOfLevelsLastSetBy;
TransformParametersAdaptorInterfaceType* m_TransformAdaptorInterface;
TransformParametersAdaptorsContainerInterfaceType* m_TransformAdaptorsContainerInterface;
protected:
/* The following struct returns the string name of computation type */
......
......@@ -168,10 +168,10 @@ ItkImageRegistrationMethodv4Component< Dimensionality, TPixel >::Set( itkTransfo
template< int Dimensionality, class TPixel >
int
ItkImageRegistrationMethodv4Component< Dimensionality, TPixel >::Set( TransformParametersAdaptorInterfaceType * component)
ItkImageRegistrationMethodv4Component< Dimensionality, TPixel >::Set(TransformParametersAdaptorsContainerInterfaceType * component)
{
// store the interface to the ParametersAdaptorsContainer since during the setup of the connections the TransformParametersAdaptorComponent might not be fully connected and thus does not have the adaptors ready.
this->m_TransformAdaptorInterface = component;
this->m_TransformAdaptorsContainerInterface = component;
return 0;
}
......@@ -237,7 +237,7 @@ ItkImageRegistrationMethodv4Component< Dimensionality, TPixel >::RunRegistration
this->m_theItkFilter->SetOptimizer( optimizer );
this->m_theItkFilter->SetTransformParametersAdaptorsPerLevel(this->m_TransformAdaptorInterface->GetItkTransformParametersAdaptorsContainer());
this->m_theItkFilter->SetTransformParametersAdaptorsPerLevel(this->m_TransformAdaptorsContainerInterface->GetItkTransformParametersAdaptorsContainer());
typedef CommandIterationUpdate< TheItkFilterType > RegistrationCommandType;
......
......@@ -37,7 +37,7 @@
#include "selxItkGradientDescentOptimizerv4.h"
#include "selxItkAffineTransform.h"
#include "selxItkGaussianExponentialDiffeomorphicTransform.h"
#include "selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent.h"
#include "selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent.h"
#include "selxItkTransformDisplacementFilter.h"
#include "selxItkResampleFilter.h"
#include "selxItkImageSourceFixed.h"
......@@ -96,7 +96,7 @@ public:
ItkGradientDescentOptimizerv4Component< double >,
ItkAffineTransformComponent< double, 3 >,
ItkGaussianExponentialDiffeomorphicTransformComponent< double, 3 >,
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent<3, double>,
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent<3, double>,
ItkTransformDisplacementFilterComponent< 2, float, double >,
ItkTransformDisplacementFilterComponent< 3, double, double >,
ItkResampleFilterComponent< 2, float, double >,
......@@ -430,7 +430,7 @@ TEST_F( RegistrationItkv4Test, FullyConfigured3d )
blueprint->AddComponent( "Transform", { { "NameOfClass", { "ItkGaussianExponentialDiffeomorphicTransformComponent" } },
{ "Dimensionality", { "3" } } } );
blueprint->AddComponent("TransformResolutionAdaptor", { { "NameOfClass", { "ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent" } },
blueprint->AddComponent("TransformResolutionAdaptor", { { "NameOfClass", { "ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent" } },
{ "Dimensionality", { "3" } },
{ "ShrinkFactorsPerLevel", { "2", "1" } } });
......
......@@ -34,7 +34,7 @@
#include "selxItkMeanSquaresImageToImageMetricv4.h"
#include "selxItkGradientDescentOptimizerv4.h"
#include "selxItkGaussianExponentialDiffeomorphicTransform.h"
#include "selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent.h"
#include "selxItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent.h"
#include "selxItkTransformDisplacementFilter.h"
#include "selxItkResampleFilter.h"
#include "selxRegistrationController.h"
......@@ -75,7 +75,7 @@ public:
ItkMeanSquaresImageToImageMetricv4Component< 2, float >,
ItkGradientDescentOptimizerv4Component< double >,
ItkGaussianExponentialDiffeomorphicTransformComponent< double, 2 >,
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent< 2, double >,
ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent< 2, double >,
ItkTransformDisplacementFilterComponent< 2, float, double >,
ItkResampleFilterComponent< 2, float, double >,
RegistrationControllerComponent< >> RegisterComponents;
......@@ -155,7 +155,7 @@ TEST_F( WBIRDemoTest, itkv4_SVF_ANTSCC )
{ "LearningRate", { "100" } } } );
blueprint->AddComponent( "Transform", { { "NameOfClass", { "ItkGaussianExponentialDiffeomorphicTransformComponent" } } } );
blueprint->AddComponent("TransformResolutionAdaptor", { { "NameOfClass", { "ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent" } },
blueprint->AddComponent("TransformResolutionAdaptor", { { "NameOfClass", { "ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent" } },
{ "ShrinkFactorsPerLevel", { "4", "2", "1" } } });
blueprint->AddComponent( "ResampleFilter", { { "NameOfClass", { "ItkResampleFilterComponent" } } } );
......@@ -267,7 +267,7 @@ TEST_F( WBIRDemoTest, itkv4_SVF_MSD )
{ "NumberOfIterations", { "100" } },
{ "LearningRate", { "0.001" } } } );
blueprint->AddComponent( "Transform", { { "NameOfClass", { "ItkGaussianExponentialDiffeomorphicTransformComponent" } } } );
blueprint->AddComponent("TransformResolutionAdaptor", { { "NameOfClass", { "ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent" } },
blueprint->AddComponent("TransformResolutionAdaptor", { { "NameOfClass", { "ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerComponent" } },
{ "ShrinkFactorsPerLevel", { "4", "2", "1" } } });
blueprint->AddComponent( "ResampleFilter", { { "NameOfClass", { "ItkResampleFilterComponent" } } } );
......
......@@ -241,20 +241,20 @@ struct InterfaceName< ReconnectTransformInterface >
template< class InternalComputationValueType, int D >
struct InterfaceName< itkTransformParametersAdaptorInterface< InternalComputationValueType, D > >
struct InterfaceName< itkTransformParametersAdaptorsContainerInterface< InternalComputationValueType, D > >
{
static const char * Get()
{
return "itkTransformParametersAdaptorInterface";
return "itkTransformParametersAdaptorsContainerInterface";
}
};
template< class InternalComputationValueType, int D >
struct InterfaceName< itkGaussianExponentialDiffeomorphicTransformParametersAdaptorInterface< InternalComputationValueType, D > >
struct InterfaceName< itkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerInterface< InternalComputationValueType, D > >
{
static const char * Get()
{
return "itkGaussianExponentialDiffeomorphicTransformParametersAdaptorInterface";
return "itkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerInterface";
}
};
......
......@@ -260,7 +260,7 @@ public:
};
template<class TransformInternalComputationValueType, int Dimensionality >
class itkTransformParametersAdaptorInterface
class itkTransformParametersAdaptorsContainerInterface
{
public:
// TransformBaseType acts as a container of the types: TParametersValueType, NInputDimensions, NOutputDimensions
......@@ -272,7 +272,7 @@ public:
};
template< class TransformInternalComputationValueType, int Dimensionality >
class itkGaussianExponentialDiffeomorphicTransformParametersAdaptorInterface
class itkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerInterface
{
public:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment