#include "vnl/vnl_math.h"
#include "itkStatisticsImageFilter.h"
-#include "vnl/vnl_vector.txx"
-#include "vnl/vnl_c_vector.txx"
+#include "vnl/vnl_vector.h"
+#include "vnl/vnl_c_vector.h"
namespace itk
{
}
m_ThreaderJointPDFSum = new double[this->m_NumberOfThreads];
- ThreadIdType threadID;
+ unsigned int threadID;
int binRange = m_NumberOfHistogramBins / this->m_NumberOfThreads;
template < class TFixedImage, class TMovingImage >
inline void
MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueThreadPreProcess( ThreadIdType threadID,
+::GetValueThreadPreProcess( unsigned int threadID,
bool withinSampleThread ) const
{
template < class TFixedImage, class TMovingImage >
inline bool
MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueThreadProcessSample( ThreadIdType threadID,
+::GetValueThreadProcessSample( unsigned int threadID,
unsigned long fixedImageSample,
const MovingImagePointType & itkNotUsed(mappedPoint),
double movingImageValue) const
template < class TFixedImage, class TMovingImage >
inline void
MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueThreadPostProcess( ThreadIdType threadID,
+::GetValueThreadPostProcess( unsigned int threadID,
bool itkNotUsed(withinSampleThread) ) const
{
unsigned int t;
{
// Set up the parameters in the transform
this->m_Transform->SetParameters( parameters );
-#if ITK_VERSION_MAJOR < 4
- this->m_Parameters = parameters;
-#endif
// MUST BE CALLED TO INITIATE PROCESSING
this->GetValueMultiThreadedInitiate();
// MUST BE CALLED TO INITIATE PROCESSING
this->GetValueMultiThreadedPostProcessInitiate();
- for(ThreadIdType threadID = 0; threadID<this->m_NumberOfThreads-1; threadID++) {
+ for(unsigned int threadID = 0; threadID<this->m_NumberOfThreads-1; threadID++) {
m_JointPDFSum += m_ThreaderJointPDFSum[threadID];
}
if ( m_JointPDFSum == 0.0 ) {
template < class TFixedImage, class TMovingImage >
inline void
MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueAndDerivativeThreadPreProcess( ThreadIdType threadID,
+::GetValueAndDerivativeThreadPreProcess( unsigned int threadID,
bool itkNotUsed(withinSampleThread) ) const
{
if(threadID > 0) {
template < class TFixedImage, class TMovingImage >
inline bool
MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueAndDerivativeThreadProcessSample( ThreadIdType threadID,
+::GetValueAndDerivativeThreadProcessSample( unsigned int threadID,
unsigned long fixedImageSample,
const MovingImagePointType & itkNotUsed(mappedPoint),
double movingImageValue,
template < class TFixedImage, class TMovingImage >
inline void
MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueAndDerivativeThreadPostProcess( ThreadIdType threadID,
+::GetValueAndDerivativeThreadPostProcess( unsigned int threadID,
bool withinSampleThread ) const
{
this->GetValueThreadPostProcess( threadID, withinSampleThread );
} else {
this->m_PRatioArray.Fill( 0.0 );
this->m_MetricDerivative.Fill( NumericTraits< MeasureType >::Zero );
- for(ThreadIdType threadID = 0; threadID < this->m_NumberOfThreads-1; threadID++ ) {
+ for(unsigned int threadID = 0; threadID < this->m_NumberOfThreads-1; threadID++ ) {
this->m_ThreaderMetricDerivative[threadID].Fill( NumericTraits< MeasureType >::Zero );
}
this->m_ImplicitDerivativesSecondPass = false;
// Set up the parameters in the transform
this->m_Transform->SetParameters( parameters );
-#if ITK_VERSION_MAJOR < 4
- this->m_Parameters = parameters;
-#endif
// MUST BE CALLED TO INITIATE PROCESSING ON SAMPLES
this->GetValueAndDerivativeMultiThreadedInitiate();
// CALL IF DOING THREADED POST PROCESSING
this->GetValueAndDerivativeMultiThreadedPostProcessInitiate();
- for(ThreadIdType threadID = 0; threadID<this->m_NumberOfThreads-1; threadID++) {
+ for(unsigned int threadID = 0; threadID<this->m_NumberOfThreads-1; threadID++) {
m_JointPDFSum += m_ThreaderJointPDFSum[threadID];
}
if ( m_JointPDFSum == 0.0 ) {
template < class TFixedImage, class TMovingImage >
void
MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::ComputePDFDerivatives( ThreadIdType threadID,
+::ComputePDFDerivatives( unsigned int threadID,
unsigned int sampleNumber,
int pdfMovingIndex,
const ImageDerivativesType & movingImageGradientValue,
transform = this->m_Transform;
}
-#if ITK_VERSION_MAJOR >= 4
JacobianType jacobian;
transform->ComputeJacobianWithRespectToParameters(this->m_FixedImageSamples[sampleNumber].point, jacobian);
-#else
- const JacobianType& jacobian =
- transform->GetJacobian( this->m_FixedImageSamples[sampleNumber].point );
-#endif
// for ( unsigned int mu = 0; mu < this->m_NumberOfParameters; mu++ )
// {
indicesHelper = &(this->m_BSplineTransformIndices);
}
-#if ITK_VERSION_MAJOR >= 4
this->m_BSplineTransform->ComputeJacobianFromBSplineWeightsWithRespectToPosition(
this->m_FixedImageSamples[sampleNumber].point,
*weightsHelper, *indicesHelper );
-#else
- this->m_BSplineTransform->GetJacobian(
- this->m_FixedImageSamples[sampleNumber].point,
- *weightsHelper, *indicesHelper );
-#endif
}
for( unsigned int dim = 0; dim < Superclass::FixedImageDimension; dim++ ) {