Updated ChangeLog, README and some copyrights

diff --git a/ChangeLog b/ChangeLog
index aa38da6..e347005 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
-git 765e0048664c14c693ceb70a286e1fc41a2f9d02
+git 39a4865f4eb0b32109ca50e7980028fed835adb9
 --------------------------------------------
+* [Frederik Eaton] Added Gibbs sampler to algorithms
 * Improved documentation of include/dai/{bipgraph.h, prob.h, smallset.h,
   var.h, varset.h, factor.h, enum.h} and of examples/example.cpp
+  Merged TODO and FILEFORMAT into doxygen documentation
 * examples/
   - Moved example.cpp to examples/ 
   - Added examples/example_bipgraph.cpp
@@ -15,11 +17,15 @@ git 765e0048664c14c693ceb70a286e1fc41a2f9d02
   - Removed TFactor<T>::divided_by, use operator/ instead
   - Removed TFactor<T>::divide, use operator/= instead
   - Removed TFactor<T>::partSum(const VarSet&), use marginal(const VarSet&,true) instead
+  - Improved constructors of TProb and TFactor to use iterators instead of pointers
 * Miscellaneous small changes and cleanups:
+  - Changed regression test so that it also works under Windows
   - Changed output stream operator<< for Var and VarSet
+  - Added TProb::draw() function, which draws a random index
   - Cleanup of matlab interface code
   - Small improvement of utils/fginfo
   - Small cleanup of BP code
+  - Switched Makefile.win to GNU Make syntax
 
 
 libDAI-0.2.2 (2008-09-30)

diff --git a/README b/README
index bc283ba..94b2610 100644 (file)
--- a/README
+++ b/README
@@ -12,9 +12,10 @@ with contributions from:
 
 Martijn Leisink
 Giuseppe Passino
+Frederik Eaton
+Bastian Wemmenhove
 Christian Wojek
 Claudio Lima
-Bastian Wemmenhove
 Jiuxiang Hu
 Peter Gober
 
@@ -40,7 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 SCIENTISTS: please be aware that the fact that this program is released as Free
 Software does not excuse you from scientific propriety, which obligates you to
-give appropriate credit! If you write a scientific paper describing research
+give appropriate credit. If you write a scientific paper describing research
 that made substantive use of this program, it is your moral obligation as a
 scientist to (a) mention the fashion in which this software was used, including
 the version number, with a citation to the literature, to allow replication;
@@ -87,7 +88,8 @@ Currently, libDAI supports the following (approximate) inference methods:
     * Tree Expectation Propagation [MiQ04];
     * Generalized Belief Propagation [YFW05];
     * Double-loop GBP [HAK03];
-    * Various variants of Loop Corrected Belief Propagation [MoK07, MoR05].
+    * Various variants of Loop Corrected Belief Propagation [MoK07, MoR05];
+    * Gibbs sampler.
 
 
 Why C++?
@@ -163,10 +165,13 @@ Quick start (windows)
 You need:
 - A recent version of MicroSoft Visual Studio (2008 works)
 - recent boost C++ libraries (version 1.34 or higher)
+- GNU make (can be obtained from http://gnuwin32.sourceforge.net)
+For the regression test, you need:
+- GNU diff (can be obtained from http://gnuwin32.sourceforge.net)
 
 To build the source, edit the Makefile and adapt it to your local setup. Then, run (from the command line)
     
-    nmake -f Makefile.win
+    make -f Makefile.win
 
 If the build was successful, you can test the example program:
 

diff --git a/include/dai/mr.h b/include/dai/mr.h
index fd81dbf..0633a34 100644 (file)
--- a/include/dai/mr.h
+++ b/include/dai/mr.h
@@ -2,6 +2,9 @@
     Radboud University Nijmegen, The Netherlands /
     Max Planck Institute for Biological Cybernetics, Germany
 
+    Copyright (C) 2007  Bastian Wemmenhove
+    Radboud University Nijmegen, The Netherlands
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/mr.cpp b/src/mr.cpp
index bc52353..f4054f0 100644 (file)
--- a/src/mr.cpp
+++ b/src/mr.cpp
@@ -2,6 +2,9 @@
     Radboud University Nijmegen, The Netherlands /
     Max Planck Institute for Biological Cybernetics, Germany
 
+    Copyright (C) 2007  Bastian Wemmenhove
+    Radboud University Nijmegen, The Netherlands
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify