Updated copyright headers

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

diff --git a/include/dai/exactinf.h b/include/dai/exactinf.h
index 3c398dd..ae4aef7 100644 (file)
--- a/include/dai/exactinf.h
+++ b/include/dai/exactinf.h
@@ -1,22 +1,17 @@
-/*  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.
+/*  This file is part of libDAI - http://www.libdai.org/
+ *
+ *  libDAI is licensed under the terms of the GNU General Public License version
+ *  2, or (at your option) any later version. libDAI is distributed without any
+ *  warranty. See the file COPYING for more details.
+ *
+ *  Copyright (C) 2006-2009  Joris Mooij  [joris dot mooij at libdai dot org]
+ *  Copyright (C) 2006-2007  Radboud University Nijmegen, The Netherlands
+ */
 
-    libDAI is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
 
-    libDAI is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with libDAI; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+/// \file
+/// \brief Defines ExactInf class
+/// \todo Improve documentation
 
 
 #ifndef __defined_libdai_exactinf_h
@@ -32,12 +27,18 @@
 namespace dai {
 
 
+/// Exact inference algorithm using brute force enumeration (mainly useful for testing purposes)
 class ExactInf : public DAIAlgFG {
     public:
+        /// Parameters of this inference algorithm
         struct Properties {
+            /// Verbosity
             size_t verbose;
         } props;
 
+        /// Name of this inference algorithm
+        static const char *Name;
+
     private:
         std::vector<Factor> _beliefsV;
         std::vector<Factor> _beliefsF;
@@ -46,89 +47,41 @@ class ExactInf : public DAIAlgFG {
     public:
         /// Default constructor
         ExactInf() : DAIAlgFG(), props(), _beliefsV(), _beliefsF(), _logZ(0) {}
-        
-        /// Copy constructor
-        ExactInf( const ExactInf &x ) : DAIAlgFG(x), props(x.props), _beliefsV(x._beliefsV), _beliefsF(x._beliefsF), _logZ(x._logZ) {}
-
-        /// Clone (virtual copy constructor)
-        virtual ExactInf* clone() const {
-            return new ExactInf(*this);
-        }
 
         /// Construct from FactorGraph fg and PropertySet opts
         ExactInf( const FactorGraph &fg, const PropertySet &opts ) : DAIAlgFG(fg), props(), _beliefsV(), _beliefsF(), _logZ() {
             setProperties( opts );
-            create();
-        }
-        
-        /// Assignment operator
-        ExactInf& operator=( const ExactInf &x ) {
-            if( this != &x ) {
-                DAIAlgFG::operator=( x );
-                props     = x.props;
-                _beliefsV = x._beliefsV;
-                _beliefsF = x._beliefsF;
-                _logZ     = x._logZ;
-            }
-            return *this;
+            construct();
         }
 
-/*        /// Create (virtual constructor)
-        virtual ExactInf* create() const {
-            return new ExactInf();
-        }
-*/
-        /// Return maximum difference between single node 
-        /// beliefs for two consecutive iterations
-        virtual double maxDiff() const {
-            DAI_THROW(NOT_IMPLEMENTED);
-            return 0.0;
-        }
-        
-        /// Identifies itself for logging purposes
-        virtual std::string identify() const;
-
-        /// Get single node belief
-        virtual Factor belief( const Var &n ) const {
-            return beliefV( findVar( n ) ); 
-        }
-
-        /// Get general belief
-        virtual Factor belief( const VarSet &n ) const;
 
-        /// Get all beliefs
+        /// @name General InfAlg interface
+        //@{
+        virtual ExactInf* clone() const { return new ExactInf(*this); }
+        virtual std::string identify() const;
+        virtual Factor belief( const Var &n ) const { return beliefV( findVar( n ) ); }
+        virtual Factor belief( const VarSet &ns ) const;
         virtual std::vector<Factor> beliefs() const;
-
-        /// Get log partition sum
-        virtual Real logZ() const {
-            return _logZ;
-        }
-
-        /// Clear messages and beliefs
+        virtual Real logZ() const { return _logZ; }
         virtual void init();
-
-        /// Clear messages and beliefs corresponding to the nodes in ns
-        virtual void init( const VarSet &/*ns*/ ) {}
-
-        /// The actual approximate inference algorithm
+        virtual void init( const VarSet &/*ns*/ ) { DAI_THROW(NOT_IMPLEMENTED); }
         virtual double run();
+        virtual double maxDiff() const { DAI_THROW(NOT_IMPLEMENTED); return 0.0; }
+        virtual size_t Iterations() const { DAI_THROW(NOT_IMPLEMENTED); return 0; }
+        //@}
 
-        /// Name of this inference method
-        static const char *Name;
 
-        void create();
-        void undoProbs( const VarSet &ns ) { FactorGraph::undoProbs(ns); init(ns); }
+        /// @name Additional interface specific for ExactInf
+        //@{
+        Factor beliefV( size_t i ) const { return _beliefsV[i]; }
+        Factor beliefF( size_t I ) const { return _beliefsF[I]; }
+        //@}
+
+    private:
+        void construct();
         void setProperties( const PropertySet &opts );
         PropertySet getProperties() const;
         std::string printProperties() const;
-
-        Factor beliefV( size_t i ) const { 
-            return _beliefsV[i]; 
-        }
-
-        Factor beliefF( size_t I ) const { 
-            return _beliefsF[I]; 
-        }
 };