Merge branch 'master' of git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Tue, 20 Apr 2010 11:02:30 +0000 (13:02 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Tue, 20 Apr 2010 11:02:30 +0000 (13:02 +0200)
Conflicts:
ChangeLog

1  2 
ChangeLog

diff --cc ChangeLog
+++ b/ChangeLog
@@@ -14,8 -16,6 +14,12 @@@ git master HEA
    outputs no marginals, VAR only variable marginals, FAC only factor
    marginals, VARFAC both types of marginals, and ALL outputs all
    marginals calculated by the algorithm.
++* Improved mf.h/cpp:
++  - Added an "init" option that allows to initialize randomly
++  - Added an "updates" option that allows to choose between standard
++    mean field and "hard-spin" mean field
 +* Improved exactinf.h/cpp:
 +  - Added ExactInf::findMaximum()
  * Improved treeep.h/cpp:
    - changed TreeEP::construct( const RootedTree& ) into
      TreeEP::construct( const FactorGraph&, const RootedTree& )