Commit 156358bc authored by Julien Malik's avatar Julien Malik
Browse files

STYLE: remove non-ascii characters, fix tests names

parent 0b95dc9c
......@@ -32,8 +32,8 @@ namespace otb
* \class GroundSpacingImageFunction
* \brief Calculate the approximate ground spacing in X and Y directions
*
* This uses the Haversine' formula to calculate great-circle distances between
* the two points – that is, the shortest distance over the Earths surface –
* This uses the 'Haversine' formula to calculate great-circle distances between
* the two points – that is, the shortest distance over the Earth's surface –
* giving an 'as-the-crow-flies' distance between the points (ignoring any hills!).
*
* \ingroup ImageFunctions
......
......@@ -332,9 +332,9 @@ int otbMultiToMonoChannelExtractROI(int argc, char * argv[])
else
{
std::cout << " Erreur : le format des images en entre est mal prcis dans la ligne de commande !!!" << std::endl;
std::cout << " valeurs autorises : -uchar, -ushort, -uint, -float, -double" << std::endl;
std::cout << " valeurs par defaut : -uchar" << std::endl;
std::cout << " Error : wrong format" << std::endl;
std::cout << " allowed values : -uchar, -ushort, -uint, -float, -double" << std::endl;
std::cout << " default value : -uchar" << std::endl;
return EXIT_FAILURE;
}
......
......@@ -30,7 +30,7 @@ int otbTestCommandLineArgumentParser(int argc, char * argv[])
parser->AddOption("-image", "Nom d'une image", "-i", 1, true);
parser->AddOption("-entier", "Une Valeur entiere (obligatoire)", "-e");
parser->AddOption("-deuxentiers", "Deux Valeurs entieres non obligatoire", "-dede", 2, false);
parser->AddOption("-double", "Valeur relle double", "-d");
parser->AddOption("-double", "Valeur reelle double", "-d");
typedef otb::CommandLineArgumentParseResult ParserResultType;
ParserResultType::Pointer parseResult = ParserResultType::New();
......
......@@ -30,8 +30,8 @@ int otbTestCommandLineArgumentParserList(int argc, char * argv[])
parser->AddOption("-image", "Nom d'une image", "-i", 1, true);
parser->AddOption("-entier", "Une Valeur entiere (obligatoire)", "-e");
parser->AddOption("-deuxentiers", "Deux Valeurs entieres non obligatoire", "-dede", 2, false);
parser->AddOption("-double", "Valeur relle double", "-d");
parser->AddOptionNParams("-doubles", "Liste de Valeurs relles", "-ld", false);
parser->AddOption("-double", "Valeur reelle double", "-d");
parser->AddOptionNParams("-doubles", "Liste de Valeurs reelles", "-ld", false);
typedef otb::CommandLineArgumentParseResult ParserResultType;
ParserResultType::Pointer parseResult = ParserResultType::New();
......
......@@ -30,7 +30,7 @@ int otbTestCommandLineArgumentParserWithError(int argc, char * argv[])
parser->AddOption("-image", "Nom d'une image", "-i", 1, true);
parser->AddOption("-entier", "Une Valeur entiere (obligatoire)", "-e");
parser->AddOption("-deuxentiers", "Deux Valeurs entieres non obligatoire", "-dede", 2, false);
parser->AddOption("-double", "Valeur relle double", "-d");
parser->AddOption("-double", "Valeur reelle double", "-d");
typedef otb::CommandLineArgumentParseResult ParserResultType;
ParserResultType::Pointer parseResult = ParserResultType::New();
......
......@@ -37,7 +37,7 @@ ADD_TEST(dmTvDisparityMapEstimationMethod ${DISPARITYMAP_TESTS1}
${TEMP}/dmDisparityMapEstimationOutput.txt
2 3
)
ADD_TEST(dmTlDisparityMapEstimationMethod ${DISPARITYMAP_TESTS1}
ADD_TEST(dmTvDisparityMapEstimationMethod ${DISPARITYMAP_TESTS1}
--compare-ascii ${NOTOL}
${BASELINE_FILES}/dmDisparityMapEstimationOutput1.txt
${TEMP}/dmDisparityMapEstimationOutput1.txt
......@@ -162,7 +162,7 @@ ADD_TEST(dmTvBSplinesInterpolateTransformDeformationFieldGenerator ${DISPARITYMA
# ------- Additional tests for deformation fields estimation ----------
ADD_TEST(dmTlTranslationDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
ADD_TEST(dmTvTranslationDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
--compare-n-images ${EPSILON_4} 12
${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_bs_df.hdr
${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_bs_df.hdr
......@@ -195,7 +195,7 @@ ADD_TEST(dmTlTranslationDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
15 10 10 250 0.95 4 50
)
ADD_TEST(dmTlEuler2DDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
ADD_TEST(dmTvEuler2DDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
--compare-n-images ${EPSILON_4} 12
${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_bs_df.hdr
${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_bs_df.hdr
......@@ -228,7 +228,7 @@ ADD_TEST(dmTlEuler2DDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
15 10 0.01 250 0.95 4 50 128 128
)
ADD_TEST(dmTlCenteredRigidDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
ADD_TEST(dmTvCenteredRigidDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
--compare-n-images ${EPSILON_4} 12
${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_df.hdr
${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_df.hdr
......@@ -262,7 +262,7 @@ ADD_TEST(dmTlCenteredRigidDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
)
ADD_TEST(dmTlSinusoidDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
ADD_TEST(dmTvSinusoidDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
--compare-n-images ${EPSILON_4} 12
${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_bs_df.hdr
${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_bs_df.hdr
......
......@@ -16,7 +16,6 @@ SET(EPSILON_2 0.01)
SET(EPSILON_3 0.001)
#Tolerance sur diff pixel image
#EPSILON est different de 0.0 pour les tests multiplateformes avec différentes options de compilation.
SET(EPSILON_6 0.000001)
SET(EPSILON_8 0.00000001)
......@@ -343,7 +342,7 @@ ADD_TEST(feTvAssociativeSymmetricalSum ${FEATUREEXTRACTION_TESTS4}
ADD_TEST(feTuAssymmetricFusionOfLineDetectorNew ${FEATUREEXTRACTION_TESTS4}
otbAssymmetricFusionOfLineDetectorNew)
ADD_TEST(feTlAssymmetricFusionOfLineDetector ${FEATUREEXTRACTION_TESTS4}
ADD_TEST(feTvAssymmetricFusionOfLineDetector ${FEATUREEXTRACTION_TESTS4}
--compare-image ${EPSILON_8} ${BASELINE}/feFiltreAssymmetricFusion_amst_2_3.hdr
${TEMP}/feFiltreAssymmetricFusion_amst_2_3.hdr
otbAssymmetricFusionOfLineDetector
......@@ -482,7 +481,7 @@ ADD_TEST(feTvLocalHoughDraw ${FEATUREEXTRACTION_TESTS5}
${TEMP}/feFiltreLocalHoughDraw_ImageLine_20_20_2.hdr
20 20 1)
ADD_TEST(feTlLocalHoughDraw2 ${FEATUREEXTRACTION_TESTS5}
ADD_TEST(feTvLocalHoughDraw2 ${FEATUREEXTRACTION_TESTS5}
--compare-image ${EPSILON_8} ${BASELINE}/feFilterLocalHoughDraw_amst_20_20_1.png
${TEMP}/feFilterLocalHoughDraw_amst_20_20_1.png
otbLocalHoughDraw
......@@ -872,7 +871,7 @@ ADD_TEST(feTuImageToSIFTKeyPointSetFilterNew ${FEATUREEXTRACTION_TESTS9}
otbImageToSIFTKeyPointSetFilterNew)
ADD_TEST(feTlImageToSIFTKeyPointSetFilterDistanceMap ${FEATUREEXTRACTION_TESTS9}
ADD_TEST(feTvImageToSIFTKeyPointSetFilterDistanceMap ${FEATUREEXTRACTION_TESTS9}
--compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvImageToSIFTKeyPointSetFilterDistanceMap.txt
${TEMP}/feTvImageToSIFTKeyPointSetFilterDistanceMap.txt
......
......@@ -38,7 +38,7 @@ int otbComplexMomentPath(int argc, char * argv[])
typedef otb::ComplexMomentPathFunction<PathType> CMType;
typedef CMType::ComplexType ComplexType;
// Dessiner un carr�:
// Draw a square
PathType::ContinuousIndexType cindex;
PathType::Pointer pathElt = PathType::New();
......
......@@ -38,7 +38,7 @@ int otbComplexMomentPathFloat(int argc, char * argv[])
typedef std::complex<float> ComplexType;
typedef otb::ComplexMomentPathFunction<PathType, ComplexType> CMType;
// Dessiner un carr�:
// Draw a square
PathType::ContinuousIndexType cindex;
PathType::Pointer pathElt = PathType::New();
......
......@@ -34,7 +34,7 @@ int otbFlusserPath(int argc, char * argv[])
typedef otb::FlusserPathFunction<PathType> FunctionType;
typedef FunctionType::RealType RealType;
// Dessiner un carr�:
// Draw a square
PathType::ContinuousIndexType cindex;
PathType::Pointer pathElt = PathType::New();
......
......@@ -50,7 +50,7 @@ int otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii(int argc, char * ar
typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
typedef otb::SiftFastImageFilter<ImageType, PointSetType> ImageToFastSIFTKeyPointSetFilterType;
// PointSet iterator types
// Iterator types
typedef PointSetType::PointsContainer PointsContainerType;
typedef PointsContainerType::Iterator PointsIteratorType;
typedef PointSetType::PointDataContainer PointDataContainerType;
......
......@@ -51,7 +51,7 @@ int otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii(int argc, char *
typedef otb::SiftFastImageFilter<ImageType, PointSetType> ImageToFastSIFTKeyPointSetFilterType;
// PointSet iterator types
// PointSet iterator types
typedef PointSetType::PointsContainer PointsContainerType;
typedef PointsContainerType::Iterator PointsIteratorType;
typedef PointSetType::PointDataContainer PointDataContainerType;
......
......@@ -40,7 +40,7 @@ typedef itk::PointSet<RealVectorType, 2> PointSetType;
typedef otb::Image<float, 2> ImageType;
typedef otb::Image<unsigned char, 2> OutputImageType;
// PointSet iterator types
// PointSet iterator types
typedef PointSetType::PointsContainer PointsContainerType;
typedef PointsContainerType::Iterator PointsIteratorType;
typedef PointSetType::PointDataContainer PointDataContainerType;
......
......@@ -47,7 +47,7 @@ int otbImageToSIFTKeyPointSetFilterOutputAscii(int argc, char * argv[])
typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
typedef otb::ImageToSIFTKeyPointSetFilter<ImageType, PointSetType> ImageToSIFTKeyPointSetFilterType;
// PointSet iterator types
// PointSet iterator type
typedef PointSetType::PointsContainer PointsContainerType;
typedef PointsContainerType::Iterator PointsIteratorType;
typedef PointSetType::PointDataContainer PointDataContainerType;
......
......@@ -47,7 +47,7 @@ int otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii(int argc, char * argv[]
typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
typedef otb::ImageToSIFTKeyPointSetFilter<ImageType, PointSetType> ImageToSIFTKeyPointSetFilterType;
// PointSet iterator types
// PointSet terator type
typedef PointSetType::PointsContainer PointsContainerType;
typedef PointsContainerType::Iterator PointsIteratorType;
typedef PointSetType::PointDataContainer PointDataContainerType;
......
......@@ -46,8 +46,6 @@ int otbImageToSIFTKeyPointSetFilterOutputImage(int argc, char * argv[])
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
typedef otb::ImageToSIFTKeyPointSetFilter<ImageType, PointSetType> ImageToSIFTKeyPointSetFilterType;
// PointSet iterator types
typedef PointSetType::PointsContainer PointsContainerType;
typedef PointsContainerType::Iterator PointsIteratorType;
......
......@@ -47,7 +47,6 @@ int otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii(int argc, char * arg
typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
typedef otb::ImageToSIFTKeyPointSetFilter<ImageType, PointSetType> ImageToSIFTKeyPointSetFilterType;
// PointSet iterator types
typedef PointSetType::PointsContainer PointsContainerType;
typedef PointsContainerType::Iterator PointsIteratorType;
typedef PointSetType::PointDataContainer PointDataContainerType;
......
......@@ -32,9 +32,8 @@ int otbLineCorrelationDetector(int argc, char* argv[])
const char * inputFilename = argv[1];
const char * outputFilename = argv[2];
// Largeur de la ligne detecter = 2*WidthLine+1
// Parameters of the line to detect
unsigned int WidthLine((unsigned int) ::atoi(argv[3]));
// Longueur de la ligne � detecter = 2*LengthLine+1
unsigned int LengthLine((unsigned int) ::atoi(argv[4]));
typedef unsigned char InputPixelType;
......
......@@ -10,7 +10,6 @@ SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary)
SET(NOTOL 0.0)
#Tolerance sur diff pixel image
#EPSILON est different de 0.0 pour les tests multiplateformes avec différentes options de compilation.
SET(EPSILON_8 0.00000001)
SET(FUSION_TESTS1 ${CXX_TEST_PATH}/otbFusionTests1)
......
......@@ -20,7 +20,6 @@ SET(EPSILON_5 0.00001)
SET(EPSILON_6 0.000001)
SET(EPSILON_9 0.000000001)
# !!!!! Pointe sur un exe généré dans le repertoire Common
SET(COMMON_TESTS2 ${CXX_TEST_PATH}/otbCommonTests2)
SET(COMMON_TESTS3 ${CXX_TEST_PATH}/otbCommonTests3)
SET(IO_TESTS1 ${CXX_TEST_PATH}/otbIOTests1)
......@@ -75,7 +74,7 @@ ADD_TEST(ioTvMultiMonoChannelROI_RADARSAT2ENVI ${COMMON_TESTS3}
-ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT2ENVI_2559_3591_337_280.hdr
-startX 2559 -startY 3591 -sizeX 337 -sizeY 280 )
# --- RADARSAT (GDAL) Nom r�pertoire ---
# --- RADARSAT (GDAL) dir name ---
ADD_TEST(ioTvMultiMonoChannelROI_RADARSAT_ENVI2ENVI ${COMMON_TESTS3}
# THOMAS (provisoire) : Images OK mais erreur au DIFF ITK !!!
# --compare-image ${EPSILON_9} ${BASELINE}/ioMultiMonoChannelROI_RADARSAT2ENVI_2559_3591_337_280.hdr
......@@ -1780,7 +1779,7 @@ ADD_TEST(ioTvSHPVectorDataFileReader2 ${IO_TESTS15}
)
IF(OTB_DATA_USE_LARGEINPUT)
ADD_TEST(ioTlSHPVectorDataFileReader3 ${IO_TESTS15}
ADD_TEST(ioTvSHPVectorDataFileReader3 ${IO_TESTS15}
--compare-ascii ${EPSILON_9} ${BASELINE_FILES}/ioSHPVectorDataFileReader3.txt
${TEMP}/ioSHPVectorDataFileReader3.txt
otbVectorDataFileReader
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment