[opengm] 33/40: Merge pull request #8 from opengm/master

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository opengm.

commit 5b790d97feea2e572cd5bb65963d271be329b51c
Merge: 819601a 3f68450
Author: Thorsten B <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Tue Jan 5 14:31:45 2016 +0100

    Merge pull request #8 from opengm/master
    
    from master to my fork

 CMakeLists.txt                                     |  70 ++-
 ChangeLog.txt                                      |  35 +-
 Doxyfile.in                                        |   2 +-
 README.md                                          |  23 +
 include/opengm/inference/cgc/submodel2.hxx         |   7 +-
 include/opengm/inference/lpcplex.hxx               |   1 +
 include/opengm/inference/multicut.hxx              |  69 ++-
 include/opengm/unittests/test.hxx                  |   2 +-
 include/opengm/utilities/meminfo.hxx               |   3 +-
 include/opengm/utilities/tribool.hxx               |  16 +-
 src/converter/CMakeLists.txt                       |  15 +-
 src/converter/matching2opengm-N2N.cxx              | 151 ++++++
 src/converter/matching2opengm.cxx                  | 516 +++++++++++++++++++++
 src/external/patches/IBFS/ibfs-new.patch           |  20 +
 src/external/patches/IBFS/patchIBFS.sh             |  22 +-
 src/interfaces/common/caller/multicut_caller.hxx   |   1 +
 src/interfaces/python/CMakeLists.txt               |  33 +-
 src/interfaces/python/examples/freelena.bmp        | Bin 0 -> 786554 bytes
 src/interfaces/python/examples/lena.bmp            | Bin 786486 -> 0 bytes
 .../python/opengm/inference/inf_def_visitor.hxx    |   4 +-
 src/tutorials/matlab/applications/binaryNDSeg.m    |  57 +++
 src/tutorials/matlab/demo/demo1.m                  |   5 +
 src/tutorials/matlab/demo/demo2.m                  |  67 +++
 src/tutorials/matlab/demo/demo3.m                  |  43 ++
 src/tutorials/matlab/demo/demo4.m                  |  52 +++
 src/tutorials/matlab/demo/denoise_fast.m           |  41 ++
 src/tutorials/matlab/demo/setup.m                  |   5 +
 src/tutorials/python/demo/demo1.py                 |  56 +++
 src/tutorials/python/demo/demo2.py                 |  56 +++
 src/tutorials/python/demo/demo3.py                 |  50 ++
 src/tutorials/python/demo/demo4.py                 |  62 +++
 src/tutorials/python/demo/demo5.py                 |  92 ++++
 src/unittest/inference/CMakeLists.txt              |   6 +
 src/unittest/inference/test_graphcut.cxx           |  17 +-
 src/unittest/inference/test_ibfs.cxx               |  39 ++
 src/unittest/test_canonicalview.cxx                |   1 +
 src/unittest/test_functions.cxx                    |  36 +-
 src/unittest/test_graphicalmodeldecomposer.cxx     | 117 ++---
 src/unittest/test_memoryinfo.cxx                   |  22 +-
 src/unittest/test_operations.cxx                   |  54 +--
 src/unittest/test_partitions.cxx                   |  13 +-
 41 files changed, 1668 insertions(+), 213 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git