From 93995a6a7c0abce4baeaa186b62c793172c998d3 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Tue, 22 Feb 2011 10:27:25 +0100
Subject: [PATCH] DOC
---
.../otbISRAUnmixingImageFilter.txx | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/Code/Hyperspectral/otbISRAUnmixingImageFilter.txx b/Code/Hyperspectral/otbISRAUnmixingImageFilter.txx
index 7a37873e02..c82ae27acc 100644
--- a/Code/Hyperspectral/otbISRAUnmixingImageFilter.txx
+++ b/Code/Hyperspectral/otbISRAUnmixingImageFilter.txx
@@ -41,7 +41,6 @@ ISRAUnmixingFunctor<TInput, TOutput, TPrecision>
{
}
-
template <class TInput, class TOutput, class TPrecision>
unsigned int
ISRAUnmixingFunctor<TInput, TOutput, TPrecision>
@@ -92,14 +91,20 @@ ISRAUnmixingFunctor<TInput, TOutput, TPrecision>
{
// TODO : support different types between input and output ?
VectorType inVector(in.GetDataPointer(), in.Size());
+
+ // Initialize with Unconstrained Least Square solution
VectorType outVector = m_Svd->solve(inVector);
unsigned int nbEndmembers = m_OutputSize;
unsigned int nbBands = in.Size();
+ // Apply ISRA iterations
for (int i = 0; i < m_MaxIteration; ++i)
{
- VectorType outVectorTmp = outVector;
+
+ // Use a temporary storage since it is used
+ // inside the iterations
+ VectorType outVectorNew = outVector;
for (int e = 0; e < nbEndmembers; ++e)
{
PrecisionType numerator = 0;
@@ -112,15 +117,17 @@ ISRAUnmixingFunctor<TInput, TOutput, TPrecision>
PrecisionType dot = 0;
for (int s = 0; s < nbEndmembers; ++s)
{
- dot += m_U(b, s) * outVectorTmp[s];
+ // Use outVector from previous iteration here
+ dot += m_U(b, s) * outVector[s];
}
-
denominator += dot * m_U(b, e);
}
- outVectorTmp[e] *= (numerator/denominator);
+
+ outVectorNew[e] *= (numerator/denominator);
}
- outVector = outVectorTmp;
+ // Prepare for next iteration
+ outVector = outVectorNew;
}
return OutputType(outVector.data_block(), outVector.size());
--
GitLab