Updated copyrights

diff --git a/ChangeLog b/ChangeLog
index 91987de..66326a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,14 @@
 libDAI-0.2.2 (2008-??-??)
 -------------------------
 
-* Now compiles also under Visual C++.
+* Now compiles also under Visual C++ and cygwin.
 * Added Exceptions framework.
+* Approximate inference methods now report the number of iterations needed.
+* Added damping to various algorithms to improve convergence properties.
 * Replaced ENUM2,ENUM3,ENUM4,ENUM5,ENUM6 by single DAI_ENUM macro.
 * Removed utils/remove_short_loops and matlab/remove_short_loops.
 * Added more features to utils/createfg for creating factor graphs.
+* Replaced sub_nb class in mr.h by boost::dynamic_bitset.
 * Pervasive change of BipartiteGraph implementation (based on an idea by
   Giuseppe Passino). BipartiteGraph no longer stores the node properties 
   (former _V1 and _V2), nor does it store a dense adjacency matrix anymore, 
@@ -20,41 +23,46 @@ libDAI-0.2.2 (2008-??-??)
   - Replaced multind by Permute
   - Added MultiFor
   - Added State
-* Improved factor.h (merged from SVN head): mainly new functionality
-* Moved everything into namespace "dai"
-* Added ExactInf class for brute force exact inference
-* Renamed DEBUG to DAI_DEBUG to avoid conflicts
-* Added conditional compilation of inference methods
+* Improved factor.h (merged from SVN head): mainly new functionality.
+* Moved everything into namespace "dai".
+* Added ExactInf class for brute force exact inference.
+* Renamed DEBUG to DAI_DEBUG to avoid conflicts.
+* Added conditional compilation of inference methods.
 * Contributions by Peter Gober:
-  - Renamed variable _N in mr.* for compatibility with g++ under cygwin
+  - Renamed variable _N in mr.* for compatibility with g++ under cygwin.
 * Contributions by Giuseppe Passino:
-  - removed "using namespace std;" from header files - bad practice
-  - moved header files in include/dai and sources in src
-  - changed #ifndefs to GNU style
-  - added extra warning checks (-W -Wextra) and fixed resulting warnings
+  - removed "using namespace std;" from header files - bad practice;
+  - moved header files in include/dai and sources in src;
+  - changed #ifndefs to GNU style;
+  - added extra warning checks (-W -Wextra) and fixed resulting warnings;
   - dai::TProb: 
-    o removed copy constructor and assignment operators (redundant)
-    o implementation of some methods via STL algorithms
-    o added methods takeExp, takeLog, takeLog0 for transformation in-place
-    o explicit constructor (prevents implicit conversion from size_t to TProb)
-    o added operator+,+=,-,-=, with argument T (for calculations in log-scale)
+    o removed copy constructor and assignment operators (redundant);
+    o implementation of some methods via STL algorithms;
+    o added methods takeExp, takeLog, takeLog0 for transformation in-place;
+    o explicit constructor (prevents implicit conversion from size_t to TProb);
+    o added operator+,+=,-,-=, with argument T (for calculations in log-scale);
   - Added "logdomain" property to BP, a boolean that controls whether 
     calculations are done in the log-domain or in the linear domain;
     doing calculations in the log-domain may help if the numerical range
     of a double is too small.
 * Contributions by Christian Wojek:
   - New FactorGraph constructor that constructs from given ranges of factors
-    and variables
+    and variables;
   - Optimization of FactorGraph constructors using tr1::unordered_map.
+* Contributions by Claudio Lima:
+  - Added Max-Product functinoality to BP.
 * FactorGraph constructors no longer check for short loops (huge speed
   increase for large factor graphs), nor for negative entries. Also, the 
   normtype is now Prob::NORMPROB by default.
 * VarSet is now implemented using a std::vector<Var> instead of a
-  std::set<Var>, which yields a significant speed improvement.
-* Improved MaxSpanningTreePrims algorithm (uses boost::graph)
-* Small optimization in Diffs
+  std::set<Var>, which yields a significant speed improvement. Furthermore,
+  the implementation has been generalized, resulting in the small_set<T> class
+  which can be used to represent sets of small cardinality; VarSet is the
+  specialization with T = Var.
+* Improved MaxSpanningTreePrims algorithm (uses boost::graph).
+* Small optimization in Diffs.
 * Replaced Complex with real numbers (negative potentials is just not
-  used enough to warrant the additional "complexity" :))
+  used enough to warrant the additional "complexity" :)).
 * Moved Properties and MaxDiff frameworks from InfAlg to each individual
   inference algorithm, because the Properties framework was not as 
   convenient as I hoped, and not every inference algorithm needs a maxdiff
@@ -63,7 +71,8 @@ libDAI-0.2.2 (2008-??-??)
   entangled) code.
 * Improved ClusterGraph implementation, yielding significant speedups
   for the JunctionTree algorithm on large factorgraphs.
-* Improved documetation
+* Improved documetation.
+* Removed x2x.
 * Interface changes:
   - VarSet::
       VarSet::stateSpace() -> nrStates(const VarSet &)

diff --git a/Makefile b/Makefile
index 7c01696..b43d620 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
-#   Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-#   Radboud University Nijmegen, The Netherlands
+#   Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+#   Radboud University Nijmegen, The Netherlands /
+#   Max Planck Institute for Biological Cybernetics, Germany
 #   
 #   This file is part of libDAI.
 #

diff --git a/Makefile.win b/Makefile.win
index 876e988..e8a1b80 100755 (executable)
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,5 +1,6 @@
-#   Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]\r
-#   Radboud University Nijmegen, The Netherlands\r
+#   Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]\r
+#   Radboud University Nijmegen, The Netherlands /\r
+#   Max Planck Institute for Biological Cybernetics, Germany\r
 #   \r
 #   This file is part of libDAI.\r
 #\r

diff --git a/README b/README
index f8e36a7..954f794 100644 (file)
--- a/README
+++ b/README
@@ -1,11 +1,12 @@
 libDAI - A free/open source C++ library for Discrete Approximate Inference methods
 ==================================================================================
 
-v 0.2.1 - May 26, 2008
+v 0.2.2 - May 26, 2008
 
 
-Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-Radboud University Nijmegen, The Netherlands
+Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+Radboud University Nijmegen, The Netherlands /
+Max Planck Institute for Biological Cybernetics, Germany
     
 
 ----------------------------------------------------------------------------------

diff --git a/STATUS b/STATUS
index f418fbb..010714f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,29 +1,9 @@
-OPTIMIZATION:
-- BipartiteGraph::isConnected should be optimized using boost::graph
-- Can the FactorGraph constructors be optimized further?
-- Cache second-order neighborhoods (delta's) in BipGraph?
-- Replace VarSets by small_set<size_t> if appropriate, in order to minimize the use of findVar().
-
-- A DAIAlg<T> should not inherit from a FactorGraph/RegionGraph, but should store a reference to it
-
 TODO FOR RELEASE:
-- http://www.boost.org/development/requirements.html#Design_and_Programming
 - Test {Visual C++, cygwin, gcc various version} compatibility; state tested compilers/build environments in README
 - Figure out which libraries are required and document in README
   boost headers, boost::program_options library, boost::graph library,
   boost::math library (under Windows)
-- Change email address
-
-FILES IN SVN HEAD RELEVANT FOR A LATER RELEASE:
-       matlab/dai_potstrength.*
-       matlab/dai_bpconvbound.*
-       utils/fg2dot.cpp
-       utils/viewfg
-       tests/aliases.conf
-       tests/testall
-       tests/test.cpp ("limit")
-       all subdirs not included in git:
-               bugs, experimental, tests/errorbounds, tests/kees, tests/large, tests/ldpc, tests/uai
+- Complete doxygen documentation
 
 DOCUMENTATION READY:
 - bipgraph.h, bipgraph.cpp

diff --git a/TODO b/TODO
index 6a563c6..003e9ff 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,8 +1,20 @@
-- Idea: use a PropertySet as output of a DAIAlg, instead of functions like
-  maxDiff and Iterations().
+- Add comments in example.cpp, add documentation.
+- Write documentation.
+- Improve error handling.
+- http://www.boost.org/development/requirements.html#Design_and_Programming
 
-- Idea: a FactorGraph and a RegionGraph are often equipped with
-extra properties for nodes and edges. The code to initialize those
+OPTIMIZATION:
+- BipartiteGraph::isConnected should be optimized using boost::graph
+- Can the FactorGraph constructors be optimized further?
+- Cache second-order neighborhoods (delta's) in BipGraph?
+- Replace VarSets by small_set<size_t> if appropriate, in order to minimize the use of findVar().
+- A DAIAlg<T> should not inherit from a FactorGraph/RegionGraph, but should store a reference to it
+
+IDEAS:
+- Use a PropertySet as output of a DAIAlg, instead of functions like maxDiff and Iterations().
+
+- A FactorGraph and a RegionGraph are often equipped with
+additional properties for nodes and edges. The code to initialize those
 is often quite similar; maybe this can be abstracted to classes
 like ExtFactorGraph and ExtRegionGraph (Ext stands for Extended), e.g.
 template <typename NodeProperties, typename EdgeProperties>
@@ -22,7 +34,7 @@ the typeid, comparing it with Empty, and doing something special in that case
 The main disadvantage of this approach seems to be that it leads to even more
 entanglement.
 
-- THIS SMELLS LIKE A GOOD IDEA: instead of polymorphism by inheritance,
+- Instead of polymorphism by inheritance,
 use polymorphism by template parameterization. For example, the real reason
 you introduced the complicated inheritance scheme was for functions like
     Factor calcMarginal( const InferenceAlgorithm & obj, const VarSet & ns, bool reInit );
@@ -37,6 +49,7 @@ the ability to calculate marginals, the ability to calculate bounds, the ability
 to calculate MAP states, etcetera. Then, use traits classes in order to be able to
 query the capabilities of the model. For example, you would be able to query whether
 the inference algorithm supports calculation of logZ.
+Unfortunately, this is compile-time polymorphism, whereas tests/test needs runtime polymorphism.
 
 - If you ever do a rewrite, make sure that the graphical properties are
 not entangled with the probabilistic properties. E.g., a factor graph
@@ -95,16 +108,11 @@ Each DAIAlg should have its own _properties struct and handle conversion.
   they construct a new object without copying the FactorGraph. Or they can be made
   simply methods of the general InfAlg class.
 
-- Add comments in example.cpp, add documentation.
-
-- Write documentation.
-
-- Improve error handling.
 
 
 DIFFICULT
 
-- Bug: TreeEP sometimes returns NANs.
+- What to do in case of NANs?
 
 - Bug: TreeEP::logZ() seems to be wrong (?).
 
@@ -113,9 +121,9 @@ DIFFICULT
 
 OPTIONAL
 
-- Use Expat XML parser for IO and define a XML based fileformat for .fg files?
+- Define a better fileformat for .fg files (maybe using XML)?
 
-- Port to GNU autotool chain?
+- Find a good multi-platform build system (GNU autotool? Boost JAM?)
 
 - Another design question that needs to be answered: should a BP object own a
   FactorGraph, or only store a reference to a FactorGraph (which can optimize
@@ -138,8 +146,6 @@ could also be implemented in the factor itself, which could maintain its state
 - Think about the _fac2ind variable: a better implementation of this feature is
 probably possible.
 
-- Changed() methods?
-
 - Optimize GBP with precalculated indices.
 
 - Optimize all indices as follows: keep a cache of all indices that have been

diff --git a/example.cpp b/example.cpp
index 6056ce4..47c83f3 100644 (file)
--- a/example.cpp
+++ b/example.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/alldai.h b/include/dai/alldai.h
index 3f46faa..7772657 100644 (file)
--- a/include/dai/alldai.h
+++ b/include/dai/alldai.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/bipgraph.h b/include/dai/bipgraph.h
index 01229e7..e11ca0e 100644 (file)
--- a/include/dai/bipgraph.h
+++ b/include/dai/bipgraph.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/bp.h b/include/dai/bp.h
index ba75fbd..ba53c8e 100644 (file)
--- a/include/dai/bp.h
+++ b/include/dai/bp.h
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
 
     This file is part of libDAI.
 

diff --git a/include/dai/clustergraph.h b/include/dai/clustergraph.h
index 9d2772e..211f636 100644 (file)
--- a/include/dai/clustergraph.h
+++ b/include/dai/clustergraph.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/daialg.h b/include/dai/daialg.h
index 1147b22..b4e0419 100644 (file)
--- a/include/dai/daialg.h
+++ b/include/dai/daialg.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/diffs.h b/include/dai/diffs.h
index 589076c..cf06f09 100644 (file)
--- a/include/dai/diffs.h
+++ b/include/dai/diffs.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/enum.h b/include/dai/enum.h
index e99bb5e..e6b926a 100644 (file)
--- a/include/dai/enum.h
+++ b/include/dai/enum.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/exactinf.h b/include/dai/exactinf.h
index 246b433..7d69c68 100644 (file)
--- a/include/dai/exactinf.h
+++ b/include/dai/exactinf.h
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
 
     This file is part of libDAI.
 

diff --git a/include/dai/exceptions.h b/include/dai/exceptions.h
index 9eddcaf..dc46756 100644 (file)
--- a/include/dai/exceptions.h
+++ b/include/dai/exceptions.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/factor.h b/include/dai/factor.h
index a7e534b..9801546 100644 (file)
--- a/include/dai/factor.h
+++ b/include/dai/factor.h
@@ -1,7 +1,10 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     Copyright (C) 2002  Martijn Leisink  [martijn@mbfys.kun.nl]
     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/include/dai/factorgraph.h b/include/dai/factorgraph.h
index 7e7f4d9..ffb5315 100644 (file)
--- a/include/dai/factorgraph.h
+++ b/include/dai/factorgraph.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/hak.h b/include/dai/hak.h
index 01373b5..7401e46 100644 (file)
--- a/include/dai/hak.h
+++ b/include/dai/hak.h
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
 
     This file is part of libDAI.
 

diff --git a/include/dai/index.h b/include/dai/index.h
index 83d35af..9193d5b 100644 (file)
--- a/include/dai/index.h
+++ b/include/dai/index.h
@@ -1,7 +1,10 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     Copyright (C) 2002  Martijn Leisink  [martijn@mbfys.kun.nl]
     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/include/dai/jtree.h b/include/dai/jtree.h
index 032d84d..db1ddd1 100644 (file)
--- a/include/dai/jtree.h
+++ b/include/dai/jtree.h
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
 
     This file is part of libDAI.
 

diff --git a/include/dai/lc.h b/include/dai/lc.h
index 4f31426..70f7c69 100644 (file)
--- a/include/dai/lc.h
+++ b/include/dai/lc.h
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
 
     This file is part of libDAI.
 

diff --git a/include/dai/mf.h b/include/dai/mf.h
index 90e5a4f..185e80b 100644 (file)
--- a/include/dai/mf.h
+++ b/include/dai/mf.h
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
 
     This file is part of libDAI.
 

diff --git a/include/dai/mr.h b/include/dai/mr.h
index d1af608..a15b7b3 100644 (file)
--- a/include/dai/mr.h
+++ b/include/dai/mr.h
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
 
     This file is part of libDAI.
 

diff --git a/include/dai/prob.h b/include/dai/prob.h
index 53c4598..7e3d62f 100644 (file)
--- a/include/dai/prob.h
+++ b/include/dai/prob.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/properties.h b/include/dai/properties.h
index 2590ff7..f77dc53 100644 (file)
--- a/include/dai/properties.h
+++ b/include/dai/properties.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/regiongraph.h b/include/dai/regiongraph.h
index 887515b..aa4829f 100644 (file)
--- a/include/dai/regiongraph.h
+++ b/include/dai/regiongraph.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/treeep.h b/include/dai/treeep.h
index d98d02f..9ec2045 100644 (file)
--- a/include/dai/treeep.h
+++ b/include/dai/treeep.h
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
 
     This file is part of libDAI.
 

diff --git a/include/dai/util.h b/include/dai/util.h
index 900f275..670fef9 100644 (file)
--- a/include/dai/util.h
+++ b/include/dai/util.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/include/dai/var.h b/include/dai/var.h
index 4d027b9..5deb3ff 100644 (file)
--- a/include/dai/var.h
+++ b/include/dai/var.h
@@ -1,7 +1,10 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     Copyright (C) 2002  Martijn Leisink  [martijn@mbfys.kun.nl]
     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/include/dai/varset.h b/include/dai/varset.h
index 30ff83e..fc41e52 100644 (file)
--- a/include/dai/varset.h
+++ b/include/dai/varset.h
@@ -1,7 +1,10 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     Copyright (C) 2002  Martijn Leisink  [martijn@mbfys.kun.nl]
     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/include/dai/weightedgraph.h b/include/dai/weightedgraph.h
index 231a37d..6560119 100644 (file)
--- a/include/dai/weightedgraph.h
+++ b/include/dai/weightedgraph.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/matlab/dai.cpp b/matlab/dai.cpp
index 70530d0..c6f26dd 100644 (file)
--- a/matlab/dai.cpp
+++ b/matlab/dai.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/matlab/dai_potstrength.cpp b/matlab/dai_potstrength.cpp
index ab83201..af2d2f0 100644 (file)
--- a/matlab/dai_potstrength.cpp
+++ b/matlab/dai_potstrength.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/matlab/dai_readfg.cpp b/matlab/dai_readfg.cpp
index d6c6adc..7fcc411 100644 (file)
--- a/matlab/dai_readfg.cpp
+++ b/matlab/dai_readfg.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/matlab/dai_writefg.cpp b/matlab/dai_writefg.cpp
index 1a44577..bbe1761 100644 (file)
--- a/matlab/dai_writefg.cpp
+++ b/matlab/dai_writefg.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/matlab/matlab.cpp b/matlab/matlab.cpp
index 9e9bf25..a2b053e 100644 (file)
--- a/matlab/matlab.cpp
+++ b/matlab/matlab.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/matlab/matlab.h b/matlab/matlab.h
index 04abe8f..6d6dc84 100644 (file)
--- a/matlab/matlab.h
+++ b/matlab/matlab.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/alldai.cpp b/src/alldai.cpp
index ebabd1f..ee5b7b8 100644 (file)
--- a/src/alldai.cpp
+++ b/src/alldai.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/bipgraph.cpp b/src/bipgraph.cpp
index d27b8c0..2c5f4b3 100644 (file)
--- a/src/bipgraph.cpp
+++ b/src/bipgraph.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/bp.cpp b/src/bp.cpp
index ac431a2..accb5f7 100644 (file)
--- a/src/bp.cpp
+++ b/src/bp.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/clustergraph.cpp b/src/clustergraph.cpp
index f823fd8..6446fe4 100644 (file)
--- a/src/clustergraph.cpp
+++ b/src/clustergraph.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/daialg.cpp b/src/daialg.cpp
index 0fabbfb..133143c 100644 (file)
--- a/src/daialg.cpp
+++ b/src/daialg.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/exactinf.cpp b/src/exactinf.cpp
index 1940025..bb56a45 100644 (file)
--- a/src/exactinf.cpp
+++ b/src/exactinf.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/exceptions.cpp b/src/exceptions.cpp
index 65b6464..12b74eb 100644 (file)
--- a/src/exceptions.cpp
+++ b/src/exceptions.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/factorgraph.cpp b/src/factorgraph.cpp
index c28e864..3851923 100644 (file)
--- a/src/factorgraph.cpp
+++ b/src/factorgraph.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/hak.cpp b/src/hak.cpp
index 330b0fb..92260ea 100644 (file)
--- a/src/hak.cpp
+++ b/src/hak.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/jtree.cpp b/src/jtree.cpp
index a64d84a..463abb3 100644 (file)
--- a/src/jtree.cpp
+++ b/src/jtree.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/lc.cpp b/src/lc.cpp
index 3aae934..c37c9fd 100644 (file)
--- a/src/lc.cpp
+++ b/src/lc.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/mf.cpp b/src/mf.cpp
index 5a45b9f..9d35b8f 100644 (file)
--- a/src/mf.cpp
+++ b/src/mf.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     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 9816982..4fe2e31 100644 (file)
--- a/src/mr.cpp
+++ b/src/mr.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/properties.cpp b/src/properties.cpp
index 9166b32..38a8824 100644 (file)
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/regiongraph.cpp b/src/regiongraph.cpp
index 1e52bd4..267a4fd 100644 (file)
--- a/src/regiongraph.cpp
+++ b/src/regiongraph.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/treeep.cpp b/src/treeep.cpp
index d21ed5f..e50be83 100644 (file)
--- a/src/treeep.cpp
+++ b/src/treeep.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/util.cpp b/src/util.cpp
index 728f62f..a5d8cc0 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/src/varset.cpp b/src/varset.cpp
index ab4f2de..d45c4d6 100644 (file)
--- a/src/varset.cpp
+++ b/src/varset.cpp
@@ -1,4 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     Copyright (C) 2002  Martijn Leisink  [martijn@mbfys.kun.nl]
     Radboud University Nijmegen, The Netherlands
 
@@ -20,14 +23,6 @@
 */
 
 
-/*#include <vector>
-#include <map>
-#include <algorithm>
-#include <iostream>
-#include <cassert>
-#include <dai/var.h>
-#include <dai/util.h>
-*/
 #include <dai/varset.h>
 
 

diff --git a/src/weightedgraph.cpp b/src/weightedgraph.cpp
index 2cfdf08..78d2069 100644 (file)
--- a/src/weightedgraph.cpp
+++ b/src/weightedgraph.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/tests/test.cpp b/tests/test.cpp
index 5f24776..4e8117e 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/utils/createfg.cpp b/utils/createfg.cpp
index ebfdb54..009caec 100644 (file)
--- a/utils/createfg.cpp
+++ b/utils/createfg.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/utils/fg2dot.cpp b/utils/fg2dot.cpp
index b84b1da..ec4b94c 100644 (file)
--- a/utils/fg2dot.cpp
+++ b/utils/fg2dot.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify

diff --git a/utils/fginfo.cpp b/utils/fginfo.cpp
index 1e8b88a..df6a942 100644 (file)
--- a/utils/fginfo.cpp
+++ b/utils/fginfo.cpp
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
+/*  Copyright (C) 2006-2008  Joris Mooij  [joris dot mooij at tuebingen dot mpg dot de]
+    Radboud University Nijmegen, The Netherlands /
+    Max Planck Institute for Biological Cybernetics, Germany
+
     This file is part of libDAI.
 
     libDAI is free software; you can redistribute it and/or modify