diff --git a/CMakeLists.txt b/CMakeLists.txt index 550f199867..001530a39d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,15 +156,10 @@ endif() #========================================================= # lp_solve library #========================================================= -add_subdirectory(utilities/lp_solve) +find_library(lpsolve55 NAMES lpsolve55 liblpsolve55 REQUIRED) set(LPSOLVE_INCLUDE_DIRS - ${PROJECT_SOURCE_DIR}/utilities/lp_solve - ${PROJECT_SOURCE_DIR}/utilities/lp_solve/shared - ${PROJECT_SOURCE_DIR}/utilities/lp_solve/bfp - ${PROJECT_SOURCE_DIR}/utilities/lp_solve/bfp/bfp_LUSOL - ${PROJECT_SOURCE_DIR}/utilities/lp_solve/bfp/bfp_LUSOL/LUSOL - ${PROJECT_SOURCE_DIR}/utilities/lp_solve/colamd + "/usr/include/lp_solve" ) list(APPEND RTK_INCLUDE_DIRS diff --git a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h index 790e82ea47..0d17eaff58 100644 --- a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h +++ b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h @@ -237,7 +237,7 @@ protected: * It is normal that they do not occupy the same physical space. Therefore this check * must be removed */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** The volume and the projections must have different requested regions diff --git a/include/rtkADMMTotalVariationConjugateGradientOperator.h b/include/rtkADMMTotalVariationConjugateGradientOperator.h index 34d219e8bd..325e853b1b 100644 --- a/include/rtkADMMTotalVariationConjugateGradientOperator.h +++ b/include/rtkADMMTotalVariationConjugateGradientOperator.h @@ -196,7 +196,7 @@ protected: * same physical space or not. Obviously they dont, so we have to remove this check */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** The volume and the projections must have different requested regions diff --git a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h index 71c6ebdc1a..ada7a33d8d 100644 --- a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h +++ b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h @@ -233,7 +233,7 @@ protected: * It is normal that they do not occupy the same physical space. Therefore this check * must be removed */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** The volume and the projections must have different requested regions diff --git a/include/rtkADMMWaveletsConjugateGradientOperator.h b/include/rtkADMMWaveletsConjugateGradientOperator.h index def383903a..3d3a994433 100644 --- a/include/rtkADMMWaveletsConjugateGradientOperator.h +++ b/include/rtkADMMWaveletsConjugateGradientOperator.h @@ -166,7 +166,7 @@ protected: * same physical space or not. Obviously they dont, so we have to remove this check */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** The volume and the projections must have different requested regions diff --git a/include/rtkBackProjectionImageFilter.h b/include/rtkBackProjectionImageFilter.h index 4f300ce5a4..00f588d653 100644 --- a/include/rtkBackProjectionImageFilter.h +++ b/include/rtkBackProjectionImageFilter.h @@ -129,7 +129,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** The input is a stack of projections, we need to interpolate in one projection diff --git a/include/rtkConjugateGradientConeBeamReconstructionFilter.h b/include/rtkConjugateGradientConeBeamReconstructionFilter.h index f9fc427141..2ea2e3fc9a 100644 --- a/include/rtkConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkConjugateGradientConeBeamReconstructionFilter.h @@ -233,7 +233,7 @@ protected: * It is normal that they do not occupy the same physical space. Therefore this check * must be removed */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** The volume and the projections must have different requested regions diff --git a/include/rtkFDKConeBeamReconstructionFilter.h b/include/rtkFDKConeBeamReconstructionFilter.h index 0d4634b255..b110d30318 100644 --- a/include/rtkFDKConeBeamReconstructionFilter.h +++ b/include/rtkFDKConeBeamReconstructionFilter.h @@ -138,7 +138,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Pointers to each subfilter of this composite filter */ diff --git a/include/rtkForwardProjectionImageFilter.h b/include/rtkForwardProjectionImageFilter.h index d7d99d81a4..f1e3f5664a 100644 --- a/include/rtkForwardProjectionImageFilter.h +++ b/include/rtkForwardProjectionImageFilter.h @@ -76,7 +76,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} private: diff --git a/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h b/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h index 1d46f806b7..a6d50677f1 100644 --- a/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkFourDConjugateGradientConeBeamReconstructionFilter.h @@ -195,7 +195,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Pointers to each subfilter of this composite filter */ diff --git a/include/rtkFourDROOSTERConeBeamReconstructionFilter.h b/include/rtkFourDROOSTERConeBeamReconstructionFilter.h index a39b0321d7..ac0a2df984 100644 --- a/include/rtkFourDROOSTERConeBeamReconstructionFilter.h +++ b/include/rtkFourDROOSTERConeBeamReconstructionFilter.h @@ -407,7 +407,7 @@ protected: // Inputs are not supposed to occupy the same physical space, // so there is nothing to verify void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Member pointers to the filters used internally (for convenience)*/ diff --git a/include/rtkFourDSARTConeBeamReconstructionFilter.h b/include/rtkFourDSARTConeBeamReconstructionFilter.h index 20331fe9c1..83afd67ccc 100644 --- a/include/rtkFourDSARTConeBeamReconstructionFilter.h +++ b/include/rtkFourDSARTConeBeamReconstructionFilter.h @@ -228,7 +228,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Pointers to each subfilter of this composite filter */ diff --git a/include/rtkIterativeFDKConeBeamReconstructionFilter.h b/include/rtkIterativeFDKConeBeamReconstructionFilter.h index 6297408144..ecc8b3525f 100644 --- a/include/rtkIterativeFDKConeBeamReconstructionFilter.h +++ b/include/rtkIterativeFDKConeBeamReconstructionFilter.h @@ -203,7 +203,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Pointers to each subfilter of this composite filter */ diff --git a/include/rtkJosephBackAttenuatedProjectionImageFilter.h b/include/rtkJosephBackAttenuatedProjectionImageFilter.h index 95cfc6487b..6a634b6f52 100644 --- a/include/rtkJosephBackAttenuatedProjectionImageFilter.h +++ b/include/rtkJosephBackAttenuatedProjectionImageFilter.h @@ -251,7 +251,7 @@ protected: /** Only the last two inputs should be in the same space so we need * to overwrite the method. */ void - VerifyInputInformation() const override; + VerifyInputInformation() ITKv5_CONST override; void GenerateData() override; diff --git a/include/rtkJosephBackAttenuatedProjectionImageFilter.hxx b/include/rtkJosephBackAttenuatedProjectionImageFilter.hxx index a69caef8a6..0f56b717e6 100644 --- a/include/rtkJosephBackAttenuatedProjectionImageFilter.hxx +++ b/include/rtkJosephBackAttenuatedProjectionImageFilter.hxx @@ -75,7 +75,7 @@ JosephBackAttenuatedProjectionImageFilter::VerifyInputInformation() const + TSumAlongRay>::VerifyInputInformation() ITKv5_CONST { using ImageBaseType = const itk::ImageBase; diff --git a/include/rtkJosephBackProjectionImageFilter.h b/include/rtkJosephBackProjectionImageFilter.h index 1709868d5a..992f3ea997 100644 --- a/include/rtkJosephBackProjectionImageFilter.h +++ b/include/rtkJosephBackProjectionImageFilter.h @@ -266,7 +266,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} inline void diff --git a/include/rtkJosephForwardAttenuatedProjectionImageFilter.h b/include/rtkJosephForwardAttenuatedProjectionImageFilter.h index b3e3858648..d606ff5018 100644 --- a/include/rtkJosephForwardAttenuatedProjectionImageFilter.h +++ b/include/rtkJosephForwardAttenuatedProjectionImageFilter.h @@ -310,7 +310,7 @@ protected: /** Only the last two inputs should be in the same space so we need * to overwrite the method. */ void - VerifyInputInformation() const override; + VerifyInputInformation() ITKv5_CONST override; }; } // end namespace rtk diff --git a/include/rtkJosephForwardAttenuatedProjectionImageFilter.hxx b/include/rtkJosephForwardAttenuatedProjectionImageFilter.hxx index 6363a5923b..1feb00e28a 100644 --- a/include/rtkJosephForwardAttenuatedProjectionImageFilter.hxx +++ b/include/rtkJosephForwardAttenuatedProjectionImageFilter.hxx @@ -80,7 +80,7 @@ JosephForwardAttenuatedProjectionImageFilter::VerifyInputInformation() const + TComputeAttenuationCorrection>::VerifyInputInformation() ITKv5_CONST { using ImageBaseType = const itk::ImageBase; diff --git a/include/rtkJosephForwardProjectionImageFilter.h b/include/rtkJosephForwardProjectionImageFilter.h index a8d812256e..9e04b9d786 100644 --- a/include/rtkJosephForwardProjectionImageFilter.h +++ b/include/rtkJosephForwardProjectionImageFilter.h @@ -271,7 +271,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} inline OutputPixelType diff --git a/include/rtkMaskCollimationImageFilter.h b/include/rtkMaskCollimationImageFilter.h index 838a15ca9a..6aa546bfbb 100644 --- a/include/rtkMaskCollimationImageFilter.h +++ b/include/rtkMaskCollimationImageFilter.h @@ -81,7 +81,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} private: diff --git a/include/rtkMechlemOneStepSpectralReconstructionFilter.h b/include/rtkMechlemOneStepSpectralReconstructionFilter.h index 6ff22f08cd..e6fba3f3e5 100644 --- a/include/rtkMechlemOneStepSpectralReconstructionFilter.h +++ b/include/rtkMechlemOneStepSpectralReconstructionFilter.h @@ -320,7 +320,7 @@ protected: * It is normal that they do not occupy the same physical space. Therefore this check * must be removed */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** The volume and the projections must have different requested regions diff --git a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h index 4581485374..01551646d3 100644 --- a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h +++ b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h @@ -193,7 +193,7 @@ protected: /** The inputs should not be in the same space so there is nothing to verify */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Does the real work. */ diff --git a/include/rtkOSEMConeBeamReconstructionFilter.h b/include/rtkOSEMConeBeamReconstructionFilter.h index 9fec89877a..256a616a73 100644 --- a/include/rtkOSEMConeBeamReconstructionFilter.h +++ b/include/rtkOSEMConeBeamReconstructionFilter.h @@ -195,7 +195,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Pointers to each subfilter of this composite filter */ diff --git a/include/rtkReconstructImageFilter.h b/include/rtkReconstructImageFilter.h index ccca3976fb..62f11cbecb 100644 --- a/include/rtkReconstructImageFilter.h +++ b/include/rtkReconstructImageFilter.h @@ -186,7 +186,7 @@ public: * VerifyInputInformation method has to be reimplemented. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} void diff --git a/include/rtkReconstructionConjugateGradientOperator.h b/include/rtkReconstructionConjugateGradientOperator.h index 0cb8449370..9e8dbd719f 100644 --- a/include/rtkReconstructionConjugateGradientOperator.h +++ b/include/rtkReconstructionConjugateGradientOperator.h @@ -239,7 +239,7 @@ protected: /** When the inputs have the same type, ITK checks whether they occupy the * same physical space or not. Obviously they dont, so we have to remove this check */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** The volume and the projections must have different requested regions */ diff --git a/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h b/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h index 0ca363cc59..5d9cf7794c 100644 --- a/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h @@ -242,7 +242,7 @@ protected: // Inputs are not supposed to occupy the same physical space, // so there is nothing to verify void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Member pointers to the filters used internally (for convenience)*/ diff --git a/include/rtkSARTConeBeamReconstructionFilter.h b/include/rtkSARTConeBeamReconstructionFilter.h index 4b4c3cf652..edaa956900 100644 --- a/include/rtkSARTConeBeamReconstructionFilter.h +++ b/include/rtkSARTConeBeamReconstructionFilter.h @@ -229,7 +229,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Pointers to each subfilter of this composite filter */ diff --git a/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h b/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h index 91d134c0bb..299d6846ea 100644 --- a/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h +++ b/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h @@ -163,7 +163,7 @@ protected: /** The inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Parameters */ diff --git a/include/rtkSpectralForwardModelImageFilter.h b/include/rtkSpectralForwardModelImageFilter.h index 31971b0af0..efedc6fe84 100644 --- a/include/rtkSpectralForwardModelImageFilter.h +++ b/include/rtkSpectralForwardModelImageFilter.h @@ -147,7 +147,7 @@ protected: /** The inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} ThresholdsType m_Thresholds; diff --git a/include/rtkUnwarpSequenceConjugateGradientOperator.h b/include/rtkUnwarpSequenceConjugateGradientOperator.h index cf5b6fcbc3..b3f5c65d0c 100644 --- a/include/rtkUnwarpSequenceConjugateGradientOperator.h +++ b/include/rtkUnwarpSequenceConjugateGradientOperator.h @@ -120,7 +120,7 @@ protected: * same physical space or not. Obviously they dont, so we have to remove this check */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** The volume and the projections must have different requested regions diff --git a/include/rtkUnwarpSequenceImageFilter.h b/include/rtkUnwarpSequenceImageFilter.h index 5419ed05c1..8625aa023b 100644 --- a/include/rtkUnwarpSequenceImageFilter.h +++ b/include/rtkUnwarpSequenceImageFilter.h @@ -160,7 +160,7 @@ protected: * It is normal that they do not occupy the same physical space. Therefore this check * must be removed */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** The volume and the projections must have different requested regions diff --git a/include/rtkWarpFourDToProjectionStackImageFilter.h b/include/rtkWarpFourDToProjectionStackImageFilter.h index 77f5825b56..1296519efc 100644 --- a/include/rtkWarpFourDToProjectionStackImageFilter.h +++ b/include/rtkWarpFourDToProjectionStackImageFilter.h @@ -175,7 +175,7 @@ protected: /** The first two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Member pointers to the filters used internally (for convenience)*/ diff --git a/include/rtkWarpProjectionStackToFourDImageFilter.h b/include/rtkWarpProjectionStackToFourDImageFilter.h index 68ba9465a4..6fef735b86 100644 --- a/include/rtkWarpProjectionStackToFourDImageFilter.h +++ b/include/rtkWarpProjectionStackToFourDImageFilter.h @@ -166,7 +166,7 @@ protected: /** The first two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Member pointers to the filters used internally (for convenience)*/ diff --git a/include/rtkWarpSequenceImageFilter.h b/include/rtkWarpSequenceImageFilter.h index 75c7eebbc9..76787fd375 100644 --- a/include/rtkWarpSequenceImageFilter.h +++ b/include/rtkWarpSequenceImageFilter.h @@ -189,7 +189,7 @@ protected: * It is normal that they do not occupy the same physical space. Therefore this check * must be removed */ void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** The volume and the projections must have different requested regions diff --git a/include/rtkWeidingerForwardModelImageFilter.h b/include/rtkWeidingerForwardModelImageFilter.h index 3674aba90b..1cf96e7e34 100644 --- a/include/rtkWeidingerForwardModelImageFilter.h +++ b/include/rtkWeidingerForwardModelImageFilter.h @@ -113,7 +113,7 @@ protected: void GenerateInputRequestedRegion() override; void - VerifyInputInformation() const override + VerifyInputInformation() ITKv5_CONST override {} /** Does the real work. */ diff --git a/include/rtkZengBackProjectionImageFilter.h b/include/rtkZengBackProjectionImageFilter.h index 5812897f17..d00fbf449e 100644 --- a/include/rtkZengBackProjectionImageFilter.h +++ b/include/rtkZengBackProjectionImageFilter.h @@ -138,7 +138,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override; + VerifyInputInformation() ITKv5_CONST override; AddImageFilterPointerType m_AddImageFilter; PasteImageFilterPointerType m_PasteImageFilter; diff --git a/include/rtkZengBackProjectionImageFilter.hxx b/include/rtkZengBackProjectionImageFilter.hxx index dc5ba46cc2..71dab55916 100644 --- a/include/rtkZengBackProjectionImageFilter.hxx +++ b/include/rtkZengBackProjectionImageFilter.hxx @@ -85,7 +85,7 @@ ZengBackProjectionImageFilter::GenerateInputRequested template void -ZengBackProjectionImageFilter::VerifyInputInformation() const +ZengBackProjectionImageFilter::VerifyInputInformation() ITKv5_CONST { using ImageBaseType = const itk::ImageBase; diff --git a/include/rtkZengForwardProjectionImageFilter.h b/include/rtkZengForwardProjectionImageFilter.h index 74ea062d02..c9ec57e2ac 100644 --- a/include/rtkZengForwardProjectionImageFilter.h +++ b/include/rtkZengForwardProjectionImageFilter.h @@ -129,7 +129,7 @@ protected: /** The two inputs should not be in the same space so there is nothing * to verify. */ void - VerifyInputInformation() const override; + VerifyInputInformation() ITKv5_CONST override; RegionOfInterestPointerType m_RegionOfInterest; AddImageFilterPointerType m_AddImageFilter; diff --git a/include/rtkZengForwardProjectionImageFilter.hxx b/include/rtkZengForwardProjectionImageFilter.hxx index 15110c229c..58e2a789db 100644 --- a/include/rtkZengForwardProjectionImageFilter.hxx +++ b/include/rtkZengForwardProjectionImageFilter.hxx @@ -88,7 +88,7 @@ ZengForwardProjectionImageFilter::GenerateInputReques template void -ZengForwardProjectionImageFilter::VerifyInputInformation() const +ZengForwardProjectionImageFilter::VerifyInputInformation() ITKv5_CONST { using ImageBaseType = const itk::ImageBase;