Merged SVN head ...

[libdai.git] / include / dai / mr.h

diff --git a/include/dai/mr.h b/include/dai/mr.h
index 2b55e96..34ec957 100644 (file)
--- a/include/dai/mr.h
+++ b/include/dai/mr.h
@@ -1,6 +1,6 @@
 /*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
     Radboud University Nijmegen, The Netherlands
-    
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify
@@ -56,6 +56,9 @@ class MR : public DAIAlgFG {
 
         std::vector<double> Mag;
 
+        double _maxdiff;
+        size_t _iters;
+
     public:
         struct Properties {
             size_t verbose;
@@ -65,36 +68,92 @@ class MR : public DAIAlgFG {
             UpdateType updates;
             InitType inits;
         } props;
-        double maxdiff;
+        static const char *Name;
 
     public:
-        MR() {}
-        MR( const FactorGraph & fg, const PropertySet &opts );
-        void init(size_t Nin, double *_w, double *_th);
-        void makekindex();
-        void read_files();
-        void init_cor();
-        double init_cor_resp();
-        void solvemcav();
-        void solveM();
-        double run();
-        Factor belief( const Var &n ) const;
-        Factor belief( const VarSet &/*ns*/ ) const { 
+        /// Default constructor
+        MR() : DAIAlgFG(), supported(), con(), nb(), tJ(), theta(), M(), kindex(), cors(), N(), Mag(), _maxdiff(), _iters(), props() {}
+
+        /// Construct from FactorGraph fg and PropertySet opts
+        MR( const FactorGraph &fg, const PropertySet &opts );
+
+        /// Copy constructor
+        MR( const MR &x ) : DAIAlgFG(x), supported(x.supported), con(x.con), nb(x.nb), tJ(x.tJ), theta(x.theta), M(x.M), kindex(x.kindex), cors(x.cors), N(x.N), Mag(x.Mag), _maxdiff(x._maxdiff), _iters(x._iters), props(x.props) {}
+
+        /// Clone *this (virtual copy constructor)
+        virtual MR* clone() const { return new MR(*this); }
+
+        /// Create (virtual default constructor)
+        virtual MR* create() const { return new MR(); }
+
+        /// Assignment operator
+        MR& operator=( const MR &x ) {
+            if( this != &x ) {
+                DAIAlgFG::operator=(x);
+                supported = x.supported;
+                con       = x.con; 
+                nb        = x.nb;
+                tJ        = x.tJ;
+                theta     = x.theta;
+                M         = x.M;
+                kindex    = x.kindex;
+                cors      = x.cors;
+                N         = x.N;
+                Mag       = x.Mag;
+                _maxdiff  = x._maxdiff;
+                _iters    = x._iters;
+                props     = x.props;
+            }
+            return *this;
+        }
+
+        /// Identifies itself for logging purposes
+        virtual std::string identify() const;
+
+        /// Get single node belief
+        virtual Factor belief( const Var &n ) const;
+
+        /// Get general belief
+        virtual Factor belief( const VarSet &/*ns*/ ) const { 
             DAI_THROW(NOT_IMPLEMENTED);
             return Factor(); 
         }
-        std::vector<Factor> beliefs() const;
-        Real logZ() const { 
+
+        /// Get all beliefs
+        virtual std::vector<Factor> beliefs() const;
+
+        /// Get log partition sum
+        virtual Real logZ() const { 
             DAI_THROW(NOT_IMPLEMENTED);
             return 0.0; 
         }
-        void init() {}
+
+        /// Clear messages and beliefs
+        virtual void init() {}
+
         /// Clear messages and beliefs corresponding to the nodes in ns
         virtual void init( const VarSet &/*ns*/ ) {
             DAI_THROW(NOT_IMPLEMENTED);
         }
-        static const char *Name;
-        std::string identify() const;
+
+        /// The actual approximate inference algorithm
+        virtual double run();
+
+        /// Return maximum difference between single node beliefs in the last pass
+        virtual double maxDiff() const { return _maxdiff; }
+
+        /// Return number of passes over the factorgraph
+        virtual size_t Iterations() const { return _iters; }
+
+
+        void init(size_t Nin, double *_w, double *_th);
+        void makekindex();
+        void read_files();
+        void init_cor();
+        double init_cor_resp();
+        void solvemcav();
+        void solveM();
+
         double _tJ(size_t i, sub_nb A);
 
         double Omega(size_t i, size_t _j, size_t _l);
@@ -107,14 +166,10 @@ class MR : public DAIAlgFG {
         void sum_subs(size_t j, sub_nb A, double *sum_even, double *sum_odd);
 
         double sign(double a) { return (a >= 0) ? 1.0 : -1.0; }
-        MR* clone() const { return new MR(*this); }
-        /// Create (virtual constructor)
-        virtual MR* create() const { return new MR(); }
-
+        
         void setProperties( const PropertySet &opts );
         PropertySet getProperties() const;
         std::string printProperties() const;
-        double maxDiff() const { return maxdiff; }
 };