diff --git a/Code/Markov/otbMRFEnergyFisherClassification.h b/Code/Markov/otbMRFEnergyFisherClassification.h index 0b0a6f0cb2a679001b78f557bb1384a013720457..c534b6c0d0961cdf9502a7e63a799e3ad3db547f 100644 --- a/Code/Markov/otbMRFEnergyFisherClassification.h +++ b/Code/Markov/otbMRFEnergyFisherClassification.h @@ -22,7 +22,6 @@ #include "otbMRFEnergy.h" #include "otbMath.h" -#include "otbGamma.h" #include <boost/math/special_functions/gamma.hpp> namespace otb @@ -57,7 +56,6 @@ public: itkNewMacro(Self); itkTypeMacro(MRFEnergyFisherClassification, MRFEnergy); - Gamma g; void SetNumberOfParameters(const unsigned int nParameters) { Superclass::SetNumberOfParameters(nParameters); diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt index 887f0a9f2911f02ec5cdbef34dfc8334df134507..c3fa7fffde9e7ec8bd5c73d99c7d1e321f5fb4bb 100644 --- a/Testing/Code/Common/CMakeLists.txt +++ b/Testing/Code/Common/CMakeLists.txt @@ -1044,13 +1044,6 @@ ADD_TEST(coTvRAMDrivenTiledStreamingManager ${COMMON_TESTS13} ${TEMP}/coTvRAMDrivenTiledStreamingManager.txt ) -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbCommonTests14 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# Gamma function tests # -ADD_TEST(coTvGamma ${COMMON_TESTS14} - otbGammaTest -) # ------- Fichiers sources CXX ----------------------------------- SET(BasicCommon_SRCS1 @@ -1216,12 +1209,6 @@ otbPipelineMemoryPrintCalculatorTest.cxx otbStreamingManager.cxx ) -SET(BasicCommon_SRCS14 -otbCommonTests14.cxx -otbGammaTest.cxx -) - - OTB_ADD_EXECUTABLE(otbCommonTests1 "${BasicCommon_SRCS1}" "OTBIO;OTBTesting") OTB_ADD_EXECUTABLE(otbCommonTests2 "${BasicCommon_SRCS2}" "OTBIO;OTBTesting") OTB_ADD_EXECUTABLE(otbCommonTests3 "${BasicCommon_SRCS3}" "OTBIO;OTBTesting") @@ -1243,6 +1230,5 @@ TARGET_LINK_LIBRARIES(otbCommonTests11 OTBIO OTBTesting itkvcl) OTB_ADD_EXECUTABLE(otbCommonTests12 "${BasicCommon_SRCS12}" "OTBIO;OTBTesting") OTB_ADD_EXECUTABLE(otbCommonTests13 "${BasicCommon_SRCS13}" "OTBIO;OTBTesting") -OTB_ADD_EXECUTABLE(otbCommonTests14 "${BasicCommon_SRCS14}" "OTBIO;OTBTesting") ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) diff --git a/Testing/Code/Common/otbCommonTests14.cxx b/Testing/Code/Common/otbCommonTests14.cxx deleted file mode 100644 index a26f15d1081d10c00d8f2a10354cd0255607c2e5..0000000000000000000000000000000000000000 --- a/Testing/Code/Common/otbCommonTests14.cxx +++ /dev/null @@ -1,30 +0,0 @@ -/*========================================================================= - - Program: ORFEO Toolbox - Language: C++ - Date: $Date$ - Version: $Revision$ - - - Copyright (c) Centre National d'Etudes Spatiales. All rights reserved. - See OTBCopyright.txt for details. - - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - -=========================================================================*/ - -// this file defines the otbCommonTest for the test driver -// and all it expects is that you have a function called RegisterTests -#if defined(_MSC_VER) -#pragma warning ( disable : 4786 ) -#endif - -#include "otbTestMain.h" - -void RegisterTests() -{ - REGISTER_TEST(otbGammaTest); -} diff --git a/Testing/Code/Common/otbGammaTest.cxx b/Testing/Code/Common/otbGammaTest.cxx deleted file mode 100644 index 9fba84aa07988539ada57420c0bcf95d2abf7894..0000000000000000000000000000000000000000 --- a/Testing/Code/Common/otbGammaTest.cxx +++ /dev/null @@ -1,40 +0,0 @@ -/*========================================================================= - - Program: ORFEO Toolbox - Language: C++ - Date: $Date$ - Version: $Revision$ - - - Copyright (c) Centre National d'Etudes Spatiales. All rights reserved. - See OTBCopyright.txt for details. - - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - -=========================================================================*/ - -#include "otbGamma.h" -#include "otbMacro.h" -#include <iostream> - - -int otbGammaTest(int argc, char * argv[]) -{ - typedef otb::Gamma GammaFunctionType; - - //Instantiation - GammaFunctionType * gam = new GammaFunctionType(); - const double epsilon = 0.0000000001; - int output = EXIT_SUCCESS; - - if ( vcl_abs(gam->gamma(1) - 1) > epsilon ) output = EXIT_FAILURE; - if ( vcl_abs(gam->gamma(0.5) - 1.77245385091) > epsilon ) output = EXIT_FAILURE; - if ( vcl_abs(gam->gamma(4) - 6) > epsilon ) output = EXIT_FAILURE; - - delete gam; - - return output; -}