diff --git a/Testing/Code/MultiScale/CMakeLists.txt b/Testing/Code/MultiScale/CMakeLists.txt index 3ebb70ccff86f2d72e8a844789d158904f7f2037..fb1f21ac660e46855208fc5867d1ad25b47c6c17 100644 --- a/Testing/Code/MultiScale/CMakeLists.txt +++ b/Testing/Code/MultiScale/CMakeLists.txt @@ -397,23 +397,23 @@ ADD_TEST(msTvWaveletPacketTransform ${MULTISCALE_TESTS4} -out ${TEMP}/msTvWaveletPacketTransform ) -# ------- otb::StationaryFilterBankNew ---------- -ADD_TEST(msTuStationaryFilterBankNew ${MULTISCALE_TESTS4} - otbStationaryFilterBankNew) +# ------- otb::WaveletFilterBankNew ---------- +ADD_TEST(msTuWaveletFilterBankNew ${MULTISCALE_TESTS4} + otbWaveletFilterBankNew) -ADD_TEST(msTvStationaryFilterBank ${MULTISCALE_TESTS4} +ADD_TEST(msTvWaveletFilterBank ${MULTISCALE_TESTS4} --compare-n-images ${TOL} 4 - ${BASELINE}/msTvStationaryFilterBank-0.tif - ${TEMP}/msTvStationaryFilterBank-0.tif - ${BASELINE}/msTvStationaryFilterBank-1.tif - ${TEMP}/msTvStationaryFilterBank-1.tif - ${BASELINE}/msTvStationaryFilterBank-2.tif - ${TEMP}/msTvStationaryFilterBank-2.tif - ${BASELINE}/msTvStationaryFilterBank-3.tif - ${TEMP}/msTvStationaryFilterBank-3.tif - otbStationaryFilterBank + ${BASELINE}/msTvWaveletFilterBank-0.tif + ${TEMP}/msTvWaveletFilterBank-0.tif + ${BASELINE}/msTvWaveletFilterBank-1.tif + ${TEMP}/msTvWaveletFilterBank-1.tif + ${BASELINE}/msTvWaveletFilterBank-2.tif + ${TEMP}/msTvWaveletFilterBank-2.tif + ${BASELINE}/msTvWaveletFilterBank-3.tif + ${TEMP}/msTvWaveletFilterBank-3.tif + otbWaveletFilterBank -in ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif - -out ${TEMP}/msTvStationaryFilterBank + -out ${TEMP}/msTvWaveletFilterBank ) # ------- Fichiers sources CXX ----------------------------------- @@ -458,8 +458,8 @@ otbWaveletTransformNew.cxx otbWaveletTransform.cxx otbWaveletPacketTransformNew.cxx otbWaveletPacketTransform.cxx -otbStationaryFilterBankNew.cxx -otbStationaryFilterBank.cxx +otbWaveletFilterBankNew.cxx +otbWaveletFilterBank.cxx ) INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}") diff --git a/Testing/Code/MultiScale/otbMultiScaleTests4.cxx b/Testing/Code/MultiScale/otbMultiScaleTests4.cxx index 59f8d11c2aeb5747d8a6d6fcd8770efc87a63c05..af0eb97b747fa6013795fbf61f3ad9cc1dbed6f2 100644 --- a/Testing/Code/MultiScale/otbMultiScaleTests4.cxx +++ b/Testing/Code/MultiScale/otbMultiScaleTests4.cxx @@ -30,6 +30,6 @@ void RegisterTests() REGISTER_TEST(otbWaveletTransform); REGISTER_TEST(otbWaveletPacketTransformNew); REGISTER_TEST(otbWaveletPacketTransform); - REGISTER_TEST(otbStationaryFilterBankNew); - REGISTER_TEST(otbStationaryFilterBank); + REGISTER_TEST(otbWaveletFilterBankNew); + REGISTER_TEST(otbWaveletFilterBank); } diff --git a/Testing/Code/MultiScale/otbStationaryFilterBank.cxx b/Testing/Code/MultiScale/otbWaveletFilterBank.cxx similarity index 95% rename from Testing/Code/MultiScale/otbStationaryFilterBank.cxx rename to Testing/Code/MultiScale/otbWaveletFilterBank.cxx index fec501f425c7e997c47a385bf94d0e2b2eb5890d..97bb2951a3d3d6a2e957d5ddfceac2ef8e8b050b 100644 --- a/Testing/Code/MultiScale/otbStationaryFilterBank.cxx +++ b/Testing/Code/MultiScale/otbWaveletFilterBank.cxx @@ -25,7 +25,7 @@ #include "otbImageFileReader.h" #include "otbImageFileWriter.h" -#include "otbStationaryFilterBank.h" +#include "otbWaveletFilterBank.h" #include "otbHaarOperator.h" #include "otb_9_7_Operator.h" @@ -33,7 +33,7 @@ #include "otbCommandLineArgumentParser.h" #include "otbCommandProgressUpdate.h" -int otbStationaryFilterBank( int argc, char * argv[] ) +int otbWaveletFilterBank( int argc, char * argv[] ) { typedef otb::CommandLineArgumentParser ParserType; ParserType::Pointer parser = ParserType::New(); @@ -79,7 +79,7 @@ int otbStationaryFilterBank( int argc, char * argv[] ) typedef otb::LowPass_9_7_Operator< PixelType, Dimension > LowPassOperator; typedef otb::HighPass_9_7_Operator< PixelType, Dimension > HighPassOperator; - typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > + typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > FilterType; FilterType::Pointer filter = FilterType::New(); filter->SetInput( reader->GetOutput() ); diff --git a/Testing/Code/MultiScale/otbStationaryFilterBankNew.cxx b/Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx similarity index 82% rename from Testing/Code/MultiScale/otbStationaryFilterBankNew.cxx rename to Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx index e8e6ee39e1e0e3850dbf32e1dbaa0725baf5fb9c..c1efd89ee5ad0c6b275fb4e85e6cf7cc3f762188 100644 --- a/Testing/Code/MultiScale/otbStationaryFilterBankNew.cxx +++ b/Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx @@ -18,16 +18,16 @@ PURPOSE. See the above copyright notices for more information. #include "otbImage.h" #include "otb_9_7_Operator.h" -#include "otbStationaryFilterBank.h" +#include "otbWaveletFilterBank.h" -int otbStationaryFilterBankNew(int argc, char * argv[]) +int otbWaveletFilterBankNew(int argc, char * argv[]) { const int Dimension = 2; typedef double PixelType; typedef otb::Image< PixelType, Dimension > ImageType; typedef otb::LowPass_9_7_Operator< PixelType, Dimension > LowPassOperator; typedef otb::HighPass_9_7_Operator< PixelType, Dimension > HighPassOperator; - typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > FilterType; + typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > FilterType; FilterType::Pointer filter = FilterType::New(); diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx index b94319a4d14c76aae91211a86dff0792718e7419..40a24c80e2941f506c7a7c65167e3931a2fb3aa0 100644 --- a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx +++ b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx @@ -25,7 +25,7 @@ #include "otbImageFileReader.h" #include "otbImageFileWriter.h" -#include "otbStationaryFilterBank.h" +#include "otbWaveletFilterBank.h" #include "otbWaveletPacketForwardTransform.h" #include "otbWPCost.h" @@ -79,7 +79,7 @@ int otbWaveletPacketTransform( int argc, char * argv[] ) typedef otb::LowPass_9_7_Operator< PixelType, Dimension > LowPassOperator; typedef otb::HighPass_9_7_Operator< PixelType, Dimension > HighPassOperator; - typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > + typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > WaveletFilterType; typedef otb::FullyDecomposedWaveletPacketCost< ImageType > CostType; diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx index 13e9e69263716d228cfe791faf9339adaf40f82b..1b77e86cd0466e6539d18b0c0c93c81b7aa6ede9 100644 --- a/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx +++ b/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx @@ -18,7 +18,7 @@ PURPOSE. See the above copyright notices for more information. #include "otbImage.h" #include "otbHaarOperator.h" -#include "otbStationaryFilterBank.h" +#include "otbWaveletFilterBank.h" #include "otbWaveletPacketForwardTransform.h" #include "otbWPCost.h" @@ -29,7 +29,7 @@ int otbWaveletPacketTransformNew(int argc, char * argv[]) typedef otb::Image< PixelType, Dimension > ImageType; typedef otb::LowPassHaarOperator< PixelType, Dimension > LowPassOperator; typedef otb::HighPassHaarOperator< PixelType, Dimension > HighPassOperator; - typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > WaveletFilterType; + typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > WaveletFilterType; typedef otb::FullyDecomposedWaveletPacketCost< ImageType > CostType; typedef otb::WaveletPacketForwardTransform< ImageType, ImageType, WaveletFilterType, CostType > FilterType; diff --git a/Testing/Code/MultiScale/otbWaveletTransform.cxx b/Testing/Code/MultiScale/otbWaveletTransform.cxx index f1ce9a627863363f5d2e073bce90e1c652b61719..d78036a02df2e4ed395e099aa6ecc125999c502c 100644 --- a/Testing/Code/MultiScale/otbWaveletTransform.cxx +++ b/Testing/Code/MultiScale/otbWaveletTransform.cxx @@ -25,7 +25,7 @@ #include "otbImageFileReader.h" #include "otbImageFileWriter.h" -#include "otbStationaryFilterBank.h" +#include "otbWaveletFilterBank.h" #include "otbWaveletForwardTransform.h" #include "otbHaarOperator.h" @@ -78,7 +78,7 @@ int otbWaveletTransform( int argc, char * argv[] ) typedef otb::LowPass_9_7_Operator< PixelType, Dimension > LowPassOperator; typedef otb::HighPass_9_7_Operator< PixelType, Dimension > HighPassOperator; - typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > WaveletFilterType; + typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > WaveletFilterType; typedef otb::WaveletForwardTransform< ImageType, ImageType, WaveletFilterType > FilterType; FilterType::Pointer filter = FilterType::New(); filter->SetInput( reader->GetOutput() ); diff --git a/Testing/Code/MultiScale/otbWaveletTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletTransformNew.cxx index ebc38a7c32a8940e3176d7c70310845938c4ea5b..cbaaa75c3830650d29086d93d3494418e7e09fc6 100644 --- a/Testing/Code/MultiScale/otbWaveletTransformNew.cxx +++ b/Testing/Code/MultiScale/otbWaveletTransformNew.cxx @@ -19,7 +19,7 @@ PURPOSE. See the above copyright notices for more information. #include "otbImage.h" #include "otbWaveletForwardTransform.h" #include "otbHaarOperator.h" -#include "otbStationaryFilterBank.h" +#include "otbWaveletFilterBank.h" int otbWaveletTransformNew(int argc, char * argv[]) { @@ -28,7 +28,7 @@ int otbWaveletTransformNew(int argc, char * argv[]) typedef otb::Image< PixelType, Dimension > ImageType; typedef otb::LowPassHaarOperator< PixelType, Dimension > LowPassOperator; typedef otb::HighPassHaarOperator< PixelType, Dimension > HighPassOperator; - typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > WaveletFilterType; + typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > WaveletFilterType; typedef otb::WaveletForwardTransform< ImageType, ImageType, WaveletFilterType > FilterType;