added openfabmap code, contributed by Arren Glover. fixed several warnings in…

added openfabmap code, contributed by Arren Glover. fixed several warnings in the new versions of retina filters

modules/contrib/doc/openfabmap.rst

+openFABMAP
+========================================
+
+.. highlight:: cpp
+
+The openFABMAP package has been integrated into OpenCV from the openFABMAP <http://code.google.com/p/openfabmap/> project. OpenFABMAP is an open and modifiable code-source which implements the Fast Appearance-based Mapping algorithm (FAB-MAP) developed by Mark Cummins and Paul Newman. The algorithms used in openFABMAP were developed using only the relevant FAB-MAP publications.
+
+FAB-MAP is an approach to appearance-based place recognition. FAB-MAP compares images of locations that have been visited and determines the probability of re-visiting a location, as well as providing a measure of the probability of being at a new, previously unvisited location. Camera images form the sole input to the system, from which visual bag-of-words models are formed through the extraction of appearance-based (e.g. SURF) features.
+
+openFABMAP requires training data (e.g. a collection of images from a similar but not identical environment) to construct a visual vocabulary for the visual bag-of-words model, along with a Chow-Liu tree representation of feature likelihood and for use in the Sampled new place method (see below).
+
+FabMap
+--------------------
+
+.. ocv:class:: FabMap
+
+The main FabMap class performs the comparison between visual bags-of-words extracted from one or more images. The FabMap class is instantiated as one of the four inherited FabMap classes (FabMap1, FabMapLUT, FabMapFBO, FabMap2). Each inherited class performs the comparison differently based on algorithm iterations as published (see each class below for specifics). A Chow-Liu tree, detector model parameters and some option flags are common to all Fabmap variants and are supplied on class creation. Training data (visual bag-of-words) is supplied to the class if using the SAMPLED new place method. Test data (visual bag-of-words) is supplied as images to which query bag-of-words are compared against. The common flags are listed below: ::
+
+    enum {
+        MEAN_FIELD,
+        SAMPLED,
+        NAIVE_BAYES,
+        CHOW_LIU,
+        MOTION_MODEL
+    };
+
+#. MEAN_FIELD: Use the Mean Field approximation to determine the new place likelihood (cannot be used for FabMap2).
+#. SAMPLED: Use the Sampled approximation to determine the new place likelihood. Requires training data (see below).
+#. NAIVE_BAYES: Assume a naive Bayes approximation to feature distribution (i.e. all features are independent). Note that a Chow-Liu tree is still required but only the absolute word probabilities are used, feature co-occurrance information is discarded.
+#. CHOW_LIU: Use the full Chow-Liu tree to approximate feature distribution.
+#. MOTION_MODEL: Update the location distribution using the previous distribution as a (weak) prior. Used for matching in sequences (i.e. successive video frames).
+
+Training Data
+++++++++++++++++++++
+
+Training data is required to use the SAMPLED new place method. The SAMPLED method was shown to have improved performance over the alternative MEAN_FIELD method. Training data can be added singularly or as a batch.
+
+.. ocv:function:: virtual void addTraining(const Mat& queryImgDescriptor)
+
+    :param queryImgDescriptor: bag-of-words image descriptors stored as rows in a Mat
+
+.. ocv:function:: virtual void addTraining(const vector<Mat>& queryImgDescriptors)
+
+    :param queryImgDescriptors: a vector containing multiple bag-of-words image descriptors
+
+.. ocv:function:: const vector<Mat>& getTrainingImgDescriptors() const
+
+    Returns a vector containing multiple bag-of-words image descriptors
+
+Test Data
+++++++++++++++++++++
+
+Test Data is the database of images represented using bag-of-words models. When a compare function is called, each query point is compared to the test data.
+
+.. ocv:function:: virtual void add(const Mat& queryImgDescriptor)
+
+    :param queryImgDescriptor: bag-of-words image descriptors stored as rows in a Mat
+
+.. ocv:function:: virtual void add(const vector<Mat>& queryImgDescriptors)
+
+    :param queryImgDescriptors: a vector containing multiple bag-of-words image descriptors
+
+.. ocv:function:: const vector<Mat>& getTestImgDescriptors() const
+
+    Returns a vector containing multiple bag-of-words image descriptors
+
+Image Comparison
+++++++++++++++++++++
+
+Image matching is performed calling the compare function. Query bag-of-words image descriptors are provided and compared to test data added to the FabMap class. Alternatively test data can be provided with the call to compare to which the comparison is performed. Results are written to the 'matches' argument.
+
+.. ocv:function:: void compare(const Mat& queryImgDescriptor, vector<IMatch>& matches, bool addQuery = false, const Mat& mask = Mat())
+
+    :param queryImgDescriptor: bag-of-words image descriptors stored as rows in a Mat
+
+    :param matches: a vector of image match probabilities
+
+    :param addQuery: if true the queryImg Descriptor is added to the test data after the comparison is performed.
+
+    :param mask: *not implemented*
+
+.. ocv:function:: void compare(const Mat& queryImgDescriptor, const Mat& testImgDescriptors, vector<IMatch>& matches, const Mat& mask = Mat())
+
+    :param testImgDescriptors: bag-of-words image descriptors stored as rows in a Mat
+
+.. ocv:function:: void compare(const Mat& queryImgDescriptor, const vector<Mat>& testImgDescriptors, vector<IMatch>& matches, const Mat& mask = Mat())
+
+    :param testImgDescriptors:  a vector of multiple bag-of-words image descriptors
+
+.. ocv:function:: void compare(const vector<Mat>& queryImgDescriptors, vector<IMatch>& matches, bool addQuery = false, const Mat& mask = Mat())
+
+    :param queryImgDescriptors: a vector of multiple bag-of-words image descriptors
+
+.. ocv:function:: void compare(const vector<Mat>& queryImgDescriptors, const vector<Mat>& testImgDescriptors, vector<IMatch>& matches, const Mat& mask = Mat())
+
+
+
+FabMap classes
+++++++++++++++++++++
+
+.. ocv:class:: FabMap1 : public FabMap
+
+The original FAB-MAP algorithm without any computational improvements as published in [IJRR2008]_
+
+.. ocv:function:: FabMap1::FabMap1(const Mat& clTree, double PzGe, double PzGNe, int flags, int numSamples = 0)
+
+    :param clTree: a Chow-Liu tree class
+
+    :param PzGe: the dector model recall. The probability of the feature detector extracting a feature from an object given it is in the scene. This is used to account for detector noise.
+
+    :param PzGNe: the dector model precision. The probability of the feature detector falsing extracting a feature representing an object that is not in the scene.
+
+    :param numSamples: the number of samples to use for the SAMPLED new place calculation
+
+.. ocv:class:: FabMapLUT : public FabMap
+
+The original FAB-MAP algorithm implemented as a look-up table for speed enhancements [ICRA2011]_
+
+.. ocv:function:: FabMapLUT::FabMapLUT(const Mat& clTree, double PzGe, double PzGNe, int flags, int numSamples = 0, int precision = 6)
+
+    :param precision: the precision with which to store the pre-computed likelihoods
+
+.. ocv:class:: FabMapFBO : public FabMap
+
+The accelerated FAB-MAP using a 'fast bail-out' approach as in [TRO2010]_
+
+.. ocv:function:: FabMapFBO::FabMapFBO(const Mat& clTree, double PzGe, double PzGNe, int flags, int numSamples = 0, double rejectionThreshold = 1e-8, double PsGd = 1e-8, int bisectionStart = 512, int bisectionIts = 9)
+
+    :param rejectionThreshold: images are not considered a match when the likelihood falls below the Bennett bound by the amount given by the rejectionThreshold. The threshold provides a speed/accuracy trade-off. A lower bound will be more accurate
+
+    :param PsGd: used to calculate the Bennett bound. Provides a speed/accuracy trade-off. A lower bound will be more accurate
+
+    :param bisectionStart: Used to estimate the bound using the bisection method. Must be larger than the largest expected difference between maximum and minimum image likelihoods
+
+    :param bisectionIts: The number of iterations for which to perform the bisection method
+
+
+.. ocv:class:: FabMap2 : public FabMap
+
+The inverted index FAB-MAP as in [IJRR2010]_. This version of FAB-MAP is the fastest without any loss of accuracy.
+
+.. ocv:function:: FabMap2::FabMap2(const Mat& clTree, double PzGe, double PzGNe, int flags)
+
+.. [IJRR2008] M. Cummins and P. Newman, "FAB-MAP: Probabilistic Localization and Mapping in the Space of Appearance," The International Journal of Robotics Research, vol. 27(6), pp. 647-665, 2008
+
+.. [TRO2010] M. Cummins and P. Newman, "Accelerating FAB-MAP with concentration inequalities," IEEE Transactions on Robotics, vol. 26(6), pp. 1042-1050, 2010
+
+.. [IJRR2010] M. Cummins and P. Newman, "Appearance-only SLAM at large scale with FAB-MAP 2.0," The International Journal of Robotics Research, vol. 30(9), pp. 1100-1123, 2010
+
+.. [ICRA2011] A. Glover, et al., "OpenFABMAP: An Open Source Toolbox for Appearance-based Loop Closure Detection," in IEEE International Conference on Robotics and Automation, St Paul, Minnesota, 2011
+
+ImageMatch
+--------------------
+
+.. ocv:struct:: IMatch
+
+FAB-MAP comparison results are stored in a vector of IMatch structs. Each IMatch structure provides the index of the provided query bag-of-words, the index of the test bag-of-words, the raw log-likelihood of the match (independent of other comparisons), and the match probability (normalised over other comparison likelihoods).
+
+::
+
+    struct IMatch {
+
+        IMatch() :
+            queryIdx(-1), imgIdx(-1), likelihood(-DBL_MAX), match(-DBL_MAX) {
+        }
+        IMatch(int _queryIdx, int _imgIdx, double _likelihood, double _match) :
+            queryIdx(_queryIdx), imgIdx(_imgIdx), likelihood(_likelihood), match(
+                    _match) {
+        }
+
+        int queryIdx;    //query index
+        int imgIdx;      //test index
+
+        double likelihood;  //raw loglikelihood
+        double match;      //normalised probability
+
+        bool operator<(const IMatch& m) const {
+            return match < m.match;
+        }
+
+    };
+
+Chow-Liu Tree
+--------------------
+
+.. ocv:class:: ChowLiuTree
+
+The Chow-Liu tree is a probabilistic model of the environment in terms of feature occurance and co-occurance. The Chow-Liu tree is a form of Bayesian network. FAB-MAP uses the model when calculating bag-of-words similarity by taking into account feature saliency. Training data is provided to the ChowLiuTree class in the form of bag-of-words image descriptors. The make function produces a cv::Mat that encodes the tree structure.
+
+.. ocv:function:: ChowLiuTree::ChowLiuTree()
+
+.. ocv:function:: void add(const Mat& imgDescriptor)
+
+    :param imgDescriptor:  bag-of-words image descriptors stored as rows in a Mat
+
+.. ocv:function:: void add(const vector<Mat>& imgDescriptors)
+
+    :param imgDescriptors: a vector containing multiple bag-of-words image descriptors
+
+.. ocv:function:: const vector<Mat>& getImgDescriptors() const
+
+    Returns a vector containing multiple bag-of-words image descriptors
+
+.. ocv:function:: Mat make(double infoThreshold = 0.0)
+
+    :param infoThreshold: a threshold can be set to reduce the amount of memory used when making the Chow-Liu tree, which can occur with large vocabulary sizes. This function can fail if the threshold is set too high. If memory is an issue the value must be set by trial and error (~0.0005)
+
+
+BOWMSCTrainer
+--------------------
+
+.. ocv:class:: BOWMSCTrainer : public BOWTrainer
+
+BOWMSCTrainer is a custom clustering algorithm used to produce the feature vocabulary required to create bag-of-words representations. The algorithm is an implementation of [AVC2007]_. Arguments against using K-means for the FAB-MAP algorithm are discussed in [IJRR2010]_. The BOWMSCTrainer inherits from the cv::BOWTrainer class, overwriting the cluster function.
+
+.. ocv:function::   BOWMSCTrainer::BOWMSCTrainer(double clusterSize = 0.4)
+
+    :param clusterSize: the specificity of the vocabulary produced. A smaller cluster size will instigate a larger vocabulary.
+
+.. ocv:function::  virtual Mat cluster() const
+
+Cluster using features added to the class
+
+.. ocv:function:: virtual Mat cluster(const Mat& descriptors) const
+
+    :param descriptors: feature descriptors provided as rows of the Mat.
+
+.. [AVC2007] Alexandra Teynor and Hans Burkhardt, "Fast Codebook Generation by Sequential Data Analysis for Object Classification", in Advances in Visual Computing, pp. 610-620, 2007

modules/contrib/include/opencv2/contrib/contrib.hpp

@@ -967,6 +967,8 @@ namespace cv
 
 #include "opencv2/contrib/retina.hpp"
 
+#include "opencv2/contrib/openfabmap.hpp"
+
 #endif
 
 #endif

modules/contrib/include/opencv2/contrib/openfabmap.hpp

+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+// This file originates from the openFABMAP project:
+// [http://code.google.com/p/openfabmap/]
+//
+// For published work which uses all or part of OpenFABMAP, please cite:
+// [http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=6224843]
+//
+// Original Algorithm by Mark Cummins and Paul Newman:
+// [http://ijr.sagepub.com/content/27/6/647.short]
+// [http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=5613942]
+// [http://ijr.sagepub.com/content/30/9/1100.abstract]
+//
+//                           License Agreement
+//
+// Copyright (C) 2012 Arren Glover [aj.glover@qut.edu.au] and
+//                    Will Maddern [w.maddern@qut.edu.au], all rights reserved.
+//
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef __OPENCV_OPENFABMAP_H_
+#define __OPENCV_OPENFABMAP_H_
+
+#include "opencv2/core/core.hpp"
+#include "opencv2/features2d/features2d.hpp"
+
+#include <vector>
+#include <list>
+#include <map>
+#include <set>
+#include <valarray>
+
+namespace cv {
+
+namespace of2 {
+
+using std::list;
+using std::map;
+using std::multiset;
+
+/*
+    Return data format of a FABMAP compare call
+*/
+struct CV_EXPORTS IMatch {
+
+    IMatch() :
+        queryIdx(-1), imgIdx(-1), likelihood(-DBL_MAX), match(-DBL_MAX) {
+    }
+    IMatch(int _queryIdx, int _imgIdx, double _likelihood, double _match) :
+        queryIdx(_queryIdx), imgIdx(_imgIdx), likelihood(_likelihood), match(
+                _match) {
+    }
+
+    int queryIdx;    //query index
+    int imgIdx;      //test index
+
+    double likelihood;  //raw loglikelihood
+    double match;      //normalised probability
+
+    bool operator<(const IMatch& m) const {
+        return match < m.match;
+    }
+
+};
+
+/*
+    Base FabMap class. Each FabMap method inherits from this class.
+*/
+class CV_EXPORTS FabMap {
+public:
+
+    //FabMap options
+    enum {
+        MEAN_FIELD = 1,
+        SAMPLED = 2,
+        NAIVE_BAYES = 4,
+        CHOW_LIU = 8,
+        MOTION_MODEL = 16
+    };
+
+    FabMap(const Mat& clTree, double PzGe, double PzGNe, int flags,
+            int numSamples = 0);
+    virtual ~FabMap();
+
+    //methods to add training data for sampling method
+    virtual void addTraining(const Mat& queryImgDescriptor);
+    virtual void addTraining(const vector<Mat>& queryImgDescriptors);
+
+    //methods to add to the test data
+    virtual void add(const Mat& queryImgDescriptor);
+    virtual void add(const vector<Mat>& queryImgDescriptors);
+
+    //accessors
+    const vector<Mat>& getTrainingImgDescriptors() const;
+    const vector<Mat>& getTestImgDescriptors() const;
+
+    //Main FabMap image comparison
+    void compare(const Mat& queryImgDescriptor,
+            vector<IMatch>& matches, bool addQuery = false,
+            const Mat& mask = Mat());
+    void compare(const Mat& queryImgDescriptor,
+            const Mat& testImgDescriptors, vector<IMatch>& matches,
+            const Mat& mask = Mat());
+    void compare(const Mat& queryImgDescriptor,
+            const vector<Mat>& testImgDescriptors,
+            vector<IMatch>& matches, const Mat& mask = Mat());
+    void compare(const vector<Mat>& queryImgDescriptors, vector<
+            IMatch>& matches, bool addQuery = false, const Mat& mask =
+            Mat());
+    void compare(const vector<Mat>& queryImgDescriptors,
+            const vector<Mat>& testImgDescriptors,
+            vector<IMatch>& matches, const Mat& mask = Mat());
+
+protected:
+
+    void compareImgDescriptor(const Mat& queryImgDescriptor,
+            int queryIndex, const vector<Mat>& testImgDescriptors,
+            vector<IMatch>& matches);
+
+    void addImgDescriptor(const Mat& queryImgDescriptor);
+
+    //the getLikelihoods method is overwritten for each different FabMap
+    //method.
+    virtual void getLikelihoods(const Mat& queryImgDescriptor,
+            const vector<Mat>& testImgDescriptors,
+            vector<IMatch>& matches);
+    virtual double getNewPlaceLikelihood(const Mat& queryImgDescriptor);
+
+    //turn likelihoods into probabilities (also add in motion model if used)
+    void normaliseDistribution(vector<IMatch>& matches);
+
+    //Chow-Liu Tree
+    int pq(int q);
+    double Pzq(int q, bool zq);
+    double PzqGzpq(int q, bool zq, bool zpq);
+
+    //FAB-MAP Core
+    double PzqGeq(bool zq, bool eq);
+    double PeqGL(int q, bool Lzq, bool eq);
+    double PzqGL(int q, bool zq, bool zpq, bool Lzq);
+    double PzqGzpqL(int q, bool zq, bool zpq, bool Lzq);
+    double (FabMap::*PzGL)(int q, bool zq, bool zpq, bool Lzq);
+
+    //data
+    Mat clTree;
+    vector<Mat> trainingImgDescriptors;
+    vector<Mat> testImgDescriptors;
+    vector<IMatch> priorMatches;
+
+    //parameters
+    double PzGe;
+    double PzGNe;
+    double Pnew;
+
+    double mBias;
+    double sFactor;
+
+    int flags;
+    int numSamples;
+
+};
+
+/*
+    The original FAB-MAP algorithm, developed based on:
+    http://ijr.sagepub.com/content/27/6/647.short
+*/
+class CV_EXPORTS FabMap1: public FabMap {
+public:
+    FabMap1(const Mat& clTree, double PzGe, double PzGNe, int flags,
+            int numSamples = 0);
+    virtual ~FabMap1();
+protected:
+
+    //FabMap1 implementation of likelihood comparison
+    void getLikelihoods(const Mat& queryImgDescriptor, const vector<
+            Mat>& testImgDescriptors, vector<IMatch>& matches);
+};
+
+/*
+    A computationally faster version of the original FAB-MAP algorithm. A look-
+    up-table is used to precompute many of the reoccuring calculations
+*/
+class CV_EXPORTS FabMapLUT: public FabMap {
+public:
+    FabMapLUT(const Mat& clTree, double PzGe, double PzGNe,
+            int flags, int numSamples = 0, int precision = 6);
+    virtual ~FabMapLUT();
+protected:
+
+    //FabMap look-up-table implementation of the likelihood comparison
+    void getLikelihoods(const Mat& queryImgDescriptor, const vector<
+            Mat>& testImgDescriptors, vector<IMatch>& matches);
+
+    //procomputed data
+    int (*table)[8];
+
+    //data precision
+    int precision;
+};
+
+/*
+    The Accelerated FAB-MAP algorithm, developed based on:
+    http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=5613942
+*/
+class CV_EXPORTS FabMapFBO: public FabMap {
+public:
+    FabMapFBO(const Mat& clTree, double PzGe, double PzGNe, int flags,
+            int numSamples = 0, double rejectionThreshold = 1e-8, double PsGd =
+                    1e-8, int bisectionStart = 512, int bisectionIts = 9);
+    virtual ~FabMapFBO();
+
+protected:
+
+    //FabMap Fast Bail-out implementation of the likelihood comparison
+    void getLikelihoods(const Mat& queryImgDescriptor, const vector<
+            Mat>& testImgDescriptors, vector<IMatch>& matches);
+
+    //stucture used to determine word comparison order
+    struct WordStats {
+        WordStats() :
+            q(0), info(0), V(0), M(0) {
+        }
+
+        WordStats(int _q, double _info) :
+            q(_q), info(_info), V(0), M(0) {
+        }
+
+        int q;
+        double info;
+        mutable double V;
+        mutable double M;
+
+        bool operator<(const WordStats& w) const {
+            return info < w.info;
+        }
+
+    };
+
+    //private fast bail-out necessary functions
+    void setWordStatistics(const Mat& queryImgDescriptor, multiset<WordStats>& wordData);
+    double limitbisection(double v, double m);
+    double bennettInequality(double v, double m, double delta);
+    static bool compInfo(const WordStats& first, const WordStats& second);
+
+    //parameters
+    double PsGd;
+    double rejectionThreshold;
+    int bisectionStart;
+    int bisectionIts;
+};
+
+/*
+    The FAB-MAP2.0 algorithm, developed based on:
+    http://ijr.sagepub.com/content/30/9/1100.abstract
+*/
+class CV_EXPORTS FabMap2: public FabMap {
+public:
+
+    FabMap2(const Mat& clTree, double PzGe, double PzGNe, int flags);
+    virtual ~FabMap2();
+
+    //FabMap2 builds the inverted index and requires an additional training/test
+    //add function
+    void addTraining(const Mat& queryImgDescriptors) {
+        FabMap::addTraining(queryImgDescriptors);
+    }
+    void addTraining(const vector<Mat>& queryImgDescriptors);
+
+    void add(const Mat& queryImgDescriptors) {
+        FabMap::add(queryImgDescriptors);
+    }
+    void add(const vector<Mat>& queryImgDescriptors);
+
+protected:
+
+    //FabMap2 implementation of the likelihood comparison
+    void getLikelihoods(const Mat& queryImgDescriptor, const vector<
+            Mat>& testImgDescriptors, vector<IMatch>& matches);
+    double getNewPlaceLikelihood(const Mat& queryImgDescriptor);
+
+    //the likelihood function using the inverted index
+    void getIndexLikelihoods(const Mat& queryImgDescriptor, vector<
+                             double>& defaults, map<int, vector<int> >& invertedMap,
+            vector<IMatch>& matches);
+    void addToIndex(const Mat& queryImgDescriptor,
+            vector<double>& defaults,
+            map<int, vector<int> >& invertedMap);
+
+    //data
+    vector<double> d1, d2, d3, d4;
+    vector<vector<int> > children;
+
+    // TODO: inverted map a vector?
+
+    vector<double> trainingDefaults;
+    map<int, vector<int> > trainingInvertedMap;
+
+    vector<double> testDefaults;
+    map<int, vector<int> > testInvertedMap;
+
+};
+/*
+    A Chow-Liu tree is required by FAB-MAP. The Chow-Liu tree provides an
+    estimate of the full distribution of visual words using a minimum spanning
+    tree. The tree is generated through training data.
+*/
+class CV_EXPORTS ChowLiuTree {
+public:
+    ChowLiuTree();
+    virtual ~ChowLiuTree();
+
+    //add data to the chow-liu tree before calling make
+    void add(const Mat& imgDescriptor);
+    void add(const vector<Mat>& imgDescriptors);
+
+    const vector<Mat>& getImgDescriptors() const;
+
+    Mat make(double infoThreshold = 0.0);
+
+private:
+    vector<Mat> imgDescriptors;
+    Mat mergedImgDescriptors;
+
+    typedef struct info {
+        float score;
+        short word1;
+        short word2;
+    } info;
+
+    //probabilities extracted from mergedImgDescriptors
+    double P(int a, bool za);
+    double JP(int a, bool za, int b, bool zb); //a & b
+    double CP(int a, bool za, int b, bool zb); // a | b
+
+    //calculating mutual information of all edges
+    void createBaseEdges(list<info>& edges, double infoThreshold);
+    double calcMutInfo(int word1, int word2);
+    static bool sortInfoScores(const info& first, const info& second);
+
+    //selecting minimum spanning egdges with maximum information
+    bool reduceEdgesToMinSpan(list<info>& edges);
+
+    //building the tree sctructure
+    Mat buildTree(int root_word, list<info> &edges);
+    void recAddToTree(Mat &cltree, int q, int pq,
+        list<info> &remaining_edges);
+    vector<int> extractChildren(list<info> &remaining_edges, int q);
+
+};
+
+/*
+    A custom vocabulary training method based on:
+    http://www.springerlink.com/content/d1h6j8x552532003/
+*/
+class CV_EXPORTS BOWMSCTrainer: public BOWTrainer {
+public:
+    BOWMSCTrainer(double clusterSize = 0.4);
+    virtual ~BOWMSCTrainer();
+
+    // Returns trained vocabulary (i.e. cluster centers).
+    virtual Mat cluster() const;
+    virtual Mat cluster(const Mat& descriptors) const;
+
+protected:
+
+    double clusterSize;
+
+};
+
+}
+
+}
+
+#endif /* OPENFABMAP_H_ */

modules/contrib/src/basicretinafilter.hpp

@@ -115,541 +115,541 @@
 //using namespace std;
 namespace cv
 {
-class BasicRetinaFilter
-{
-public:
-
-    /**
-    * constructor of the base bio-inspired toolbox, parameters are only linked to imae input size and number of filtering capabilities of the object
-    * @param NBrows: number of rows of the input image
-    * @param NBcolumns: number of columns of the input image
-    * @param parametersListSize: specifies the number of parameters set (each parameters set represents a specific low pass spatio-temporal filter)
-    * @param useProgressiveFilter: specifies if the filter has irreguar (progressive) filtering capabilities (this can be activated later using setProgressiveFilterConstants_xxx methods)
-    */
-    BasicRetinaFilter(const unsigned int NBrows, const unsigned int NBcolumns, const unsigned int parametersListSize=1, const bool useProgressiveFilter=false);
-
-    /**
-    * standrad destructore
-    */
-    ~BasicRetinaFilter();
-
-    /**
-    * function which clears the output buffer of the object
-    */
-    inline void clearOutputBuffer(){_filterOutput=0;};
-
-    /**
-    * function which clears the secondary buffer of the object
-    */
-    inline void clearSecondaryBuffer(){_localBuffer=0;};
-
-    /**
-    * function which clears the output and the secondary buffer of the object
-    */
-    inline void clearAllBuffers(){clearOutputBuffer();clearSecondaryBuffer();};
-
-    /**
-    * resize basic retina filter object (resize all allocated buffers
-    * @param NBrows: the new height size
-    * @param NBcolumns: the new width size
-    */
-    void resize(const unsigned int NBrows, const unsigned int NBcolumns);
-
-    /**
-    * forbiden method inherited from parent std::valarray
-    * prefer not to use this method since the filter matrix become vectors
-    */
-    void resize(const unsigned int){std::cerr<<"error, not accessible method"<<std::endl;};
-
-    /**
-    *  low pass filter call and run (models the homogeneous cells network at the retina level, for example horizontal cells or photoreceptors)
-    * @param inputFrame: the input image to be processed
-    * @param filterIndex: the offset which specifies the parameter set that should be used for the filtering
-    * @return the processed image, the output is reachable later by using function getOutput()
-    */
-    const std::valarray<float> &runFilter_LPfilter(const std::valarray<float> &inputFrame, const unsigned int filterIndex=0); // run the LP filter for a new frame input and save result in _filterOutput
-
-    /**
-    * low pass filter call and run (models the homogeneous cells network at the retina level, for example horizontal cells or photoreceptors)
-    * @param inputFrame: the input image to be processed
-    * @param outputFrame: the output buffer in which the result is writed
-    * @param filterIndex: the offset which specifies the parameter set that should be used for the filtering
-    */
-    void runFilter_LPfilter(const std::valarray<float> &inputFrame, std::valarray<float> &outputFrame, const unsigned int filterIndex=0); // run LP filter on a specific output adress
-
-    /**
-    *  low pass filter call and run (models the homogeneous cells network at the retina level, for example horizontal cells or photoreceptors)
-    * @param inputOutputFrame: the input image to be processed on which the result is rewrited
-    * @param filterIndex: the offset which specifies the parameter set that should be used for the filtering
-    */
-    void runFilter_LPfilter_Autonomous(std::valarray<float> &inputOutputFrame, const unsigned int filterIndex=0);// run LP filter on the input data and rewrite it
-
-    /**
-    *  local luminance adaptation call and run (contrast enhancement property of the photoreceptors)
-    * @param inputOutputFrame: the input image to be processed
-    * @param localLuminance: an image which represents the local luminance of the inputFrame parameter, in general, it is its low pass spatial filtering
-    * @return the processed image, the output is reachable later by using function getOutput()
-    */
-    const std::valarray<float> &runFilter_LocalAdapdation(const std::valarray<float> &inputOutputFrame, const std::valarray<float> &localLuminance);// run local adaptation filter and save result in _filterOutput
-
-    /**
-    *  local luminance adaptation call and run (contrast enhancement property of the photoreceptors)
-    * @param inputFrame: the input image to be processed
-    * @param localLuminance: an image which represents the local luminance of the inputFrame parameter, in general, it is its low pass spatial filtering
-    * @param outputFrame: the output buffer in which the result is writed
-    */
-    void runFilter_LocalAdapdation(const std::valarray<float> &inputFrame, const std::valarray<float> &localLuminance, std::valarray<float> &outputFrame); // run local adaptation filter on a specific output adress
-
-    /**
-    *  local luminance adaptation call and run (contrast enhancement property of the photoreceptors)
-    * @param inputFrame: the input image to be processed
-    * @return the processed image, the output is reachable later by using function getOutput()
-    */
-    const std::valarray<float> &runFilter_LocalAdapdation_autonomous(const std::valarray<float> &inputFrame);// run local adaptation filter and save result in _filterOutput
-
-    /**
-    *  local luminance adaptation call and run (contrast enhancement property of the photoreceptors)
-    * @param inputFrame: the input image to be processed
-    * @param outputFrame: the output buffer in which the result is writen
-    */
-    void runFilter_LocalAdapdation_autonomous(const std::valarray<float> &inputFrame, std::valarray<float> &outputFrame); // run local adaptation filter on a specific output adress
-
-    /**
-    * run low pass filtering with progressive parameters (models the retina log sampling of the photoreceptors and its low pass filtering effect consequence: more powerfull low pass filtering effect on the corners)
-    * @param inputFrame: the input image to be processed
-    * @param filterIndex: the index which specifies the parameter set that should be used for the filtering
-    * @return the processed image, the output is reachable later by using function getOutput() if outputFrame is NULL
-    */
-    inline void runProgressiveFilter(std::valarray<float> &inputFrame, const unsigned int filterIndex=0){_spatiotemporalLPfilter_Irregular(&inputFrame[0], filterIndex);};
-
-    /**
-    * run low pass filtering with progressive parameters (models the retina log sampling of the photoreceptors and its low pass filtering effect consequence: more powerfull low pass filtering effect on the corners)
-    * @param inputFrame: the input image to be processed
-    * @param outputFrame: the output buffer in which the result is writen
-    * @param filterIndex: the index which specifies the parameter set that should be used for the filtering
-    */
-    inline void runProgressiveFilter(const std::valarray<float> &inputFrame,
-                                     std::valarray<float> &outputFrame,
-                                     const unsigned int filterIndex=0)
-    {_spatiotemporalLPfilter_Irregular(get_data(inputFrame), &outputFrame[0], filterIndex);};
-
-    /**
-    * first order spatio-temporal low pass filter setup function
-    * @param beta: gain of the filter (generally set to zero)
-    * @param tau: time constant of the filter (unit is frame for video processing)
-    * @param k: spatial constant of the filter (unit is pixels)
-    * @param filterIndex: the index which specifies the parameter set that should be used for the filtering
-    */
-    void setLPfilterParameters(const float beta, const float tau, const float k, const unsigned int filterIndex=0); // change the parameters of the filter
-
-    /**
-    * first order spatio-temporal low pass filter setup function
-    * @param beta: gain of the filter (generally set to zero)
-    * @param tau: time constant of the filter (unit is frame for video processing)
-    * @param alpha0: spatial constant of the filter (unit is pixels) on the border of the image
-    * @param filterIndex: the index which specifies the parameter set that should be used for the filtering
-    */
-    void setProgressiveFilterConstants_CentredAccuracy(const float beta, const float tau, const float alpha0, const unsigned int filterIndex=0);
-
-    /**
-    * first order spatio-temporal low pass filter setup function
-    * @param beta: gain of the filter (generally set to zero)
-    * @param tau: time constant of the filter (unit is frame for video processing)
-    * @param alpha0: spatial constant of the filter (unit is pixels) on the border of the image
-    * @param accuracyMap an image (float format) which values range is between 0 and 1, where 0 means, apply no filtering and 1 means apply the filtering as specified in the parameters set, intermediate values allow to smooth variations of the filtering strenght
-    * @param filterIndex: the index which specifies the parameter set that should be used for the filtering
-    */
-    void setProgressiveFilterConstants_CustomAccuracy(const float beta, const float tau, const float alpha0, const std::valarray<float> &accuracyMap, const unsigned int filterIndex=0);
-
-    /**
-    * local luminance adaptation setup, this function should be applied for normal local adaptation (not for tone mapping operation)
-    * @param v0: compression effect for the local luminance adaptation processing, set a value between 0.6 and 0.9 for best results, a high value yields to a high compression effect
-    * @param maxInputValue: the maximum amplitude value measured after local adaptation processing (c.f. function runFilter_LocalAdapdation & runFilter_LocalAdapdation_autonomous)
-    * @param meanLuminance: the a priori meann luminance of the input data (should be 128 for 8bits images but can vary greatly in case of High Dynamic Range Images (HDRI)
-    */
-    void setV0CompressionParameter(const float v0, const float maxInputValue, const float){ _v0=v0*maxInputValue; _localLuminanceFactor=v0; _localLuminanceAddon=maxInputValue*(1.0f-v0); _maxInputValue=maxInputValue;};
-
-    /**
-    * update local luminance adaptation setup, initial maxInputValue is kept. This function should be applied for normal local adaptation (not for tone mapping operation)
-    * @param v0: compression effect for the local luminance adaptation processing, set a value between 0.6 and 0.9 for best results, a high value yields to a high compression effect
-    * @param meanLuminance: the a priori meann luminance of the input data (should be 128 for 8bits images but can vary greatly in case of High Dynamic Range Images (HDRI)
-    */
-    void setV0CompressionParameter(const float v0, const float meanLuminance){ this->setV0CompressionParameter(v0, _maxInputValue, meanLuminance);};
-
-    /**
-    * local luminance adaptation setup, this function should be applied for normal local adaptation (not for tone mapping operation)
-    * @param v0: compression effect for the local luminance adaptation processing, set a value between 0.6 and 0.9 for best results, a high value yields to a high compression effect
-    */
-    void setV0CompressionParameter(const float v0){ _v0=v0*_maxInputValue; _localLuminanceFactor=v0; _localLuminanceAddon=_maxInputValue*(1.0f-v0);};
-
-    /**
-    * local luminance adaptation setup, this function should be applied for local adaptation applied to tone mapping operation
-    * @param v0: compression effect for the local luminance adaptation processing, set a value between 0.6 and 0.9 for best results, a high value yields to a high compression effect
-    * @param maxInputValue: the maximum amplitude value measured after local adaptation processing (c.f. function runFilter_LocalAdapdation & runFilter_LocalAdapdation_autonomous)
-    * @param meanLuminance: the a priori meann luminance of the input data (should be 128 for 8bits images but can vary greatly in case of High Dynamic Range Images (HDRI)
-    */
-    void setV0CompressionParameterToneMapping(const float v0, const float maxInputValue, const float meanLuminance=128.0f){ _v0=v0*maxInputValue; _localLuminanceFactor=1.0f; _localLuminanceAddon=meanLuminance*_v0; _maxInputValue=maxInputValue;};
-
-    /**
-    * update compression parameters while keeping v0 parameter value
-    * @param meanLuminance the input frame mean luminance
-    */
-    inline void updateCompressionParameter(const float meanLuminance){_localLuminanceFactor=1; _localLuminanceAddon=meanLuminance*_v0;};
-
-    /**
-    * @return the v0 compression parameter used to compute the local adaptation
-    */
-    float getV0CompressionParameter(){ return _v0/_maxInputValue;};
-
-    /**
-    * @return the output result of the object
-    */
-    inline const std::valarray<float> &getOutput() const {return _filterOutput;};
-
-    /**
-    * @return number of rows of the filter
-    */
-    inline unsigned int getNBrows(){return _filterOutput.getNBrows();};
-
-    /**
-    * @return number of columns of the filter
-    */
-    inline unsigned int getNBcolumns(){return _filterOutput.getNBcolumns();};
-
-    /**
-    * @return number of pixels of the filter
-    */
-    inline unsigned int getNBpixels(){return _filterOutput.getNBpixels();};
-
-    /**
-    * force filter output to be normalized between 0 and maxValue
-    * @param maxValue: the maximum output value that is required
-    */
-    inline void normalizeGrayOutput_0_maxOutputValue(const float maxValue){_filterOutput.normalizeGrayOutput_0_maxOutputValue(maxValue);};
-
-    /**
-    * force filter output to be normalized around 0 and rescaled with a sigmoide effect (extrem values saturation)
-    * @param maxValue: the maximum output value that is required
-    */
-    inline void normalizeGrayOutputCentredSigmoide(){_filterOutput.normalizeGrayOutputCentredSigmoide();};
-
-    /**
-    * force filter output to be normalized : data centering and std normalisation
-    * @param maxValue: the maximum output value that is required
-    */
-    inline void centerReductImageLuminance(){_filterOutput.centerReductImageLuminance();};
-
-    /**
-    * @return the maximum input buffer value
-    */
-    inline float getMaxInputValue(){return this->_maxInputValue;};
-
-    /**
-    * @return the maximum input buffer value
-    */
-    inline void setMaxInputValue(const float newMaxInputValue){this->_maxInputValue=newMaxInputValue;};
-
-protected:
-
-    /////////////////////////
-    // data buffers
-    TemplateBuffer<float> _filterOutput; // primary buffer (contains processing outputs)
-    std::valarray<float> _localBuffer; // local secondary buffer
-    /////////////////////////
-    // PARAMETERS
-    unsigned int _halfNBrows;
-    unsigned int _halfNBcolumns;
-
-    // parameters buffers
-    std::valarray <float>_filteringCoeficientsTable;
-    std::valarray <float>_progressiveSpatialConstant;// pointer to a local table containing local spatial constant (allocated with the object)
-    std::valarray <float>_progressiveGain;// pointer to a local table containing local spatial constant (allocated with the object)
-
-    // local adaptation filtering parameters
-    float _v0; //value used for local luminance adaptation function
-    float _maxInputValue;
-    float _meanInputValue;
-    float _localLuminanceFactor;
-    float _localLuminanceAddon;
-
-    // protected data related to standard low pass filters parameters
-    float _a;
-    float _tau;
-    float _gain;
-
-    /////////////////////////
-    // FILTERS METHODS
-
-    // Basic low pass spation temporal low pass filter used by each retina filters
-    void _spatiotemporalLPfilter(const float *inputFrame, float *LPfilterOutput, const unsigned int coefTableOffset=0);
-    float _squaringSpatiotemporalLPfilter(const float *inputFrame, float *outputFrame, const unsigned int filterIndex=0);
-
-    // LP filter with an irregular spatial filtering
-
-    // -> rewrites the input buffer
-    void _spatiotemporalLPfilter_Irregular(float *inputOutputFrame, const unsigned int filterIndex=0);
-    // writes the output on another buffer
-    void _spatiotemporalLPfilter_Irregular(const float *inputFrame, float *outputFrame, const unsigned int filterIndex=0);
-    // LP filter that squares the input and computes the output ONLY on the areas where the integrationAreas map are TRUE
-    void _localSquaringSpatioTemporalLPfilter(const float *inputFrame, float *LPfilterOutput, const unsigned int *integrationAreas, const unsigned int filterIndex=0);
-
-	// local luminance adaptation of the input in regard of localLuminance buffer
-	void _localLuminanceAdaptation(const float *inputFrame, const float *localLuminance, float *outputFrame, const bool updateLuminanceMean=true);
-	// local luminance adaptation of the input in regard of localLuminance buffer, the input is rewrited and becomes the output
-	void _localLuminanceAdaptation(float *inputOutputFrame, const float *localLuminance);
-	// local adaptation applied on a range of values which can be positive and negative
-	void _localLuminanceAdaptationPosNegValues(const float *inputFrame, const float *localLuminance, float *outputFrame);
-
-
-    //////////////////////////////////////////////////////////////
-    // 1D directional filters used for the 2D low pass filtering
-
-	// 1D filters with image input
-	void _horizontalCausalFilter_addInput(const float *inputFrame, float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);
-	// 1D filters  with image input that is squared in the function // parallelized with TBB
-	void _squaringHorizontalCausalFilter(const float *inputFrame, float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);
-	//  vertical anticausal filter that returns the mean value of its result
-	float _verticalAnticausalFilter_returnMeanValue(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd);
-
-	// most simple functions: only perform 1D filtering with output=input (no add on)
-	void _horizontalCausalFilter(float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);
-	void _horizontalAnticausalFilter(float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);     // parallelized with TBB
-	void _verticalCausalFilter(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd);     // parallelized with TBB 
-	void _verticalAnticausalFilter(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd);
-
-	// perform 1D filtering with output with varrying spatial coefficient
-	void _horizontalCausalFilter_Irregular(float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);
-	void _horizontalCausalFilter_Irregular_addInput(const float *inputFrame, float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);
-	void _horizontalAnticausalFilter_Irregular(float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd, const float *spatialConstantBuffer);   // parallelized with TBB 
-	void _verticalCausalFilter_Irregular(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd, const float *spatialConstantBuffer);   // parallelized with TBB 
-	void _verticalAnticausalFilter_Irregular_multGain(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd);
-
-
-	// 1D filters in which the output is multiplied by _gain
-	void _verticalAnticausalFilter_multGain(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd); // this functions affects _gain at the output // parallelized with TBB
-	void _horizontalAnticausalFilter_multGain(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd); // this functions affects _gain at the output
-
-	// LP filter on specific parts of the picture instead of all the image
-	// same functions (some of them) but take a binary flag to allow integration, false flag means, 0 at the output...
-	void _local_squaringHorizontalCausalFilter(const float *inputFrame, float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd, const unsigned int *integrationAreas);
-	void _local_horizontalAnticausalFilter(float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd, const unsigned int *integrationAreas);
-	void _local_verticalCausalFilter(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd, const unsigned int *integrationAreas);
-	void _local_verticalAnticausalFilter_multGain(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd, const unsigned int *integrationAreas); // this functions affects _gain at the output
+    class BasicRetinaFilter
+    {
+    public:
+
+        /**
+        * constructor of the base bio-inspired toolbox, parameters are only linked to imae input size and number of filtering capabilities of the object
+        * @param NBrows: number of rows of the input image
+        * @param NBcolumns: number of columns of the input image
+        * @param parametersListSize: specifies the number of parameters set (each parameters set represents a specific low pass spatio-temporal filter)
+        * @param useProgressiveFilter: specifies if the filter has irreguar (progressive) filtering capabilities (this can be activated later using setProgressiveFilterConstants_xxx methods)
+        */
+        BasicRetinaFilter(const unsigned int NBrows, const unsigned int NBcolumns, const unsigned int parametersListSize=1, const bool useProgressiveFilter=false);
+
+        /**
+        * standrad destructore
+        */
+        ~BasicRetinaFilter();
+
+        /**
+        * function which clears the output buffer of the object
+        */
+        inline void clearOutputBuffer(){_filterOutput=0;};
+
+        /**
+        * function which clears the secondary buffer of the object
+        */
+        inline void clearSecondaryBuffer(){_localBuffer=0;};
+
+        /**
+        * function which clears the output and the secondary buffer of the object
+        */
+        inline void clearAllBuffers(){clearOutputBuffer();clearSecondaryBuffer();};
+
+        /**
+        * resize basic retina filter object (resize all allocated buffers
+        * @param NBrows: the new height size
+        * @param NBcolumns: the new width size
+        */
+        void resize(const unsigned int NBrows, const unsigned int NBcolumns);
+
+        /**
+        * forbiden method inherited from parent std::valarray
+        * prefer not to use this method since the filter matrix become vectors
+        */
+        void resize(const unsigned int){std::cerr<<"error, not accessible method"<<std::endl;};
+
+        /**
+        *  low pass filter call and run (models the homogeneous cells network at the retina level, for example horizontal cells or photoreceptors)
+        * @param inputFrame: the input image to be processed
+        * @param filterIndex: the offset which specifies the parameter set that should be used for the filtering
+        * @return the processed image, the output is reachable later by using function getOutput()
+        */
+        const std::valarray<float> &runFilter_LPfilter(const std::valarray<float> &inputFrame, const unsigned int filterIndex=0); // run the LP filter for a new frame input and save result in _filterOutput
+
+        /**
+        * low pass filter call and run (models the homogeneous cells network at the retina level, for example horizontal cells or photoreceptors)
+        * @param inputFrame: the input image to be processed
+        * @param outputFrame: the output buffer in which the result is writed
+        * @param filterIndex: the offset which specifies the parameter set that should be used for the filtering
+        */
+        void runFilter_LPfilter(const std::valarray<float> &inputFrame, std::valarray<float> &outputFrame, const unsigned int filterIndex=0); // run LP filter on a specific output adress
+
+        /**
+        *  low pass filter call and run (models the homogeneous cells network at the retina level, for example horizontal cells or photoreceptors)
+        * @param inputOutputFrame: the input image to be processed on which the result is rewrited
+        * @param filterIndex: the offset which specifies the parameter set that should be used for the filtering
+        */
+        void runFilter_LPfilter_Autonomous(std::valarray<float> &inputOutputFrame, const unsigned int filterIndex=0);// run LP filter on the input data and rewrite it
+
+        /**
+        *  local luminance adaptation call and run (contrast enhancement property of the photoreceptors)
+        * @param inputOutputFrame: the input image to be processed
+        * @param localLuminance: an image which represents the local luminance of the inputFrame parameter, in general, it is its low pass spatial filtering
+        * @return the processed image, the output is reachable later by using function getOutput()
+        */
+        const std::valarray<float> &runFilter_LocalAdapdation(const std::valarray<float> &inputOutputFrame, const std::valarray<float> &localLuminance);// run local adaptation filter and save result in _filterOutput
+
+        /**
+        *  local luminance adaptation call and run (contrast enhancement property of the photoreceptors)
+        * @param inputFrame: the input image to be processed
+        * @param localLuminance: an image which represents the local luminance of the inputFrame parameter, in general, it is its low pass spatial filtering
+        * @param outputFrame: the output buffer in which the result is writed
+        */
+        void runFilter_LocalAdapdation(const std::valarray<float> &inputFrame, const std::valarray<float> &localLuminance, std::valarray<float> &outputFrame); // run local adaptation filter on a specific output adress
+
+        /**
+        *  local luminance adaptation call and run (contrast enhancement property of the photoreceptors)
+        * @param inputFrame: the input image to be processed
+        * @return the processed image, the output is reachable later by using function getOutput()
+        */
+        const std::valarray<float> &runFilter_LocalAdapdation_autonomous(const std::valarray<float> &inputFrame);// run local adaptation filter and save result in _filterOutput
+
+        /**
+        *  local luminance adaptation call and run (contrast enhancement property of the photoreceptors)
+        * @param inputFrame: the input image to be processed
+        * @param outputFrame: the output buffer in which the result is writen
+        */
+        void runFilter_LocalAdapdation_autonomous(const std::valarray<float> &inputFrame, std::valarray<float> &outputFrame); // run local adaptation filter on a specific output adress
+
+        /**
+        * run low pass filtering with progressive parameters (models the retina log sampling of the photoreceptors and its low pass filtering effect consequence: more powerfull low pass filtering effect on the corners)
+        * @param inputFrame: the input image to be processed
+        * @param filterIndex: the index which specifies the parameter set that should be used for the filtering
+        * @return the processed image, the output is reachable later by using function getOutput() if outputFrame is NULL
+        */
+        inline void runProgressiveFilter(std::valarray<float> &inputFrame, const unsigned int filterIndex=0){_spatiotemporalLPfilter_Irregular(&inputFrame[0], filterIndex);};
+
+        /**
+        * run low pass filtering with progressive parameters (models the retina log sampling of the photoreceptors and its low pass filtering effect consequence: more powerfull low pass filtering effect on the corners)
+        * @param inputFrame: the input image to be processed
+        * @param outputFrame: the output buffer in which the result is writen
+        * @param filterIndex: the index which specifies the parameter set that should be used for the filtering
+        */
+        inline void runProgressiveFilter(const std::valarray<float> &inputFrame,
+            std::valarray<float> &outputFrame,
+            const unsigned int filterIndex=0)
+        {_spatiotemporalLPfilter_Irregular(get_data(inputFrame), &outputFrame[0], filterIndex);};
+
+        /**
+        * first order spatio-temporal low pass filter setup function
+        * @param beta: gain of the filter (generally set to zero)
+        * @param tau: time constant of the filter (unit is frame for video processing)
+        * @param k: spatial constant of the filter (unit is pixels)
+        * @param filterIndex: the index which specifies the parameter set that should be used for the filtering
+        */
+        void setLPfilterParameters(const float beta, const float tau, const float k, const unsigned int filterIndex=0); // change the parameters of the filter
+
+        /**
+        * first order spatio-temporal low pass filter setup function
+        * @param beta: gain of the filter (generally set to zero)
+        * @param tau: time constant of the filter (unit is frame for video processing)
+        * @param alpha0: spatial constant of the filter (unit is pixels) on the border of the image
+        * @param filterIndex: the index which specifies the parameter set that should be used for the filtering
+        */
+        void setProgressiveFilterConstants_CentredAccuracy(const float beta, const float tau, const float alpha0, const unsigned int filterIndex=0);
+
+        /**
+        * first order spatio-temporal low pass filter setup function
+        * @param beta: gain of the filter (generally set to zero)
+        * @param tau: time constant of the filter (unit is frame for video processing)
+        * @param alpha0: spatial constant of the filter (unit is pixels) on the border of the image
+        * @param accuracyMap an image (float format) which values range is between 0 and 1, where 0 means, apply no filtering and 1 means apply the filtering as specified in the parameters set, intermediate values allow to smooth variations of the filtering strenght
+        * @param filterIndex: the index which specifies the parameter set that should be used for the filtering
+        */
+        void setProgressiveFilterConstants_CustomAccuracy(const float beta, const float tau, const float alpha0, const std::valarray<float> &accuracyMap, const unsigned int filterIndex=0);
+
+        /**
+        * local luminance adaptation setup, this function should be applied for normal local adaptation (not for tone mapping operation)
+        * @param v0: compression effect for the local luminance adaptation processing, set a value between 0.6 and 0.9 for best results, a high value yields to a high compression effect
+        * @param maxInputValue: the maximum amplitude value measured after local adaptation processing (c.f. function runFilter_LocalAdapdation & runFilter_LocalAdapdation_autonomous)
+        * @param meanLuminance: the a priori meann luminance of the input data (should be 128 for 8bits images but can vary greatly in case of High Dynamic Range Images (HDRI)
+        */
+        void setV0CompressionParameter(const float v0, const float maxInputValue, const float){ _v0=v0*maxInputValue; _localLuminanceFactor=v0; _localLuminanceAddon=maxInputValue*(1.0f-v0); _maxInputValue=maxInputValue;};
+
+        /**
+        * update local luminance adaptation setup, initial maxInputValue is kept. This function should be applied for normal local adaptation (not for tone mapping operation)
+        * @param v0: compression effect for the local luminance adaptation processing, set a value between 0.6 and 0.9 for best results, a high value yields to a high compression effect
+        * @param meanLuminance: the a priori meann luminance of the input data (should be 128 for 8bits images but can vary greatly in case of High Dynamic Range Images (HDRI)
+        */
+        void setV0CompressionParameter(const float v0, const float meanLuminance){ this->setV0CompressionParameter(v0, _maxInputValue, meanLuminance);};
+
+        /**
+        * local luminance adaptation setup, this function should be applied for normal local adaptation (not for tone mapping operation)
+        * @param v0: compression effect for the local luminance adaptation processing, set a value between 0.6 and 0.9 for best results, a high value yields to a high compression effect
+        */
+        void setV0CompressionParameter(const float v0){ _v0=v0*_maxInputValue; _localLuminanceFactor=v0; _localLuminanceAddon=_maxInputValue*(1.0f-v0);};
+
+        /**
+        * local luminance adaptation setup, this function should be applied for local adaptation applied to tone mapping operation
+        * @param v0: compression effect for the local luminance adaptation processing, set a value between 0.6 and 0.9 for best results, a high value yields to a high compression effect
+        * @param maxInputValue: the maximum amplitude value measured after local adaptation processing (c.f. function runFilter_LocalAdapdation & runFilter_LocalAdapdation_autonomous)
+        * @param meanLuminance: the a priori meann luminance of the input data (should be 128 for 8bits images but can vary greatly in case of High Dynamic Range Images (HDRI)
+        */
+        void setV0CompressionParameterToneMapping(const float v0, const float maxInputValue, const float meanLuminance=128.0f){ _v0=v0*maxInputValue; _localLuminanceFactor=1.0f; _localLuminanceAddon=meanLuminance*_v0; _maxInputValue=maxInputValue;};
+
+        /**
+        * update compression parameters while keeping v0 parameter value
+        * @param meanLuminance the input frame mean luminance
+        */
+        inline void updateCompressionParameter(const float meanLuminance){_localLuminanceFactor=1; _localLuminanceAddon=meanLuminance*_v0;};
+
+        /**
+        * @return the v0 compression parameter used to compute the local adaptation
+        */
+        float getV0CompressionParameter(){ return _v0/_maxInputValue;};
+
+        /**
+        * @return the output result of the object
+        */
+        inline const std::valarray<float> &getOutput() const {return _filterOutput;};
+
+        /**
+        * @return number of rows of the filter
+        */
+        inline unsigned int getNBrows(){return _filterOutput.getNBrows();};
+
+        /**
+        * @return number of columns of the filter
+        */
+        inline unsigned int getNBcolumns(){return _filterOutput.getNBcolumns();};
+
+        /**
+        * @return number of pixels of the filter
+        */
+        inline unsigned int getNBpixels(){return _filterOutput.getNBpixels();};
+
+        /**
+        * force filter output to be normalized between 0 and maxValue
+        * @param maxValue: the maximum output value that is required
+        */
+        inline void normalizeGrayOutput_0_maxOutputValue(const float maxValue){_filterOutput.normalizeGrayOutput_0_maxOutputValue(maxValue);};
+
+        /**
+        * force filter output to be normalized around 0 and rescaled with a sigmoide effect (extrem values saturation)
+        * @param maxValue: the maximum output value that is required
+        */
+        inline void normalizeGrayOutputCentredSigmoide(){_filterOutput.normalizeGrayOutputCentredSigmoide();};
+
+        /**
+        * force filter output to be normalized : data centering and std normalisation
+        * @param maxValue: the maximum output value that is required
+        */
+        inline void centerReductImageLuminance(){_filterOutput.centerReductImageLuminance();};
+
+        /**
+        * @return the maximum input buffer value
+        */
+        inline float getMaxInputValue(){return this->_maxInputValue;};
+
+        /**
+        * @return the maximum input buffer value
+        */
+        inline void setMaxInputValue(const float newMaxInputValue){this->_maxInputValue=newMaxInputValue;};
+
+    protected:
+
+        /////////////////////////
+        // data buffers
+        TemplateBuffer<float> _filterOutput; // primary buffer (contains processing outputs)
+        std::valarray<float> _localBuffer; // local secondary buffer
+        /////////////////////////
+        // PARAMETERS
+        unsigned int _halfNBrows;
+        unsigned int _halfNBcolumns;
+
+        // parameters buffers
+        std::valarray <float>_filteringCoeficientsTable;
+        std::valarray <float>_progressiveSpatialConstant;// pointer to a local table containing local spatial constant (allocated with the object)
+        std::valarray <float>_progressiveGain;// pointer to a local table containing local spatial constant (allocated with the object)
+
+        // local adaptation filtering parameters
+        float _v0; //value used for local luminance adaptation function
+        float _maxInputValue;
+        float _meanInputValue;
+        float _localLuminanceFactor;
+        float _localLuminanceAddon;
+
+        // protected data related to standard low pass filters parameters
+        float _a;
+        float _tau;
+        float _gain;
+
+        /////////////////////////
+        // FILTERS METHODS
+
+        // Basic low pass spation temporal low pass filter used by each retina filters
+        void _spatiotemporalLPfilter(const float *inputFrame, float *LPfilterOutput, const unsigned int coefTableOffset=0);
+        float _squaringSpatiotemporalLPfilter(const float *inputFrame, float *outputFrame, const unsigned int filterIndex=0);
+
+        // LP filter with an irregular spatial filtering
+
+        // -> rewrites the input buffer
+        void _spatiotemporalLPfilter_Irregular(float *inputOutputFrame, const unsigned int filterIndex=0);
+        // writes the output on another buffer
+        void _spatiotemporalLPfilter_Irregular(const float *inputFrame, float *outputFrame, const unsigned int filterIndex=0);
+        // LP filter that squares the input and computes the output ONLY on the areas where the integrationAreas map are TRUE
+        void _localSquaringSpatioTemporalLPfilter(const float *inputFrame, float *LPfilterOutput, const unsigned int *integrationAreas, const unsigned int filterIndex=0);
+
+        // local luminance adaptation of the input in regard of localLuminance buffer
+        void _localLuminanceAdaptation(const float *inputFrame, const float *localLuminance, float *outputFrame, const bool updateLuminanceMean=true);
+        // local luminance adaptation of the input in regard of localLuminance buffer, the input is rewrited and becomes the output
+        void _localLuminanceAdaptation(float *inputOutputFrame, const float *localLuminance);
+        // local adaptation applied on a range of values which can be positive and negative
+        void _localLuminanceAdaptationPosNegValues(const float *inputFrame, const float *localLuminance, float *outputFrame);
+
+
+        //////////////////////////////////////////////////////////////
+        // 1D directional filters used for the 2D low pass filtering
+
+        // 1D filters with image input
+        void _horizontalCausalFilter_addInput(const float *inputFrame, float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);
+        // 1D filters  with image input that is squared in the function // parallelized with TBB
+        void _squaringHorizontalCausalFilter(const float *inputFrame, float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);
+        //  vertical anticausal filter that returns the mean value of its result
+        float _verticalAnticausalFilter_returnMeanValue(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd);
+
+        // most simple functions: only perform 1D filtering with output=input (no add on)
+        void _horizontalCausalFilter(float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);
+        void _horizontalAnticausalFilter(float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);     // parallelized with TBB
+        void _verticalCausalFilter(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd);     // parallelized with TBB 
+        void _verticalAnticausalFilter(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd);
+
+        // perform 1D filtering with output with varrying spatial coefficient
+        void _horizontalCausalFilter_Irregular(float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);
+        void _horizontalCausalFilter_Irregular_addInput(const float *inputFrame, float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd);
+        void _horizontalAnticausalFilter_Irregular(float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd, const float *spatialConstantBuffer);   // parallelized with TBB 
+        void _verticalCausalFilter_Irregular(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd, const float *spatialConstantBuffer);   // parallelized with TBB 
+        void _verticalAnticausalFilter_Irregular_multGain(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd);
+
+
+        // 1D filters in which the output is multiplied by _gain
+        void _verticalAnticausalFilter_multGain(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd); // this functions affects _gain at the output // parallelized with TBB
+        void _horizontalAnticausalFilter_multGain(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd); // this functions affects _gain at the output
+
+        // LP filter on specific parts of the picture instead of all the image
+        // same functions (some of them) but take a binary flag to allow integration, false flag means, 0 at the output...
+        void _local_squaringHorizontalCausalFilter(const float *inputFrame, float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd, const unsigned int *integrationAreas);
+        void _local_horizontalAnticausalFilter(float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd, const unsigned int *integrationAreas);
+        void _local_verticalCausalFilter(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd, const unsigned int *integrationAreas);
+        void _local_verticalAnticausalFilter_multGain(float *outputFrame, unsigned int IDcolumnStart, unsigned int IDcolumnEnd, const unsigned int *integrationAreas); // this functions affects _gain at the output
 
 #ifdef MAKE_PARALLEL
-/******************************************************
-** IF some parallelizing thread methods are available, then, main loops are parallelized using these functors
-** ==> main idea paralellise main filters loops, then, only the most used methods are parallelized... TODO : increase the number of parallelised methods as necessary
-** ==> functors names = Parallel_$$$ where $$$= the name of the serial method that is parallelised
-** ==> functors constructors can differ from the parameters used with their related serial functions
-*/
+        /******************************************************
+        ** IF some parallelizing thread methods are available, then, main loops are parallelized using these functors
+        ** ==> main idea paralellise main filters loops, then, only the most used methods are parallelized... TODO : increase the number of parallelised methods as necessary
+        ** ==> functors names = Parallel_$$$ where $$$= the name of the serial method that is parallelised
+        ** ==> functors constructors can differ from the parameters used with their related serial functions
+        */
 
 #define _DEBUG_TBB // define DEBUG_TBB in order to display additionnal data on stdout
-    class Parallel_horizontalAnticausalFilter: public cv::ParallelLoopBody
-    {
-    private:
-        float *outputFrame;
-        const unsigned int IDrowEnd, nbColumns;
-        const float filterParam_a;
-    public:
-        // constructor which takes the input image pointer reference reference and limits
-        Parallel_horizontalAnticausalFilter(float *bufferToProcess, const unsigned int idEnd, const unsigned int nbCols, const float a )
-        :outputFrame(bufferToProcess), IDrowEnd(idEnd), nbColumns(nbCols), filterParam_a(a)
+        class Parallel_horizontalAnticausalFilter: public cv::ParallelLoopBody
         {
+        private:
+            float *outputFrame;
+            unsigned int IDrowEnd, nbColumns;
+            float filterParam_a;
+        public:
+            // constructor which takes the input image pointer reference reference and limits
+            Parallel_horizontalAnticausalFilter(float *bufferToProcess, const unsigned int idEnd, const unsigned int nbCols, const float a )
+                :outputFrame(bufferToProcess), IDrowEnd(idEnd), nbColumns(nbCols), filterParam_a(a)
+            {
 #ifdef DEBUG_TBB
-            std::cout<<"Parallel_horizontalAnticausalFilter::Parallel_horizontalAnticausalFilter :"
-		<<"\n\t idEnd="<<IDrowEnd
-		<<"\n\t nbCols="<<nbColumns
-		<<"\n\t filterParam="<<filterParam_a
-		<<std::endl;
+                std::cout<<"Parallel_horizontalAnticausalFilter::Parallel_horizontalAnticausalFilter :"
+                    <<"\n\t idEnd="<<IDrowEnd
+                    <<"\n\t nbCols="<<nbColumns
+                    <<"\n\t filterParam="<<filterParam_a
+                    <<std::endl;
 #endif
-        }
+            }
 
-        virtual void operator()( const Range& r ) const {
+            virtual void operator()( const Range& r ) const {
 
 #ifdef DEBUG_TBB
-            std::cout<<"Parallel_horizontalAnticausalFilter::operator() :"
-		<<"\n\t range size="<<r.size()
-		<<"\n\t first index="<<r.start
-		//<<"\n\t last index="<<filterParam
-		<<std::endl;
+                std::cout<<"Parallel_horizontalAnticausalFilter::operator() :"
+                    <<"\n\t range size="<<r.size()
+                    <<"\n\t first index="<<r.start
+                    //<<"\n\t last index="<<filterParam
+                    <<std::endl;
 #endif
-            for (int IDrow=r.start; IDrow!=r.end; ++IDrow)
-	    {
-                register float* outputPTR=outputFrame+(IDrowEnd-IDrow)*(nbColumns)-1;
-		register float result=0;
-		for (unsigned int index=0; index<nbColumns; ++index)
-		{
-			result = *(outputPTR)+  filterParam_a* result;
-			*(outputPTR--) = result;
-		}
+                for (int IDrow=r.start; IDrow!=r.end; ++IDrow)
+                {
+                    register float* outputPTR=outputFrame+(IDrowEnd-IDrow)*(nbColumns)-1;
+                    register float result=0;
+                    for (unsigned int index=0; index<nbColumns; ++index)
+                    {
+                        result = *(outputPTR)+  filterParam_a* result;
+                        *(outputPTR--) = result;
+                    }
+                }
             }
-    }
-    };
+        };
 
-    class Parallel_horizontalCausalFilter_addInput: public cv::ParallelLoopBody
-    {
-    private:
-        const float *inputFrame;
-        float *outputFrame;
-        const unsigned int IDrowStart, nbColumns;
-        const float filterParam_a, filterParam_tau;
-    public:
-	Parallel_horizontalCausalFilter_addInput(const float *bufferToAddAsInputProcess, float *bufferToProcess, const unsigned int idStart, const unsigned int nbCols,  const float a,  const float tau)
-        :inputFrame(bufferToAddAsInputProcess), outputFrame(bufferToProcess), IDrowStart(idStart), nbColumns(nbCols), filterParam_a(a), filterParam_tau(tau){}
-
-        virtual void operator()( const Range& r ) const {
-	    for (int IDrow=r.start; IDrow!=r.end; ++IDrow)
-	    {
-		register float* outputPTR=outputFrame+(IDrowStart+IDrow)*nbColumns;
-		register const float* inputPTR=inputFrame+(IDrowStart+IDrow)*nbColumns;
-		register float result=0;
-		for (unsigned int index=0; index<nbColumns; ++index)
-		{
-			result = *(inputPTR++) + filterParam_tau**(outputPTR)+  filterParam_a* result;
-			*(outputPTR++) = result;
-		}
-	    }
-        }
-    };
+        class Parallel_horizontalCausalFilter_addInput: public cv::ParallelLoopBody
+        {
+        private:
+            const float *inputFrame;
+            float *outputFrame;
+            unsigned int IDrowStart, nbColumns;
+            float filterParam_a, filterParam_tau;
+        public:
+            Parallel_horizontalCausalFilter_addInput(const float *bufferToAddAsInputProcess, float *bufferToProcess, const unsigned int idStart, const unsigned int nbCols,  const float a,  const float tau)
+                :inputFrame(bufferToAddAsInputProcess), outputFrame(bufferToProcess), IDrowStart(idStart), nbColumns(nbCols), filterParam_a(a), filterParam_tau(tau){}
+
+            virtual void operator()( const Range& r ) const {
+                for (int IDrow=r.start; IDrow!=r.end; ++IDrow)
+                {
+                    register float* outputPTR=outputFrame+(IDrowStart+IDrow)*nbColumns;
+                    register const float* inputPTR=inputFrame+(IDrowStart+IDrow)*nbColumns;
+                    register float result=0;
+                    for (unsigned int index=0; index<nbColumns; ++index)
+                    {
+                        result = *(inputPTR++) + filterParam_tau**(outputPTR)+  filterParam_a* result;
+                        *(outputPTR++) = result;
+                    }
+                }
+            }
+        };
 
-    class Parallel_verticalCausalFilter: public cv::ParallelLoopBody
-    {
-    private:
-        float *outputFrame;
-        const unsigned int nbRows, nbColumns;
-        const float filterParam_a;
-    public:
-        Parallel_verticalCausalFilter(float *bufferToProcess, const unsigned int nbRws, const unsigned int nbCols, const float a )
-        :outputFrame(bufferToProcess), nbRows(nbRws), nbColumns(nbCols), filterParam_a(a){}
-        
-        virtual void operator()( const Range& r ) const {
-            for (int IDcolumn=r.start; IDcolumn!=r.end; ++IDcolumn)
-	    {
-		register float result=0;
-		register float *outputPTR=outputFrame+IDcolumn;
-
-		for (unsigned int index=0; index<nbRows; ++index)
-		{
-			result = *(outputPTR) + filterParam_a * result;
-			*(outputPTR) = result;
-			outputPTR+=nbColumns;
-
-		}
-	    }
-        }
-    };
+        class Parallel_verticalCausalFilter: public cv::ParallelLoopBody
+        {
+        private:
+            float *outputFrame;
+            unsigned int nbRows, nbColumns;
+            float filterParam_a;
+        public:
+            Parallel_verticalCausalFilter(float *bufferToProcess, const unsigned int nbRws, const unsigned int nbCols, const float a )
+                :outputFrame(bufferToProcess), nbRows(nbRws), nbColumns(nbCols), filterParam_a(a){}
+
+            virtual void operator()( const Range& r ) const {
+                for (int IDcolumn=r.start; IDcolumn!=r.end; ++IDcolumn)
+                {
+                    register float result=0;
+                    register float *outputPTR=outputFrame+IDcolumn;
+
+                    for (unsigned int index=0; index<nbRows; ++index)
+                    {
+                        result = *(outputPTR) + filterParam_a * result;
+                        *(outputPTR) = result;
+                        outputPTR+=nbColumns;
+
+                    }
+                }
+            }
+        };
 
-    class Parallel_verticalAnticausalFilter_multGain: public cv::ParallelLoopBody
-    {
-    private:
-        float *outputFrame;
-        const unsigned int nbRows, nbColumns;
-        const float filterParam_a, filterParam_gain;
-    public:        
-        Parallel_verticalAnticausalFilter_multGain(float *bufferToProcess, const unsigned int nbRws, const unsigned int nbCols, const float a, const float  gain)
-        :outputFrame(bufferToProcess), nbRows(nbRws), nbColumns(nbCols), filterParam_a(a), filterParam_gain(gain){}
-        
-        virtual void operator()( const Range& r ) const {
-            float* offset=outputFrame+nbColumns*nbRows-nbColumns;
-    	    for (int IDcolumn=r.start; IDcolumn!=r.end; ++IDcolumn)
-	    {
-		register float result=0;
-		register float *outputPTR=offset+IDcolumn;
-
-		for (unsigned int index=0; index<nbRows; ++index)
-		{
-			result = *(outputPTR) + filterParam_a * result;
-			*(outputPTR) = filterParam_gain*result;
-			outputPTR-=nbColumns;
-
-		}
-	    }
-        }
-    };
+        class Parallel_verticalAnticausalFilter_multGain: public cv::ParallelLoopBody
+        {
+        private:
+            float *outputFrame;
+            unsigned int nbRows, nbColumns;
+            float filterParam_a, filterParam_gain;
+        public:        
+            Parallel_verticalAnticausalFilter_multGain(float *bufferToProcess, const unsigned int nbRws, const unsigned int nbCols, const float a, const float  gain)
+                :outputFrame(bufferToProcess), nbRows(nbRws), nbColumns(nbCols), filterParam_a(a), filterParam_gain(gain){}
+
+            virtual void operator()( const Range& r ) const {
+                float* offset=outputFrame+nbColumns*nbRows-nbColumns;
+                for (int IDcolumn=r.start; IDcolumn!=r.end; ++IDcolumn)
+                {
+                    register float result=0;
+                    register float *outputPTR=offset+IDcolumn;
+
+                    for (unsigned int index=0; index<nbRows; ++index)
+                    {
+                        result = *(outputPTR) + filterParam_a * result;
+                        *(outputPTR) = filterParam_gain*result;
+                        outputPTR-=nbColumns;
+
+                    }
+                }
+            }
+        };
 
-    class Parallel_localAdaptation: public cv::ParallelLoopBody
-    {
-    private:
-         const float *localLuminance, *inputFrame;
-         float *outputFrame;
-         const float localLuminanceFactor, localLuminanceAddon, maxInputValue;
-    public:
-         Parallel_localAdaptation(const float *localLum, const float *inputImg, float *bufferToProcess, const float localLuminanceFact, const float localLuminanceAdd, const float maxInputVal)
-         :localLuminance(localLum), inputFrame(inputImg),outputFrame(bufferToProcess), localLuminanceFactor(localLuminanceFact), localLuminanceAddon(localLuminanceAdd), maxInputValue(maxInputVal) {};
-
-         virtual void operator()( const Range& r ) const {
-             const float *localLuminancePTR=localLuminance+r.start;
-	     const float *inputFramePTR=inputFrame+r.start;
-	     float *outputFramePTR=outputFrame+r.start;
-	     for (register int IDpixel=r.start ; IDpixel!=r.end ; ++IDpixel, ++inputFramePTR, ++outputFramePTR)
-	     {
-		float X0=*(localLuminancePTR++)*localLuminanceFactor+localLuminanceAddon;
-		// TODO : the following line can lead to a divide by zero ! A small offset is added, take care if the offset is too large in case of High Dynamic Range images which can use very small values...		
-		*(outputFramePTR) = (maxInputValue+X0)**inputFramePTR/(*inputFramePTR +X0+0.00000000001);
-		//std::cout<<"BasicRetinaFilter::inputFrame[IDpixel]=%f, X0=%f, outputFrame[IDpixel]=%f\n", inputFrame[IDpixel], X0, outputFrame[IDpixel]);
-	     }
-         }
-    };
+        class Parallel_localAdaptation: public cv::ParallelLoopBody
+        {
+        private:
+            const float *localLuminance, *inputFrame;
+            float *outputFrame;
+            float localLuminanceFactor, localLuminanceAddon, maxInputValue;
+        public:
+            Parallel_localAdaptation(const float *localLum, const float *inputImg, float *bufferToProcess, const float localLuminanceFact, const float localLuminanceAdd, const float maxInputVal)
+                :localLuminance(localLum), inputFrame(inputImg),outputFrame(bufferToProcess), localLuminanceFactor(localLuminanceFact), localLuminanceAddon(localLuminanceAdd), maxInputValue(maxInputVal) {};
+
+            virtual void operator()( const Range& r ) const {
+                const float *localLuminancePTR=localLuminance+r.start;
+                const float *inputFramePTR=inputFrame+r.start;
+                float *outputFramePTR=outputFrame+r.start;
+                for (register int IDpixel=r.start ; IDpixel!=r.end ; ++IDpixel, ++inputFramePTR, ++outputFramePTR)
+                {
+                    float X0=*(localLuminancePTR++)*localLuminanceFactor+localLuminanceAddon;
+                    // TODO : the following line can lead to a divide by zero ! A small offset is added, take care if the offset is too large in case of High Dynamic Range images which can use very small values...		
+                    *(outputFramePTR) = (maxInputValue+X0)**inputFramePTR/(*inputFramePTR +X0+0.00000000001f);
+                    //std::cout<<"BasicRetinaFilter::inputFrame[IDpixel]=%f, X0=%f, outputFrame[IDpixel]=%f\n", inputFrame[IDpixel], X0, outputFrame[IDpixel]);
+                }
+            }
+        };
 
-//////////////////////////////////////////
-/// Specific filtering methods which manage non const spatial filtering parameter (used By retinacolor and LogProjectors) 
-    class Parallel_horizontalAnticausalFilter_Irregular: public cv::ParallelLoopBody
-    {
-    private:
-	float *outputFrame;
-        const float *spatialConstantBuffer;
-        const unsigned int IDrowEnd, nbColumns;
-    public:
-        Parallel_horizontalAnticausalFilter_Irregular(float *bufferToProcess, const float *spatialConst, const unsigned int idEnd, const unsigned int nbCols)
-        :outputFrame(bufferToProcess), spatialConstantBuffer(spatialConst), IDrowEnd(idEnd), nbColumns(nbCols){}
-
-virtual void operator()( const Range& r ) const {
-
-            for (int IDrow=r.start; IDrow!=r.end; ++IDrow)
-	    {
-                register float* outputPTR=outputFrame+(IDrowEnd-IDrow)*(nbColumns)-1;
-                register const float* spatialConstantPTR=spatialConstantBuffer+(IDrowEnd-IDrow)*(nbColumns)-1;
-		register float result=0;
-		for (unsigned int index=0; index<nbColumns; ++index)
-		{
-			result = *(outputPTR)+  *(spatialConstantPTR--)* result;
-			*(outputPTR--) = result;
-		}
+        //////////////////////////////////////////
+        /// Specific filtering methods which manage non const spatial filtering parameter (used By retinacolor and LogProjectors) 
+        class Parallel_horizontalAnticausalFilter_Irregular: public cv::ParallelLoopBody
+        {
+        private:
+            float *outputFrame;
+            const float *spatialConstantBuffer;
+            unsigned int IDrowEnd, nbColumns;
+        public:
+            Parallel_horizontalAnticausalFilter_Irregular(float *bufferToProcess, const float *spatialConst, const unsigned int idEnd, const unsigned int nbCols)
+                :outputFrame(bufferToProcess), spatialConstantBuffer(spatialConst), IDrowEnd(idEnd), nbColumns(nbCols){}
+
+            virtual void operator()( const Range& r ) const {
+
+                for (int IDrow=r.start; IDrow!=r.end; ++IDrow)
+                {
+                    register float* outputPTR=outputFrame+(IDrowEnd-IDrow)*(nbColumns)-1;
+                    register const float* spatialConstantPTR=spatialConstantBuffer+(IDrowEnd-IDrow)*(nbColumns)-1;
+                    register float result=0;
+                    for (unsigned int index=0; index<nbColumns; ++index)
+                    {
+                        result = *(outputPTR)+  *(spatialConstantPTR--)* result;
+                        *(outputPTR--) = result;
+                    }
+                }
             }
-        }
-    };
+        };
 
-    class Parallel_verticalCausalFilter_Irregular: public cv::ParallelLoopBody
-    {
-    private:
-        float *outputFrame;
-        const float *spatialConstantBuffer;
-        const unsigned int nbRows, nbColumns;
-    public:
-        Parallel_verticalCausalFilter_Irregular(float *bufferToProcess, const float *spatialConst, const unsigned int nbRws, const unsigned int nbCols)
-        :outputFrame(bufferToProcess), spatialConstantBuffer(spatialConst), nbRows(nbRws), nbColumns(nbCols){}
-        
-        virtual void operator()( const Range& r ) const {
-            for (int IDcolumn=r.start; IDcolumn!=r.end; ++IDcolumn)
-	    {
-		register float result=0;
-		register float *outputPTR=outputFrame+IDcolumn;
-                register const float* spatialConstantPTR=spatialConstantBuffer+IDcolumn;
-		for (unsigned int index=0; index<nbRows; ++index)
-		{
-			result = *(outputPTR) +  *(spatialConstantPTR) * result;
-			*(outputPTR) = result;
-			outputPTR+=nbColumns;
+        class Parallel_verticalCausalFilter_Irregular: public cv::ParallelLoopBody
+        {
+        private:
+            float *outputFrame;
+            const float *spatialConstantBuffer;
+            unsigned int nbRows, nbColumns;
+        public:
+            Parallel_verticalCausalFilter_Irregular(float *bufferToProcess, const float *spatialConst, const unsigned int nbRws, const unsigned int nbCols)
+                :outputFrame(bufferToProcess), spatialConstantBuffer(spatialConst), nbRows(nbRws), nbColumns(nbCols){}
+
+            virtual void operator()( const Range& r ) const {
+                for (int IDcolumn=r.start; IDcolumn!=r.end; ++IDcolumn)
+                {
+                    register float result=0;
+                    register float *outputPTR=outputFrame+IDcolumn;
+                    register const float* spatialConstantPTR=spatialConstantBuffer+IDcolumn;
+                    for (unsigned int index=0; index<nbRows; ++index)
+                    {
+                        result = *(outputPTR) +  *(spatialConstantPTR) * result;
+                        *(outputPTR) = result;
+                        outputPTR+=nbColumns;
                         spatialConstantPTR+=nbColumns;
-		}
-	    }
-        }
-    };
+                    }
+                }
+            }
+        };
 
 #endif
 
-};
+    };
 
 }
 #endif

modules/contrib/src/bowmsctrainer.cpp

+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+// This file originates from the openFABMAP project:
+// [http://code.google.com/p/openfabmap/]
+//
+// For published work which uses all or part of OpenFABMAP, please cite:
+// [http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=6224843]
+//
+// Original Algorithm by Mark Cummins and Paul Newman:
+// [http://ijr.sagepub.com/content/27/6/647.short]
+// [http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=5613942]
+// [http://ijr.sagepub.com/content/30/9/1100.abstract]
+//
+//                           License Agreement
+//
+// Copyright (C) 2012 Arren Glover [aj.glover@qut.edu.au] and
+//                    Will Maddern [w.maddern@qut.edu.au], all rights reserved.
+//
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#include "precomp.hpp"
+#include "opencv2/contrib/openfabmap.hpp"
+
+namespace cv {
+
+namespace of2 {
+
+BOWMSCTrainer::BOWMSCTrainer(double _clusterSize) :
+    clusterSize(_clusterSize) {
+}
+
+BOWMSCTrainer::~BOWMSCTrainer() {
+}
+
+Mat BOWMSCTrainer::cluster() const {
+    CV_Assert(!descriptors.empty());
+    int descCount = 0;
+    for(size_t i = 0; i < descriptors.size(); i++)
+    descCount += descriptors[i].rows;
+
+    Mat mergedDescriptors(descCount, descriptors[0].cols,
+        descriptors[0].type());
+    for(size_t i = 0, start = 0; i < descriptors.size(); i++)
+    {
+        Mat submut = mergedDescriptors.rowRange((int)start,
+            (int)(start + descriptors[i].rows));
+        descriptors[i].copyTo(submut);
+        start += descriptors[i].rows;
+    }
+    return cluster(mergedDescriptors);
+}
+
+Mat BOWMSCTrainer::cluster(const Mat& descriptors) const {
+
+    CV_Assert(!descriptors.empty());
+
+    // TODO: sort the descriptors before clustering.
+
+
+    Mat icovar = Mat::eye(descriptors.cols,descriptors.cols,descriptors.type());
+
+    vector<Mat> initialCentres;
+    initialCentres.push_back(descriptors.row(0));
+    for (int i = 1; i < descriptors.rows; i++) {
+        double minDist = DBL_MAX;
+        for (size_t j = 0; j < initialCentres.size(); j++) {
+            minDist = std::min(minDist,
+                cv::Mahalanobis(descriptors.row(i),initialCentres[j],
+                icovar));
+        }
+        if (minDist > clusterSize)
+            initialCentres.push_back(descriptors.row(i));
+    }
+
+    std::vector<std::list<cv::Mat> > clusters;
+    clusters.resize(initialCentres.size());
+    for (int i = 0; i < descriptors.rows; i++) {
+        int index = 0; double dist = 0, minDist = DBL_MAX;
+        for (size_t j = 0; j < initialCentres.size(); j++) {
+            dist = cv::Mahalanobis(descriptors.row(i),initialCentres[j],icovar);
+            if (dist < minDist) {
+                minDist = dist;
+                index = (int)j;
+            }
+        }
+        clusters[index].push_back(descriptors.row(i));
+    }
+
+    // TODO: throw away small clusters.
+
+    Mat vocabulary;
+    Mat centre = Mat::zeros(1,descriptors.cols,descriptors.type());
+    for (size_t i = 0; i < clusters.size(); i++) {
+        centre.setTo(0);
+        for (std::list<cv::Mat>::iterator Ci = clusters[i].begin(); Ci != clusters[i].end(); Ci++) {
+            centre += *Ci;
+        }
+        centre /= (double)clusters[i].size();
+        vocabulary.push_back(centre);
+    }
+
+    return vocabulary;
+}
+
+}
+
+}
+

modules/contrib/src/chowliutree.cpp

+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+// This file originates from the openFABMAP project:
+// [http://code.google.com/p/openfabmap/]
+//
+// For published work which uses all or part of OpenFABMAP, please cite:
+// [http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=6224843]
+//
+// Original Algorithm by Mark Cummins and Paul Newman:
+// [http://ijr.sagepub.com/content/27/6/647.short]
+// [http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=5613942]
+// [http://ijr.sagepub.com/content/30/9/1100.abstract]
+//
+//                           License Agreement
+//
+// Copyright (C) 2012 Arren Glover [aj.glover@qut.edu.au] and
+//                    Will Maddern [w.maddern@qut.edu.au], all rights reserved.
+//
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#include "precomp.hpp"
+#include "opencv2/contrib/openfabmap.hpp"
+
+namespace cv {
+
+namespace of2 {
+
+ChowLiuTree::ChowLiuTree() {
+}
+
+ChowLiuTree::~ChowLiuTree() {
+}
+
+void ChowLiuTree::add(const Mat& imgDescriptor) {
+    CV_Assert(!imgDescriptor.empty());
+    if (!imgDescriptors.empty()) {
+        CV_Assert(imgDescriptors[0].cols == imgDescriptor.cols);
+        CV_Assert(imgDescriptors[0].type() == imgDescriptor.type());
+    }
+
+    imgDescriptors.push_back(imgDescriptor);
+
+}
+
+void ChowLiuTree::add(const vector<Mat>& _imgDescriptors) {
+    for (size_t i = 0; i < _imgDescriptors.size(); i++) {
+        add(_imgDescriptors[i]);
+    }
+}
+
+const std::vector<cv::Mat>& ChowLiuTree::getImgDescriptors() const {
+    return imgDescriptors;
+}
+
+Mat ChowLiuTree::make(double infoThreshold) {
+    CV_Assert(!imgDescriptors.empty());
+
+    unsigned int descCount = 0;
+    for (size_t i = 0; i < imgDescriptors.size(); i++)
+        descCount += imgDescriptors[i].rows;
+
+    mergedImgDescriptors = cv::Mat(descCount, imgDescriptors[0].cols,
+        imgDescriptors[0].type());
+    for (size_t i = 0, start = 0; i < imgDescriptors.size(); i++)
+    {
+        Mat submut = mergedImgDescriptors.rowRange((int)start,
+            (int)(start + imgDescriptors[i].rows));
+        imgDescriptors[i].copyTo(submut);
+        start += imgDescriptors[i].rows;
+    }
+
+    std::list<info> edges;
+    createBaseEdges(edges, infoThreshold);
+
+    // TODO: if it cv_asserts here they really won't know why.
+
+    CV_Assert(reduceEdgesToMinSpan(edges));
+
+    return buildTree(edges.front().word1, edges);
+}
+
+double ChowLiuTree::P(int a, bool za) {
+
+    if(za) {
+        return (0.98 * cv::countNonZero(mergedImgDescriptors.col(a)) /
+            mergedImgDescriptors.rows) + 0.01;
+    } else {
+        return 1 - ((0.98 * cv::countNonZero(mergedImgDescriptors.col(a)) /
+            mergedImgDescriptors.rows) + 0.01);
+    }
+
+}
+double ChowLiuTree::JP(int a, bool za, int b, bool zb) {
+
+    double count = 0;
+    for(int i = 0; i < mergedImgDescriptors.rows; i++) {
+        if((mergedImgDescriptors.at<float>(i,a) > 0) == za &&
+            (mergedImgDescriptors.at<float>(i,b) > 0) == zb) {
+                count++;
+        }
+    }
+    return count / mergedImgDescriptors.rows;
+
+}
+double ChowLiuTree::CP(int a, bool za, int b, bool zb){
+
+    int count = 0, total = 0;
+    for(int i = 0; i < mergedImgDescriptors.rows; i++) {
+        if((mergedImgDescriptors.at<float>(i,b) > 0) == zb) {
+            total++;
+            if((mergedImgDescriptors.at<float>(i,a) > 0) == za) {
+                count++;
+            }
+        }
+    }
+    if(total) {
+        return (double)(0.98 * count)/total + 0.01;
+    } else {
+        return (za) ? 0.01 : 0.99;
+    }
+}
+
+cv::Mat ChowLiuTree::buildTree(int root_word, std::list<info> &edges) {
+
+    int q = root_word;
+    cv::Mat cltree(4, (int)edges.size()+1, CV_64F);
+
+    cltree.at<double>(0, q) = q;
+    cltree.at<double>(1, q) = P(q, true);
+    cltree.at<double>(2, q) = P(q, true);
+    cltree.at<double>(3, q) = P(q, true);
+    //setting P(zq|zpq) to P(zq) gives the root node of the chow-liu
+    //independence from a parent node.
+
+    //find all children and do the same
+    vector<int> nextqs = extractChildren(edges, q);
+
+    int pq = q;
+    vector<int>::iterator nextq;
+    for(nextq = nextqs.begin(); nextq != nextqs.end(); nextq++) {
+        recAddToTree(cltree, *nextq, pq, edges);
+    }
+
+    return cltree;
+
+
+}
+
+void ChowLiuTree::recAddToTree(cv::Mat &cltree, int q, int pq,
+                               std::list<info>& remaining_edges) {
+
+    cltree.at<double>(0, q) = pq;
+    cltree.at<double>(1, q) = P(q, true);
+    cltree.at<double>(2, q) = CP(q, true, pq, true);
+    cltree.at<double>(3, q) = CP(q, true, pq, false);
+
+    //find all children and do the same
+    vector<int> nextqs = extractChildren(remaining_edges, q);
+
+    pq = q;
+    vector<int>::iterator nextq;
+    for(nextq = nextqs.begin(); nextq != nextqs.end(); nextq++) {
+        recAddToTree(cltree, *nextq, pq, remaining_edges);
+    }
+}
+
+vector<int> ChowLiuTree::extractChildren(std::list<info> &remaining_edges, int q) {
+
+    std::vector<int> children;
+    std::list<info>::iterator edge = remaining_edges.begin();
+
+    while(edge != remaining_edges.end()) {
+        if(edge->word1 == q) {
+            children.push_back(edge->word2);
+            edge = remaining_edges.erase(edge);
+            continue;
+        }
+        if(edge->word2 == q) {
+            children.push_back(edge->word1);
+            edge = remaining_edges.erase(edge);
+            continue;
+        }
+        edge++;
+    }
+
+    return children;
+}
+
+bool ChowLiuTree::sortInfoScores(const info& first, const info& second) {
+    return first.score > second.score;
+}
+
+double ChowLiuTree::calcMutInfo(int word1, int word2) {
+    double accumulation = 0;
+
+    double P00 = JP(word1, false, word2, false);
+    if(P00) accumulation += P00 * log(P00 / (P(word1, false)*P(word2, false)));
+
+    double P01 = JP(word1, false, word2, true);
+    if(P01) accumulation += P01 * log(P01 / (P(word1, false)*P(word2, true)));
+
+    double P10 = JP(word1, true, word2, false);
+    if(P10) accumulation += P10 * log(P10 / (P(word1, true)*P(word2, false)));
+
+    double P11 = JP(word1, true, word2, true);
+    if(P11) accumulation += P11 * log(P11 / (P(word1, true)*P(word2, true)));
+
+    return accumulation;
+}
+
+void ChowLiuTree::createBaseEdges(std::list<info>& edges, double infoThreshold) {
+
+    int nWords = imgDescriptors[0].cols;
+    info mutInfo;
+
+    for(int word1 = 0; word1 < nWords; word1++) {
+        for(int word2 = word1 + 1; word2 < nWords; word2++) {
+            mutInfo.word1 = (short)word1;
+            mutInfo.word2 = (short)word2;
+            mutInfo.score = (float)calcMutInfo(word1, word2);
+            if(mutInfo.score >= infoThreshold)
+            edges.push_back(mutInfo);
+        }
+    }
+    edges.sort(sortInfoScores);
+}
+
+bool ChowLiuTree::reduceEdgesToMinSpan(std::list<info>& edges) {
+
+    std::map<int, int> groups;
+    std::map<int, int>::iterator groupIt;
+    for(int i = 0; i < imgDescriptors[0].cols; i++) groups[i] = i;
+    int group1, group2;
+
+    std::list<info>::iterator edge = edges.begin();
+    while(edge != edges.end()) {
+        if(groups[edge->word1] != groups[edge->word2]) {
+            group1 = groups[edge->word1];
+            group2 = groups[edge->word2];
+            for(groupIt = groups.begin(); groupIt != groups.end(); groupIt++)
+            if(groupIt->second == group2) groupIt->second = group1;
+            edge++;
+        } else {
+            edge = edges.erase(edge);
+        }
+    }
+
+    if(edges.size() != (unsigned int)imgDescriptors[0].cols - 1) {
+        return false;
+    } else {
+        return true;
+    }
+
+}
+
+}
+
+}
+

modules/contrib/src/magnoretinafilter.hpp

@@ -100,143 +100,143 @@
 namespace cv
 {
 
-class MagnoRetinaFilter: public BasicRetinaFilter
-{
-public:
-    /**
-    * constructor parameters are only linked to image input size
-    * @param NBrows: number of rows of the input image
-    * @param NBcolumns: number of columns of the input image
-    */
-    MagnoRetinaFilter(const unsigned int NBrows, const unsigned int NBcolumns);
-
-
-    /**
-    * destructor
-    */
-    virtual ~MagnoRetinaFilter();
-
-    /**
-    * function that clears all buffers of the object
-    */
-    void clearAllBuffers();
-
-    /**
-    * resize retina magno filter object (resize all allocated buffers)
-    * @param NBrows: the new height size
-    * @param NBcolumns: the new width size
-    */
-    void resize(const unsigned int NBrows, const unsigned int NBcolumns);
-
-    /**
-    * set parameters values
-    * @param parasolCells_beta: the low pass filter gain used for local contrast adaptation at the IPL level of the retina (for ganglion cells local adaptation), typical value is 0
-    * @param parasolCells_tau: the low pass filter time constant used for local contrast adaptation at the IPL level of the retina (for ganglion cells local adaptation), unit is frame, typical value is 0 (immediate response)
-    * @param parasolCells_k: the low pass filter spatial constant used for local contrast adaptation at the IPL level of the retina (for ganglion cells local adaptation), unit is pixels, typical value is 5
-    * @param amacrinCellsTemporalCutFrequency: the time constant of the first order high pass fiter of the magnocellular way (motion information channel), unit is frames, tipicall value is 5
-    * @param localAdaptIntegration_tau: specifies the temporal constant of the low pas filter involved in the computation of the local "motion mean" for the local adaptation computation
-    * @param localAdaptIntegration_k: specifies the spatial constant of the low pas filter involved in the computation of the local "motion mean" for the local adaptation computation
-    */
-    void setCoefficientsTable(const float parasolCells_beta, const float parasolCells_tau, const float parasolCells_k, const float amacrinCellsTemporalCutFrequency, const float localAdaptIntegration_tau, const float localAdaptIntegration_k);
-
-    /**
-    * launch filter that runs all the IPL magno filter (model of the magnocellular channel of the Inner Plexiform Layer of the retina)
-    * @param OPL_ON: the output of the bipolar ON cells of the retina (available from the ParvoRetinaFilter class (getBipolarCellsON() function)
-    * @param OPL_OFF: the output of the bipolar OFF cells of the retina (available from the ParvoRetinaFilter class (getBipolarCellsOFF() function)
-    * @return the processed result without post-processing
-    */
-    const std::valarray<float> &runFilter(const std::valarray<float> &OPL_ON, const std::valarray<float> &OPL_OFF);
-
-    /**
-    * @return the Magnocellular ON channel filtering output
-    */
-    inline const std::valarray<float> &getMagnoON() const {return _magnoXOutputON;};
-
-    /**
-    * @return the Magnocellular OFF channel filtering output
-    */
-    inline const std::valarray<float> &getMagnoOFF() const {return _magnoXOutputOFF;};
-
-    /**
-    * @return the Magnocellular Y (sum of the ON and OFF magno channels) filtering output
-    */
-    inline const std::valarray<float> &getMagnoYsaturated() const {return *_magnoYsaturated;};
-
-    /**
-    * applies an image normalization which saturates the high output values by the use of an assymetric sigmoide
-    */
-    inline void normalizeGrayOutputNearZeroCentreredSigmoide(){_filterOutput.normalizeGrayOutputNearZeroCentreredSigmoide(&(*_magnoYOutput)[0], &(*_magnoYsaturated)[0]);};
-
-    /**
-    * @return the horizontal cells' temporal constant
-    */
-    inline float getTemporalConstant(){return this->_filteringCoeficientsTable[2];};
-
-private:
-
-    // related pointers to these buffers
-    std::valarray<float> _previousInput_ON;
-    std::valarray<float> _previousInput_OFF;
-    std::valarray<float> _amacrinCellsTempOutput_ON;
-    std::valarray<float> _amacrinCellsTempOutput_OFF;
-    std::valarray<float> _magnoXOutputON;
-    std::valarray<float> _magnoXOutputOFF;
-    std::valarray<float> _localProcessBufferON;
-    std::valarray<float> _localProcessBufferOFF;
-    // reference to parent buffers and allow better readability
-    TemplateBuffer<float> *_magnoYOutput;
-    std::valarray<float> *_magnoYsaturated;
-
-    // varialbles
-    float _temporalCoefficient;
-
-	// amacrine cells filter : high pass temporal filter
-	void _amacrineCellsComputing(const float *ONinput, const float *OFFinput);
-#ifdef MAKE_PARALLEL
-/******************************************************
-** IF some parallelizing thread methods are available, then, main loops are parallelized using these functors
-** ==> main idea paralellise main filters loops, then, only the most used methods are parallelized... TODO : increase the number of parallelised methods as necessary
-** ==> functors names = Parallel_$$$ where $$$= the name of the serial method that is parallelised
-** ==> functors constructors can differ from the parameters used with their related serial functions
-*/
-    class Parallel_amacrineCellsComputing: public cv::ParallelLoopBody
+    class MagnoRetinaFilter: public BasicRetinaFilter
     {
-    private:
-	const float *OPL_ON, *OPL_OFF;
-        float *previousInput_ON, *previousInput_OFF, *amacrinCellsTempOutput_ON, *amacrinCellsTempOutput_OFF;
-	const float temporalCoefficient;
     public:
-        Parallel_amacrineCellsComputing(const float *OPL_ON_PTR, const float *OPL_OFF_PTR, float *previousInput_ON_PTR, float *previousInput_OFF_PTR, float *amacrinCellsTempOutput_ON_PTR, float *amacrinCellsTempOutput_OFF_PTR, float temporalCoefficientVal)
-        :OPL_ON(OPL_ON_PTR), OPL_OFF(OPL_OFF_PTR), previousInput_ON(previousInput_ON_PTR), previousInput_OFF(previousInput_OFF_PTR), amacrinCellsTempOutput_ON(amacrinCellsTempOutput_ON_PTR), amacrinCellsTempOutput_OFF(amacrinCellsTempOutput_OFF_PTR), temporalCoefficient(temporalCoefficientVal) {}
-        
-        virtual void operator()( const Range& r ) const {
-	register const float *OPL_ON_PTR=OPL_ON+r.start;
-	register const float *OPL_OFF_PTR=OPL_OFF+r.start;
-	register float *previousInput_ON_PTR= previousInput_ON+r.start;
-	register float *previousInput_OFF_PTR= previousInput_OFF+r.start;
-	register float *amacrinCellsTempOutput_ON_PTR= amacrinCellsTempOutput_ON+r.start;
-	register float *amacrinCellsTempOutput_OFF_PTR= amacrinCellsTempOutput_OFF+r.start;
-
-	for (int IDpixel=r.start ; IDpixel!=r.end; ++IDpixel)
-	{
-
-		/* Compute ON and OFF amacrin cells high pass temporal filter */
-		float magnoXonPixelResult = temporalCoefficient*(*amacrinCellsTempOutput_ON_PTR+ *OPL_ON_PTR-*previousInput_ON_PTR);
-		*(amacrinCellsTempOutput_ON_PTR++)=((float)(magnoXonPixelResult>0))*magnoXonPixelResult;
-
-		float magnoXoffPixelResult = temporalCoefficient*(*amacrinCellsTempOutput_OFF_PTR+ *OPL_OFF_PTR-*previousInput_OFF_PTR);
-		*(amacrinCellsTempOutput_OFF_PTR++)=((float)(magnoXoffPixelResult>0))*magnoXoffPixelResult;
-
-		/* prepare next loop */
-		*(previousInput_ON_PTR++)=*(OPL_ON_PTR++);
-		*(previousInput_OFF_PTR++)=*(OPL_OFF_PTR++);
-
-	}
-        }
+        /**
+        * constructor parameters are only linked to image input size
+        * @param NBrows: number of rows of the input image
+        * @param NBcolumns: number of columns of the input image
+        */
+        MagnoRetinaFilter(const unsigned int NBrows, const unsigned int NBcolumns);
+
+
+        /**
+        * destructor
+        */
+        virtual ~MagnoRetinaFilter();
+
+        /**
+        * function that clears all buffers of the object
+        */
+        void clearAllBuffers();
+
+        /**
+        * resize retina magno filter object (resize all allocated buffers)
+        * @param NBrows: the new height size
+        * @param NBcolumns: the new width size
+        */
+        void resize(const unsigned int NBrows, const unsigned int NBcolumns);
+
+        /**
+        * set parameters values
+        * @param parasolCells_beta: the low pass filter gain used for local contrast adaptation at the IPL level of the retina (for ganglion cells local adaptation), typical value is 0
+        * @param parasolCells_tau: the low pass filter time constant used for local contrast adaptation at the IPL level of the retina (for ganglion cells local adaptation), unit is frame, typical value is 0 (immediate response)
+        * @param parasolCells_k: the low pass filter spatial constant used for local contrast adaptation at the IPL level of the retina (for ganglion cells local adaptation), unit is pixels, typical value is 5
+        * @param amacrinCellsTemporalCutFrequency: the time constant of the first order high pass fiter of the magnocellular way (motion information channel), unit is frames, tipicall value is 5
+        * @param localAdaptIntegration_tau: specifies the temporal constant of the low pas filter involved in the computation of the local "motion mean" for the local adaptation computation
+        * @param localAdaptIntegration_k: specifies the spatial constant of the low pas filter involved in the computation of the local "motion mean" for the local adaptation computation
+        */
+        void setCoefficientsTable(const float parasolCells_beta, const float parasolCells_tau, const float parasolCells_k, const float amacrinCellsTemporalCutFrequency, const float localAdaptIntegration_tau, const float localAdaptIntegration_k);
+
+        /**
+        * launch filter that runs all the IPL magno filter (model of the magnocellular channel of the Inner Plexiform Layer of the retina)
+        * @param OPL_ON: the output of the bipolar ON cells of the retina (available from the ParvoRetinaFilter class (getBipolarCellsON() function)
+        * @param OPL_OFF: the output of the bipolar OFF cells of the retina (available from the ParvoRetinaFilter class (getBipolarCellsOFF() function)
+        * @return the processed result without post-processing
+        */
+        const std::valarray<float> &runFilter(const std::valarray<float> &OPL_ON, const std::valarray<float> &OPL_OFF);
+
+        /**
+        * @return the Magnocellular ON channel filtering output
+        */
+        inline const std::valarray<float> &getMagnoON() const {return _magnoXOutputON;};
+
+        /**
+        * @return the Magnocellular OFF channel filtering output
+        */
+        inline const std::valarray<float> &getMagnoOFF() const {return _magnoXOutputOFF;};
+
+        /**
+        * @return the Magnocellular Y (sum of the ON and OFF magno channels) filtering output
+        */
+        inline const std::valarray<float> &getMagnoYsaturated() const {return *_magnoYsaturated;};
+
+        /**
+        * applies an image normalization which saturates the high output values by the use of an assymetric sigmoide
+        */
+        inline void normalizeGrayOutputNearZeroCentreredSigmoide(){_filterOutput.normalizeGrayOutputNearZeroCentreredSigmoide(&(*_magnoYOutput)[0], &(*_magnoYsaturated)[0]);};
+
+        /**
+        * @return the horizontal cells' temporal constant
+        */
+        inline float getTemporalConstant(){return this->_filteringCoeficientsTable[2];};
 
-    };
+    private:
+
+        // related pointers to these buffers
+        std::valarray<float> _previousInput_ON;
+        std::valarray<float> _previousInput_OFF;
+        std::valarray<float> _amacrinCellsTempOutput_ON;
+        std::valarray<float> _amacrinCellsTempOutput_OFF;
+        std::valarray<float> _magnoXOutputON;
+        std::valarray<float> _magnoXOutputOFF;
+        std::valarray<float> _localProcessBufferON;
+        std::valarray<float> _localProcessBufferOFF;
+        // reference to parent buffers and allow better readability
+        TemplateBuffer<float> *_magnoYOutput;
+        std::valarray<float> *_magnoYsaturated;
+
+        // varialbles
+        float _temporalCoefficient;
+
+        // amacrine cells filter : high pass temporal filter
+        void _amacrineCellsComputing(const float *ONinput, const float *OFFinput);
+#ifdef MAKE_PARALLEL
+        /******************************************************
+        ** IF some parallelizing thread methods are available, then, main loops are parallelized using these functors
+        ** ==> main idea paralellise main filters loops, then, only the most used methods are parallelized... TODO : increase the number of parallelised methods as necessary
+        ** ==> functors names = Parallel_$$$ where $$$= the name of the serial method that is parallelised
+        ** ==> functors constructors can differ from the parameters used with their related serial functions
+        */
+        class Parallel_amacrineCellsComputing: public cv::ParallelLoopBody
+        {
+        private:
+            const float *OPL_ON, *OPL_OFF;
+            float *previousInput_ON, *previousInput_OFF, *amacrinCellsTempOutput_ON, *amacrinCellsTempOutput_OFF;
+            float temporalCoefficient;
+        public:
+            Parallel_amacrineCellsComputing(const float *OPL_ON_PTR, const float *OPL_OFF_PTR, float *previousInput_ON_PTR, float *previousInput_OFF_PTR, float *amacrinCellsTempOutput_ON_PTR, float *amacrinCellsTempOutput_OFF_PTR, float temporalCoefficientVal)
+                :OPL_ON(OPL_ON_PTR), OPL_OFF(OPL_OFF_PTR), previousInput_ON(previousInput_ON_PTR), previousInput_OFF(previousInput_OFF_PTR), amacrinCellsTempOutput_ON(amacrinCellsTempOutput_ON_PTR), amacrinCellsTempOutput_OFF(amacrinCellsTempOutput_OFF_PTR), temporalCoefficient(temporalCoefficientVal) {}
+
+            virtual void operator()( const Range& r ) const {
+                register const float *OPL_ON_PTR=OPL_ON+r.start;
+                register const float *OPL_OFF_PTR=OPL_OFF+r.start;
+                register float *previousInput_ON_PTR= previousInput_ON+r.start;
+                register float *previousInput_OFF_PTR= previousInput_OFF+r.start;
+                register float *amacrinCellsTempOutput_ON_PTR= amacrinCellsTempOutput_ON+r.start;
+                register float *amacrinCellsTempOutput_OFF_PTR= amacrinCellsTempOutput_OFF+r.start;
+
+                for (int IDpixel=r.start ; IDpixel!=r.end; ++IDpixel)
+                {
+
+                    /* Compute ON and OFF amacrin cells high pass temporal filter */
+                    float magnoXonPixelResult = temporalCoefficient*(*amacrinCellsTempOutput_ON_PTR+ *OPL_ON_PTR-*previousInput_ON_PTR);
+                    *(amacrinCellsTempOutput_ON_PTR++)=((float)(magnoXonPixelResult>0))*magnoXonPixelResult;
+
+                    float magnoXoffPixelResult = temporalCoefficient*(*amacrinCellsTempOutput_OFF_PTR+ *OPL_OFF_PTR-*previousInput_OFF_PTR);
+                    *(amacrinCellsTempOutput_OFF_PTR++)=((float)(magnoXoffPixelResult>0))*magnoXoffPixelResult;
+
+                    /* prepare next loop */
+                    *(previousInput_ON_PTR++)=*(OPL_ON_PTR++);
+                    *(previousInput_OFF_PTR++)=*(OPL_OFF_PTR++);
+
+                }
+            }
+
+        };
 #endif
-};
+    };
 
 }
 

modules/contrib/src/openfabmap.cpp

+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+// This file originates from the openFABMAP project:
+// [http://code.google.com/p/openfabmap/]
+//
+// For published work which uses all or part of OpenFABMAP, please cite:
+// [http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=6224843]
+//
+// Original Algorithm by Mark Cummins and Paul Newman:
+// [http://ijr.sagepub.com/content/27/6/647.short]
+// [http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=5613942]
+// [http://ijr.sagepub.com/content/30/9/1100.abstract]
+//
+//                           License Agreement
+//
+// Copyright (C) 2012 Arren Glover [aj.glover@qut.edu.au] and
+//                    Will Maddern [w.maddern@qut.edu.au], all rights reserved.
+//
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#include "precomp.hpp"
+#include "opencv2/contrib/openfabmap.hpp"
+
+
+/*
+    Calculate the sum of two log likelihoods
+*/
+namespace cv {
+
+namespace of2 {
+
+static double logsumexp(double a, double b) {
+    return a > b ? log(1 + exp(b - a)) + a : log(1 + exp(a - b)) + b;
+}
+    
+FabMap::FabMap(const Mat& _clTree, double _PzGe,
+        double _PzGNe, int _flags, int _numSamples) :
+    clTree(_clTree), PzGe(_PzGe), PzGNe(_PzGNe), flags(
+            _flags), numSamples(_numSamples) {
+
+    CV_Assert(flags & MEAN_FIELD || flags & SAMPLED);
+    CV_Assert(flags & NAIVE_BAYES || flags & CHOW_LIU);
+    if (flags & NAIVE_BAYES) {
+        PzGL = &FabMap::PzqGL;
+    } else {
+        PzGL = &FabMap::PzqGzpqL;
+    }
+
+    //check for a valid Chow-Liu tree
+    CV_Assert(clTree.type() == CV_64FC1);
+    cv::checkRange(clTree.row(0), false, NULL, 0, clTree.cols);
+    cv::checkRange(clTree.row(1), false, NULL, DBL_MIN, 1);
+    cv::checkRange(clTree.row(2), false, NULL, DBL_MIN, 1);
+    cv::checkRange(clTree.row(3), false, NULL, DBL_MIN, 1);
+
+    // TODO: Add default values for member variables
+    Pnew = 0.9;
+    sFactor = 0.99;
+    mBias = 0.5;
+}
+
+FabMap::~FabMap() {
+}
+
+const std::vector<cv::Mat>& FabMap::getTrainingImgDescriptors() const {
+    return trainingImgDescriptors;
+}
+
+const std::vector<cv::Mat>& FabMap::getTestImgDescriptors() const {
+    return testImgDescriptors;
+}
+
+void FabMap::addTraining(const Mat& queryImgDescriptor) {
+    CV_Assert(!queryImgDescriptor.empty());
+    vector<Mat> queryImgDescriptors;
+    for (int i = 0; i < queryImgDescriptor.rows; i++) {
+        queryImgDescriptors.push_back(queryImgDescriptor.row(i));
+    }
+    addTraining(queryImgDescriptors);
+}
+
+void FabMap::addTraining(const vector<Mat>& queryImgDescriptors) {
+    for (size_t i = 0; i < queryImgDescriptors.size(); i++) {
+        CV_Assert(!queryImgDescriptors[i].empty());
+        CV_Assert(queryImgDescriptors[i].rows == 1);
+        CV_Assert(queryImgDescriptors[i].cols == clTree.cols);
+        CV_Assert(queryImgDescriptors[i].type() == CV_32F);
+        trainingImgDescriptors.push_back(queryImgDescriptors[i]);
+    }
+}
+
+void FabMap::add(const cv::Mat& queryImgDescriptor) {
+    CV_Assert(!queryImgDescriptor.empty());
+    vector<Mat> queryImgDescriptors;
+    for (int i = 0; i < queryImgDescriptor.rows; i++) {
+        queryImgDescriptors.push_back(queryImgDescriptor.row(i));
+    }
+    add(queryImgDescriptors);
+}
+
+void FabMap::add(const std::vector<cv::Mat>& queryImgDescriptors) {
+    for (size_t i = 0; i < queryImgDescriptors.size(); i++) {
+        CV_Assert(!queryImgDescriptors[i].empty());
+        CV_Assert(queryImgDescriptors[i].rows == 1);
+        CV_Assert(queryImgDescriptors[i].cols == clTree.cols);
+        CV_Assert(queryImgDescriptors[i].type() == CV_32F);
+        testImgDescriptors.push_back(queryImgDescriptors[i]);
+    }
+}
+
+void FabMap::compare(const Mat& queryImgDescriptor,
+            vector<IMatch>& matches, bool addQuery,
+            const Mat& mask) {
+    CV_Assert(!queryImgDescriptor.empty());
+    vector<Mat> queryImgDescriptors;
+    for (int i = 0; i < queryImgDescriptor.rows; i++) {
+        queryImgDescriptors.push_back(queryImgDescriptor.row(i));
+    }
+    compare(queryImgDescriptors,matches,addQuery,mask);
+}
+
+void FabMap::compare(const Mat& queryImgDescriptor,
+            const Mat& testImgDescriptor, vector<IMatch>& matches,
+            const Mat& mask) {
+    CV_Assert(!queryImgDescriptor.empty());
+    vector<Mat> queryImgDescriptors;
+    for (int i = 0; i < queryImgDescriptor.rows; i++) {
+        queryImgDescriptors.push_back(queryImgDescriptor.row(i));
+    }
+
+    CV_Assert(!testImgDescriptor.empty());
+    vector<Mat> _testImgDescriptors;
+    for (int i = 0; i < testImgDescriptor.rows; i++) {
+        _testImgDescriptors.push_back(testImgDescriptor.row(i));
+    }
+    compare(queryImgDescriptors,_testImgDescriptors,matches,mask);
+
+}
+
+void FabMap::compare(const Mat& queryImgDescriptor,
+        const vector<Mat>& _testImgDescriptors,
+        vector<IMatch>& matches, const Mat& mask) {
+    CV_Assert(!queryImgDescriptor.empty());
+    vector<Mat> queryImgDescriptors;
+    for (int i = 0; i < queryImgDescriptor.rows; i++) {
+        queryImgDescriptors.push_back(queryImgDescriptor.row(i));
+    }
+    compare(queryImgDescriptors,_testImgDescriptors,matches,mask);
+}
+
+void FabMap::compare(const vector<Mat>& queryImgDescriptors,
+                     vector<IMatch>& matches, bool addQuery, const Mat& /*mask*/) {
+
+    // TODO: add first query if empty (is this necessary)
+
+    for (size_t i = 0; i < queryImgDescriptors.size(); i++) {
+        CV_Assert(!queryImgDescriptors[i].empty());
+        CV_Assert(queryImgDescriptors[i].rows == 1);
+        CV_Assert(queryImgDescriptors[i].cols == clTree.cols);
+        CV_Assert(queryImgDescriptors[i].type() == CV_32F);
+
+        // TODO: add mask
+
+        compareImgDescriptor(queryImgDescriptors[i],
+                             (int)i, testImgDescriptors, matches);
+        if (addQuery)
+            add(queryImgDescriptors[i]);
+    }
+}
+
+void FabMap::compare(const vector<Mat>& queryImgDescriptors,
+        const vector<Mat>& _testImgDescriptors,
+        vector<IMatch>& matches, const Mat& /*mask*/) {
+    if (_testImgDescriptors[0].data != this->testImgDescriptors[0].data) {
+        CV_Assert(!(flags & MOTION_MODEL));
+        for (size_t i = 0; i < _testImgDescriptors.size(); i++) {
+            CV_Assert(!_testImgDescriptors[i].empty());
+            CV_Assert(_testImgDescriptors[i].rows == 1);
+            CV_Assert(_testImgDescriptors[i].cols == clTree.cols);
+            CV_Assert(_testImgDescriptors[i].type() == CV_32F);
+        }
+    }
+
+    for (size_t i = 0; i < queryImgDescriptors.size(); i++) {
+        CV_Assert(!queryImgDescriptors[i].empty());
+        CV_Assert(queryImgDescriptors[i].rows == 1);
+        CV_Assert(queryImgDescriptors[i].cols == clTree.cols);
+        CV_Assert(queryImgDescriptors[i].type() == CV_32F);
+
+        // TODO: add mask
+
+        compareImgDescriptor(queryImgDescriptors[i],
+                (int)i, _testImgDescriptors, matches);
+    }
+}
+
+void FabMap::compareImgDescriptor(const Mat& queryImgDescriptor,
+        int queryIndex, const vector<Mat>& _testImgDescriptors,
+        vector<IMatch>& matches) {
+
+    vector<IMatch> queryMatches;
+    queryMatches.push_back(IMatch(queryIndex,-1,
+        getNewPlaceLikelihood(queryImgDescriptor),0));
+    getLikelihoods(queryImgDescriptor,_testImgDescriptors,queryMatches);
+    normaliseDistribution(queryMatches);
+    for (size_t j = 1; j < queryMatches.size(); j++) {
+        queryMatches[j].queryIdx = queryIndex;
+    }
+    matches.insert(matches.end(), queryMatches.begin(), queryMatches.end());
+}
+
+void FabMap::getLikelihoods(const Mat& /*queryImgDescriptor*/,
+        const vector<Mat>& /*testImgDescriptors*/, vector<IMatch>& /*matches*/) {
+
+}
+
+double FabMap::getNewPlaceLikelihood(const Mat& queryImgDescriptor) {
+    if (flags & MEAN_FIELD) {
+        double logP = 0;
+        bool zq, zpq;
+        if(flags & NAIVE_BAYES) {
+            for (int q = 0; q < clTree.cols; q++) {
+                zq = queryImgDescriptor.at<float>(0,q) > 0;
+
+                logP += log(Pzq(q, false) * PzqGeq(zq, false) +
+                        Pzq(q, true) * PzqGeq(zq, true));
+            }
+        } else {
+            for (int q = 0; q < clTree.cols; q++) {
+                zq = queryImgDescriptor.at<float>(0,q) > 0;
+                zpq = queryImgDescriptor.at<float>(0,pq(q)) > 0;
+
+                double alpha, beta, p;
+                alpha = Pzq(q, zq) * PzqGeq(!zq, false) * PzqGzpq(q, !zq, zpq);
+                beta = Pzq(q, !zq) * PzqGeq(zq, false) * PzqGzpq(q, zq, zpq);
+                p = Pzq(q, false) * beta / (alpha + beta);
+
+                alpha = Pzq(q, zq) * PzqGeq(!zq, true) * PzqGzpq(q, !zq, zpq);
+                beta = Pzq(q, !zq) * PzqGeq(zq, true) * PzqGzpq(q, zq, zpq);
+                p += Pzq(q, true) * beta / (alpha + beta);
+
+                logP += log(p);
+            }
+        }
+        return logP;
+    }
+
+    if (flags & SAMPLED) {
+        CV_Assert(!trainingImgDescriptors.empty());
+        CV_Assert(numSamples > 0);
+
+        vector<Mat> sampledImgDescriptors;
+
+        // TODO: this method can result in the same sample being added
+        // multiple times. Is this desired?
+
+        for (int i = 0; i < numSamples; i++) {
+            int index = rand() % trainingImgDescriptors.size();
+            sampledImgDescriptors.push_back(trainingImgDescriptors[index]);
+        }
+
+        vector<IMatch> matches;
+        getLikelihoods(queryImgDescriptor,sampledImgDescriptors,matches);
+
+        double averageLogLikelihood = -DBL_MAX + matches.front().likelihood + 1;
+        for (int i = 0; i < numSamples; i++) {
+            averageLogLikelihood =
+                logsumexp(matches[i].likelihood, averageLogLikelihood);
+        }
+
+        return averageLogLikelihood - log((double)numSamples);
+    }
+    return 0;
+}
+
+void FabMap::normaliseDistribution(vector<IMatch>& matches) {
+    CV_Assert(!matches.empty());
+
+    if (flags & MOTION_MODEL) {
+
+        matches[0].match = matches[0].likelihood + log(Pnew);
+
+        if (priorMatches.size() > 2) {
+            matches[1].match = matches[1].likelihood;
+            matches[1].match += log(
+                (2 * (1-mBias) * priorMatches[1].match +
+                priorMatches[1].match +
+                2 * mBias * priorMatches[2].match) / 3);
+            for (size_t i = 2; i < priorMatches.size()-1; i++) {
+                matches[i].match = matches[i].likelihood;
+                matches[i].match += log(
+                    (2 * (1-mBias) * priorMatches[i-1].match +
+                    priorMatches[i].match +
+                    2 * mBias * priorMatches[i+1].match)/3);
+            }
+            matches[priorMatches.size()-1].match =
+                matches[priorMatches.size()-1].likelihood;
+            matches[priorMatches.size()-1].match += log(
+                (2 * (1-mBias) * priorMatches[priorMatches.size()-2].match +
+                priorMatches[priorMatches.size()-1].match +
+                2 * mBias * priorMatches[priorMatches.size()-1].match)/3);
+
+            for(size_t i = priorMatches.size(); i < matches.size(); i++) {
+                matches[i].match = matches[i].likelihood;
+            }
+        } else {
+            for(size_t i = 1; i < matches.size(); i++) {
+                matches[i].match = matches[i].likelihood;
+            }
+        }
+
+        double logsum = -DBL_MAX + matches.front().match + 1;
+
+        //calculate the normalising constant
+        for (size_t i = 0; i < matches.size(); i++) {
+            logsum = logsumexp(logsum, matches[i].match);
+        }
+
+        //normalise
+        for (size_t i = 0; i < matches.size(); i++) {
+            matches[i].match = exp(matches[i].match - logsum);
+        }
+
+        //smooth final probabilities
+        for (size_t i = 0; i < matches.size(); i++) {
+            matches[i].match = sFactor*matches[i].match +
+            (1 - sFactor)/matches.size();
+        }
+
+        //update our location priors
+        priorMatches = matches;
+
+    } else {
+
+        double logsum = -DBL_MAX + matches.front().likelihood + 1;
+
+        for (size_t i = 0; i < matches.size(); i++) {
+            logsum = logsumexp(logsum, matches[i].likelihood);
+        }
+        for (size_t i = 0; i < matches.size(); i++) {
+            matches[i].match = exp(matches[i].likelihood - logsum);
+        }
+        for (size_t i = 0; i < matches.size(); i++) {
+            matches[i].match = sFactor*matches[i].match +
+            (1 - sFactor)/matches.size();
+        }
+    }
+}
+
+int FabMap::pq(int q) {
+    return (int)clTree.at<double>(0,q);
+}
+
+double FabMap::Pzq(int q, bool zq) {
+    return (zq) ? clTree.at<double>(1,q) : 1 - clTree.at<double>(1,q);
+}
+
+double FabMap::PzqGzpq(int q, bool zq, bool zpq) {
+    if (zpq) {
+        return (zq) ? clTree.at<double>(2,q) : 1 - clTree.at<double>(2,q);
+    } else {
+        return (zq) ? clTree.at<double>(3,q) : 1 - clTree.at<double>(3,q);
+    }
+}
+
+double FabMap::PzqGeq(bool zq, bool eq) {
+    if (eq) {
+        return (zq) ? PzGe : 1 - PzGe;
+    } else {
+        return (zq) ? PzGNe : 1 - PzGNe;
+    }
+}
+
+double FabMap::PeqGL(int q, bool Lzq, bool eq) {
+    double alpha, beta;
+    alpha = PzqGeq(Lzq, true) * Pzq(q, true);
+    beta = PzqGeq(Lzq, false) * Pzq(q, false);
+
+    if (eq) {
+        return alpha / (alpha + beta);
+    } else {
+        return 1 - (alpha / (alpha + beta));
+    }
+}
+
+double FabMap::PzqGL(int q, bool zq, bool /*zpq*/, bool Lzq) {
+    return PeqGL(q, Lzq, false) * PzqGeq(zq, false) +
+        PeqGL(q, Lzq, true) * PzqGeq(zq, true);
+}
+
+
+double FabMap::PzqGzpqL(int q, bool zq, bool zpq, bool Lzq) {
+    double p;
+    double alpha, beta;
+
+    alpha = Pzq(q,  zq) * PzqGeq(!zq, false) * PzqGzpq(q, !zq, zpq);
+    beta  = Pzq(q, !zq) * PzqGeq( zq, false) * PzqGzpq(q,  zq, zpq);
+    p = PeqGL(q, Lzq, false) * beta / (alpha + beta);
+
+    alpha = Pzq(q,  zq) * PzqGeq(!zq, true) * PzqGzpq(q, !zq, zpq);
+    beta  = Pzq(q, !zq) * PzqGeq( zq, true) * PzqGzpq(q,  zq, zpq);
+    p += PeqGL(q, Lzq, true) * beta / (alpha + beta);
+
+    return p;
+}
+
+
+FabMap1::FabMap1(const Mat& _clTree, double _PzGe, double _PzGNe, int _flags,
+        int _numSamples) : FabMap(_clTree, _PzGe, _PzGNe, _flags,
+                _numSamples) {
+}
+
+FabMap1::~FabMap1() {
+}
+
+void FabMap1::getLikelihoods(const Mat& queryImgDescriptor,
+        const vector<Mat>& testImgDescriptors, vector<IMatch>& matches) {
+
+    for (size_t i = 0; i < testImgDescriptors.size(); i++) {
+        bool zq, zpq, Lzq;
+        double logP = 0;
+        for (int q = 0; q < clTree.cols; q++) {
+
+            zq = queryImgDescriptor.at<float>(0,q) > 0;
+            zpq = queryImgDescriptor.at<float>(0,pq(q)) > 0;
+            Lzq = testImgDescriptors[i].at<float>(0,q) > 0;
+
+            logP += log((this->*PzGL)(q, zq, zpq, Lzq));
+
+        }
+        matches.push_back(IMatch(0,(int)i,logP,0));
+    }
+}
+
+FabMapLUT::FabMapLUT(const Mat& _clTree, double _PzGe, double _PzGNe,
+        int _flags, int _numSamples, int _precision) :
+FabMap(_clTree, _PzGe, _PzGNe, _flags, _numSamples), precision(_precision) {
+
+    int nWords = clTree.cols;
+    double precFactor = (double)pow(10.0, precision);
+
+    table = new int[nWords][8];
+
+    for (int q = 0; q < nWords; q++) {
+        for (unsigned char i = 0; i < 8; i++) {
+
+            bool Lzq = (bool) ((i >> 2) & 0x01);
+            bool zq = (bool) ((i >> 1) & 0x01);
+            bool zpq = (bool) (i & 1);
+
+            table[q][i] = -(int)(log((this->*PzGL)(q, zq, zpq, Lzq))
+                    * precFactor);
+        }
+    }
+}
+
+FabMapLUT::~FabMapLUT() {
+    delete[] table;
+}
+
+void FabMapLUT::getLikelihoods(const Mat& queryImgDescriptor,
+        const vector<Mat>& testImgDescriptors, vector<IMatch>& matches) {
+
+    double precFactor = (double)pow(10.0, -precision);
+
+    for (size_t i = 0; i < testImgDescriptors.size(); i++) {
+        unsigned long long int logP = 0;
+        for (int q = 0; q < clTree.cols; q++) {
+            logP += table[q][(queryImgDescriptor.at<float>(0,pq(q)) > 0) +
+            ((queryImgDescriptor.at<float>(0, q) > 0) << 1) +
+            ((testImgDescriptors[i].at<float>(0,q) > 0) << 2)];
+        }
+        matches.push_back(IMatch(0,(int)i,-precFactor*(double)logP,0));
+    }
+}
+
+FabMapFBO::FabMapFBO(const Mat& _clTree, double _PzGe, double _PzGNe,
+        int _flags, int _numSamples, double _rejectionThreshold,
+        double _PsGd, int _bisectionStart, int _bisectionIts) :
+FabMap(_clTree, _PzGe, _PzGNe, _flags, _numSamples), PsGd(_PsGd),
+    rejectionThreshold(_rejectionThreshold), bisectionStart(_bisectionStart),
+        bisectionIts(_bisectionIts) {
+}
+
+
+FabMapFBO::~FabMapFBO() {
+}
+
+void FabMapFBO::getLikelihoods(const Mat& queryImgDescriptor,
+        const vector<Mat>& testImgDescriptors, vector<IMatch>& matches) {
+
+    std::multiset<WordStats> wordData;
+    setWordStatistics(queryImgDescriptor, wordData);
+
+    vector<int> matchIndices;
+    vector<IMatch> queryMatches;
+
+    for (size_t i = 0; i < testImgDescriptors.size(); i++) {
+        queryMatches.push_back(IMatch(0,(int)i,0,0));
+        matchIndices.push_back((int)i);
+    }
+
+    double currBest  = -DBL_MAX;
+    double bailedOut = DBL_MAX;
+
+    for (std::multiset<WordStats>::iterator wordIter = wordData.begin();
+            wordIter != wordData.end(); wordIter++) {
+        bool zq = queryImgDescriptor.at<float>(0,wordIter->q) > 0;
+        bool zpq = queryImgDescriptor.at<float>(0,pq(wordIter->q)) > 0;
+
+        currBest = -DBL_MAX;
+
+        for (size_t i = 0; i < matchIndices.size(); i++) {
+            bool Lzq =
+                testImgDescriptors[matchIndices[i]].at<float>(0,wordIter->q) > 0;
+            queryMatches[matchIndices[i]].likelihood +=
+                log((this->*PzGL)(wordIter->q,zq,zpq,Lzq));
+            currBest =
+                std::max(queryMatches[matchIndices[i]].likelihood, currBest);
+        }
+
+        if (matchIndices.size() == 1)
+            continue;
+
+        double delta = std::max(limitbisection(wordIter->V, wordIter->M),
+            -log(rejectionThreshold));
+
+        vector<int>::iterator matchIter = matchIndices.begin();
+        while (matchIter != matchIndices.end()) {
+            if (currBest - queryMatches[*matchIter].likelihood > delta) {
+                queryMatches[*matchIter].likelihood = bailedOut;
+                matchIter = matchIndices.erase(matchIter);
+            } else {
+                matchIter++;
+            }
+        }
+    }
+
+    for (size_t i = 0; i < queryMatches.size(); i++) {
+        if (queryMatches[i].likelihood == bailedOut) {
+            queryMatches[i].likelihood = currBest + log(rejectionThreshold);
+        }
+    }
+    matches.insert(matches.end(), queryMatches.begin(), queryMatches.end());
+
+}
+
+void FabMapFBO::setWordStatistics(const Mat& queryImgDescriptor,
+        std::multiset<WordStats>& wordData) {
+    //words are sorted according to information = -ln(P(zq|zpq))
+    //in non-log format this is lowest probability first
+    for (int q = 0; q < clTree.cols; q++) {
+        wordData.insert(WordStats(q,PzqGzpq(q,
+                queryImgDescriptor.at<float>(0,q) > 0,
+                queryImgDescriptor.at<float>(0,pq(q)) > 0)));
+    }
+
+    double d = 0, V = 0, M = 0;
+    bool zq, zpq;
+
+    for (std::multiset<WordStats>::reverse_iterator wordIter =
+            wordData.rbegin();
+            wordIter != wordData.rend(); wordIter++) {
+
+        zq = queryImgDescriptor.at<float>(0,wordIter->q) > 0;
+        zpq = queryImgDescriptor.at<float>(0,pq(wordIter->q)) > 0;
+
+        d = log((this->*PzGL)(wordIter->q, zq, zpq, true)) -
+            log((this->*PzGL)(wordIter->q, zq, zpq, false));
+
+        V += pow(d, 2.0) * 2 *
+            (Pzq(wordIter->q, true) - pow(Pzq(wordIter->q, true), 2.0));
+        M = std::max(M, fabs(d));
+
+        wordIter->V = V;
+        wordIter->M = M;
+    }
+}
+
+double FabMapFBO::limitbisection(double v, double m) {
+    double midpoint, left_val, mid_val;
+    double left = 0, right = bisectionStart;
+
+    left_val = bennettInequality(v, m, left) - PsGd;
+
+    for(int i = 0; i < bisectionIts; i++) {
+
+        midpoint = (left + right)*0.5;
+        mid_val = bennettInequality(v, m, midpoint)- PsGd;
+
+        if(left_val * mid_val > 0) {
+            left = midpoint;
+            left_val = mid_val;
+        } else {
+            right = midpoint;
+        }
+    }
+
+    return (right + left) * 0.5;
+}
+
+double FabMapFBO::bennettInequality(double v, double m, double delta) {
+    double DMonV = delta * m / v;
+    double f_delta = log(DMonV + sqrt(pow(DMonV, 2.0) + 1));
+    return exp((v / pow(m, 2.0))*(cosh(f_delta) - 1 - DMonV * f_delta));
+}
+
+bool FabMapFBO::compInfo(const WordStats& first, const WordStats& second) {
+    return first.info < second.info;
+}
+
+FabMap2::FabMap2(const Mat& _clTree, double _PzGe, double _PzGNe,
+        int _flags) :
+FabMap(_clTree, _PzGe, _PzGNe, _flags) {
+    CV_Assert(flags & SAMPLED);
+
+    children.resize(clTree.cols);
+
+    for (int q = 0; q < clTree.cols; q++) {
+        d1.push_back(log((this->*PzGL)(q, false, false, true) /
+                (this->*PzGL)(q, false, false, false)));
+        d2.push_back(log((this->*PzGL)(q, false, true, true) /
+                (this->*PzGL)(q, false, true, false)) - d1[q]);
+        d3.push_back(log((this->*PzGL)(q, true, false, true) /
+                (this->*PzGL)(q, true, false, false))- d1[q]);
+        d4.push_back(log((this->*PzGL)(q, true, true, true) /
+                (this->*PzGL)(q, true, true, false))- d1[q]);
+        children[pq(q)].push_back(q);
+    }
+
+}
+
+FabMap2::~FabMap2() {
+}
+
+
+void FabMap2::addTraining(const vector<Mat>& queryImgDescriptors) {
+    for (size_t i = 0; i < queryImgDescriptors.size(); i++) {
+        CV_Assert(!queryImgDescriptors[i].empty());
+        CV_Assert(queryImgDescriptors[i].rows == 1);
+        CV_Assert(queryImgDescriptors[i].cols == clTree.cols);
+        CV_Assert(queryImgDescriptors[i].type() == CV_32F);
+        trainingImgDescriptors.push_back(queryImgDescriptors[i]);
+        addToIndex(queryImgDescriptors[i], trainingDefaults, trainingInvertedMap);
+    }
+}
+
+
+void FabMap2::add(const vector<Mat>& queryImgDescriptors) {
+    for (size_t i = 0; i < queryImgDescriptors.size(); i++) {
+        CV_Assert(!queryImgDescriptors[i].empty());
+        CV_Assert(queryImgDescriptors[i].rows == 1);
+        CV_Assert(queryImgDescriptors[i].cols == clTree.cols);
+        CV_Assert(queryImgDescriptors[i].type() == CV_32F);
+        testImgDescriptors.push_back(queryImgDescriptors[i]);
+        addToIndex(queryImgDescriptors[i], testDefaults, testInvertedMap);
+    }
+}
+
+void FabMap2::getLikelihoods(const Mat& queryImgDescriptor,
+        const vector<Mat>& testImgDescriptors, vector<IMatch>& matches) {
+
+    if (&testImgDescriptors== &(this->testImgDescriptors)) {
+        getIndexLikelihoods(queryImgDescriptor, testDefaults, testInvertedMap,
+            matches);
+    } else {
+        CV_Assert(!(flags & MOTION_MODEL));
+        vector<double> defaults;
+        std::map<int, vector<int> > invertedMap;
+        for (size_t i = 0; i < testImgDescriptors.size(); i++) {
+            addToIndex(testImgDescriptors[i],defaults,invertedMap);
+        }
+        getIndexLikelihoods(queryImgDescriptor, defaults, invertedMap, matches);
+    }
+}
+
+double FabMap2::getNewPlaceLikelihood(const Mat& queryImgDescriptor) {
+
+    CV_Assert(!trainingImgDescriptors.empty());
+
+    vector<IMatch> matches;
+    getIndexLikelihoods(queryImgDescriptor, trainingDefaults,
+            trainingInvertedMap, matches);
+
+    double averageLogLikelihood = -DBL_MAX + matches.front().likelihood + 1;
+    for (size_t i = 0; i < matches.size(); i++) {
+        averageLogLikelihood =
+            logsumexp(matches[i].likelihood, averageLogLikelihood);
+    }
+
+    return averageLogLikelihood - log((double)trainingDefaults.size());
+
+}
+
+void FabMap2::addToIndex(const Mat& queryImgDescriptor,
+        vector<double>& defaults,
+        std::map<int, vector<int> >& invertedMap) {
+    defaults.push_back(0);
+    for (int q = 0; q < clTree.cols; q++) {
+        if (queryImgDescriptor.at<float>(0,q) > 0) {
+            defaults.back() += d1[q];
+            invertedMap[q].push_back((int)defaults.size()-1);
+        }
+    }
+}
+
+void FabMap2::getIndexLikelihoods(const Mat& queryImgDescriptor,
+        std::vector<double>& defaults,
+        std::map<int, vector<int> >& invertedMap,
+        std::vector<IMatch>& matches) {
+
+    vector<int>::iterator LwithI, child;
+
+    std::vector<double> likelihoods = defaults;
+
+    for (int q = 0; q < clTree.cols; q++) {
+        if (queryImgDescriptor.at<float>(0,q) > 0) {
+            for (LwithI = invertedMap[q].begin();
+                LwithI != invertedMap[q].end(); LwithI++) {
+
+                if (queryImgDescriptor.at<float>(0,pq(q)) > 0) {
+                    likelihoods[*LwithI] += d4[q];
+                } else {
+                    likelihoods[*LwithI] += d3[q];
+                }
+            }
+            for (child = children[q].begin(); child != children[q].end();
+                child++) {
+
+                if (queryImgDescriptor.at<float>(0,*child) == 0) {
+                    for (LwithI = invertedMap[*child].begin();
+                        LwithI != invertedMap[*child].end(); LwithI++) {
+
+                        likelihoods[*LwithI] += d2[*child];
+                    }
+                }
+            }
+        }
+    }
+
+    for (size_t i = 0; i < likelihoods.size(); i++) {
+        matches.push_back(IMatch(0,(int)i,likelihoods[i],0));
+    }
+}
+
+}
+
+}

modules/contrib/src/retinacolor.hpp

@@ -86,255 +86,255 @@
 namespace cv
 {
 
-class RetinaColor: public BasicRetinaFilter
-{
-public:
-	/**
-	* @typedef which allows to select the type of photoreceptors color sampling
-	*/
-
-	/**
-	* constructor of the retina color processing model
-	* @param NBrows: number of rows of the input image
-	* @param NBcolumns: number of columns of the input image
-	* @param samplingMethod: the chosen color sampling method
-	*/
-	RetinaColor(const unsigned int NBrows, const unsigned int NBcolumns, const RETINA_COLORSAMPLINGMETHOD samplingMethod=RETINA_COLOR_DIAGONAL);
-
-	/**
-	* standard destructor
-	*/
-	virtual ~RetinaColor();
-
-	/**
-	* function that clears all buffers of the object
-	*/
-	void clearAllBuffers();
-
-	/**
-	* resize retina color filter object (resize all allocated buffers)
-	* @param NBrows: the new height size
-	* @param NBcolumns: the new width size
-	*/
-	void resize(const unsigned int NBrows, const unsigned int NBcolumns);
-
-
-	/**
-	* color multiplexing function: a demultiplexed RGB frame of size M*N*3 is transformed into a multiplexed M*N*1 pixels frame where each pixel is either Red, or Green or Blue
-	* @param inputRGBFrame: the input RGB frame to be processed
-	* @return, nothing but the multiplexed frame is available by the use of the getMultiplexedFrame() function
-	*/
-	inline void runColorMultiplexing(const std::valarray<float> &inputRGBFrame){runColorMultiplexing(inputRGBFrame, *_multiplexedFrame);};
-
-	/**
-	* color multiplexing function: a demultipleed RGB frame of size M*N*3 is transformed into a multiplexed M*N*1 pixels frame where each pixel is either Red, or Green or Blue if using RGB images
-	* @param demultiplexedInputFrame: the demultiplexed input frame to be processed of size M*N*3
-	* @param multiplexedFrame: the resulting multiplexed frame
-	*/
-	void runColorMultiplexing(const std::valarray<float> &demultiplexedInputFrame, std::valarray<float> &multiplexedFrame);
-
-	/**
-	* color demultiplexing function: a multiplexed frame of size M*N*1 pixels is transformed into a RGB demultiplexed M*N*3 pixels frame
-	* @param multiplexedColorFrame: the input multiplexed frame to be processed
-	* @param adaptiveFiltering: specifies if an adaptive filtering has to be perform rather than standard filtering (adaptive filtering allows a better rendering)
-	* @param maxInputValue: the maximum input data value (should be 255 for 8 bits images but it can change in the case of High Dynamic Range Images (HDRI)
-	* @return, nothing but the output demultiplexed frame is available by the use of the getDemultiplexedColorFrame() function, also use getLuminance() and getChrominance() in order to retreive either luminance or chrominance
-	*/
-	void runColorDemultiplexing(const std::valarray<float> &multiplexedColorFrame, const bool adaptiveFiltering=false, const float maxInputValue=255.0);
-
-	/**
-	* activate color saturation as the final step of the color demultiplexing process
-	* -> this saturation is a sigmoide function applied to each channel of the demultiplexed image.
-	* @param saturateColors: boolean that activates color saturation (if true) or desactivate (if false)
-	* @param colorSaturationValue: the saturation factor
-	* */
-	void setColorSaturation(const bool saturateColors=true, const float colorSaturationValue=4.0){_saturateColors=saturateColors; _colorSaturationValue=colorSaturationValue;};
-
-	/**
-	* set parameters of the low pass spatio-temporal filter used to retreive the low chrominance
-	* @param beta: gain of the filter (generally set to zero)
-	* @param tau: time constant of the filter (unit is frame for video processing), typically 0 when considering static processing, 1 or more if a temporal smoothing effect is required
-	* @param k: spatial constant of the filter (unit is pixels), typical value is 2.5
-	*/
-	void setChrominanceLPfilterParameters(const float beta, const float tau, const float k){setLPfilterParameters(beta, tau, k);};
-
-	/**
-	* apply to the retina color output the Krauskopf transformation which leads to an opponent color system: output colorspace if Acr1cr2 if input of the retina was LMS color space
-	* @param result: the input buffer to fill with the transformed colorspace retina output
-	* @return true if process ended successfully
-	*/
-	bool applyKrauskopfLMS2Acr1cr2Transform(std::valarray<float> &result);
-
-	/**
-	* apply to the retina color output the CIE Lab color transformation
-	* @param result: the input buffer to fill with the transformed colorspace retina output
-	* @return true if process ended successfully
-	*/
-	bool applyLMS2LabTransform(std::valarray<float> &result);
-
-	/**
-	* @return the multiplexed frame result (use this after function runColorMultiplexing)
-	*/
-	inline const std::valarray<float> &getMultiplexedFrame() const {return *_multiplexedFrame;};
-
-	/**
-	* @return the demultiplexed frame result (use this after function runColorDemultiplexing)
-	*/
-	inline const std::valarray<float> &getDemultiplexedColorFrame() const {return _demultiplexedColorFrame;};
-
-	/**
-	* @return the luminance of the processed frame (use this after function runColorDemultiplexing)
-	*/
-	inline const std::valarray<float> &getLuminance() const {return *_luminance;};
-
-	/**
-	* @return the chrominance of the processed frame (use this after function runColorDemultiplexing)
-	*/
-	inline const std::valarray<float> &getChrominance() const {return _chrominance;};
-
-	/**
-	* standard 0 to 255 image clipping function appled to RGB images (of size M*N*3 pixels)
-	* @param inputOutputBuffer: the image to be normalized (rewrites the input), if no parameter, then, the built in buffer reachable by getOutput() function is normalized
-	* @param maxOutputValue: the maximum value allowed at the output (values superior to it would be clipped
-	*/
-	void clipRGBOutput_0_maxInputValue(float *inputOutputBuffer, const float maxOutputValue=255.0);
-
-	/**
-	* standard 0 to 255 image normalization function appled to RGB images (of size M*N*3 pixels)
-	* @param maxOutputValue: the maximum value allowed at the output (values superior to it would be clipped
-	*/
-	void normalizeRGBOutput_0_maxOutputValue(const float maxOutputValue=255.0);
-
-	/**
-	* return the color sampling map: a Nrows*Mcolumns image in which each pixel value is the ofsset adress which gives the adress of the sampled pixel on an Nrows*Mcolumns*3 color image ordered by layers: layer1, layer2, layer3
-	*/
-	inline const std::valarray<unsigned int> &getSamplingMap() const {return _colorSampling;};
-
-	/**
-	* function used (to bypass processing) to manually set the color output
-	* @param demultiplexedImage: the color image (luminance+chrominance) which has to be written in the object buffer
-	*/
-	inline void setDemultiplexedColorFrame(const std::valarray<float> &demultiplexedImage){_demultiplexedColorFrame=demultiplexedImage;};
-
-protected:
-
-	// private functions
-	RETINA_COLORSAMPLINGMETHOD _samplingMethod;
-	bool _saturateColors;
-	float _colorSaturationValue;
-	// links to parent buffers (more convienient names
-	TemplateBuffer<float> *_luminance;
-	std::valarray<float> *_multiplexedFrame;
-	// instance buffers
-	std::valarray<unsigned int> _colorSampling; // table (size (_nbRows*_nbColumns) which specifies the color of each pixel
-	std::valarray<float> _RGBmosaic;
-	std::valarray<float> _tempMultiplexedFrame;
-	std::valarray<float> _demultiplexedTempBuffer;
-	std::valarray<float> _demultiplexedColorFrame;
-	std::valarray<float> _chrominance;
-	std::valarray<float> _colorLocalDensity;// buffer which contains the local density of the R, G and B photoreceptors for a normalization use
-	std::valarray<float> _imageGradient;
-
-	// variables
-	float _pR, _pG, _pB; // probabilities of color R, G and B
-	bool _objectInit;
-
-	// protected functions
-	void _initColorSampling();
-	void _interpolateImageDemultiplexedImage(float *inputOutputBuffer);
-	void _interpolateSingleChannelImage111(float *inputOutputBuffer);
-	void _interpolateBayerRGBchannels(float *inputOutputBuffer);
-	void _applyRIFfilter(const float *sourceBuffer, float *destinationBuffer);
-	void _getNormalizedContoursImage(const float *inputFrame, float *outputFrame);
-	// -> special adaptive filters dedicated to low pass filtering on the chrominance (skeeps filtering on the edges)
-	void _adaptiveSpatialLPfilter(const float *inputFrame,  float *outputFrame);
-	void _adaptiveHorizontalCausalFilter_addInput(const float *inputFrame, float *outputFrame, const unsigned int IDrowStart, const unsigned int IDrowEnd); // TBB parallelized
-	void _adaptiveVerticalAnticausalFilter_multGain(float *outputFrame, const unsigned int IDcolumnStart, const unsigned int IDcolumnEnd);
-	void _computeGradient(const float *luminance);
-	void _normalizeOutputs_0_maxOutputValue(void);
-
-	// color space transform
-	void _applyImageColorSpaceConversion(const std::valarray<float> &inputFrame, std::valarray<float> &outputFrame, const float *transformTable);
+    class RetinaColor: public BasicRetinaFilter
+    {
+    public:
+        /**
+        * @typedef which allows to select the type of photoreceptors color sampling
+        */
+
+        /**
+        * constructor of the retina color processing model
+        * @param NBrows: number of rows of the input image
+        * @param NBcolumns: number of columns of the input image
+        * @param samplingMethod: the chosen color sampling method
+        */
+        RetinaColor(const unsigned int NBrows, const unsigned int NBcolumns, const RETINA_COLORSAMPLINGMETHOD samplingMethod=RETINA_COLOR_DIAGONAL);
+
+        /**
+        * standard destructor
+        */
+        virtual ~RetinaColor();
+
+        /**
+        * function that clears all buffers of the object
+        */
+        void clearAllBuffers();
+
+        /**
+        * resize retina color filter object (resize all allocated buffers)
+        * @param NBrows: the new height size
+        * @param NBcolumns: the new width size
+        */
+        void resize(const unsigned int NBrows, const unsigned int NBcolumns);
+
+
+        /**
+        * color multiplexing function: a demultiplexed RGB frame of size M*N*3 is transformed into a multiplexed M*N*1 pixels frame where each pixel is either Red, or Green or Blue
+        * @param inputRGBFrame: the input RGB frame to be processed
+        * @return, nothing but the multiplexed frame is available by the use of the getMultiplexedFrame() function
+        */
+        inline void runColorMultiplexing(const std::valarray<float> &inputRGBFrame){runColorMultiplexing(inputRGBFrame, *_multiplexedFrame);};
+
+        /**
+        * color multiplexing function: a demultipleed RGB frame of size M*N*3 is transformed into a multiplexed M*N*1 pixels frame where each pixel is either Red, or Green or Blue if using RGB images
+        * @param demultiplexedInputFrame: the demultiplexed input frame to be processed of size M*N*3
+        * @param multiplexedFrame: the resulting multiplexed frame
+        */
+        void runColorMultiplexing(const std::valarray<float> &demultiplexedInputFrame, std::valarray<float> &multiplexedFrame);
+
+        /**
+        * color demultiplexing function: a multiplexed frame of size M*N*1 pixels is transformed into a RGB demultiplexed M*N*3 pixels frame
+        * @param multiplexedColorFrame: the input multiplexed frame to be processed
+        * @param adaptiveFiltering: specifies if an adaptive filtering has to be perform rather than standard filtering (adaptive filtering allows a better rendering)
+        * @param maxInputValue: the maximum input data value (should be 255 for 8 bits images but it can change in the case of High Dynamic Range Images (HDRI)
+        * @return, nothing but the output demultiplexed frame is available by the use of the getDemultiplexedColorFrame() function, also use getLuminance() and getChrominance() in order to retreive either luminance or chrominance
+        */
+        void runColorDemultiplexing(const std::valarray<float> &multiplexedColorFrame, const bool adaptiveFiltering=false, const float maxInputValue=255.0);
+
+        /**
+        * activate color saturation as the final step of the color demultiplexing process
+        * -> this saturation is a sigmoide function applied to each channel of the demultiplexed image.
+        * @param saturateColors: boolean that activates color saturation (if true) or desactivate (if false)
+        * @param colorSaturationValue: the saturation factor
+        * */
+        void setColorSaturation(const bool saturateColors=true, const float colorSaturationValue=4.0){_saturateColors=saturateColors; _colorSaturationValue=colorSaturationValue;};
+
+        /**
+        * set parameters of the low pass spatio-temporal filter used to retreive the low chrominance
+        * @param beta: gain of the filter (generally set to zero)
+        * @param tau: time constant of the filter (unit is frame for video processing), typically 0 when considering static processing, 1 or more if a temporal smoothing effect is required
+        * @param k: spatial constant of the filter (unit is pixels), typical value is 2.5
+        */
+        void setChrominanceLPfilterParameters(const float beta, const float tau, const float k){setLPfilterParameters(beta, tau, k);};
+
+        /**
+        * apply to the retina color output the Krauskopf transformation which leads to an opponent color system: output colorspace if Acr1cr2 if input of the retina was LMS color space
+        * @param result: the input buffer to fill with the transformed colorspace retina output
+        * @return true if process ended successfully
+        */
+        bool applyKrauskopfLMS2Acr1cr2Transform(std::valarray<float> &result);
+
+        /**
+        * apply to the retina color output the CIE Lab color transformation
+        * @param result: the input buffer to fill with the transformed colorspace retina output
+        * @return true if process ended successfully
+        */
+        bool applyLMS2LabTransform(std::valarray<float> &result);
+
+        /**
+        * @return the multiplexed frame result (use this after function runColorMultiplexing)
+        */
+        inline const std::valarray<float> &getMultiplexedFrame() const {return *_multiplexedFrame;};
+
+        /**
+        * @return the demultiplexed frame result (use this after function runColorDemultiplexing)
+        */
+        inline const std::valarray<float> &getDemultiplexedColorFrame() const {return _demultiplexedColorFrame;};
+
+        /**
+        * @return the luminance of the processed frame (use this after function runColorDemultiplexing)
+        */
+        inline const std::valarray<float> &getLuminance() const {return *_luminance;};
+
+        /**
+        * @return the chrominance of the processed frame (use this after function runColorDemultiplexing)
+        */
+        inline const std::valarray<float> &getChrominance() const {return _chrominance;};
+
+        /**
+        * standard 0 to 255 image clipping function appled to RGB images (of size M*N*3 pixels)
+        * @param inputOutputBuffer: the image to be normalized (rewrites the input), if no parameter, then, the built in buffer reachable by getOutput() function is normalized
+        * @param maxOutputValue: the maximum value allowed at the output (values superior to it would be clipped
+        */
+        void clipRGBOutput_0_maxInputValue(float *inputOutputBuffer, const float maxOutputValue=255.0);
+
+        /**
+        * standard 0 to 255 image normalization function appled to RGB images (of size M*N*3 pixels)
+        * @param maxOutputValue: the maximum value allowed at the output (values superior to it would be clipped
+        */
+        void normalizeRGBOutput_0_maxOutputValue(const float maxOutputValue=255.0);
+
+        /**
+        * return the color sampling map: a Nrows*Mcolumns image in which each pixel value is the ofsset adress which gives the adress of the sampled pixel on an Nrows*Mcolumns*3 color image ordered by layers: layer1, layer2, layer3
+        */
+        inline const std::valarray<unsigned int> &getSamplingMap() const {return _colorSampling;};
+
+        /**
+        * function used (to bypass processing) to manually set the color output
+        * @param demultiplexedImage: the color image (luminance+chrominance) which has to be written in the object buffer
+        */
+        inline void setDemultiplexedColorFrame(const std::valarray<float> &demultiplexedImage){_demultiplexedColorFrame=demultiplexedImage;};
+
+    protected:
+
+        // private functions
+        RETINA_COLORSAMPLINGMETHOD _samplingMethod;
+        bool _saturateColors;
+        float _colorSaturationValue;
+        // links to parent buffers (more convienient names
+        TemplateBuffer<float> *_luminance;
+        std::valarray<float> *_multiplexedFrame;
+        // instance buffers
+        std::valarray<unsigned int> _colorSampling; // table (size (_nbRows*_nbColumns) which specifies the color of each pixel
+        std::valarray<float> _RGBmosaic;
+        std::valarray<float> _tempMultiplexedFrame;
+        std::valarray<float> _demultiplexedTempBuffer;
+        std::valarray<float> _demultiplexedColorFrame;
+        std::valarray<float> _chrominance;
+        std::valarray<float> _colorLocalDensity;// buffer which contains the local density of the R, G and B photoreceptors for a normalization use
+        std::valarray<float> _imageGradient;
+
+        // variables
+        float _pR, _pG, _pB; // probabilities of color R, G and B
+        bool _objectInit;
+
+        // protected functions
+        void _initColorSampling();
+        void _interpolateImageDemultiplexedImage(float *inputOutputBuffer);
+        void _interpolateSingleChannelImage111(float *inputOutputBuffer);
+        void _interpolateBayerRGBchannels(float *inputOutputBuffer);
+        void _applyRIFfilter(const float *sourceBuffer, float *destinationBuffer);
+        void _getNormalizedContoursImage(const float *inputFrame, float *outputFrame);
+        // -> special adaptive filters dedicated to low pass filtering on the chrominance (skeeps filtering on the edges)
+        void _adaptiveSpatialLPfilter(const float *inputFrame,  float *outputFrame);
+        void _adaptiveHorizontalCausalFilter_addInput(const float *inputFrame, float *outputFrame, const unsigned int IDrowStart, const unsigned int IDrowEnd); // TBB parallelized
+        void _adaptiveVerticalAnticausalFilter_multGain(float *outputFrame, const unsigned int IDcolumnStart, const unsigned int IDcolumnEnd);
+        void _computeGradient(const float *luminance);
+        void _normalizeOutputs_0_maxOutputValue(void);
+
+        // color space transform
+        void _applyImageColorSpaceConversion(const std::valarray<float> &inputFrame, std::valarray<float> &outputFrame, const float *transformTable);
 
 #ifdef MAKE_PARALLEL
-/******************************************************
-** IF some parallelizing thread methods are available, then, main loops are parallelized using these functors
-** ==> main idea paralellise main filters loops, then, only the most used methods are parallelized... TODO : increase the number of parallelised methods as necessary
-** ==> functors names = Parallel_$$$ where $$$= the name of the serial method that is parallelised
-** ==> functors constructors can differ from the parameters used with their related serial functions
-*/
+        /******************************************************
+        ** IF some parallelizing thread methods are available, then, main loops are parallelized using these functors
+        ** ==> main idea paralellise main filters loops, then, only the most used methods are parallelized... TODO : increase the number of parallelised methods as necessary
+        ** ==> functors names = Parallel_$$$ where $$$= the name of the serial method that is parallelised
+        ** ==> functors constructors can differ from the parameters used with their related serial functions
+        */
 
-/* Template :
-    class Parallel_ : public cv::ParallelLoopBody
-    {
-    private:
+        /* Template :
+        class Parallel_ : public cv::ParallelLoopBody
+        {
+        private:
 
-    public:
-         Parallel_()
-         : {}
-    
-         virtual void operator()( const cv::Range& r ) const {
+        public:
+        Parallel_()
+        : {}
 
-        }
-    }:
-*/
-    class Parallel_adaptiveHorizontalCausalFilter_addInput: public cv::ParallelLoopBody
-    {
-    private:
-	float *outputFrame;
-	const float *inputFrame, *imageGradient;
-	const unsigned int nbColumns;
-    public:
-         Parallel_adaptiveHorizontalCausalFilter_addInput(const float *inputImg, float *bufferToProcess, const float *imageGrad, const unsigned int nbCols)
-         :outputFrame(bufferToProcess), inputFrame(inputImg), imageGradient(imageGrad), nbColumns(nbCols) {};
-    
-         virtual void operator()( const Range& r ) const {
-            register float* outputPTR=outputFrame+r.start*nbColumns;
-	    register const float* inputPTR=inputFrame+r.start*nbColumns;
-	    register const float *imageGradientPTR= imageGradient+r.start*nbColumns;
-	    for (int IDrow=r.start; IDrow!=r.end; ++IDrow)
-	    {
-		register float result=0;
-		for (unsigned int index=0; index<nbColumns; ++index)
-		{
-			result = *(inputPTR++) + (*imageGradientPTR++)* result;
-			*(outputPTR++) = result;
-		}
-	    }
-        }
-    };
+        virtual void operator()( const cv::Range& r ) const {
 
-    class Parallel_adaptiveVerticalAnticausalFilter_multGain: public cv::ParallelLoopBody
-    {
-    private:
-        float *outputFrame;
-	const float *imageGradient;
-        const unsigned int nbRows, nbColumns;
-        const float filterParam_gain;
-    public:        
-        Parallel_adaptiveVerticalAnticausalFilter_multGain(float *bufferToProcess, const float *imageGrad, const unsigned int nbRws, const unsigned int nbCols, const float  gain)
-        :outputFrame(bufferToProcess), imageGradient(imageGrad), nbRows(nbRws), nbColumns(nbCols), filterParam_gain(gain){}
-        
-        virtual void operator()( const Range& r ) const {
-            float* offset=outputFrame+nbColumns*nbRows-nbColumns;
-            const float* gradOffset= imageGradient+nbColumns*nbRows-nbColumns;
-    	    for (int IDcolumn=r.start; IDcolumn!=r.end; ++IDcolumn)
-	    {
-		register float result=0;
-		register float *outputPTR=offset+IDcolumn;
-		register const float *imageGradientPTR=gradOffset+IDcolumn;
-		for (unsigned int index=0; index<nbRows; ++index)
-		{
-			result = *(outputPTR) + *(imageGradientPTR) * result;
-			*(outputPTR) = filterParam_gain*result;
-			outputPTR-=nbColumns;
-			imageGradientPTR-=nbColumns;
-		}
-	    }
         }
-    };
+        }:
+        */
+        class Parallel_adaptiveHorizontalCausalFilter_addInput: public cv::ParallelLoopBody
+        {
+        private:
+            float *outputFrame;
+            const float *inputFrame, *imageGradient;
+            unsigned int nbColumns;
+        public:
+            Parallel_adaptiveHorizontalCausalFilter_addInput(const float *inputImg, float *bufferToProcess, const float *imageGrad, const unsigned int nbCols)
+                :outputFrame(bufferToProcess), inputFrame(inputImg), imageGradient(imageGrad), nbColumns(nbCols) {};
+
+            virtual void operator()( const Range& r ) const {
+                register float* outputPTR=outputFrame+r.start*nbColumns;
+                register const float* inputPTR=inputFrame+r.start*nbColumns;
+                register const float *imageGradientPTR= imageGradient+r.start*nbColumns;
+                for (int IDrow=r.start; IDrow!=r.end; ++IDrow)
+                {
+                    register float result=0;
+                    for (unsigned int index=0; index<nbColumns; ++index)
+                    {
+                        result = *(inputPTR++) + (*imageGradientPTR++)* result;
+                        *(outputPTR++) = result;
+                    }
+                }
+            }
+        };
+
+        class Parallel_adaptiveVerticalAnticausalFilter_multGain: public cv::ParallelLoopBody
+        {
+        private:
+            float *outputFrame;
+            const float *imageGradient;
+            unsigned int nbRows, nbColumns;
+            float filterParam_gain;
+        public:        
+            Parallel_adaptiveVerticalAnticausalFilter_multGain(float *bufferToProcess, const float *imageGrad, const unsigned int nbRws, const unsigned int nbCols, const float  gain)
+                :outputFrame(bufferToProcess), imageGradient(imageGrad), nbRows(nbRws), nbColumns(nbCols), filterParam_gain(gain){}
+
+            virtual void operator()( const Range& r ) const {
+                float* offset=outputFrame+nbColumns*nbRows-nbColumns;
+                const float* gradOffset= imageGradient+nbColumns*nbRows-nbColumns;
+                for (int IDcolumn=r.start; IDcolumn!=r.end; ++IDcolumn)
+                {
+                    register float result=0;
+                    register float *outputPTR=offset+IDcolumn;
+                    register const float *imageGradientPTR=gradOffset+IDcolumn;
+                    for (unsigned int index=0; index<nbRows; ++index)
+                    {
+                        result = *(outputPTR) + *(imageGradientPTR) * result;
+                        *(outputPTR) = filterParam_gain*result;
+                        outputPTR-=nbColumns;
+                        imageGradientPTR-=nbColumns;
+                    }
+                }
+            }
+        };
 #endif
-};
+    };
 }
 
 #endif /*RETINACOLOR_HPP_*/

modules/contrib/src/templatebuffer.hpp

@@ -82,21 +82,21 @@ class Parallel_clipBufferValues: public cv::ParallelLoopBody
 {
 private:
     type *bufferToClip;
-    const type minValue, maxValue;
-    
+    type minValue, maxValue;
+
 public:
     Parallel_clipBufferValues(type* bufferToProcess, const type min, const type max)
-    : bufferToClip(bufferToProcess), minValue(min), maxValue(max){}
+        : bufferToClip(bufferToProcess), minValue(min), maxValue(max){}
 
     virtual void operator()( const cv::Range &r ) const {
-	register type *inputOutputBufferPTR=bufferToClip+r.start;
+        register type *inputOutputBufferPTR=bufferToClip+r.start;
         for (register int jf = r.start; jf != r.end; ++jf, ++inputOutputBufferPTR)
-	{
-	    if (*inputOutputBufferPTR>maxValue)
-		*inputOutputBufferPTR=maxValue;
-	    else if (*inputOutputBufferPTR<minValue)
-		*inputOutputBufferPTR=minValue;
-	}
+        {
+            if (*inputOutputBufferPTR>maxValue)
+                *inputOutputBufferPTR=maxValue;
+            else if (*inputOutputBufferPTR<minValue)
+                *inputOutputBufferPTR=minValue;
+        }
     }
 };
 #endif
@@ -105,448 +105,448 @@ public:
 
 namespace cv
 {
-/**
-* @class TemplateBuffer
-* @brief this class is a simple template memory buffer which contains basic functions to get information on or normalize the buffer content
-* note that thanks to the parent STL template class "valarray", it is possible to perform easily operations on the full array such as addition, product etc.
-* @author Alexandre BENOIT (benoit.alexandre.vision@gmail.com), helped by Gelu IONESCU (gelu.ionescu@lis.inpg.fr)
-* creation date: september 2007
-*/
-template <class type> class TemplateBuffer : public std::valarray<type>
-{
-public:
-
     /**
-    * constructor for monodimensional array
-    * @param dim: the size of the vector
+    * @class TemplateBuffer
+    * @brief this class is a simple template memory buffer which contains basic functions to get information on or normalize the buffer content
+    * note that thanks to the parent STL template class "valarray", it is possible to perform easily operations on the full array such as addition, product etc.
+    * @author Alexandre BENOIT (benoit.alexandre.vision@gmail.com), helped by Gelu IONESCU (gelu.ionescu@lis.inpg.fr)
+    * creation date: september 2007
     */
-    TemplateBuffer(const size_t dim=0)
-    : std::valarray<type>((type)0, dim)
-      {
-        _NBrows=1;
-        _NBcolumns=dim;
-        _NBdepths=1;
-        _NBpixels=dim;
-        _doubleNBpixels=2*dim;
-      }
+    template <class type> class TemplateBuffer : public std::valarray<type>
+    {
+    public:
+
+        /**
+        * constructor for monodimensional array
+        * @param dim: the size of the vector
+        */
+        TemplateBuffer(const size_t dim=0)
+            : std::valarray<type>((type)0, dim)
+        {
+            _NBrows=1;
+            _NBcolumns=dim;
+            _NBdepths=1;
+            _NBpixels=dim;
+            _doubleNBpixels=2*dim;
+        }
 
-    /**
-    * constructor by copy for monodimensional array
-    * @param pVal: the pointer to a buffer to copy
-    * @param dim: the size of the vector
-    */
-    TemplateBuffer(const type* pVal, const size_t dim)
-    : std::valarray<type>(pVal, dim)
-      {
-        _NBrows=1;
-        _NBcolumns=dim;
-        _NBdepths=1;
-        _NBpixels=dim;
-        _doubleNBpixels=2*dim;
-      }
+        /**
+        * constructor by copy for monodimensional array
+        * @param pVal: the pointer to a buffer to copy
+        * @param dim: the size of the vector
+        */
+        TemplateBuffer(const type* pVal, const size_t dim)
+            : std::valarray<type>(pVal, dim)
+        {
+            _NBrows=1;
+            _NBcolumns=dim;
+            _NBdepths=1;
+            _NBpixels=dim;
+            _doubleNBpixels=2*dim;
+        }
 
-    /**
-    * constructor for bidimensional array
-    * @param dimRows: the size of the vector
-    * @param dimColumns: the size of the vector
-    * @param depth: the number of layers of the buffer in its third dimension (3 of color images, 1 for gray images.
-    */
-    TemplateBuffer(const size_t dimRows, const size_t dimColumns, const size_t depth=1)
-    : std::valarray<type>((type)0, dimRows*dimColumns*depth)
-      {
+        /**
+        * constructor for bidimensional array
+        * @param dimRows: the size of the vector
+        * @param dimColumns: the size of the vector
+        * @param depth: the number of layers of the buffer in its third dimension (3 of color images, 1 for gray images.
+        */
+        TemplateBuffer(const size_t dimRows, const size_t dimColumns, const size_t depth=1)
+            : std::valarray<type>((type)0, dimRows*dimColumns*depth)
+        {
 #ifdef TEMPLATEBUFFERDEBUG
-        std::cout<<"TemplateBuffer::TemplateBuffer: new buffer, size="<<dimRows<<", "<<dimColumns<<", "<<depth<<"valarraySize="<<this->size()<<std::endl;
+            std::cout<<"TemplateBuffer::TemplateBuffer: new buffer, size="<<dimRows<<", "<<dimColumns<<", "<<depth<<"valarraySize="<<this->size()<<std::endl;
 #endif
-        _NBrows=dimRows;
-        _NBcolumns=dimColumns;
-        _NBdepths=depth;
-        _NBpixels=dimRows*dimColumns;
-        _doubleNBpixels=2*dimRows*dimColumns;
-        //_createTableIndex();
+            _NBrows=dimRows;
+            _NBcolumns=dimColumns;
+            _NBdepths=depth;
+            _NBpixels=dimRows*dimColumns;
+            _doubleNBpixels=2*dimRows*dimColumns;
+            //_createTableIndex();
 #ifdef TEMPLATEBUFFERDEBUG
-        std::cout<<"TemplateBuffer::TemplateBuffer: construction successful"<<std::endl;
+            std::cout<<"TemplateBuffer::TemplateBuffer: construction successful"<<std::endl;
 #endif
 
-      }
+        }
 
-    /**
-    * copy constructor
-    * @param toCopy
-    * @return thenconstructed instance
-    *emplateBuffer(const TemplateBuffer &toCopy)
-    :_NBrows(toCopy.getNBrows()),_NBcolumns(toCopy.getNBcolumns()),_NBdepths(toCopy.getNBdephs()), _NBpixels(toCopy.getNBpixels()), _doubleNBpixels(toCopy.getNBpixels()*2)
-    //std::valarray<type>(toCopy)
-    {
-    memcpy(Buffer(), toCopy.Buffer(), this->size());
-    }*/
-    /**
-    * destructor
-    */
-    virtual ~TemplateBuffer()
-    {
+        /**
+        * copy constructor
+        * @param toCopy
+        * @return thenconstructed instance
+        *emplateBuffer(const TemplateBuffer &toCopy)
+        :_NBrows(toCopy.getNBrows()),_NBcolumns(toCopy.getNBcolumns()),_NBdepths(toCopy.getNBdephs()), _NBpixels(toCopy.getNBpixels()), _doubleNBpixels(toCopy.getNBpixels()*2)
+        //std::valarray<type>(toCopy)
+        {
+        memcpy(Buffer(), toCopy.Buffer(), this->size());
+        }*/
+        /**
+        * destructor
+        */
+        virtual ~TemplateBuffer()
+        {
 #ifdef TEMPLATEBUFFERDEBUG
-        std::cout<<"~TemplateBuffer"<<std::endl;
+            std::cout<<"~TemplateBuffer"<<std::endl;
 #endif
-    }
-
-    /**
-    * delete the buffer content (set zeros)
-    */
-    inline void setZero(){std::valarray<type>::operator=(0);};//memset(Buffer(), 0, sizeof(type)*_NBpixels);};
-
-    /**
-    * @return the numbers of rows (height) of the images used by the object
-    */
-    inline unsigned int getNBrows(){return (unsigned int)_NBrows;};
-
-    /**
-    * @return the numbers of columns (width) of the images used by the object
-    */
-    inline unsigned int getNBcolumns(){return (unsigned int)_NBcolumns;};
-
-    /**
-    * @return the numbers of pixels (width*height) of the images used by the object
-    */
-    inline unsigned int getNBpixels(){return (unsigned int)_NBpixels;};
-
-    /**
-    * @return the numbers of pixels (width*height) of the images used by the object
-    */
-    inline unsigned int getDoubleNBpixels(){return (unsigned int)_doubleNBpixels;};
-
-    /**
-    * @return the numbers of depths (3rd dimension: 1 for gray images, 3 for rgb images) of the images used by the object
-    */
-    inline unsigned int getDepthSize(){return (unsigned int)_NBdepths;};
-
-    /**
-    * resize the buffer and recompute table index etc.
-    */
-    void resizeBuffer(const size_t dimRows, const size_t dimColumns, const size_t depth=1)
-    {
-        this->resize(dimRows*dimColumns*depth);
-        _NBrows=dimRows;
-        _NBcolumns=dimColumns;
-        _NBdepths=depth;
-        _NBpixels=dimRows*dimColumns;
-        _doubleNBpixels=2*dimRows*dimColumns;
-    }
-
-    inline TemplateBuffer<type> & operator=(const std::valarray<type> &b)
-    {
-        //std::cout<<"TemplateBuffer<type> & operator= affect vector: "<<std::endl;
-        std::valarray<type>::operator=(b);
-        return *this;
-    }
-
-    inline TemplateBuffer<type> & operator=(const type &b)
-    {
-        //std::cout<<"TemplateBuffer<type> & operator= affect value: "<<b<<std::endl;
-        std::valarray<type>::operator=(b);
-        return *this;
-    }
-
-    /*  inline const type  &operator[](const unsigned int &b)
-  {
-      return (*this)[b];
-  }
-     */
-    /**
-    * @return the buffer adress in non const mode
-    */
-    inline type*    Buffer()            {    return &(*this)[0];    }
-
-    ///////////////////////////////////////////////////////
-    // Standard Image manipulation functions
-
-    /**
-    * standard 0 to 255 image normalization function
-    * @param inputOutputBuffer: the image to be normalized (rewrites the input), if no parameter, then, the built in buffer reachable by getOutput() function is normalized
-    * @param nbPixels: specifies the number of pixel on which the normalization should be performed, if 0, then all pixels specified in the constructor are processed
-    * @param maxOutputValue: the maximum output value
-    */
-    static void normalizeGrayOutput_0_maxOutputValue(type *inputOutputBuffer, const size_t nbPixels, const type maxOutputValue=(type)255.0);
-
-    /**
-    * standard 0 to 255 image normalization function
-    * @param inputOutputBuffer: the image to be normalized (rewrites the input), if no parameter, then, the built in buffer reachable by getOutput() function is normalized
-    * @param nbPixels: specifies the number of pixel on which the normalization should be performed, if 0, then all pixels specified in the constructor are processed
-    * @param maxOutputValue: the maximum output value
-    */
-    void normalizeGrayOutput_0_maxOutputValue(const type maxOutputValue=(type)255.0){normalizeGrayOutput_0_maxOutputValue(this->Buffer(), this->size(), maxOutputValue);};
-
-    /**
-    * sigmoide image normalization function (saturates min and max values)
-    * @param meanValue: specifies the mean value of th pixels to be processed
-    * @param sensitivity: strenght of the sigmoide
-    * @param inputPicture: the image to be normalized if no parameter, then, the built in buffer reachable by getOutput() function is normalized
-    * @param outputBuffer: the ouput buffer on which the result is writed, if no parameter, then, the built in buffer reachable by getOutput() function is normalized
-    * @param maxOutputValue: the maximum output value
-    */
-    static void normalizeGrayOutputCentredSigmoide(const type meanValue, const type sensitivity, const type maxOutputValue, type *inputPicture, type *outputBuffer, const unsigned int nbPixels);
-
-    /**
-    * sigmoide image normalization function on the current buffer (saturates min and max values)
-    * @param meanValue: specifies the mean value of th pixels to be processed
-    * @param sensitivity: strenght of the sigmoide
-    * @param maxOutputValue: the maximum output value
-    */
-    inline void normalizeGrayOutputCentredSigmoide(const type meanValue=(type)0.0, const type sensitivity=(type)2.0, const type maxOutputValue=(type)255.0){ (void)maxOutputValue; normalizeGrayOutputCentredSigmoide(meanValue, sensitivity, 255.0, this->Buffer(), this->Buffer(), this->getNBpixels());};
-
-    /**
-    * sigmoide image normalization function (saturates min and max values), in this function, the sigmoide is centered on low values (high saturation of the medium and high values
-    * @param inputPicture: the image to be normalized if no parameter, then, the built in buffer reachable by getOutput() function is normalized
-    * @param outputBuffer: the ouput buffer on which the result is writed, if no parameter, then, the built in buffer reachable by getOutput() function is normalized
-    * @param sensitivity: strenght of the sigmoide
-    * @param maxOutputValue: the maximum output value
-    */
-    void normalizeGrayOutputNearZeroCentreredSigmoide(type *inputPicture=(type*)NULL, type *outputBuffer=(type*)NULL, const type sensitivity=(type)40, const type maxOutputValue=(type)255.0);
-
-    /**
-    * center and reduct the image (image-mean)/std
-    * @param inputOutputBuffer: the image to be normalized if no parameter, the result is rewrited on it
-    */
-    void centerReductImageLuminance(type *inputOutputBuffer=(type*)NULL);
+        }
 
-    /**
-    * @return standard deviation of the buffer
-    */
-    double getStandardDeviation()
-    {
-        double standardDeviation=0;
-        double meanValue=getMean();
+        /**
+        * delete the buffer content (set zeros)
+        */
+        inline void setZero(){std::valarray<type>::operator=(0);};//memset(Buffer(), 0, sizeof(type)*_NBpixels);};
+
+        /**
+        * @return the numbers of rows (height) of the images used by the object
+        */
+        inline unsigned int getNBrows(){return (unsigned int)_NBrows;};
+
+        /**
+        * @return the numbers of columns (width) of the images used by the object
+        */
+        inline unsigned int getNBcolumns(){return (unsigned int)_NBcolumns;};
+
+        /**
+        * @return the numbers of pixels (width*height) of the images used by the object
+        */
+        inline unsigned int getNBpixels(){return (unsigned int)_NBpixels;};
+
+        /**
+        * @return the numbers of pixels (width*height) of the images used by the object
+        */
+        inline unsigned int getDoubleNBpixels(){return (unsigned int)_doubleNBpixels;};
+
+        /**
+        * @return the numbers of depths (3rd dimension: 1 for gray images, 3 for rgb images) of the images used by the object
+        */
+        inline unsigned int getDepthSize(){return (unsigned int)_NBdepths;};
+
+        /**
+        * resize the buffer and recompute table index etc.
+        */
+        void resizeBuffer(const size_t dimRows, const size_t dimColumns, const size_t depth=1)
+        {
+            this->resize(dimRows*dimColumns*depth);
+            _NBrows=dimRows;
+            _NBcolumns=dimColumns;
+            _NBdepths=depth;
+            _NBpixels=dimRows*dimColumns;
+            _doubleNBpixels=2*dimRows*dimColumns;
+        }
 
-        type *bufferPTR=Buffer();
-        for (unsigned int i=0;i<this->size();++i)
+        inline TemplateBuffer<type> & operator=(const std::valarray<type> &b)
         {
-            double diff=(*(bufferPTR++)-meanValue);
-            standardDeviation+=diff*diff;
+            //std::cout<<"TemplateBuffer<type> & operator= affect vector: "<<std::endl;
+            std::valarray<type>::operator=(b);
+            return *this;
         }
-        return sqrt(standardDeviation/this->size());
-    };
 
-    /**
-    * Clip buffer histogram
-    * @param minRatio: the minimum ratio of the lower pixel values, range=[0,1] and lower than maxRatio
-    * @param maxRatio: the aximum ratio of the higher pixel values, range=[0,1] and higher than minRatio
-    */
-    void clipHistogram(double minRatio, double maxRatio, double maxOutputValue)
-    {
+        inline TemplateBuffer<type> & operator=(const type &b)
+        {
+            //std::cout<<"TemplateBuffer<type> & operator= affect value: "<<b<<std::endl;
+            std::valarray<type>::operator=(b);
+            return *this;
+        }
 
-        if (minRatio>=maxRatio)
+        /*  inline const type  &operator[](const unsigned int &b)
         {
-            std::cerr<<"TemplateBuffer::clipHistogram: minRatio must be inferior to maxRatio, buffer unchanged"<<std::endl;
-            return;
+        return (*this)[b];
         }
+        */
+        /**
+        * @return the buffer adress in non const mode
+        */
+        inline type*    Buffer()            {    return &(*this)[0];    }
+
+        ///////////////////////////////////////////////////////
+        // Standard Image manipulation functions
+
+        /**
+        * standard 0 to 255 image normalization function
+        * @param inputOutputBuffer: the image to be normalized (rewrites the input), if no parameter, then, the built in buffer reachable by getOutput() function is normalized
+        * @param nbPixels: specifies the number of pixel on which the normalization should be performed, if 0, then all pixels specified in the constructor are processed
+        * @param maxOutputValue: the maximum output value
+        */
+        static void normalizeGrayOutput_0_maxOutputValue(type *inputOutputBuffer, const size_t nbPixels, const type maxOutputValue=(type)255.0);
+
+        /**
+        * standard 0 to 255 image normalization function
+        * @param inputOutputBuffer: the image to be normalized (rewrites the input), if no parameter, then, the built in buffer reachable by getOutput() function is normalized
+        * @param nbPixels: specifies the number of pixel on which the normalization should be performed, if 0, then all pixels specified in the constructor are processed
+        * @param maxOutputValue: the maximum output value
+        */
+        void normalizeGrayOutput_0_maxOutputValue(const type maxOutputValue=(type)255.0){normalizeGrayOutput_0_maxOutputValue(this->Buffer(), this->size(), maxOutputValue);};
+
+        /**
+        * sigmoide image normalization function (saturates min and max values)
+        * @param meanValue: specifies the mean value of th pixels to be processed
+        * @param sensitivity: strenght of the sigmoide
+        * @param inputPicture: the image to be normalized if no parameter, then, the built in buffer reachable by getOutput() function is normalized
+        * @param outputBuffer: the ouput buffer on which the result is writed, if no parameter, then, the built in buffer reachable by getOutput() function is normalized
+        * @param maxOutputValue: the maximum output value
+        */
+        static void normalizeGrayOutputCentredSigmoide(const type meanValue, const type sensitivity, const type maxOutputValue, type *inputPicture, type *outputBuffer, const unsigned int nbPixels);
+
+        /**
+        * sigmoide image normalization function on the current buffer (saturates min and max values)
+        * @param meanValue: specifies the mean value of th pixels to be processed
+        * @param sensitivity: strenght of the sigmoide
+        * @param maxOutputValue: the maximum output value
+        */
+        inline void normalizeGrayOutputCentredSigmoide(const type meanValue=(type)0.0, const type sensitivity=(type)2.0, const type maxOutputValue=(type)255.0){ (void)maxOutputValue; normalizeGrayOutputCentredSigmoide(meanValue, sensitivity, 255.0, this->Buffer(), this->Buffer(), this->getNBpixels());};
+
+        /**
+        * sigmoide image normalization function (saturates min and max values), in this function, the sigmoide is centered on low values (high saturation of the medium and high values
+        * @param inputPicture: the image to be normalized if no parameter, then, the built in buffer reachable by getOutput() function is normalized
+        * @param outputBuffer: the ouput buffer on which the result is writed, if no parameter, then, the built in buffer reachable by getOutput() function is normalized
+        * @param sensitivity: strenght of the sigmoide
+        * @param maxOutputValue: the maximum output value
+        */
+        void normalizeGrayOutputNearZeroCentreredSigmoide(type *inputPicture=(type*)NULL, type *outputBuffer=(type*)NULL, const type sensitivity=(type)40, const type maxOutputValue=(type)255.0);
+
+        /**
+        * center and reduct the image (image-mean)/std
+        * @param inputOutputBuffer: the image to be normalized if no parameter, the result is rewrited on it
+        */
+        void centerReductImageLuminance(type *inputOutputBuffer=(type*)NULL);
+
+        /**
+        * @return standard deviation of the buffer
+        */
+        double getStandardDeviation()
+        {
+            double standardDeviation=0;
+            double meanValue=getMean();
 
-        /*    minRatio=min(max(minRatio, 1.0),0.0);
-    maxRatio=max(max(maxRatio, 0.0),1.0);
-         */
+            type *bufferPTR=Buffer();
+            for (unsigned int i=0;i<this->size();++i)
+            {
+                double diff=(*(bufferPTR++)-meanValue);
+                standardDeviation+=diff*diff;
+            }
+            return sqrt(standardDeviation/this->size());
+        };
+
+        /**
+        * Clip buffer histogram
+        * @param minRatio: the minimum ratio of the lower pixel values, range=[0,1] and lower than maxRatio
+        * @param maxRatio: the aximum ratio of the higher pixel values, range=[0,1] and higher than minRatio
+        */
+        void clipHistogram(double minRatio, double maxRatio, double maxOutputValue)
+        {
+
+            if (minRatio>=maxRatio)
+            {
+                std::cerr<<"TemplateBuffer::clipHistogram: minRatio must be inferior to maxRatio, buffer unchanged"<<std::endl;
+                return;
+            }
 
-        // find the pixel value just above the threshold
-        const double maxThreshold=this->max()*maxRatio;
-        const double minThreshold=(this->max()-this->min())*minRatio+this->min();
+            /*    minRatio=min(max(minRatio, 1.0),0.0);
+            maxRatio=max(max(maxRatio, 0.0),1.0);
+            */
 
-        type *bufferPTR=this->Buffer();
+            // find the pixel value just above the threshold
+            const double maxThreshold=this->max()*maxRatio;
+            const double minThreshold=(this->max()-this->min())*minRatio+this->min();
 
-        double deltaH=maxThreshold;
-        double deltaL=maxThreshold;
+            type *bufferPTR=this->Buffer();
 
-        double updatedHighValue=maxThreshold;
-        double updatedLowValue=maxThreshold;
+            double deltaH=maxThreshold;
+            double deltaL=maxThreshold;
 
-        for (unsigned int i=0;i<this->size();++i)
-        {
-            double curentValue=(double)*(bufferPTR++);
+            double updatedHighValue=maxThreshold;
+            double updatedLowValue=maxThreshold;
 
-            // updating "closest to the high threshold" pixel value
-            double highValueTest=maxThreshold-curentValue;
-            if (highValueTest>0)
+            for (unsigned int i=0;i<this->size();++i)
             {
-                if (deltaH>highValueTest)
+                double curentValue=(double)*(bufferPTR++);
+
+                // updating "closest to the high threshold" pixel value
+                double highValueTest=maxThreshold-curentValue;
+                if (highValueTest>0)
                 {
-                    deltaH=highValueTest;
-                    updatedHighValue=curentValue;
+                    if (deltaH>highValueTest)
+                    {
+                        deltaH=highValueTest;
+                        updatedHighValue=curentValue;
+                    }
                 }
-            }
 
-            // updating "closest to the low threshold" pixel value
-            double lowValueTest=curentValue-minThreshold;
-            if (lowValueTest>0)
-            {
-                if (deltaL>lowValueTest)
+                // updating "closest to the low threshold" pixel value
+                double lowValueTest=curentValue-minThreshold;
+                if (lowValueTest>0)
                 {
-                    deltaL=lowValueTest;
-                    updatedLowValue=curentValue;
+                    if (deltaL>lowValueTest)
+                    {
+                        deltaL=lowValueTest;
+                        updatedLowValue=curentValue;
+                    }
                 }
             }
-        }
 
-		std::cout<<"Tdebug"<<std::endl;
-		std::cout<<"deltaL="<<deltaL<<", deltaH="<<deltaH<<std::endl;
-		std::cout<<"this->max()"<<this->max()<<"maxThreshold="<<maxThreshold<<"updatedHighValue="<<updatedHighValue<<std::endl;
-		std::cout<<"this->min()"<<this->min()<<"minThreshold="<<minThreshold<<"updatedLowValue="<<updatedLowValue<<std::endl;
-		// clipping values outside than the updated thresholds
-                bufferPTR=this->Buffer();
+            std::cout<<"Tdebug"<<std::endl;
+            std::cout<<"deltaL="<<deltaL<<", deltaH="<<deltaH<<std::endl;
+            std::cout<<"this->max()"<<this->max()<<"maxThreshold="<<maxThreshold<<"updatedHighValue="<<updatedHighValue<<std::endl;
+            std::cout<<"this->min()"<<this->min()<<"minThreshold="<<minThreshold<<"updatedLowValue="<<updatedLowValue<<std::endl;
+            // clipping values outside than the updated thresholds
+            bufferPTR=this->Buffer();
 #ifdef MAKE_PARALLEL // call the TemplateBuffer multitreaded clipping method
-                parallel_for_(cv::Range(0,this->size()), Parallel_clipBufferValues<type>(bufferPTR, updatedLowValue, updatedHighValue));
+            parallel_for_(cv::Range(0,this->size()), Parallel_clipBufferValues<type>(bufferPTR, updatedLowValue, updatedHighValue));
 #else
 
-		for (unsigned int i=0;i<this->size();++i, ++bufferPTR)
-		{
-			if (*bufferPTR<updatedLowValue)
-				*bufferPTR=updatedLowValue;
-			else if (*bufferPTR>updatedHighValue)
-				*bufferPTR=updatedHighValue;
-		}
+            for (unsigned int i=0;i<this->size();++i, ++bufferPTR)
+            {
+                if (*bufferPTR<updatedLowValue)
+                    *bufferPTR=updatedLowValue;
+                else if (*bufferPTR>updatedHighValue)
+                    *bufferPTR=updatedHighValue;
+            }
 #endif
-		normalizeGrayOutput_0_maxOutputValue(this->Buffer(), this->size(), maxOutputValue);
-
-    }
+            normalizeGrayOutput_0_maxOutputValue(this->Buffer(), this->size(), maxOutputValue);
 
-    /**
-    * @return the mean value of the vector
-    */
-    inline double getMean(){return this->sum()/this->size();};
+        }
 
-protected:
-    size_t _NBrows;
-    size_t _NBcolumns;
-    size_t _NBdepths;
-    size_t _NBpixels;
-    size_t _doubleNBpixels;
-    // utilities
-    static type _abs(const type x);
+        /**
+        * @return the mean value of the vector
+        */
+        inline double getMean(){return this->sum()/this->size();};
 
-};
+    protected:
+        size_t _NBrows;
+        size_t _NBcolumns;
+        size_t _NBdepths;
+        size_t _NBpixels;
+        size_t _doubleNBpixels;
+        // utilities
+        static type _abs(const type x);
 
-///////////////////////////////////////////////////////////////////////
-/// normalize output between 0 and 255, can be applied on images of different size that the declared size if nbPixels parameters is setted up;
-template <class type>
-void TemplateBuffer<type>::normalizeGrayOutput_0_maxOutputValue(type *inputOutputBuffer, const size_t processedPixels, const type maxOutputValue)
-{
-    type maxValue=inputOutputBuffer[0], minValue=inputOutputBuffer[0];
+    };
 
-    // get the min and max value
-    register type *inputOutputBufferPTR=inputOutputBuffer;
-    for (register size_t j = 0; j<processedPixels; ++j)
+    ///////////////////////////////////////////////////////////////////////
+    /// normalize output between 0 and 255, can be applied on images of different size that the declared size if nbPixels parameters is setted up;
+    template <class type>
+    void TemplateBuffer<type>::normalizeGrayOutput_0_maxOutputValue(type *inputOutputBuffer, const size_t processedPixels, const type maxOutputValue)
     {
-        type pixValue = *(inputOutputBufferPTR++);
-        if (maxValue < pixValue)
-            maxValue = pixValue;
-        else if (minValue > pixValue)
-            minValue = pixValue;
-    }
-    // change the range of the data to 0->255
+        type maxValue=inputOutputBuffer[0], minValue=inputOutputBuffer[0];
 
-    type factor = maxOutputValue/(maxValue-minValue);
-    type offset = (type)(-minValue*factor);
+        // get the min and max value
+        register type *inputOutputBufferPTR=inputOutputBuffer;
+        for (register size_t j = 0; j<processedPixels; ++j)
+        {
+            type pixValue = *(inputOutputBufferPTR++);
+            if (maxValue < pixValue)
+                maxValue = pixValue;
+            else if (minValue > pixValue)
+                minValue = pixValue;
+        }
+        // change the range of the data to 0->255
 
-    inputOutputBufferPTR=inputOutputBuffer;
-    for (register size_t j = 0; j < processedPixels; ++j, ++inputOutputBufferPTR)
-        *inputOutputBufferPTR=*(inputOutputBufferPTR)*factor+offset;
+        type factor = maxOutputValue/(maxValue-minValue);
+        type offset = (type)(-minValue*factor);
 
-}
-// normalize data with a sigmoide close to 0 (saturates values for those superior to 0)
-template <class type>
-void TemplateBuffer<type>::normalizeGrayOutputNearZeroCentreredSigmoide(type *inputBuffer, type *outputBuffer, const type sensitivity, const type maxOutputValue)
-{
-    if (inputBuffer==NULL)
-        inputBuffer=Buffer();
-    if (outputBuffer==NULL)
-        outputBuffer=Buffer();
+        inputOutputBufferPTR=inputOutputBuffer;
+        for (register size_t j = 0; j < processedPixels; ++j, ++inputOutputBufferPTR)
+            *inputOutputBufferPTR=*(inputOutputBufferPTR)*factor+offset;
 
-    type X0cube=sensitivity*sensitivity*sensitivity;
+    }
+    // normalize data with a sigmoide close to 0 (saturates values for those superior to 0)
+    template <class type>
+    void TemplateBuffer<type>::normalizeGrayOutputNearZeroCentreredSigmoide(type *inputBuffer, type *outputBuffer, const type sensitivity, const type maxOutputValue)
+    {
+        if (inputBuffer==NULL)
+            inputBuffer=Buffer();
+        if (outputBuffer==NULL)
+            outputBuffer=Buffer();
 
-    register type *inputBufferPTR=inputBuffer;
-    register type *outputBufferPTR=outputBuffer;
+        type X0cube=sensitivity*sensitivity*sensitivity;
 
-    for (register size_t j = 0; j < _NBpixels; ++j, ++inputBufferPTR)
-    {
+        register type *inputBufferPTR=inputBuffer;
+        register type *outputBufferPTR=outputBuffer;
 
-        type currentCubeLuminance=*inputBufferPTR**inputBufferPTR**inputBufferPTR;
-        *(outputBufferPTR++)=maxOutputValue*currentCubeLuminance/(currentCubeLuminance+X0cube);
-    }
-}
+        for (register size_t j = 0; j < _NBpixels; ++j, ++inputBufferPTR)
+        {
 
-// normalize and adjust luminance with a centered to 128 sigmode
-template <class type>
-void TemplateBuffer<type>::normalizeGrayOutputCentredSigmoide(const type meanValue, const type sensitivity, const type maxOutputValue, type *inputBuffer, type *outputBuffer, const unsigned int nbPixels)
-{
+            type currentCubeLuminance=*inputBufferPTR**inputBufferPTR**inputBufferPTR;
+            *(outputBufferPTR++)=maxOutputValue*currentCubeLuminance/(currentCubeLuminance+X0cube);
+        }
+    }
 
-    if (sensitivity==1.0)
+    // normalize and adjust luminance with a centered to 128 sigmode
+    template <class type>
+    void TemplateBuffer<type>::normalizeGrayOutputCentredSigmoide(const type meanValue, const type sensitivity, const type maxOutputValue, type *inputBuffer, type *outputBuffer, const unsigned int nbPixels)
     {
-        std::cerr<<"TemplateBuffer::TemplateBuffer<type>::normalizeGrayOutputCentredSigmoide error: 2nd parameter (sensitivity) must not equal 0, copying original data..."<<std::endl;
-        memcpy(outputBuffer, inputBuffer, sizeof(type)*nbPixels);
-        return;
-    }
 
-    type X0=maxOutputValue/(sensitivity-(type)1.0);
+        if (sensitivity==1.0)
+        {
+            std::cerr<<"TemplateBuffer::TemplateBuffer<type>::normalizeGrayOutputCentredSigmoide error: 2nd parameter (sensitivity) must not equal 0, copying original data..."<<std::endl;
+            memcpy(outputBuffer, inputBuffer, sizeof(type)*nbPixels);
+            return;
+        }
 
-    register type *inputBufferPTR=inputBuffer;
-    register type *outputBufferPTR=outputBuffer;
+        type X0=maxOutputValue/(sensitivity-(type)1.0);
 
-    for (register size_t j = 0; j < nbPixels; ++j, ++inputBufferPTR)
-        *(outputBufferPTR++)=(meanValue+(meanValue+X0)*(*(inputBufferPTR)-meanValue)/(_abs(*(inputBufferPTR)-meanValue)+X0));
+        register type *inputBufferPTR=inputBuffer;
+        register type *outputBufferPTR=outputBuffer;
 
-}
+        for (register size_t j = 0; j < nbPixels; ++j, ++inputBufferPTR)
+            *(outputBufferPTR++)=(meanValue+(meanValue+X0)*(*(inputBufferPTR)-meanValue)/(_abs(*(inputBufferPTR)-meanValue)+X0));
 
-// center and reduct the image (image-mean)/std
-template <class type>
-void TemplateBuffer<type>::centerReductImageLuminance(type *inputOutputBuffer)
-{
-    // if outputBuffer unsassigned, the rewrite the buffer
-    if (inputOutputBuffer==NULL)
-        inputOutputBuffer=Buffer();
-    type meanValue=0, stdValue=0;
-
-    // compute mean value
-    for (register size_t j = 0; j < _NBpixels; ++j)
-        meanValue+=inputOutputBuffer[j];
-    meanValue/=((type)_NBpixels);
-
-    // compute std value
-    register type *inputOutputBufferPTR=inputOutputBuffer;
-    for (size_t index=0;index<_NBpixels;++index)
-    {
-        type inputMinusMean=*(inputOutputBufferPTR++)-meanValue;
-        stdValue+=inputMinusMean*inputMinusMean;
     }
 
-    stdValue=sqrt(stdValue/((type)_NBpixels));
-    // adjust luminance in regard of mean and std value;
-    inputOutputBufferPTR=inputOutputBuffer;
-    for (size_t index=0;index<_NBpixels;++index, ++inputOutputBufferPTR)
-        *inputOutputBufferPTR=(*(inputOutputBufferPTR)-meanValue)/stdValue;
-}
+    // center and reduct the image (image-mean)/std
+    template <class type>
+    void TemplateBuffer<type>::centerReductImageLuminance(type *inputOutputBuffer)
+    {
+        // if outputBuffer unsassigned, the rewrite the buffer
+        if (inputOutputBuffer==NULL)
+            inputOutputBuffer=Buffer();
+        type meanValue=0, stdValue=0;
+
+        // compute mean value
+        for (register size_t j = 0; j < _NBpixels; ++j)
+            meanValue+=inputOutputBuffer[j];
+        meanValue/=((type)_NBpixels);
+
+        // compute std value
+        register type *inputOutputBufferPTR=inputOutputBuffer;
+        for (size_t index=0;index<_NBpixels;++index)
+        {
+            type inputMinusMean=*(inputOutputBufferPTR++)-meanValue;
+            stdValue+=inputMinusMean*inputMinusMean;
+        }
 
+        stdValue=sqrt(stdValue/((type)_NBpixels));
+        // adjust luminance in regard of mean and std value;
+        inputOutputBufferPTR=inputOutputBuffer;
+        for (size_t index=0;index<_NBpixels;++index, ++inputOutputBufferPTR)
+            *inputOutputBufferPTR=(*(inputOutputBufferPTR)-meanValue)/stdValue;
+    }
 
-template <class type>
-type TemplateBuffer<type>::_abs(const type x)
-{
 
-    if (x>0)
-        return x;
-    else
-        return -x;
-}
+    template <class type>
+    type TemplateBuffer<type>::_abs(const type x)
+    {
 
-template < >
-inline int TemplateBuffer<int>::_abs(const int x)
-{
-    return std::abs(x);
-}
-template < >
-inline double TemplateBuffer<double>::_abs(const double x)
-{
-    return std::fabs(x);
-}
+        if (x>0)
+            return x;
+        else
+            return -x;
+    }
 
-template < >
-inline float TemplateBuffer<float>::_abs(const float x)
-{
-    return std::fabs(x);
-}
+    template < >
+    inline int TemplateBuffer<int>::_abs(const int x)
+    {
+        return std::abs(x);
+    }
+    template < >
+    inline double TemplateBuffer<double>::_abs(const double x)
+    {
+        return std::fabs(x);
+    }
+
+    template < >
+    inline float TemplateBuffer<float>::_abs(const float x)
+    {
+        return std::fabs(x);
+    }
 
 }
 #endif

modules/objdetect/src/linemod.cpp

@@ -856,8 +856,8 @@ bool DepthNormalPyramid::extractTemplate(Template& templ) const
   std::stable_sort(candidates.begin(), candidates.end());
 
   // Use heuristic based on object area for initial distance threshold
-  int area = static_cast<int>(no_mask ? normal.total() : countNonZero(local_mask));
-  float distance = sqrtf(static_cast<float>(area)) / sqrtf(static_cast<float>(num_features)) + 1.5f;
+  float area = no_mask ? (float)normal.total() : (float)countNonZero(local_mask);
+  float distance = sqrtf(area) / sqrtf((float)num_features) + 1.5f;
   selectScatteredFeatures(candidates, templ.features, num_features, distance);
 
   // Size determined externally, needs to match templates for other modalities

samples/cpp/fabmap_sample.cpp

+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+// This file originates from the openFABMAP project:
+// [http://code.google.com/p/openfabmap/]
+//
+// For published work which uses all or part of OpenFABMAP, please cite:
+// [http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=6224843]
+//
+// Original Algorithm by Mark Cummins and Paul Newman:
+// [http://ijr.sagepub.com/content/27/6/647.short]
+// [http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=5613942]
+// [http://ijr.sagepub.com/content/30/9/1100.abstract]
+//
+//                           License Agreement
+//
+// Copyright (C) 2012 Arren Glover [aj.glover@qut.edu.au] and
+//                    Will Maddern [w.maddern@qut.edu.au], all rights reserved.
+//
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+
+#include "opencv2/opencv.hpp"
+#include "opencv2/nonfree/nonfree.hpp"
+
+using namespace cv;
+using namespace std;
+
+int main(int argc, char * argv[]) {
+
+    cout << "This sample program demonstrates the FAB-MAP image matching "
+        "algorithm" << endl << endl;
+
+    string dataDir;
+    if (argc == 1) {
+        dataDir = "fabmap/";
+    } else if (argc == 2) {
+        dataDir = string(argv[1]);
+        dataDir += "/";
+    } else {
+        //incorrect arguments
+        cout << "Usage: fabmap_sample <sample data directory>" <<
+            endl;
+        return -1;
+    }
+
+    FileStorage fs;
+
+    //load/generate vocab
+    cout << "Loading Vocabulary: " <<
+        dataDir + string("vocab_small.yml") << endl << endl;
+    fs.open(dataDir + string("vocab_small.yml"), FileStorage::READ);
+    Mat vocab;
+    fs["Vocabulary"] >> vocab;
+    if (vocab.empty()) {
+        cerr << "Vocabulary not found" << endl;
+        return -1;
+    }
+    fs.release();
+
+    //load/generate training data
+
+    cout << "Loading Training Data: " <<
+        dataDir + string("train_data_small.yml") << endl << endl;
+    fs.open(dataDir + string("train_data_small.yml"), FileStorage::READ);
+    Mat trainData;
+    fs["BOWImageDescs"] >> trainData;
+    if (trainData.empty()) {
+        cerr << "Training Data not found" << endl;
+        return -1;
+    }
+    fs.release();
+
+    //create Chow-liu tree
+    cout << "Making Chow-Liu Tree from training data" << endl <<
+        endl;
+    of2::ChowLiuTree treeBuilder;
+    treeBuilder.add(trainData);
+    Mat tree = treeBuilder.make();
+
+    //generate test data
+    cout << "Extracting Test Data from images" << endl <<
+        endl;
+    Ptr<FeatureDetector> detector =
+        new DynamicAdaptedFeatureDetector(
+        AdjusterAdapter::create("STAR"), 130, 150, 5);
+    Ptr<DescriptorExtractor> extractor =
+        new SurfDescriptorExtractor(1000, 4, 2, false, true);
+    Ptr<DescriptorMatcher> matcher =
+        DescriptorMatcher::create("FlannBased");
+
+    BOWImgDescriptorExtractor bide(extractor, matcher);
+    bide.setVocabulary(vocab);
+
+    vector<string> imageNames;
+    imageNames.push_back(string("stlucia_test_small0000.jpeg"));
+    imageNames.push_back(string("stlucia_test_small0001.jpeg"));
+    imageNames.push_back(string("stlucia_test_small0002.jpeg"));
+    imageNames.push_back(string("stlucia_test_small0003.jpeg"));
+    imageNames.push_back(string("stlucia_test_small0004.jpeg"));
+    imageNames.push_back(string("stlucia_test_small0005.jpeg"));
+    imageNames.push_back(string("stlucia_test_small0006.jpeg"));
+    imageNames.push_back(string("stlucia_test_small0007.jpeg"));
+    imageNames.push_back(string("stlucia_test_small0008.jpeg"));
+    imageNames.push_back(string("stlucia_test_small0009.jpeg"));
+
+    Mat testData;
+    Mat frame;
+    Mat bow;
+    vector<KeyPoint> kpts;
+
+    for(size_t i = 0; i < imageNames.size(); i++) {
+        cout << dataDir + imageNames[i] << endl;
+        frame = imread(dataDir + imageNames[i]);
+        if(frame.empty()) {
+            cerr << "Test images not found" << endl;
+            return -1;
+        }
+
+        detector->detect(frame, kpts);
+
+        bide.compute(frame, kpts, bow);
+
+        testData.push_back(bow);
+
+        drawKeypoints(frame, kpts, frame);
+        imshow(imageNames[i], frame);
+        waitKey(10);
+    }
+
+    //run fabmap
+    cout << "Running FAB-MAP algorithm" << endl <<
+        endl;
+    Ptr<of2::FabMap> fabmap;
+
+    fabmap = new of2::FabMap2(tree, 0.39, 0, of2::FabMap::SAMPLED |
+        of2::FabMap::CHOW_LIU);
+    fabmap->addTraining(trainData);
+
+    vector<of2::IMatch> matches;
+    fabmap->compare(testData, matches, true);
+
+    //display output
+    Mat result_small = Mat::zeros(10, 10, CV_8UC1);
+    vector<of2::IMatch>::iterator l;
+
+    for(l = matches.begin(); l != matches.end(); l++) {
+            if(l->imgIdx < 0) {
+                result_small.at<char>(l->queryIdx, l->queryIdx) =
+                    (char)(l->match*255);
+
+            } else {
+                result_small.at<char>(l->queryIdx, l->imgIdx) =
+                    (char)(l->match*255);
+            }
+    }
+
+    Mat result_large(100, 100, CV_8UC1);
+    resize(result_small, result_large, Size(500, 500), 0, 0, CV_INTER_NN);
+
+    imshow("Confusion Matrix", result_large);
+    waitKey();
+
+    cout << endl << "Press any key to exit" << endl;
+
+    return 0;
+}