Commit 8815898e authored by Jordi Inglada's avatar Jordi Inglada

STYLE: Rename Adjency to Adjacency

parent 851df52e
......@@ -63,7 +63,7 @@
#include "otbImageToLuminanceImageFilter.h"
#include "otbLuminanceToReflectanceImageFilter.h"
#include "otbReflectanceToSurfaceReflectanceImageFilter.h"
#include "otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h"
#include "otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.h"
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
......@@ -499,7 +499,7 @@ int main(int argc, char *argv[])
//-------------------------------
// Software Guide : BeginLatex
// Next (and last step) is the neighborhood correction.
// For this, the SurfaceAdjencyEffect6SCorrectionSchemeFilter class is used.
// For this, the SurfaceAdjacencyEffect6SCorrectionSchemeFilter class is used.
// The previous surface reflectance inversion is performed under the assumption of a
// homogeneous ground environment. The following step allows to correct the adjacency
// effect on the radiometry of pixels. The method is based on the decomposition of
......@@ -530,16 +530,16 @@ int main(int argc, char *argv[])
// \end{itemize}
// \end{itemize}
// The neighborhood consideration window size is given by the window radius.
// An instance of \doxygen{otb}{SurfaceAdjencyEffect6SCorrectionSchemeFilter} is created.
// An instance of \doxygen{otb}{SurfaceAdjacencyEffect6SCorrectionSchemeFilter} is created.
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
typedef otb::SurfaceAdjencyEffect6SCorrectionSchemeFilter<ImageType,
typedef otb::SurfaceAdjacencyEffect6SCorrectionSchemeFilter<ImageType,
ImageType>
SurfaceAdjencyEffect6SCorrectionSchemeFilterType;
SurfaceAdjencyEffect6SCorrectionSchemeFilterType::Pointer
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
= SurfaceAdjencyEffect6SCorrectionSchemeFilterType::New();
SurfaceAdjacencyEffect6SCorrectionSchemeFilterType;
SurfaceAdjacencyEffect6SCorrectionSchemeFilterType::Pointer
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter
= SurfaceAdjacencyEffect6SCorrectionSchemeFilterType::New();
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
......@@ -553,14 +553,14 @@ int main(int argc, char *argv[])
// \end{itemize}
//
// Software Guide : EndLatex
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->
SetAtmosphericRadiativeTerms(
filterAtmosphericCorrectionParametersTo6SRadiativeTerms->GetOutput());
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->SetZenithalViewingAngle(
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetZenithalViewingAngle(
dataAtmosphericCorrectionParameters->GetViewingZenithalAngle());
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->SetWindowRadius(atoi(argv
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetWindowRadius(atoi(argv
[17]));
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->
SetPixelSpacingInKilometers(static_cast<double>(atof(argv[18])));
//-------------------------------
......@@ -580,11 +580,11 @@ int main(int argc, char *argv[])
filterLuminanceToReflectance->SetInput(filterImageToLuminance->GetOutput());
filterReflectanceToSurfaceReflectanceImageFilter->SetInput(
filterLuminanceToReflectance->GetOutput());
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->SetInput(
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetInput(
filterReflectanceToSurfaceReflectanceImageFilter->GetOutput());
writer->SetInput(
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->GetOutput());
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->GetOutput());
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
......
......@@ -111,7 +111,7 @@ ADD_TEST(raTeAtmosphericCorrectionSequencementTest ${EXE_TESTS}
1
0.199854
# ReflectanceToSurfaceReflectance parameters
# SurfaceAdjencyEffect6SCorrectionSchemeFilter parameters
# SurfaceAdjacencyEffect6SCorrectionSchemeFilter parameters
2 # Radius;
0.020 # pixel spacing in kilometers
)
......
......@@ -344,7 +344,7 @@ OTB-v.2.0.0 - Changes since version 1.6.0 (2007/12/14)
equivalent to the pipeline process ImageToLuminanceImageFilter
and LuminanceToReflectanceImageFilter filters
- Reflectance estimation TOC: otb::ReflectanceToSurfaceReflectanceImageFilter
- 6S effect correction: otb::SurfaceAdjencyEffect6SCorrectionSchemeFilter
- 6S effect correction: otb::SurfaceAdjacencyEffect6SCorrectionSchemeFilter
- DEM slope and shading estimations: otb::DEMCaracteriticsExtractor
*Common:
......
......@@ -440,19 +440,19 @@ ADD_TEST(raTvRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter ${RADIOMET
${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt # wavelenghts, channel 4
)
# ------- otb::SurfaceAdjencyEffect6SCorrectionSchemeFilter ------------------------------
ADD_TEST(raTuSurfaceAdjencyEffect6SCorrectionSchemeFilterNew ${RADIOMETRY_TESTS3}
otbSurfaceAdjencyEffect6SCorrectionSchemeFilterNew
# ------- otb::SurfaceAdjacencyEffect6SCorrectionSchemeFilter ------------------------------
ADD_TEST(raTuSurfaceAdjacencyEffect6SCorrectionSchemeFilterNew ${RADIOMETRY_TESTS3}
otbSurfaceAdjacencyEffect6SCorrectionSchemeFilterNew
)
ADD_TEST(raTvSurfaceAdjencyEffect6SCorrectionSchemeFilter ${RADIOMETRY_TESTS3}
--compare-image ${EPSILON} ${BASELINE}/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilter.tif
${TEMP}/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilter.tif
# --compare-ascii ${EPSILON_10e6} ${BASELINE_FILES}/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
# ${TEMP}/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
otbSurfaceAdjencyEffect6SCorrectionSchemeFilter
ADD_TEST(raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilter ${RADIOMETRY_TESTS3}
--compare-image ${EPSILON} ${BASELINE}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilter.tif
${TEMP}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilter.tif
# --compare-ascii ${EPSILON_10e6} ${BASELINE_FILES}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
# ${TEMP}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter
${BASELINE}/raTvRomania_Correction.tif
${TEMP}/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilter.tif
${TEMP}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilter.tif
2 # Radius;
0.020 # pixel spacing in kilometers
${INPUTDATA}/romania_parameter.txt # atmo param;
......@@ -461,7 +461,7 @@ ADD_TEST(raTvSurfaceAdjencyEffect6SCorrectionSchemeFilter ${RADIOMETRY_TESTS3}
${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B1.txt # wavelenghts, channel 1
${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt # wavelenghts, channel 4
# FOR plateform verification only : to remove when OK
${TEMP}/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
${TEMP}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -505,7 +505,7 @@ ADD_TEST(raTvAtmosphericCorrectionSequencementTest ${RADIOMETRY_TESTS4}
0.199854
${INPUTDATA}/atmosphericCorrectionSequencement_wavelenght_spectral_bands_spot4_1.txt
# ReflectanceToSurfaceReflectance parameters
# SurfaceAdjencyEffect6SCorrectionSchemeFilter parameters
# SurfaceAdjacencyEffect6SCorrectionSchemeFilter parameters
2 # Radius;
0.020 # pixel spacing in kilometers
)
......@@ -1217,8 +1217,8 @@ otbSIXSTraitsComputeAtmosphericParameters.cxx
otbAtmosphericRadiativeTermsNew.cxx
otbReflectanceToSurfaceReflectanceImageFilterNew.cxx
otbReflectanceToSurfaceReflectanceImageFilter.cxx
otbSurfaceAdjencyEffect6SCorrectionSchemeFilterNew.cxx
otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.cxx
otbSurfaceAdjacencyEffect6SCorrectionSchemeFilterNew.cxx
otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx
otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
)
SET(Radiometry_SRCS4
......
......@@ -29,7 +29,7 @@
#include "otbAtmosphericCorrectionParameters.h"
#include "otbAtmosphericRadiativeTerms.h"
#include "otbReflectanceToSurfaceReflectanceImageFilter.h"
#include "otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h"
#include "otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
......@@ -210,24 +210,24 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
filterReflectanceToSurfaceReflectanceImageFilter->SetInput(filterLuminanceToReflectance->GetOutput());
//-------------------------------
typedef otb::SurfaceAdjencyEffect6SCorrectionSchemeFilter<ImageType,
ImageType> SurfaceAdjencyEffect6SCorrectionSchemeFilterType;
SurfaceAdjencyEffect6SCorrectionSchemeFilterType::Pointer filterSurfaceAdjencyEffect6SCorrectionSchemeFilter =
SurfaceAdjencyEffect6SCorrectionSchemeFilterType::New();
typedef otb::SurfaceAdjacencyEffect6SCorrectionSchemeFilter<ImageType,
ImageType> SurfaceAdjacencyEffect6SCorrectionSchemeFilterType;
SurfaceAdjacencyEffect6SCorrectionSchemeFilterType::Pointer filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter =
SurfaceAdjacencyEffect6SCorrectionSchemeFilterType::New();
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->SetAtmosphericRadiativeTerms(
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetAtmosphericRadiativeTerms(
filterAtmosphericCorrectionParametersTo6SRadiativeTerms->GetOutput());
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->SetWindowRadius(atoi(argv[17]));
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->SetPixelSpacingInKilometers(static_cast<double>(atof(argv[18])));
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->SetZenithalViewingAngle(
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetWindowRadius(atoi(argv[17]));
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetPixelSpacingInKilometers(static_cast<double>(atof(argv[18])));
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetZenithalViewingAngle(
dataAtmosphericCorrectionParameters->GetViewingZenithalAngle());
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->SetInput(
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetInput(
filterReflectanceToSurfaceReflectanceImageFilter->GetOutput());
//-------------------------------
WriterType::Pointer writer = WriterType::New();
writer->SetFileName(argv[2]);
writer->SetInput(filterSurfaceAdjencyEffect6SCorrectionSchemeFilter->GetOutput());
writer->SetInput(filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->GetOutput());
writer->Update();
return EXIT_SUCCESS;
......
......@@ -35,7 +35,7 @@ void RegisterTests()
REGISTER_TEST(otbAtmosphericRadiativeTermsNew);
REGISTER_TEST(otbReflectanceToSurfaceReflectanceImageFilterNew);
REGISTER_TEST(otbReflectanceToSurfaceReflectanceImageFilter);
REGISTER_TEST(otbSurfaceAdjencyEffect6SCorrectionSchemeFilterNew);
REGISTER_TEST(otbSurfaceAdjencyEffect6SCorrectionSchemeFilter);
REGISTER_TEST(otbSurfaceAdjacencyEffect6SCorrectionSchemeFilterNew);
REGISTER_TEST(otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter);
REGISTER_TEST(otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter);
}
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