[opengm] 01/14: Merge tag 'v2.3.6+20160131' into debian/sid
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sun Feb 14 16:25:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/sid
in repository opengm.
commit e92b7e6fe1e5a68a754e4112cf252d793dcd3dde
Merge: e92a3ab f0c167b
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed Feb 3 08:20:37 2016 +0000
Merge tag 'v2.3.6+20160131' into debian/sid
Upstream snapshot version 2.3.6+20160131
ChangeLog.txt | 13 +-
include/opengm/graphicalmodel/graphicalmodel.hxx | 6 +-
.../fusion_move/permutable_label_fusion_mover.hxx | 5 +-
include/opengm/inference/lpcplex.hxx | 1 +
include/opengm/unittests/test.hxx | 2 +-
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/python/opengm/hdf5/CMakeLists.txt | 3 -
.../python/opengm/inference/CMakeLists.txt | 3 -
.../python/opengm/inference/inference.cpp | 4 +-
src/interfaces/python/opengm/inference/pyCgc.cxx | 166 ++++++-
src/interfaces/python/opengm/inference/pyCgc.hxx | 5 +-
.../opengm/inference/pyIntersectionBased.cxx | 6 +-
.../python/opengm/opengmcore/CMakeLists.txt | 3 -
.../python/opengm/opengmcore/function_injector.py | 2 +-
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 | 9 +-
src/unittest/inference/test_ibfs.cxx | 39 ++
src/unittest/test_functions.cxx | 36 +-
src/unittest/test_partitions.cxx | 13 +-
36 files changed, 1559 insertions(+), 89 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git
More information about the debian-science-commits
mailing list