Merge branch 'master' of git@git.tuebingen.mpg.de:libdai

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

diff --git a/include/dai/lc.h b/include/dai/lc.h
index 4af42dc..f1fab99 100644 (file)
--- a/include/dai/lc.h
+++ b/include/dai/lc.h
@@ -27,6 +27,7 @@
 #include <dai/daialg.h>
 #include <dai/enum.h>
 #include <dai/factorgraph.h>
+#include <dai/properties.h>
 #include <dai/exceptions.h>
 
 
@@ -44,21 +45,29 @@ class LC : public DAIAlgFG {
         std::vector<Factor>      _beliefs;
 
     public:
-        ENUM6(CavityType,FULL,PAIR,PAIR2,PAIRINT,PAIRCUM,UNIFORM)
-        ENUM3(UpdateType,SEQFIX,SEQRND,NONE)
+        struct Properties {
+            size_t verbose;
+            size_t maxiter;
+            double tol;
+            ENUM6(CavityType,FULL,PAIR,PAIR2,PAIRINT,PAIRCUM,UNIFORM)
+            CavityType cavity;
+            ENUM3(UpdateType,SEQFIX,SEQRND,NONE)
+            UpdateType updates;
+            std::string cavainame;
+            PropertySet cavaiopts;
+            bool reinit;
+        } props;
+        double maxdiff;
 
-        CavityType Cavity() const { return GetPropertyAs<CavityType>("cavity"); }
-        UpdateType Updates() const { return GetPropertyAs<UpdateType>("updates"); }
-        bool reInit() const { return GetPropertyAs<bool>("reinit"); }
-        
+    public:
         /// Default constructor
-        LC() : DAIAlgFG() {};
+        LC() : DAIAlgFG(), _pancakes(), _cavitydists(), _phis(), _beliefs(), props(), maxdiff() {}
         /// Copy constructor
-        LC(const LC & x) : DAIAlgFG(x), _pancakes(x._pancakes), _cavitydists(x._cavitydists), _phis(x._phis), _beliefs(x._beliefs) {};
+        LC(const LC & x) : DAIAlgFG(x), _pancakes(x._pancakes), _cavitydists(x._cavitydists), _phis(x._phis), _beliefs(x._beliefs), props(x.props), maxdiff(x.maxdiff) {}
         /// Clone function
         LC* clone() const { return new LC(*this); }
         /// Construct LC object from a FactorGraph and parameters
-        LC(const FactorGraph & fg, const Properties &opts);
+        LC( const FactorGraph & fg, const PropertySet &opts );
         /// Assignment operator
         LC& operator=(const LC & x) {
             if( this != &x ) {
@@ -67,13 +76,15 @@ class LC : public DAIAlgFG {
                 _cavitydists    = x._cavitydists;
                 _phis           = x._phis;
                 _beliefs        = x._beliefs;
+                props           = x.props;
+                maxdiff         = x.maxdiff;
             }
             return *this;
         }
 
         static const char *Name;
-        double CalcCavityDist( size_t i, const std::string &name, const Properties &opts );
-        double InitCavityDists( const std::string &name, const Properties &opts );
+        double CalcCavityDist( size_t i, const std::string &name, const PropertySet &opts );
+        double InitCavityDists( const std::string &name, const PropertySet &opts );
         long SetCavityDists( std::vector<Factor> &Q );
 
         void init();
@@ -92,9 +103,9 @@ class LC : public DAIAlgFG {
             return 0.0; 
         }
         void CalcBelief (size_t i);
-        const Factor & belief (size_t i) const { return _beliefs[i]; };
-        const Factor & pancake (size_t i) const { return _pancakes[i]; };
-        const Factor & cavitydist (size_t i) const { return _cavitydists[i]; };
+        const Factor &belief (size_t i) const { return _beliefs[i]; };
+        const Factor &pancake (size_t i) const { return _pancakes[i]; };
+        const Factor &cavitydist (size_t i) const { return _cavitydists[i]; };
 
         void clamp( const Var &/*n*/, size_t /*i*/ ) { 
             DAI_THROW(NOT_IMPLEMENTED);
@@ -108,7 +119,9 @@ class LC : public DAIAlgFG {
         virtual void makeCavity(const Var & /*n*/) { 
             DAI_THROW(NOT_IMPLEMENTED);
         }
-        bool checkProperties();
+        void setProperties( const PropertySet &opts );
+        PropertySet getProperties() const;
+        double maxDiff() const { return maxdiff; }
 };