Fixed typo in doxygen FBP update equation, and removed FBP::_scale_var stuff

diff --git a/include/dai/fbp.h b/include/dai/fbp.h
index 7730cc2..fa394dc 100644 (file)
--- a/include/dai/fbp.h
+++ b/include/dai/fbp.h
@@ -41,14 +41,13 @@ namespace dai {
  *
  *  The messages \f$m_{I\to i}(x_i)\f$ are passed from factors \f$I\f$ to variables \f$i\f$. 
  *  The update equation is given by:
- *    \f[ m_{I\to i}(x_i) \propto \left( \sum_{x_{N_I\setminus\{i\}}} f_I(x_I)^{1/c_I} \prod_{j\in N_I\setminus\{i\}} m_{I\to j}^{1-1/c_I}\right)^{c_I} \prod_{J\in N_j\setminus\{I\}} m_{J\to j} \f]
+ *    \f[ m_{I\to i}(x_i) \propto \left( \sum_{x_{N_I\setminus\{i\}}} f_I(x_I)^{1/c_I} \prod_{j\in N_I\setminus\{i\}} m_{I\to j}^{1-1/c_I} \prod_{J\in N_j\setminus\{I\}} m_{J\to j} \right)^{c_I} \f]
  *  After convergence, the variable beliefs are calculated by:
  *    \f[ b_i(x_i) \propto \prod_{I\in N_i} m_{I\to i} \f]
  *  and the factor beliefs are calculated by:
  *    \f[ b_I(x_I) \propto f_I(x_I)^{1/c_I} \prod_{j \in N_I} m_{I\to j}^{1-1/c_I} \prod_{J\in N_j\setminus\{I\}} m_{J\to j} \f]
  *
  *  \todo Implement logZ
- *  \todo Why are the _scale_var necessary?
  *  \todo Add nice way to set scale parameters
  *
  *  \author Frederik Eaton
@@ -57,10 +56,6 @@ class FBP : public BP {
     protected:
         /// Factor scale parameters (indexed by factor ID)
         std::vector<Real> _scale_factor;
-        /// Variable scale parameters (indexed by variable ID)
-        /** \note Equal to sum of scale parameters of neighboring factors
-         */
-        std::vector<Real> _scale_var;
 
     public:
         /// Name of this inference algorithm
@@ -70,12 +65,12 @@ class FBP : public BP {
     /// \name Constructors/destructors
     //@{
         /// Default constructor
-        FBP() : BP(), _scale_factor(), _scale_var() {}
+        FBP() : BP(), _scale_factor() {}
 
         /// Construct from FactorGraph \a fg and PropertySet \a opts
         /** \param opts Parameters @see BP::Properties
          */
-        FBP( const FactorGraph &fg, const PropertySet &opts ) : BP(fg, opts), _scale_factor(), _scale_var() {
+        FBP( const FactorGraph &fg, const PropertySet &opts ) : BP(fg, opts), _scale_factor() {
             setProperties( opts );
             construct();
         }
@@ -95,46 +90,13 @@ class FBP : public BP {
         /// Returns constant reference to vector of all factor scale parameters
         const std::vector<Real>& scaleFs() const { return _scale_factor; }
 
-        /// Returns scale parameter of the \a i 'th variable
-        Real scaleV( size_t i ) const { return _scale_var[i]; }
-
-        /// Returns constant reference to vector of all variable scale parameters
-        const std::vector<Real>& scaleVs() const { return _scale_var; }
-
         /// Sets the scale parameter of the \a I 'th factor to \a c
-        void setScaleF( size_t I, Real c ) {
-            _scale_factor[I] = c;
-            foreach( const Neighbor &i, nbF(I) )
-                recalcScaleV(i);
-        }
+        void setScaleF( size_t I, Real c ) { _scale_factor[I] = c; }
 
         /// Sets the scale parameters of all factors simultaenously
         /** \note Faster than calling setScaleF(size_t,Real) for each factor
          */
-        void setScaleFs( const std::vector<Real> &c ) {
-            _scale_factor = c;
-            recalcScaleVs();
-        }
-
-        /// Recalculates all variable scale parameters
-        /** \note For each variable, its scale parameter is set to 
-         *  the sum of the scale parameters of its neighboring factors.
-         */
-        void recalcScaleVs() {
-            for( size_t i = 0; i < nrVars(); i++ )
-                recalcScaleV(i);
-        }
-
-        /// Recalculates the scale parameter of the \a i 'th variable
-        /** \note The scale parameter is set to the sum of the scale parameters of its neighboring factors.
-         */
-        void recalcScaleV( size_t i ) {
-            // Set _scale_var[i] to the sum of its neighbors
-            Real c_i = 0.0;
-            foreach( const Neighbor &I, nbV(i) )
-                c_i += scaleF(I);
-            _scale_var[i] = c_i;
-        }
+        void setScaleFs( const std::vector<Real> &c ) { _scale_factor = c; }
 
     protected:
         // Calculate the updated message from the \a _I 'th neighbor of variable \a i to variable \a i
@@ -145,13 +107,6 @@ class FBP : public BP {
 
         // Helper function for constructors
         virtual void construct();
-
-        /// (Re)constructs the scale parameters data structures
-        void constructScaleParams() {
-            _scale_factor.resize( nrFactors(), 1.0 );
-            _scale_var.resize( nrVars() );
-            recalcScaleVs();
-        }
 };
 
 

diff --git a/src/fbp.cpp b/src/fbp.cpp
index 056cbfa..cc16223 100644 (file)
--- a/src/fbp.cpp
+++ b/src/fbp.cpp
@@ -188,7 +188,7 @@ void FBP::calcBeliefF( size_t I, Prob &p ) const {
 
 void FBP::construct() {
     BP::construct();
-    constructScaleParams();
+    _scale_factor.resize( nrFactors(), 1.0 );
 }