Skip to content

otb
otb
Commit c93cd434 authored by Manuel Grizonnet's avatar Manuel Grizonnet
Browse files
Options

ADD:add class to comute pantex texture coefficient

parent 12a89d33
Hide whitespace changes
Inline Side-by-side
Showing with 740 additions and 1 deletion
Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.h 0 → 100644
View file @ c93cd434
/*=========================================================================
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 __otb_ScalarImageToPanTexTextureFilter_h
#define __otb_ScalarImageToPanTexTextureFilter_h
#include "itkImageToImageFilter.h"
#include "otbMaskedScalarImageToGreyLevelCoocurenceMatrixGenerator.h"
namespace otb
{
template<class TInpuImage, class TOutputImage>
class ScalarImageToPanTexTextureFilter : public itk::ImageToImageFilter
<TInpuImage, TOutputImage>
{
public:
/** Standard class typedefs */
typedef ScalarImageToPanTexTextureFilter Self;
typedef itk::ImageToImageFilter<TInpuImage, TOutputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through the object factory */
itkNewMacro(Self);
/** RTTI */
itkTypeMacro(ScalarImageToPanTexTextureFilter,ImageToImageFilter);
/** Template class typedefs */
typedef TInpuImage InputImageType;
typedef typename InputImageType::Pointer InputImagePointerType;
typedef typename InputImageType::PixelType InputPixelType;
typedef typename InputImageType::RegionType InputRegionType;
typedef typename InputRegionType::SizeType SizeType;
typedef TOutputImage OutputImageType;
typedef typename OutputImageType::Pointer OutputImagePointerType;
typedef typename OutputImageType::RegionType OutputRegionType;
/** Co-occurence matrix and textures calculator */
typedef otb::MaskedScalarImageToGreyLevelCooccurrenceMatrixGenerator
<InputImageType> CoocurrenceMatrixGeneratorType;
typedef typename CoocurrenceMatrixGeneratorType::Pointer CoocurrenceMatrixGeneratorPointerType;
typedef typename CoocurrenceMatrixGeneratorType::OffsetType OffsetType;
typedef typename std::vector<OffsetType> OffsetListType;
typedef typename CoocurrenceMatrixGeneratorType::HistogramType HistogramType;
typedef typename HistogramType::FrequencyType FrequencyType;
typedef typename HistogramType::MeasurementType MeasurementType;
typedef typename HistogramType::Iterator HistogramIterator;
/** Set the radius of the window on which textures will be computed */
itkSetMacro(Radius,SizeType);
/** Get the radius of the window on which textures will be computed */
itkGetMacro(Radius,SizeType);
/** Set the number of bin per axis for histogram generation */
itkSetMacro(NumberOfBinsPerAxis,unsigned int);
/** Get the number of bin per axis for histogram generation */
itkGetMacro(NumberOfBinsPerAxis,unsigned int);
/** Set the input image minimum */
itkSetMacro(InputImageMinimum,InputPixelType);
/** Get the input image minimum */
itkGetMacro(InputImageMinimum,InputPixelType);
/** Set the input image maximum */
itkSetMacro(InputImageMaximum,InputPixelType);
/** Get the input image maximum */
itkGetMacro(InputImageMaximum,InputPixelType);
protected:
/** Constructor */
ScalarImageToPanTexTextureFilter();
/** Destructor */
~ScalarImageToPanTexTextureFilter();
/** Generate the input requested region */
virtual void GenerateInputRequestedRegion();
/** Parallel textures extraction */
virtual void ThreadedGenerateData(const OutputRegionType & outputRegion, int threadId);
private:
ScalarImageToPanTexTextureFilter(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
/** Convenient method to compute union of 2 regions */
static OutputRegionType RegionUnion(const OutputRegionType & region1, const OutputRegionType & region2);
/** Radius of the window on which to compute textures */
SizeType m_Radius;
/** List of Offsets for co-occurence */
OffsetListType m_OffsetList;
/** Number of bins per axis for histogram generation */
unsigned int m_NumberOfBinsPerAxis;
/** Input image minimum */
InputPixelType m_InputImageMinimum;
/** Input image maximum */
InputPixelType m_InputImageMaximum;
};
} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbScalarImageToPanTexTextureFilter.txx"
#endif
#endif
Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.h~ 0 → 100644
View file @ c93cd434
/*=========================================================================
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 __otb_ScalarImageToPanTexTextureFilter_h
#define __otb_ScalarImageToPanTexTextureFilter_h
#include "itkImageToImageFilter.h"
#include "otbMaskedScalarImageToGreyLevelCoocurenceMatrixGenerator.h"
namespace otb
{
template<class TInpuImage, class TOutputImage>
class ScalarImageToPanTexTextureFilter : public itk::ImageToImageFilter
<TInpuImage, TOutputImage>
{
public:
/** Standard class typedefs */
typedef ScalarImageToPanTexTextureFilter Self;
typedef itk::ImageToImageFilter<TInpuImage, TOutputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through the object factory */
itkNewMacro(Self);
/** RTTI */
itkTypeMacro(ScalarImageToPanTexTextureFilter,ImageToImageFilter);
/** Template class typedefs */
typedef TInpuImage InputImageType;
typedef typename InputImageType::Pointer InputImagePointerType;
typedef typename InputImageType::PixelType InputPixelType;
typedef typename InputImageType::RegionType InputRegionType;
typedef typename InputRegionType::SizeType SizeType;
typedef TOutputImage OutputImageType;
typedef typename OutputImageType::Pointer OutputImagePointerType;
typedef typename OutputImageType::RegionType OutputRegionType;
/** Co-occurence matrix and textures calculator */
typedef otb::MaskedScalarImageToGreyLevelCooccurrenceMatrixGenerator
<InputImageType> CoocurrenceMatrixGeneratorType;
typedef typename CoocurrenceMatrixGeneratorType::Pointer CoocurrenceMatrixGeneratorPointerType;
typedef typename CoocurrenceMatrixGeneratorType::OffsetType OffsetType;
typedef typename std::vector<OffsetType> OffsetListType;
typedef typename CoocurrenceMatrixGeneratorType::HistogramType HistogramType;
typedef typename HistogramType::FrequencyType FrequencyType;
typedef typename HistogramType::MeasurementType MeasurementType;
typedef typename HistogramType::Iterator HistogramIterator;
/** Set the radius of the window on which textures will be computed */
itkSetMacro(Radius,SizeType);
/** Get the radius of the window on which textures will be computed */
itkGetMacro(Radius,SizeType);
/** Get the offset for co-occurence computation */
itkGetMacro(Offset,OffsetType);
/** Set the number of bin per axis for histogram generation */
itkSetMacro(NumberOfBinsPerAxis,unsigned int);
/** Get the number of bin per axis for histogram generation */
itkGetMacro(NumberOfBinsPerAxis,unsigned int);
/** Set the input image minimum */
itkSetMacro(InputImageMinimum,InputPixelType);
/** Get the input image minimum */
itkGetMacro(InputImageMinimum,InputPixelType);
/** Set the input image maximum */
itkSetMacro(InputImageMaximum,InputPixelType);
/** Get the input image maximum */
itkGetMacro(InputImageMaximum,InputPixelType);
protected:
/** Constructor */
ScalarImageToPanTexTextureFilter();
/** Destructor */
~ScalarImageToPanTexTextureFilter();
/** Generate the input requested region */
virtual void GenerateInputRequestedRegion();
/** Parallel textures extraction */
virtual void ThreadedGenerateData(const OutputRegionType & outputRegion, int threadId);
private:
ScalarImageToPanTexTextureFilter(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
/** Convenient method to compute union of 2 regions */
static OutputRegionType RegionUnion(const OutputRegionType & region1, const OutputRegionType & region2);
/** Radius of the window on which to compute textures */
SizeType m_Radius;
/** List of Offsets for co-occurence */
OffsetListType m_OffsetList;
/** Number of bins per axis for histogram generation */
unsigned int m_NumberOfBinsPerAxis;
/** Input image minimum */
InputPixelType m_InputImageMinimum;
/** Input image maximum */
InputPixelType m_InputImageMaximum;
};
} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbScalarImageToPanTexTextureFilter.txx"
#endif
#endif
Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.txx 0 → 100644
View file @ c93cd434
/*=========================================================================
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 __otbScalarImageToPanTexTextureFilter_txx
#define __otbScalarImageToPanTexTextureFilter_txx
#include "otbScalarImageToPanTexTextureFilter.h"
#include "itkImageRegionIteratorWithIndex.h"
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
namespace otb
{
template <class TInputImage,class TOutputImage>
ScalarImageToPanTexTextureFilter<TInputImage,TOutputImage>
::ScalarImageToPanTexTextureFilter() : m_Radius(),
m_NumberOfBinsPerAxis(),
m_InputImageMinimum(0),
m_InputImageMaximum(256)
{
// There are 1 output corresponding to the Pan Tex texture indice
this->SetNumberOfOutputs(1);
//Fill the offset list for contrast computation
OffsetType off;
off[0] = 0;
off[1] = 1;
m_OffsetList.push_back(off); //(0,1)
off[1] = 2;
m_OffsetList.push_back(off); //(0,2)
off[0] = 1;
off[1] = -2;
m_OffsetList.push_back(off); //(1,-2)
off[1] = -1;
m_OffsetList.push_back(off); //(1,-1)
off[1] = 0;
m_OffsetList.push_back(off); //(1,0)
off[1] = 1;
m_OffsetList.push_back(off); //(1,1)
off[1] = 2;
m_OffsetList.push_back(off); //(1,2)
off[0] = 2;
off[1] = -1;
m_OffsetList.push_back(off); //(2,-1)
off[1] = 0;
m_OffsetList.push_back(off); //(2,0)
off[1] = 1;
m_OffsetList.push_back(off); //(2,1)
}
template <class TInputImage,class TOutputImage>
ScalarImageToPanTexTextureFilter<TInputImage,TOutputImage>
::~ScalarImageToPanTexTextureFilter()
{}
template <class TInputImage,class TOutputImage>
void
ScalarImageToPanTexTextureFilter<TInputImage,TOutputImage>
::GenerateInputRequestedRegion()
{
// First, call superclass implementation
Superclass::GenerateInputRequestedRegion();
// Retrieve the input and output pointers
InputImagePointerType inputPtr = const_cast<InputImageType *>(this->GetInput());
OutputImagePointerType outputPtr = this->GetOutput();
if(!inputPtr || !outputPtr)
{
return;
}
// Retrieve the output requested region
// We use only the first output since requested regions for all outputs are enforced to be equal
// by the default GenerateOutputRequestedRegiont() implementation
OutputRegionType outputRequestedRegion = outputPtr->GetRequestedRegion();
typename OutputRegionType::IndexType outputIndex = outputRequestedRegion.GetIndex();
typename OutputRegionType::SizeType outputSize = outputRequestedRegion.GetSize();
typename InputRegionType::IndexType inputIndex;
typename InputRegionType::SizeType inputSize;
// First, apply offset
for(unsigned int dim = 0; dim<InputImageType::ImageDimension;++dim)
{
inputIndex[dim]=std::min(outputIndex[dim],outputIndex[dim]+2);
inputSize[dim] =std::max(outputIndex[dim]+outputSize[dim],outputIndex[dim]+outputSize[dim]+2)-inputIndex[dim];
}
// Build the input requested region
InputRegionType inputRequestedRegion;
inputRequestedRegion.SetIndex(inputIndex);
inputRequestedRegion.SetSize(inputSize);
// Apply the radius
inputRequestedRegion.PadByRadius(m_Radius);
// Try to apply the requested region to the input image
if(inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
{
inputPtr->SetRequestedRegion(inputRequestedRegion);
}
else
{
// Build an exception
itk::InvalidRequestedRegionError e(__FILE__,__LINE__);
e.SetLocation(ITK_LOCATION);
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
}
}
template <class TInputImage,class TOutputImage>
void
ScalarImageToPanTexTextureFilter<TInputImage,TOutputImage>
::ThreadedGenerateData(const OutputRegionType & outputRegionForThread, int threadId)
{
// Retrieve the input and output pointers
InputImagePointerType inputPtr = const_cast<InputImageType *>(this->GetInput());
OutputImagePointerType outputPtr = this->GetOutput();
itk::ImageRegionIteratorWithIndex<OutputImageType> outputIt(outputPtr,outputRegionForThread);
// Go to begin
outputIt.GoToBegin();
// Set-up progress reporting
itk::ProgressReporter progress(this,threadId,outputRegionForThread.GetNumberOfPixels());
// Iterate on outputs to compute textures
while(!outputIt.IsAtEnd())
{
double out = itk::NumericTraits<double>::max();
const unsigned int offsetListSize = m_OffsetList.size();
for (unsigned int i = 0; i < offsetListSize; ++i)
{
// Find the input region on which texture will be computed
InputRegionType currentRegion;
typename InputRegionType::IndexType currentIndex = outputIt.GetIndex()-m_Radius;
typename InputRegionType::SizeType currentSize;
for(unsigned int dim = 0; dim<InputImageType::ImageDimension;++dim)
{
// Compute current size before applying offset
currentSize[dim] = 2*m_Radius[dim]+1;
// Apply offset
currentIndex[dim] = std::min(currentIndex[dim],currentIndex[dim]+m_OffsetList[i][dim]);
currentSize[dim] = std::max(currentIndex[dim]+currentSize[dim],currentIndex[dim]+currentSize[dim]+m_OffsetList[i][dim])-currentIndex[dim];
}
// Fill current region
currentRegion.SetIndex(currentIndex);
currentRegion.SetSize(currentSize);
// Build the co-occurence matrix generator
CoocurrenceMatrixGeneratorPointerType coOccurenceMatrixGenerator = CoocurrenceMatrixGeneratorType::New();
coOccurenceMatrixGenerator->SetInput(inputPtr);
coOccurenceMatrixGenerator->SetOffset(m_OffsetList[i]);
coOccurenceMatrixGenerator->SetNumberOfBinsPerAxis(m_NumberOfBinsPerAxis);
coOccurenceMatrixGenerator->SetPixelValueMinMax(m_InputImageMinimum,m_InputImageMaximum);
// Compute the co-occurence matrix
coOccurenceMatrixGenerator->SetRegion(currentRegion);
coOccurenceMatrixGenerator->Compute();
//HistogramType::Pointer histo(coOccurenceMatrixGenerator->GetOutput());
FrequencyType totalFrequency = coOccurenceMatrixGenerator->GetOutput()->GetTotalFrequency();
if ( (totalFrequency - itk::NumericTraits<MeasurementType>::One) > 0.0001 )
{
// Doesn't look normalized:
HistogramIterator hit;
FrequencyType totalFrequency =
coOccurenceMatrixGenerator->GetOutput()->GetTotalFrequency();
for (hit = coOccurenceMatrixGenerator->GetOutput()->Begin(); hit != coOccurenceMatrixGenerator->GetOutput()->End(); ++hit)
{
hit.SetFrequency(hit.GetFrequency() / totalFrequency);
}
}
double inertia = 0;
for (HistogramIterator hit = coOccurenceMatrixGenerator->GetOutput()->Begin();
hit != coOccurenceMatrixGenerator->GetOutput()->End(); ++hit)
{
MeasurementType frequency = hit.GetFrequency();
if (frequency == 0)
{
continue; // no use doing these calculations if we're just multiplying by zero.
}
typename InputRegionType::IndexType index = coOccurenceMatrixGenerator->GetOutput()->GetIndex(hit.GetInstanceIdentifier());
inertia += (index[0] - index[1]) * (index[0] - index[1]) * frequency;
}
if (inertia < out) out = inertia;
}
outputIt.Set(out);
}
}
} // End namespace otb
#endif
Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.txx~ 0 → 100644
View file @ c93cd434
/*=========================================================================
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 __otbScalarImageToPanTexTextureFilter_txx
#define __otbScalarImageToPanTexTextureFilter_txx
#include "otbScalarImageToPanTexTextureFilter.h"
#include "itkImageRegionIteratorWithIndex.h"
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
namespace otb
{
template <class TInputImage,class TOutputImage>
ScalarImageToPanTexTextureFilter<TInputImage,TOutputImage>
::ScalarImageToPanTexTextureFilter() : m_Radius(),
m_NumberOfBinsPerAxis(),
m_InputImageMinimum(0),
m_InputImageMaximum(256)
{
// There are 1 output corresponding to the Pan Tex texture indice
this->SetNumberOfOutputs(1);
//Fill the offset list for contrast computation
OffsetType off;
off[0] = 0;
off[1] = 1;
m_OffsetList.push_back(off); //(0,1)
off[1] = 2;
m_OffsetList.push_back(off); //(0,2)
off[0] = 1;
off[1] = -2;
m_OffsetList.push_back(off); //(1,-2)
off[1] = -1;
m_OffsetList.push_back(off); //(1,-1)
off[1] = 0;
m_OffsetList.push_back(off); //(1,0)
off[1] = 1;
m_OffsetList.push_back(off); //(1,1)
off[1] = 2;
m_OffsetList.push_back(off); //(1,2)
off[0] = 2;
off[1] = -1;
m_OffsetList.push_back(off); //(2,-1)
off[1] = 0;
m_OffsetList.push_back(off); //(2,0)
off[1] = 1;
m_OffsetList.push_back(off); //(2,1)
}
template <class TInputImage,class TOutputImage>
ScalarImageToPanTexTextureFilter<TInputImage,TOutputImage>
::~ScalarImageToPanTexTextureFilter()
{}
template <class TInputImage,class TOutputImage>
void
ScalarImageToPanTexTextureFilter<TInputImage,TOutputImage>
::GenerateInputRequestedRegion()
{
// First, call superclass implementation
Superclass::GenerateInputRequestedRegion();
// Retrieve the input and output pointers
InputImagePointerType inputPtr = const_cast<InputImageType *>(this->GetInput());
OutputImagePointerType outputPtr = this->GetOutput();
if(!inputPtr || !outputPtr)
{
return;
}
// Retrieve the output requested region
// We use only the first output since requested regions for all outputs are enforced to be equal
// by the default GenerateOutputRequestedRegiont() implementation
OutputRegionType outputRequestedRegion = outputPtr->GetRequestedRegion();
typename OutputRegionType::IndexType outputIndex = outputRequestedRegion.GetIndex();
typename OutputRegionType::SizeType outputSize = outputRequestedRegion.GetSize();
typename InputRegionType::IndexType inputIndex;
typename InputRegionType::SizeType inputSize;
// First, apply offset
for(unsigned int dim = 0; dim<InputImageType::ImageDimension;++dim)
{
inputIndex[dim]=std::min(outputIndex[dim],outputIndex[dim]+2);
inputSize[dim] =std::max(outputIndex[dim]+outputSize[dim],outputIndex[dim]+outputSize[dim]+2)-inputIndex[dim];
}
// Build the input requested region
InputRegionType inputRequestedRegion;
inputRequestedRegion.SetIndex(inputIndex);
inputRequestedRegion.SetSize(inputSize);
// Apply the radius
inputRequestedRegion.PadByRadius(m_Radius);
// Try to apply the requested region to the input image
if(inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
{
inputPtr->SetRequestedRegion(inputRequestedRegion);
}
else
{
// Build an exception
itk::InvalidRequestedRegionError e(__FILE__,__LINE__);
e.SetLocation(ITK_LOCATION);
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
}
}
template <class TInputImage,class TOutputImage>
void
ScalarImageToPanTexTextureFilter<TInputImage,TOutputImage>
::ThreadedGenerateData(const OutputRegionType & outputRegionForThread, int threadId)
{
// Retrieve the input and output pointers
InputImagePointerType inputPtr = const_cast<InputImageType *>(this->GetInput());
OutputImagePointerType outputPtr = this->GetOutput();
itk::ImageRegionIteratorWithIndex<OutputImageType> outputIt(outputPtr,outputRegionForThread);
// Go to begin
outputIt.GoToBegin();
// Set-up progress reporting
itk::ProgressReporter progress(this,threadId,outputRegionForThread.GetNumberOfPixels());
// Iterate on outputs to compute textures
while(!outputIt.IsAtEnd())
{
double out = itk::NumericTraits<double>::max();
const unsigned int offsetListSize = m_OffsetList.size();
for (unsigned int i = 0; i < offsetListSize; ++i)
{
// Find the input region on which texture will be computed
InputRegionType currentRegion;
typename InputRegionType::IndexType currentIndex = outputIt.GetIndex()-m_Radius;
typename InputRegionType::SizeType currentSize;
for(unsigned int dim = 0; dim<InputImageType::ImageDimension;++dim)
{
// Compute current size before applying offset
currentSize[dim] = 2*m_Radius[dim]+1;
// Apply offset
currentIndex[dim] = std::min(currentIndex[dim],currentIndex[dim]+m_OffsetList[i][dim]);
currentSize[dim] = std::max(currentIndex[dim]+currentSize[dim],currentIndex[dim]+currentSize[dim]+m_OffsetList[i][dim])-currentIndex[dim];
}
// Fill current region
currentRegion.SetIndex(currentIndex);
currentRegion.SetSize(currentSize);
// Build the co-occurence matrix generator
CoocurrenceMatrixGeneratorPointerType coOccurenceMatrixGenerator = CoocurrenceMatrixGeneratorType::New();
coOccurenceMatrixGenerator->SetInput(inputPtr);
coOccurenceMatrixGenerator->SetOffset(m_OffsetList[i]);
coOccurenceMatrixGenerator->SetNumberOfBinsPerAxis(m_NumberOfBinsPerAxis);
coOccurenceMatrixGenerator->SetPixelValueMinMax(m_InputImageMinimum,m_InputImageMaximum);
// Compute the co-occurence matrix
coOccurenceMatrixGenerator->SetRegion(currentRegion);
coOccurenceMatrixGenerator->Compute();
//HistogramType::Pointer histo(coOccurenceMatrixGenerator->GetOutput());
FrequencyType totalFrequency = coOccurenceMatrixGenerator->GetOutput()->GetTotalFrequency();
if ( (totalFrequency - itk::NumericTraits<MeasurementType>::One) > 0.0001 )
{
// Doesn't look normalized:
HistogramIterator hit;
FrequencyType totalFrequency =
coOccurenceMatrixGenerator->GetOutput()->GetTotalFrequency();
for (hit = coOccurenceMatrixGenerator->GetOutput()->Begin(); hit != coOccurenceMatrixGenerator->GetOutput()->End(); ++hit)
{
hit.SetFrequency(hit.GetFrequency() / totalFrequency);
}
}
double inertia = 0;
for (HistogramIterator hit = coOccurenceMatrixGenerator->GetOutput()->Begin();
hit != coOccurenceMatrixGenerator->GetOutput()->End(); ++hit)
{
MeasurementType frequency = hit.GetFrequency();
if (frequency == 0)
{
continue; // no use doing these calculations if we're just multiplying by zero.
}
typename InputRegionType::IndexType index = histo->GetIndex(hit.GetInstanceIdentifier());
inertia += (index[0] - index[1]) * (index[0] - index[1]) * frequency;
}
if (inertia < out) out = inertia;
}
outputIt.Set(out);
}
}
} // End namespace otb
#endif
RELEASE_NOTES.txt
View file @ c93cd434
......@@ -14,7 +14,6 @@ OTB-v.3.4.0 - Changes since version 3.2.0 (2010/06/30)
* Add filter to extract a subset from a point set (PointSetExtractROI)
* Add filter to apply a transform to a point set (TransformPointSetFilter)
* Add filter to generate a random point set (RandomPointSetSource)
* Add support for WorldView2 metadata
* Add class to compute confusion matrix (ConfusionMatrixCalculator)
* Add class to generate a list of samples from a vector data (ListSampleGenerator)
* Add a class to compute the ground spacing (GroundSpacingImageFunction)
......
Testing/Code/FeatureExtraction/CMakeLists.txt
View file @ c93cd434
......@@ -1841,6 +1841,10 @@ ADD_TEST(feTvScalarImageToAdvancedTexturesFilter ${FEATUREEXTRACTION_TESTS15}
${TEMP}/feTvScalarImageToAdvancedTexturesFilterOutput
8 5 1 1)
ADD_TEST(feTuScalarImageToPanTexTextureFilterNew ${FEATUREEXTRACTION_TESTS15}
otbScalarImageToPanTexTextureFilterNew
)
# A enrichir
SET(BasicFeatureExtraction_SRCS1
otbFeatureExtractionTests1.cxx
......@@ -2025,6 +2029,7 @@ otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx
otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
otbScalarImageToAdvancedTexturesFilterNew.cxx
otbScalarImageToAdvancedTexturesFilter.cxx
otbScalarImageToPanTexTextureFilterNew.cxx
)
OTB_ADD_EXECUTABLE(otbFeatureExtractionTests1 "${BasicFeatureExtraction_SRCS1}" "OTBFeatureExtraction;OTBIO;OTBTesting")
......