Tolerance fix (#32)

bathomas · web-flow · commit a9604f66b098 · 2018-01-27T13:40:57.000Z
* Apply orientation and spacing tolerances to all filters
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,6 +37,13 @@ CONFIGURE_FILE(
         "${PROJECT_BINARY_DIR}/config/EnvironmentInfo.h"
 )
 
+#if(CMAKE_COMPILER_IS_GNUCXX)
+#    include(CodeCoverage)
+#    setup_target_for_coverage(${PROJECT_NAME}_coverage tests coverage)
+#endif()
+
+#SET(CMAKE_CXX_FLAGS "-Wall -pedantic -pthread -g -O0 --coverage")
+
 INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}/config")
 
 ENABLE_TESTING()
diff --git a/lib/petpvcDiscreteIYPVCImageFilter.txx b/lib/petpvcDiscreteIYPVCImageFilter.txx
@@ -45,6 +45,10 @@ template< class TInputImage, class TMaskImage >
 void DiscreteIYPVCImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcFuzzyCorrectionFilter.txx b/lib/petpvcFuzzyCorrectionFilter.txx
@@ -51,6 +51,9 @@ template<class TImage>
 void FuzzyCorrectionFilter<TImage>::GenerateData()
 {
 
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     //Get pointers to input and output.
     typename TImage::ConstPointer input = this->GetInput();
     typename TImage::Pointer output = this->GetOutput();
diff --git a/lib/petpvcGTMImageFilter.txx b/lib/petpvcGTMImageFilter.txx
@@ -54,6 +54,9 @@ template<class TImage>
 void GTMImageFilter<TImage>::GenerateData()
 {
 
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+
     //Get pointers to input and output.
     typename TImage::ConstPointer input = this->GetInput();
 
diff --git a/lib/petpvcIntraRegRLImageFilter.txx b/lib/petpvcIntraRegRLImageFilter.txx
@@ -45,6 +45,10 @@ template< class TInputImage, class TMaskImage >
 void IntraRegRLImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcIntraRegVCImageFilter.txx b/lib/petpvcIntraRegVCImageFilter.txx
@@ -45,6 +45,10 @@ template< class TInputImage, class TMaskImage >
 void IntraRegVCImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcIterativeYangPVCImageFilter.txx b/lib/petpvcIterativeYangPVCImageFilter.txx
@@ -45,6 +45,10 @@ template< class TInputImage, class TMaskImage >
 void IterativeYangPVCImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcLabbeImageFilter.txx b/lib/petpvcLabbeImageFilter.txx
@@ -55,6 +55,9 @@ template<class TImage>
 void LabbeImageFilter<TImage>::GenerateData()
 {
 
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+
     //Get pointers to input and output.
     typename TImage::ConstPointer input = this->GetInput();
 
diff --git a/lib/petpvcLabbeMTCPVCImageFilter.txx b/lib/petpvcLabbeMTCPVCImageFilter.txx
@@ -45,6 +45,10 @@ template< class TInputImage, class TMaskImage >
 void LabbeMTCPVCImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcLabbePVCImageFilter.txx b/lib/petpvcLabbePVCImageFilter.txx
@@ -44,6 +44,10 @@ template< class TInputImage, class TMaskImage >
 void LabbePVCImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcLabbeRBVPVCImageFilter.txx b/lib/petpvcLabbeRBVPVCImageFilter.txx
@@ -45,6 +45,10 @@ template< class TInputImage, class TMaskImage >
 void LabbeRBVPVCImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcMTCPVCImageFilter.txx b/lib/petpvcMTCPVCImageFilter.txx
@@ -45,6 +45,10 @@ template< class TInputImage, class TMaskImage >
 void MTCPVCImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcMullerGartnerImageFilter.txx b/lib/petpvcMullerGartnerImageFilter.txx
@@ -106,6 +106,10 @@ void
 MullerGartnerImageFilter<TInputImage1, TInputImage2, TInputImage3, TOutputImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     //Get input images
     Input1ImagePointer inputPET
         = dynamic_cast<const TInputImage1*> (ProcessObject::GetInput(0));
diff --git a/lib/petpvcRBVPVCImageFilter.txx b/lib/petpvcRBVPVCImageFilter.txx
@@ -44,6 +44,10 @@ template< class TInputImage, class TMaskImage >
 void RBVPVCImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcRLPVCImageFilter.txx b/lib/petpvcRLPVCImageFilter.txx
@@ -46,6 +46,9 @@ template< class TInputImage >
 void RichardsonLucyPVCImageFilter< TInputImage >
 ::GenerateData()
 {
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcRegionConvolutionImageFilter.txx b/lib/petpvcRegionConvolutionImageFilter.txx
@@ -44,6 +44,10 @@ template< class TInputImage, class TMaskImage >
 void RegionConvolutionPVCImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcRoussetPVCImageFilter.txx b/lib/petpvcRoussetPVCImageFilter.txx
@@ -43,6 +43,10 @@ template< class TInputImage, class TMaskImage >
 void RoussetPVCImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcSTCPVCImageFilter.txx b/lib/petpvcSTCPVCImageFilter.txx
@@ -44,6 +44,10 @@ template< class TInputImage, class TMaskImage >
 void STCPVCImageFilter< TInputImage, TMaskImage>
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/lib/petpvcVanCittertPVCImageFilter.txx b/lib/petpvcVanCittertPVCImageFilter.txx
@@ -47,6 +47,10 @@ template< class TInputImage >
 void VanCittertPVCImageFilter< TInputImage >
 ::GenerateData()
 {
+
+    this->SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    this->SetGlobalDefaultDirectionTolerance( 1e-2 );
+
     typename TInputImage::ConstPointer input = this->GetInput();
     typename TInputImage::Pointer output = this->GetOutput();
 
diff --git a/src/DiscreteIY.cxx b/src/DiscreteIY.cxx
@@ -51,6 +51,10 @@ std::string getAcknowledgments(void);
 
 int main(int argc, char *argv[])
 {
+
+    itk::ImageToImageFilterCommon::SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    itk::ImageToImageFilterCommon::SetGlobalDefaultDirectionTolerance( 1e-2 );
+
     const char * const AUTHOR = "Benjamin A. Thomas";
     const char * const APP_TITLE = "Discrete Iterative Yang (IY) PVC";
 
@@ -59,7 +63,7 @@ int main(int argc, char *argv[])
     const std::string VERSION_NO = version_number.str();
 
     typedef petpvc::DiscreteIYPVCImageFilter<PETImageType, MaskImageType>  FilterType;
-
+    
     //Setting up command line argument list.
     MetaCommand command;
 
diff --git a/src/GTM.cxx b/src/GTM.cxx
@@ -33,8 +33,6 @@
 
 #include "petpvcRoussetPVCImageFilter.h"
 
-
-
 typedef itk::Vector<float, 3> VectorType;
 typedef itk::Image<float, 4> MaskImageType;
 typedef itk::Image<float, 3> PETImageType;
@@ -50,6 +48,10 @@ using namespace petpvc;
 
 int main(int argc, char *argv[])
 {
+
+    itk::ImageToImageFilterCommon::SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    itk::ImageToImageFilterCommon::SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     const char * const AUTHOR = "Benjamin A. Thomas";
     const char * const APP_TITLE = "Geometric Transfer Matrix (GTM) PVC";
 
@@ -60,8 +62,8 @@ int main(int argc, char *argv[])
     typedef petpvc::RoussetPVCImageFilter<PETImageType, MaskImageType>  FilterType;
 
     PETImageType::Pointer image = PETImageType::New();
-
-//Setting up command line argument list.
+    
+    //Setting up command line argument list.
     MetaCommand command;
 
     command.SetVersion(VERSION_NO.c_str());
diff --git a/src/IterativeYang.cxx b/src/IterativeYang.cxx
@@ -53,6 +53,9 @@ std::string getAcknowledgments(void);
 int main(int argc, char *argv[])
 {
 
+    itk::ImageToImageFilterCommon::SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    itk::ImageToImageFilterCommon::SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     const char * const AUTHOR = "Benjamin A. Thomas";
     const char * const APP_TITLE = "Iterative Yang (IY) PVC";
 
@@ -63,7 +66,7 @@ int main(int argc, char *argv[])
 
     typedef petpvc::IterativeYangPVCImageFilter<PETImageType, MaskImageType>  FilterType;
     typedef petpvc::FuzzyCorrectionFilter< MaskImageType>  FuzzyFilterType;
-
+    
     //Setting up command line argument list.
     MetaCommand command;
 
diff --git a/src/Labbe.cxx b/src/Labbe.cxx
@@ -52,6 +52,9 @@ using namespace petpvc;
 
 int main(int argc, char *argv[])
 {
+    itk::ImageToImageFilterCommon::SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    itk::ImageToImageFilterCommon::SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     const char * const AUTHOR = "Benjamin A. Thomas";
     const char * const APP_TITLE = "Labbe PVC";
 
@@ -62,8 +65,8 @@ int main(int argc, char *argv[])
     typedef petpvc::LabbePVCImageFilter<PETImageType, MaskImageType>  FilterType;
 
     PETImageType::Pointer image = PETImageType::New();
-
-//Setting up command line argument list.
+    
+    //Setting up command line argument list.
     MetaCommand command;
 
     command.SetVersion(VERSION_NO.c_str());
diff --git a/src/MTC.cxx b/src/MTC.cxx
@@ -49,6 +49,9 @@ std::string getAcknowledgments(void);
 int main(int argc, char *argv[])
 {
 
+    itk::ImageToImageFilterCommon::SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    itk::ImageToImageFilterCommon::SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     const char * const AUTHOR = "Benjamin A. Thomas";
     const char * const APP_TITLE = "Multi-target correction (MTC) PVC";
 
@@ -57,7 +60,7 @@ int main(int argc, char *argv[])
     const std::string VERSION_NO = version_number.str();
 
     typedef petpvc::MTCPVCImageFilter<PETImageType, MaskImageType>  FilterType;
-
+    
     //Setting up command line argument list.
     MetaCommand command;
 
diff --git a/src/MullerGartner.cxx b/src/MullerGartner.cxx
@@ -59,13 +59,16 @@ std::string getAcknowledgments(void);
 
 int main(int argc, char *argv[])
 {
+    itk::ImageToImageFilterCommon::SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    itk::ImageToImageFilterCommon::SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     const char * const AUTHOR = "Benjamin A. Thomas";
     const char * const APP_TITLE = "Muller-Gartner (MG) PVC";
 
     std::stringstream version_number;
     version_number << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_PATCH;
     const std::string VERSION_NO = version_number.str();
-
+    
     //Setting up command line argument list.
     MetaCommand command;
 
diff --git a/src/PETPVC.cxx b/src/PETPVC.cxx
@@ -171,6 +171,10 @@ int main(int argc, char *argv[])
     vFWHM[1] = fFWHM_y;
     vFWHM[2] = fFWHM_z;
 
+	//Set voxel tolerances.
+	itk::ImageToImageFilterCommon::SetGlobalDefaultCoordinateTolerance( 1e-2 );
+	itk::ImageToImageFilterCommon::SetGlobalDefaultDirectionTolerance( 1e-2 );
+
     //Toggle debug mode
     bool bDebug = command.GetValueAsBool("debug");
 
diff --git a/src/RBV.cxx b/src/RBV.cxx
@@ -51,6 +51,10 @@ std::string getAcknowledgments(void);
 
 int main(int argc, char *argv[])
 {
+
+    itk::ImageToImageFilterCommon::SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    itk::ImageToImageFilterCommon::SetGlobalDefaultDirectionTolerance( 1e-2 );
+
     const char * const AUTHOR = "Benjamin A. Thomas";
     const char * const APP_TITLE = "Region-based voxel-wise (RBV) PVC";
 
diff --git a/src/RichardsonLucy.cxx b/src/RichardsonLucy.cxx
@@ -46,6 +46,10 @@ std::string getAcknowledgments(void);
 
 int main(int argc, char *argv[])
 {
+
+    itk::ImageToImageFilterCommon::SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    itk::ImageToImageFilterCommon::SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     const char * const AUTHOR = "Benjamin A. Thomas";
     const char * const APP_TITLE = "Richardson-Lucy (RL) PVC";
 
diff --git a/src/STC.cxx b/src/STC.cxx
@@ -44,7 +44,9 @@ std::string getAcknowledgments(void);
 
 int main(int argc, char *argv[])
 {
-
+    itk::ImageToImageFilterCommon::SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    itk::ImageToImageFilterCommon::SetGlobalDefaultDirectionTolerance( 1e-2 );
+    
     const char * const AUTHOR = "Benjamin A. Thomas";
     const char * const APP_TITLE = "Single Target Correction (STC) PVC";
 
@@ -157,6 +159,7 @@ int main(int argc, char *argv[])
     vVariance[2] = pow(vVariance[2], 2);
 
     FilterType::Pointer stcFilter = FilterType::New();
+
     stcFilter->SetInput( petReader->GetOutput() );
     stcFilter->SetMaskInput( maskReader->GetOutput() );
     stcFilter->SetPSF(vVariance);
diff --git a/src/VanCittert.cxx b/src/VanCittert.cxx
@@ -46,6 +46,9 @@ std::string getAcknowledgments(void);
 
 int main(int argc, char *argv[])
 {
+    itk::ImageToImageFilterCommon::SetGlobalDefaultCoordinateTolerance( 1e-2 );
+    itk::ImageToImageFilterCommon::SetGlobalDefaultDirectionTolerance( 1e-2 );
+
     const char * const AUTHOR = "Benjamin A. Thomas";
     const char * const APP_TITLE = "Reblurred Van-Cittert (RVC)";
 

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ template<class TImage>`
`51`	`51`	`void FuzzyCorrectionFilter<TImage>::GenerateData()`
`52`	`52`	`{`
`53`	`53`
	`54`	`+ this->SetGlobalDefaultCoordinateTolerance( 1e-2 );`
	`55`	`+ this->SetGlobalDefaultDirectionTolerance( 1e-2 );`
	`56`	`+`
`54`	`57`	`//Get pointers to input and output.`
`55`	`58`	`typename TImage::ConstPointer input = this->GetInput();`
`56`	`59`	`typename TImage::Pointer output = this->GetOutput();`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ template<class TImage>`
`54`	`54`	`void GTMImageFilter<TImage>::GenerateData()`
`55`	`55`	`{`
`56`	`56`
	`57`	`+ this->SetGlobalDefaultCoordinateTolerance( 1e-2 );`
	`58`	`+ this->SetGlobalDefaultDirectionTolerance( 1e-2 );`
	`59`	`+`
`57`	`60`	`//Get pointers to input and output.`
`58`	`61`	`typename TImage::ConstPointer input = this->GetInput();`
`59`	`62`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@ template<class TImage>`
`55`	`55`	`void LabbeImageFilter<TImage>::GenerateData()`
`56`	`56`	`{`
`57`	`57`
	`58`	`+ this->SetGlobalDefaultCoordinateTolerance( 1e-2 );`
	`59`	`+ this->SetGlobalDefaultDirectionTolerance( 1e-2 );`
	`60`	`+`
`58`	`61`	`//Get pointers to input and output.`
`59`	`62`	`typename TImage::ConstPointer input = this->GetInput();`
`60`	`63`