Commit 0792695e authored by Manuel Grizonnet's avatar Manuel Grizonnet

ENH: output texture features in the correct order

parent 3311743f
......@@ -96,20 +96,8 @@ public:
typedef typename OutputImageType::Pointer OutputImagePointerType;
typedef typename OutputImageType::RegionType OutputRegionType;
/** Co-occurence matrix and textures calculator */
/* typedef otb::MaskedScalarImageToGreyLevelRunLengthMatrixGenerator
<InputImageType> RunLengthMatrixGeneratorType;
typedef typename RunLengthMatrixGeneratorType::Pointer RunLengthMatrixGeneratorPointerType;
typedef typename RunLengthMatrixGeneratorType::OffsetType OffsetType;
typedef typename RunLengthMatrixGeneratorType::HistogramType HistogramType;
typedef itk::Statistics::GreyLevelRunLengthMatrixTextureCoefficientsCalculator
<HistogramType> TextureCoefficientsCalculatorType;
typedef typename TextureCoefficientsCalculatorType::Pointer TextureCoefficientsCalculatorPointerType;
*/
typedef itk::Statistics::ScalarImageToRunLengthFeaturesFilter
<InputImageType> ScalarImageToRunLengthFeaturesFilterType;
//typedef typename ImageType::PixelType PixelType;
typedef typename InputImageType::OffsetType OffsetType;
typedef itk::VectorContainer< unsigned char, OffsetType > OffsetVector;
typedef typename OffsetVector::Pointer OffsetVectorPointer;
......
......@@ -142,11 +142,11 @@ typename ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
::GetLowGreyLevelRunEmphasisOutput()
{
if (this->GetNumberOfOutputs() < 6)
if (this->GetNumberOfOutputs() < 5)
{
return nullptr;
}
return static_cast<OutputImageType *>(this->GetOutput(5));
return static_cast<OutputImageType *>(this->GetOutput(4));
}
template <class TInputImage, class TOutputImage>
......@@ -155,11 +155,11 @@ typename ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
::GetHighGreyLevelRunEmphasisOutput()
{
if (this->GetNumberOfOutputs() < 7)
if (this->GetNumberOfOutputs() < 6)
{
return nullptr;
}
return static_cast<OutputImageType *>(this->GetOutput(6));
return static_cast<OutputImageType *>(this->GetOutput(5));
}
template <class TInputImage, class TOutputImage>
......@@ -168,11 +168,11 @@ typename ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
::GetShortRunLowGreyLevelEmphasisOutput()
{
if (this->GetNumberOfOutputs() < 8)
if (this->GetNumberOfOutputs() < 7)
{
return nullptr;
}
return static_cast<OutputImageType *>(this->GetOutput(7));
return static_cast<OutputImageType *>(this->GetOutput(6));
}
template <class TInputImage, class TOutputImage>
......@@ -181,11 +181,11 @@ typename ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
::GetShortRunHighGreyLevelEmphasisOutput()
{
if (this->GetNumberOfOutputs() < 9)
if (this->GetNumberOfOutputs() < 8)
{
return nullptr;
}
return static_cast<OutputImageType *>(this->GetOutput(8));
return static_cast<OutputImageType *>(this->GetOutput(7));
}
template <class TInputImage, class TOutputImage>
......@@ -194,11 +194,11 @@ typename ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
::GetLongRunLowGreyLevelEmphasisOutput()
{
if (this->GetNumberOfOutputs() < 10)
if (this->GetNumberOfOutputs() < 9)
{
return nullptr;
}
return static_cast<OutputImageType *>(this->GetOutput(9));
return static_cast<OutputImageType *>(this->GetOutput(8));
}
template <class TInputImage, class TOutputImage>
......@@ -207,11 +207,11 @@ typename ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>
::GetLongRunHighGreyLevelEmphasisOutput()
{
if (this->GetNumberOfOutputs() < 11)
if (this->GetNumberOfOutputs() < 10)
{
return nullptr;
}
return static_cast<OutputImageType *>(this->GetOutput(10));
return static_cast<OutputImageType *>(this->GetOutput(9));
}
template <class TInputImage, class TOutputImage>
......
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