Skip to content
Snippets Groups Projects

Remove false NCLS

Merged Antoine Regimbeau requested to merge hyperspect_ncls into develop
All threads resolved!
Files
7
@@ -23,8 +23,6 @@
#include "otbUnConstrainedLeastSquareImageFilter.h"
#include "otbISRAUnmixingImageFilter.h"
#include "otbNCLSUnmixingImageFilter.h"
//#include "otbFCLSUnmixingImageFilter.h"
#include "otbMDMDNMFImageFilter.h"
@@ -34,8 +32,6 @@ namespace Wrapper
{
typedef otb::UnConstrainedLeastSquareImageFilter<DoubleVectorImageType, DoubleVectorImageType, double> UCLSUnmixingFilterType;
typedef otb::ISRAUnmixingImageFilter<DoubleVectorImageType, DoubleVectorImageType, double> ISRAUnmixingFilterType;
typedef otb::NCLSUnmixingImageFilter<DoubleVectorImageType, DoubleVectorImageType, double> NCLSUnmixingFilterType;
//typedef otb::FCLSUnmixingImageFilter<DoubleVectorImageType, DoubleVectorImageType, double> FCLSUnmixingFilterType;
typedef otb::MDMDNMFImageFilter<DoubleVectorImageType, DoubleVectorImageType> MDMDNMFUnmixingFilterType;
typedef otb::VectorImageToMatrixImageFilter<DoubleVectorImageType> VectorImageToMatrixImageFilterType;
@@ -65,12 +61,12 @@ enum UnMixingMethod
{
UnMixingMethod_UCLS,
//UnMixingMethod_FCLS,
UnMixingMethod_NCLS,
// UnMixingMethod_NCLS,
UnMixingMethod_ISRA,
UnMixingMethod_MDMDNMF,
};
const char* UnMixingMethodNames [] = { "UCLS", "FCLS", "NCLS", "ISRA", "MDMDNMF", };
const char* UnMixingMethodNames [] = { "UCLS", "ISRA", "MDMDNMF", };
class HyperspectralUnmixing : public Application
@@ -104,9 +100,7 @@ private:
"be estimated using the VertexComponentAnalysis application.\n\n"
"The application allows estimating the abundance maps with several algorithms:\n\n"
"* Unconstrained Least Square (ucls)\n"
// "* Fully Constrained Least Square (fcls)\n"
"* Image Space Reconstruction Algorithm (isra)\n"
"* Non-negative constrained\n"
"* Least Square (ncls)\n"
"* Minimum Dispersion Constrained Non Negative Matrix Factorization (MDMDNMF)."
);
@@ -135,12 +129,6 @@ private:
AddChoice("ua.ucls", "UCLS");
SetParameterDescription("ua.ucls", "Unconstrained Least Square");
// AddChoice("ua.fcls", "FCLS");
// SetParameterDescription("ua.fcls", "Fully constrained Least Square");
AddChoice("ua.ncls", "NCLS");
SetParameterDescription("ua.ncls", "Non-negative constrained Least Square");
AddChoice("ua.isra", "ISRA");
SetParameterDescription("ua.isra", "Image Space Reconstruction Algorithm");
@@ -217,36 +205,6 @@ private:
}
break;
case UnMixingMethod_NCLS:
{
otbAppLogINFO("NCLS Unmixing");
NCLSUnmixingFilterType::Pointer unmixer =
NCLSUnmixingFilterType::New();
unmixer->SetInput(inputImage);
unmixer->GetModifiableFunctor().SetEndmembersMatrix(endMembersMatrix);
abundanceMap = unmixer->GetOutput();
m_ProcessObjects.push_back(unmixer.GetPointer());
}
break;
/*
case UnMixingMethod_FCLS:
{
otbAppLogINFO("FCLS Unmixing");
FCLSUnmixingFilterType::Pointer unmixer =
FCLSUnmixingFilterType::New();
unmixer->SetInput(inputImage);
unmixer->SetEndmembersMatrix(endMembersMatrix);
abundanceMap = unmixer->GetOutput();
m_ProcessObjects.push_back(unmixer.GetPointer());
}
break;
*/
case UnMixingMethod_MDMDNMF:
{
otbAppLogINFO("MDMD-NMF Unmixing");
Loading