diff --git a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h
new file mode 100644
index 0000000000000000000000000000000000000000..2ef148e3a6bdeeefa306f07cb6ae10033d1e2375
--- /dev/null
+++ b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h
@@ -0,0 +1,86 @@
+/*=========================================================================
+
+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.
+
+=========================================================================*/
+#ifndef _otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_h
+#define _otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_h
+
+#include "otbPointSetWithTransformToDeformationFieldGenerator.h"
+
+namespace otb
+{
+/** \class NNearestTransformsLinearInterpolateDeformationFieldGenerator
+ * \brief This class generate the deformation field by performing a linear interpolation of the deformations from the transforms induced by the n nearest points.
+ * \ingroup
+ * \ingroup
+ */
+template <class TPointSet, class TDeformationField>
+class ITK_EXPORT NNearestTransformsLinearInterpolateDeformationFieldGenerator
+ : public PointSetWithTransformToDeformationFieldGenerator<TPointSet, TDeformationField>
+{
+ public:
+ /** Standard typedefs */
+ typedef NNearestTransformsLinearInterpolateDeformationFieldGenerator Self;
+ typedef PointSetWithTransformToDeformationFieldGenerator<TPointSet,TDeformationField> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ /** Type macro */
+ itkNewMacro(Self);
+
+ /** Creation through object factory macro */
+ itkTypeMacro(NNearestTransformsLinearInterpolateDeformationFieldGenerator,PointSetWithTransformsToDeformationFieldGenerator);
+
+ /** Template parameters typedefs */
+ typedef typename Superclass::PointSetType PointSetType;
+ typedef typename Superclass::PointSetPointerType PointSetPointerType;
+ typedef typename Superclass::DeformationFieldType DeformationFieldType;
+ typedef typename Superclass::DeformationFieldPointerType DeformationFieldPointerType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename DeformationFieldType::PixelType PixelType;
+ typedef typename Superclass::ValueType ValueType;
+ typedef typename Superclass::PointType PointType;
+ typedef typename Superclass::IndexVectorType IndexVectorType;
+ typedef typename Superclass::DistanceVectorType DistanceVectorType;
+ typedef typename Superclass::TransformType TransformType;
+ typedef typename TransformType::ParametersType ParametersType;
+
+
+ itkSetMacro(NumberOfPoints,unsigned int);
+ itkGetMacro(NumberOfPoints,unsigned int);
+
+protected:
+ /** Constructor */
+ NNearestTransformsLinearInterpolateDeformationFieldGenerator() {};
+ /** Destructor */
+ virtual ~NNearestTransformsLinearInterpolateDeformationFieldGenerator() {};
+ /**PrintSelf method */
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ /** Main computation method */
+ virtual void GenerateData();
+
+private:
+ NNearestTransformsLinearInterpolateDeformationFieldGenerator(const Self&); //purposely not implemented
+ void operator=(const Self&); //purposely not implemented
+
+ unsigned int m_NumberOfPoints;
+};
+}// End namespace otb
+#ifndef OTB_MANUAL_INSTANTIATION
+#include "otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx"
+#endif
+
+#endif
diff --git a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx
new file mode 100644
index 0000000000000000000000000000000000000000..564231c762a5d61b1337a7b6472ec93e876cc829
--- /dev/null
+++ b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx
@@ -0,0 +1,103 @@
+/*=========================================================================
+
+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.
+
+=========================================================================*/
+#ifndef _otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_txx
+#define _otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_txx
+
+#define EPSILON 1e-15
+
+#include "otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h"
+#include "itkImageRegionIteratorWithIndex.h"
+#include "otbMacro.h"
+
+namespace otb
+{
+/** Main computation method */
+template <class TPointSet,class TDeformationField>
+void
+NNearestTransformsLinearInterpolateDeformationFieldGenerator<TPointSet, TDeformationField>
+::GenerateData(void)
+{
+ DeformationFieldPointerType outputPtr = this->GetOutput();
+ PixelType defaultValue(2);
+ defaultValue.Fill(this->GetDefaultValue());
+ outputPtr->Allocate();
+ outputPtr->FillBuffer(defaultValue);
+
+ typedef itk::ImageRegionIteratorWithIndex<DeformationFieldType> IteratorType;
+ IteratorType it(outputPtr,outputPtr->GetRequestedRegion());
+
+ for(it.GoToBegin();!it.IsAtEnd();++it)
+ {
+ IndexType index = it.GetIndex();
+ IndexVectorType indexVector = this->GenerateNearestValidPointsPointSet(it.GetIndex(),m_NumberOfPoints);
+ PixelType pixel(2);
+ double xdeformation, ydeformation,normalization;
+ xdeformation = 0;
+ ydeformation = 0;
+ normalization = 0;
+
+ for(typename IndexVectorType::iterator indexIt=indexVector.begin();indexIt!=indexVector.end();++indexIt)
+ {
+ PointType point;
+ point[0] = static_cast<double>(this->GetPointSet()->GetPoints()->GetElement(*indexIt)[0]);
+ point[1] = static_cast<double>(this->GetPointSet()->GetPoints()->GetElement(*indexIt)[1]);
+ double distance = this->EuclideanDistance(index,point);
+ if(distance<EPSILON)
+ {
+ distance = EPSILON;
+ }
+
+ ParametersType params(this->GetTransform()->GetNumberOfParameters());
+ for(unsigned int i = 0; i<this->GetTransform()->GetNumberOfParameters();++i)
+ {
+ params[i] = this->GetPointSet()->GetPointData()->GetElement((*indexIt))[i+3];
+ }
+ this->GetTransform()->SetParameters(params);
+ PointType sourcePoint,targetPoint;
+
+ outputPtr->TransformIndexToPhysicalPoint(it.GetIndex(),sourcePoint);
+ targetPoint = this->GetTransform()->TransformPoint(sourcePoint);
+ xdeformation += (targetPoint[0]-sourcePoint[0])/distance;
+ ydeformation += (targetPoint[1]-sourcePoint[1]) /distance;
+ normalization+=1/distance;
+ }
+
+ if(normalization>0)
+ {
+ pixel[0] = static_cast<ValueType>(xdeformation/normalization);
+ pixel[1] = static_cast<ValueType>(ydeformation/normalization);
+ }
+ else
+ {
+ pixel=defaultValue;
+ }
+ it.Set(pixel);
+ }
+}
+/**
+ * PrintSelf Method
+ */
+template <class TPointSet,class TDeformationField>
+void
+NNearestTransformsLinearInterpolateDeformationFieldGenerator<TPointSet, TDeformationField>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
+{
+ Superclass::PrintSelf(os, indent);
+}
+} // End namespace otb
+#endif
diff --git a/Testing/Code/DisparityMap/CMakeLists.txt b/Testing/Code/DisparityMap/CMakeLists.txt
index 7891d13b5af007149efa5ad59e0d85ebca3860a5..2c6353591b1d0a5bdf399e2c4504422a9ee5f89e 100644
--- a/Testing/Code/DisparityMap/CMakeLists.txt
+++ b/Testing/Code/DisparityMap/CMakeLists.txt
@@ -78,13 +78,13 @@ ADD_TEST(dmTvBSplinesInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS}
)
-# ------- otb::PointSetToDeformationFieldGenerator ----------
+# ------- otb::PointSetWithTransformToDeformationFieldGenerator ----------
ADD_TEST(dmTuPointSetWithTransformToDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS}
otbPointSetWithTransformToDeformationFieldGeneratorNew)
-# ------- otb::NearestPointDeformationFieldGenerator ----------
+# ------- otb::NearestTransformDeformationFieldGenerator ----------
ADD_TEST(dmTuNearestTransformDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS}
otbNearestTransformDeformationFieldGeneratorNew)
@@ -97,6 +97,21 @@ ADD_TEST(dmTvNearestTransformDeformationFieldGenerator ${DISPARITYMAP_TESTS}
${TEMP}/dmTvNearestTransformDeformationField.hdr
)
+
+# ------- otb::NNearestTransformsLinearInterpolateDeformationFieldGenerator ----------
+
+ADD_TEST(dmTuNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS}
+ otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew)
+
+ADD_TEST(dmTvNNearestTransformsLinearInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS}
+ --compare-image ${TOL}
+ ${BASELINE}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
+ ${TEMP}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
+ otbNNearestTransformsLinearInterpolateDeformationFieldGenerator
+ ${TEMP}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
+)
+
+
# ------- Fichiers sources CXX -----------------------------------
SET(BasicDisparityMap_SRCS
otbDisparityMapEstimationMethodNew.cxx
@@ -111,6 +126,8 @@ otbBSplinesInterpolateDeformationFieldGenerator.cxx
otbPointSetWithTransformToDeformationFieldGeneratorNew.cxx
otbNearestTransformDeformationFieldGeneratorNew.cxx
otbNearestTransformDeformationFieldGenerator.cxx
+otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx
+otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.cxx
)
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
diff --git a/Testing/Code/DisparityMap/otbDisparityMapTests.cxx b/Testing/Code/DisparityMap/otbDisparityMapTests.cxx
index 5dc0cf155f56132bb5ab29662e99d3fd23ccd747..aff01963a274bb0e8ef04672d0b676918910bc00 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapTests.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapTests.cxx
@@ -38,4 +38,6 @@ REGISTER_TEST(otbBSplinesInterpolateDeformationFieldGenerator);
REGISTER_TEST(otbPointSetWithTransformToDeformationFieldGeneratorNew);
REGISTER_TEST(otbNearestTransformDeformationFieldGeneratorNew);
REGISTER_TEST(otbNearestTransformDeformationFieldGenerator);
+REGISTER_TEST(otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew);
+REGISTER_TEST(otbNNearestTransformsLinearInterpolateDeformationFieldGenerator);
}
diff --git a/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.cxx b/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..a79f71615c3c3940096dc142f34207ffad5147fd
--- /dev/null
+++ b/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.cxx
@@ -0,0 +1,135 @@
+/*=========================================================================
+
+ 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 "itkExceptionObject.h"
+#include "itkPointSet.h"
+#include "otbVectorImage.h"
+#include "otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h"
+#include "otbImageFileWriter.h"
+#include "itkEuler2DTransform.h"
+
+int otbNNearestTransformsLinearInterpolateDeformationFieldGenerator(int argc, char * argv[])
+{
+ try
+ {
+ const unsigned int Dimension = 2;
+ const char * outfname = argv[1];
+ typedef double PixelType;
+ typedef otb::VectorImage<PixelType,Dimension> ImageType;
+ typedef itk::Array<double> ParamType;
+ typedef itk::PointSet<ParamType,Dimension> PointSetType;
+ typedef PointSetType::PointType PointType;
+ typedef otb::NNearestTransformsLinearInterpolateDeformationFieldGenerator<PointSetType,ImageType> FilterType;
+ typedef otb::ImageFileWriter<ImageType> WriterType;
+ typedef itk::Euler2DTransform<double> TransformType;
+
+ ImageType::SizeType size;
+ size.Fill(100);
+ double thresh = 0.9;
+
+ // Preparing point set
+ PointSetType::Pointer ps = PointSetType::New();
+ PointType p1,p2,p3,p4,p5;
+ ParamType pd1(6),pd2(6),pd3(6),pd4(6),pd5(6);
+ itk::Point<double,2> center;
+
+ p1[0] = 10;
+ p1[1] = 10;
+ p2[0] = 75;
+ p2[1] = 10;
+ p3[0] = 50;
+ p3[1] = 50;
+ p4[0] = 10;
+ p4[1] = 60;
+ p5[0] = 85;
+ p5[1] = 70;
+ center.Fill(50);
+
+ pd1[0] = 0.95;
+ pd1[1] = 0;
+ pd1[2] = 0;
+ pd1[3] = 5;
+ pd1[4] = 5;
+ pd1[5] = 0.001769;
+ pd2[0] = 0.98;
+ pd2[1] = 0;
+ pd2[2] = 0;
+ pd2[3] = -5;
+ pd2[4] = 5;
+ pd2[5] = -0.001769;
+ pd3[0] = 0.5;
+ pd3[1] = 0;
+ pd3[2] = 0;
+ pd3[3] = 0;
+ pd3[4] = 0;
+ pd3[5] = 0;
+ pd4[0] = 0.91;
+ pd4[1] = 0;
+ pd4[2] = 0;
+ pd4[3] = 5;
+ pd4[4] = -5;
+ pd4[5] = 0.001769;
+ pd5[0] = 0.91;
+ pd5[1] = 0;
+ pd5[2] = 0;
+ pd5[3] = -5;
+ pd5[4] = -5;
+ pd5[5] = -0.001769;
+
+
+ ps->SetPoint(0,p1);
+ ps->SetPointData(0,pd1);
+ ps->SetPoint(1,p2);
+ ps->SetPointData(1,pd2);
+ ps->SetPoint(2,p3);
+ ps->SetPointData(2,pd3);
+ ps->SetPoint(3,p4);
+ ps->SetPointData(3,pd4);
+ ps->SetPoint(4,p5);
+ ps->SetPointData(4,pd5);
+
+ TransformType::Pointer transform = TransformType::New();
+ transform->SetCenter(center);
+
+ // Instantiating object
+ FilterType::Pointer filter = FilterType::New();
+ filter->SetOutputSize(size);
+ filter->SetMetricThreshold(thresh);
+ filter->SetNumberOfPoints(5);
+ filter->SetPointSet(ps);
+ filter->SetTransform(transform);
+
+ WriterType::Pointer writer = WriterType::New();
+ writer->SetInput(filter->GetOutput());
+ writer->SetFileName(outfname);
+ writer->Update();
+ }
+
+ catch( itk::ExceptionObject & err )
+ {
+ std::cout << "Exception itk::ExceptionObject thrown !" << std::endl;
+ std::cout << err << std::endl;
+ return EXIT_FAILURE;
+ }
+
+ catch( ... )
+ {
+ std::cout << "Unknown exception thrown !" << std::endl;
+ return EXIT_FAILURE;
+ }
+ return EXIT_SUCCESS;
+}
diff --git a/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..42e2abf05bc9a6d0fc3f6a33b1cff6b49872eae1
--- /dev/null
+++ b/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx
@@ -0,0 +1,51 @@
+/*=========================================================================
+
+ 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 "itkExceptionObject.h"
+#include "itkPointSet.h"
+#include "otbVectorImage.h"
+#include "otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h"
+
+int otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew(int argc, char * argv[])
+{
+ try
+ {
+ const unsigned int Dimension = 2;
+ typedef double PixelType;
+ typedef otb::VectorImage<PixelType,Dimension> ImageType;
+ typedef ImageType::PointType PointType;
+ typedef itk::PointSet<PointType,Dimension> PointSetType;
+ typedef otb::NNearestTransformsLinearInterpolateDeformationFieldGenerator<PointSetType,ImageType> FilterType;
+
+ // Instantiating object
+ FilterType::Pointer filter = FilterType::New();
+ }
+
+ catch( itk::ExceptionObject & err )
+ {
+ std::cout << "Exception itk::ExceptionObject thrown !" << std::endl;
+ std::cout << err << std::endl;
+ return EXIT_FAILURE;
+ }
+
+ catch( ... )
+ {
+ std::cout << "Unknown exception thrown !" << std::endl;
+ return EXIT_FAILURE;
+ }
+ return EXIT_SUCCESS;
+}
diff --git a/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.cxx b/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.cxx
index a8e63c4276ae100011c5d63d7188870c388cbb38..ee572ff2311bf120ff88858ff66dffc2f5b702ed 100644
--- a/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.cxx
+++ b/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.cxx
@@ -57,20 +57,20 @@ int otbNearestTransformDeformationFieldGenerator(int argc, char * argv[])
p4[1] = 60;
p5[0] = 85;
p5[1] = 70;
- center.Fill(0);
+ center.Fill(50);
pd1[0] = 0.95;
pd1[1] = 0;
pd1[2] = 0;
pd1[3] = 5;
pd1[4] = 5;
- pd1[5] = 0.1769;
+ pd1[5] = 0.001769;
pd2[0] = 0.98;
pd2[1] = 0;
pd2[2] = 0;
pd2[3] = -5;
pd2[4] = 5;
- pd2[5] = -0.1769;
+ pd2[5] = -0.001769;
pd3[0] = 0.5;
pd3[1] = 0;
pd3[2] = 0;
@@ -82,13 +82,13 @@ int otbNearestTransformDeformationFieldGenerator(int argc, char * argv[])
pd4[2] = 0;
pd4[3] = 5;
pd4[4] = -5;
- pd4[5] = 0.1769;
+ pd4[5] = 0.001769;
pd5[0] = 0.91;
pd5[1] = 0;
pd5[2] = 0;
pd5[3] = -5;
pd5[4] = -5;
- pd5[5] = -0.1769;
+ pd5[5] = -0.001769;
ps->SetPoint(0,p1);
ps->SetPointData(0,pd1);