Merge branch 'master' of git@git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 19 Apr 2010 16:00:34 +0000 (18:00 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 19 Apr 2010 16:00:34 +0000 (18:00 +0200)
Conflicts:

ChangeLog
tests/testfast.out

1  2 
ChangeLog
tests/testfast.out

diff --cc ChangeLog
+++ b/ChangeLog
@@@ -6,10 -6,12 +6,16 @@@ git master HEA
  * [Stefano Pellegrini] Fixed bug in JTree::findMaximum()
  * Fixed some bugs in the MatLab interface build system
  * Fixed a bug in utils/fginfo.cpp
 +* 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
+ * utils/createfg now has a new factor type ('ISINGUNIFORM') and the old
+   'ISING' factor type has been renamed to 'ISINGGAUSS'
+ * tests/testdai option "marginals" now has five possible values: NONE
+   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 treeep.h/cpp:
    - changed TreeEP::construct( const RootedTree& ) into
      TreeEP::construct( const FactorGraph&, const RootedTree& )
@@@ -221,7 -221,7 +221,7 @@@ TRWB
  # ({x13}, (5.266e-01, 4.734e-01))
  # ({x14}, (6.033e-01, 3.967e-01))
  # ({x15}, (1.558e-01, 8.442e-01))
- MF                                            3.607e-01       1.904e-01       -1.608e+00      1.000e-09       
 -MF_SEQRND                                     3.607e-01       1.904e-01       N/A             N/A             -1.608e+00      1.000e-09       
++MF                                            3.607e-01       1.904e-01       N/A             N/A             -1.608e+00      1.000e-09       
  # ({x0}, (2.053e-01, 7.947e-01))
  # ({x1}, (9.163e-01, 8.373e-02))
  # ({x2}, (1.579e-01, 8.421e-01))