From 854b6823fd776838e83959c14d3accb7f1524f10 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Tue, 25 Feb 2014 16:17:14 +0100
Subject: [PATCH] ENH: remove lots of commented code and multiple return
statement
---
Code/ChangeDetection/otbJoinHistogramMI.h | 62 -----------------------
1 file changed, 62 deletions(-)
diff --git a/Code/ChangeDetection/otbJoinHistogramMI.h b/Code/ChangeDetection/otbJoinHistogramMI.h
index 3a74d4984d..559cebc6d5 100644
--- a/Code/ChangeDetection/otbJoinHistogramMI.h
+++ b/Code/ChangeDetection/otbJoinHistogramMI.h
@@ -41,48 +41,6 @@ public:
TOutput jointEntropy = itk::NumericTraits<TOutput>::Zero;
HistogramFrequencyType totalFreq = histogram->GetTotalFrequency();
- /* for(unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
- double value = static_cast<double>(itA.GetPixel(pos));
-
- unsigned int bin =
- HistogramFrequencyType freq = histogram.GetFrequency(, 0);
- if (freq > 0)
- {
- entropyX += freq*vcl_log(freq);
- }
- }
-
- entropyX = -entropyX/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
-
- for (unsigned int i = 0; i < this->GetHistogramSize()[1]; ++i)
- {
- HistogramFrequencyType freq = histogram.GetFrequency(i, 1);
- if (freq > 0)
- {
- entropyY += freq*vcl_log(freq);
- }
- }
-
- entropyY = -entropyY/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
-
- HistogramIteratorType it = histogram.Begin();
- HistogramIteratorType end = histogram.End();
- while (it != end)
- {
- HistogramFrequencyType freq = it.GetFrequency();
- if (freq > 0)
- {
- jointEntropy += freq*vcl_log(freq);
- }
- ++it;
- }
-
- jointEntropy = -jointEntropy/static_cast<TOutput>(totalFreq) +
- vcl_log(totalFreq);
-
- return entropyX + entropyY - jointEntropy; */
-
typename HistogramType::MeasurementVectorType sample(2);
for (unsigned long pos = 0; pos < itA.Size(); ++pos)
{
@@ -106,28 +64,8 @@ public:
vcl_log(totalFreq);
return jointEntropy;
-
- /* TOutput meanA = 0.0;
- TOutput meanB = 0.0;
-
- for(unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
-
- meanA += static_cast<TOutput>(itA.GetPixel(pos));
- meanB += static_cast<TOutput>(itB.GetPixel(pos));
-
-
- }*/
- return static_cast<TOutput>(0);
}
- /* void SetHistogram(HistogramType* histo)
- {
- m_Histogram = histo;
- }
-
- protected:
- HistogramType::Pointer m_Histogram; */
};
}
} // end namespace otb
--
GitLab