diff --git a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h index ae30bf8441f6f1f96c3fbd4562f642205d75d3ec..eeabdbc2c140857bf89726c0ccc60ad9011370cb 100644 --- a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h +++ b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h @@ -61,8 +61,8 @@ public: /** Populate the confusion Matrix for a image iteration */ template<class TRefIterator, class TProdIterator> - void Compute(TRefIterator itRef, TProdIterator itProd, bool refHasNoData = false, typename TRefIterator::InternalPixelType refNoData = 0, - bool prodHasNoData = false, typename TProdIterator::InternalPixelType prodNoData = 0); + void Compute(TRefIterator itRef, TProdIterator itProd, bool refHasNoData = false, typename TRefIterator::InternalPixelType refNoData = 0, + bool prodHasNoData = false, typename TProdIterator::InternalPixelType prodNoData = 0); /** Populate the confusion Matrix with input which provide GetMeasurementVector()[0] access */ template<class TRefIterator, class TProdIterator> diff --git a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.txx b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.txx index 369ee1a3a0bcac71dc3bc473dc3886c7fc22ecb1..d587ebc5043dc3a63bb967efa68a2c1269574823 100644 --- a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.txx +++ b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.txx @@ -32,7 +32,7 @@ namespace otb { template<class TClassLabel> ContingencyTableCalculator<TClassLabel>::ContingencyTableCalculator() -: m_NumberOfRefClasses(0), m_NumberOfProdClasses(0), m_NumberOfSamples(0) + : m_NumberOfRefClasses(0), m_NumberOfProdClasses(0), m_NumberOfSamples(0) {} template<class TClassLabel> @@ -52,13 +52,13 @@ void ContingencyTableCalculator<TClassLabel> ::Compute(TRefIterator refBegin, TRefIterator refEnd, TProdIterator prodBegin, TProdIterator prodEnd) { - while( refBegin != refEnd && prodBegin != prodEnd ) - { - ++m_LabelCount[refBegin.GetMeasurementVector()[0]][prodBegin.GetMeasurementVector()[0]]; - ++refBegin; - ++prodBegin; - ++m_NumberOfSamples; - } + while( refBegin != refEnd && prodBegin != prodEnd ) + { + ++m_LabelCount[refBegin.GetMeasurementVector()[0]][prodBegin.GetMeasurementVector()[0]]; + ++refBegin; + ++prodBegin; + ++m_NumberOfSamples; + } } template<class TClassLabel> @@ -66,7 +66,7 @@ template<class TRefIterator, class TProdIterator> void ContingencyTableCalculator<TClassLabel> ::Compute(TRefIterator itRef, TProdIterator itProd, bool refHasNoData, typename TRefIterator::InternalPixelType refNoData, - bool prodHasNoData, typename TProdIterator::InternalPixelType prodNoData) + bool prodHasNoData, typename TProdIterator::InternalPixelType prodNoData) { while( !itRef.IsAtEnd() && !itProd.IsAtEnd() ) { @@ -76,7 +76,7 @@ ContingencyTableCalculator<TClassLabel> ++m_LabelCount[itRef.Get()][itProd.Get()]; ++m_NumberOfSamples; } - ++itRef; + ++itRef; ++itProd; } } @@ -93,12 +93,12 @@ ContingencyTableCalculator<TClassLabel> // Retrieve all labels needed to iterate over all labelCount for(typename MapOfClassesType::const_iterator refIt = m_LabelCount.begin(); refIt != m_LabelCount.end(); ++refIt) { - refLabels.insert(refIt->first); - CountMapType cmt = refIt->second; - for(typename CountMapType::const_iterator prodIt = cmt.begin(); prodIt != cmt.end(); ++prodIt) - { - prodLabels.insert(prodIt->first); - } + refLabels.insert(refIt->first); + CountMapType cmt = refIt->second; + for(typename CountMapType::const_iterator prodIt = cmt.begin(); prodIt != cmt.end(); ++prodIt) + { + prodLabels.insert(prodIt->first); + } } m_NumberOfRefClasses = refLabels.size();