From 3c575fd8b8a69aa731d17e754ad76d64f1b0fbe6 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@c-s.fr>
Date: Fri, 1 Jun 2007 15:18:08 +0000
Subject: [PATCH] MAJ examples Kullback leibler.
---
CMakeLists.txt | 4 ++--
.../ChangeDetection/KullbackLeiblerDistanceChDet.cxx | 5 +++--
.../ChangeDetection/KullbackLeiblerProfileChDet.cxx | 12 +++++-------
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b5912454d..081e8ed40b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,8 +55,8 @@ ADD_DEFINITIONS(
#-----------------------------------------------------------------------------
# OTB version number. An even minor number corresponds to releases.
SET(OTB_VERSION_MAJOR "1")
-SET(OTB_VERSION_MINOR "2")
-SET(OTB_VERSION_PATCH "1")
+SET(OTB_VERSION_MINOR "4")
+SET(OTB_VERSION_PATCH "0")
# Version string should not include patch level. The major.minor is
# enough to distinguish available features of the toolkit.
diff --git a/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx b/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx
index cc9188cae7..6325b98b43 100755
--- a/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx
+++ b/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx
@@ -45,7 +45,7 @@
// \right) \\
// - 10 \frac{\kappa_{X_1;3} \kappa_{X_2;3}
// \left( \kappa_{X_1;1} - \kappa_{X_2;1} \right)
-// \left( \kappa_{X_1;2} - \kappa_{X_2;2} \right)}{\kappa_{X_2;2}^6}
+// \left( \kappa_{X_1;2} - \kappa_{X_2;2} \right)}{\kappa_{X_2;2}^6} \qquad
// \end{multline}
// where
// \begin{align*}
@@ -122,7 +122,8 @@ int main(int argc, char * argv[])
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
- typedef otb::KullbackLeiblerDistanceImageFilter<ImageType,ImageType,ImageType> FilterType;
+ typedef otb::KullbackLeiblerDistanceImageFilter<ImageType,
+ ImageType,ImageType> FilterType;
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
diff --git a/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx b/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx
index d5339c7534..c4e04ab448 100755
--- a/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx
+++ b/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx
@@ -29,12 +29,12 @@
// between pairs of images, according to a range of window size.
// This example is very similar, in its principle, to all of the change
// detection examples, especially the distance between distribution one
-// (section~\ref{sec:KullbackLeiblerDistance} which uses a fixed window size.
+// (section~\ref{sec:KullbackLeiblerDistance}) which uses a fixed window size.
//
// The main differences are:
// \begin{enumerate}
// \item a set of window range instead of a fixed size of window;
-// \item an output of type \doxygen[otb}{VectorImage}.
+// \item an output of type \doxygen{otb}{VectorImage}.
// \end{enumerate}
// Then, the program begins with the \doxygen{otb}{VectorImage} and the
// \doxygen{otb}{KullbackLeiblerProfileImageFilter} header files in complements
@@ -49,13 +49,10 @@
// Software Guide : BeginCodeSnippet
#include "otbVectorImage.h"
+#include "otbKullbackLeiblerProfileImageFilter.h"
// Software Guide : EndCodeSnippet
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
-// Software Guide : BeginCodeSnippet
-#include "otbKullbackLeiblerProfileImageFilter.h"
-// Software Guide : EndCodeSnippet
-
int main(int argc, char * argv[])
{
@@ -93,7 +90,8 @@ int main(int argc, char * argv[])
// Software Guide : BeginCodeSnippet
typedef otb::Image<PixelType,Dimension> ImageType;
typedef otb::VectorImage<PixelType,Dimension> VectorImageType;
- typedef otb::KullbackLeiblerProfileImageFilter<ImageType,ImageType,VectorImageType> FilterType;
+ typedef otb::KullbackLeiblerProfileImageFilter<ImageType,
+ ImageType,VectorImageType> FilterType;
// Software Guide : EndCodeSnippet
typedef otb::VectorImage<OutPixelType,Dimension> OutVectorImageType;
--
GitLab