[opengm] 322/386: Merge pull request #422 from ilastikdev/structured_learning_2
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Aug 31 08:38:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository opengm.
commit 5855a40fc97ba713df6716f1597397ac9c13ba5b
Merge: 4964326 5b2bb5a
Author: Joerg Kappes <kappes at math.uni-heidelberg.de>
Date: Fri Mar 4 21:05:38 2016 +0100
Merge pull request #422 from ilastikdev/structured_learning_2
Structured learning 2
CMakeLists.txt | 76 +-
ChangeLog.txt | 48 +
Doxyfile.in | 2 +-
README.md | 23 +
include/opengm/functions/accumulated_view.hxx | 159 ++
include/opengm/functions/explicit_function.hxx | 29 +
include/opengm/functions/pottsg.hxx | 163 +-
include/opengm/functions/view.hxx | 2 +-
include/opengm/graphicalmodel/graphicalmodel.hxx | 6 +-
.../modelgenerators/syntheticmodelgenerator.hxx | 15 +-
include/opengm/inference/astar.hxx | 2 +-
.../fusion_move/high_level_fusion_mover.hxx | 429 +++++
.../fusion_move/permutable_label_fusion_mover.hxx | 1004 ++++++++++
.../opengm/inference/auxiliary/planar_graph.hxx | 662 +++++++
.../opengm/inference/auxiliary/planar_maxcut.hxx | 67 +-
.../inference/auxiliary/planar_maxcut_graph.hxx | 4 +-
.../proposal_generator/multi_label_proposals.hxx | 177 ++
include/opengm/inference/cgc.hxx | 730 ++++++++
.../inference/cgc/generate_starting_point.hxx | 56 +
include/opengm/inference/cgc/submodel2.hxx | 998 ++++++++++
include/opengm/inference/cgc/visitors.hxx | 62 +
include/opengm/inference/dmc.hxx | 312 ++++
include/opengm/inference/external/mplp.hxx | 3 +-
include/opengm/inference/external/trws.hxx | 56 +-
include/opengm/inference/fusion_based_inf.hxx | 1945 ++++++++------------
.../opengm/inference/intersection_based_inf.hxx | 1535 +++++++++++++++
include/opengm/inference/lpcplex.hxx | 1 +
include/opengm/inference/multicut.hxx | 173 +-
include/opengm/operations/minimizer.hxx | 2 +-
include/opengm/unittests/blackboxtester.hxx | 27 +-
.../unittests/blackboxtests/blackboxtestgrid.hxx | 11 +-
include/opengm/unittests/test.hxx | 2 +-
include/opengm/utilities/accumulation.hxx | 2 +-
include/opengm/utilities/canonical_view.hxx | 323 ++++
include/opengm/utilities/meminfo.hxx | 3 +-
include/opengm/utilities/metaprogramming.hxx | 16 +
include/opengm/utilities/partitions.hxx | 147 ++
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/external/patches/Planarity/patchPlanarity.sh | 14 +-
src/external/patches/Planarity/planarity.patch | 27 +
src/interfaces/commandline/double/CMakeLists.txt | 6 +
.../commandline/double/opengm_min_sum.cxx | 21 +-
src/interfaces/common/caller/cgc_caller.hxx | 83 +
.../common/caller/intersection_based_caller.hxx | 246 +++
src/interfaces/common/caller/multicut_caller.hxx | 1 +
.../matlab/opengm/m_files/model/openGMModel.m | 14 +-
.../matlab/opengm/mex-src/CMakeLists.txt | 12 +-
.../matlab/opengm/mex-src/model/evaluate.cpp | 72 +
.../matlab/opengm/mex-src/model/getPottsModel.cpp | 30 +-
.../opengm/mex-src/model/setMulticutModel.cpp | 64 +
src/interfaces/python/CMakeLists.txt | 33 +-
src/interfaces/python/examples/freelena.bmp | Bin 0 -> 786554 bytes
.../python/examples/inference_fusion_based.py | 10 +
src/interfaces/python/examples/lena.bmp | Bin 786486 -> 0 bytes
src/interfaces/python/examples/mrf/denoise.py | 4 +-
src/interfaces/python/examples/test_fancy_stuff.py | 107 ++
src/interfaces/python/opengm/__init__.py | 40 +-
src/interfaces/python/opengm/hdf5/CMakeLists.txt | 3 -
.../python/opengm/inference/CMakeLists.txt | 86 +-
.../python/opengm/inference/inf_def_visitor.hxx | 2 +-
.../python/opengm/inference/inference.cpp | 16 +
.../python/opengm/inference/param/cgc_param.hxx | 69 +
.../opengm/inference/param/fusion_based_param.hxx | 53 +-
.../inference/param/intersection_based_param.hxx | 306 +++
.../opengm/inference/param/multicut_param.hxx | 8 +-
src/interfaces/python/opengm/inference/pyCgc.cxx | 175 ++
src/interfaces/python/opengm/inference/pyCgc.hxx | 5 +
.../python/opengm/inference/pyFusionBased.cxx | 61 +-
.../opengm/inference/pyIntersectionBased.cxx | 130 ++
.../opengm/inference/pyIntersectionBased.hxx | 4 +
.../python/opengm/opengmcore/CMakeLists.txt | 3 -
.../python/opengm/opengmcore/__init__.py | 2 +
.../python/opengm/opengmcore/function_injector.py | 2 +-
src/tutorials/c++/applications/CMakeLists.txt | 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/CMakeLists.txt | 6 +
src/unittest/inference/CMakeLists.txt | 20 +
src/unittest/inference/test_cgc.cxx | 139 ++
src/unittest/inference/test_graphcut.cxx | 17 +-
src/unittest/inference/test_ibfs.cxx | 39 +
src/unittest/inference/test_planar_maxcut.cxx | 88 +-
src/unittest/inference/test_trws.cxx | 8 +
src/unittest/test_canonicalview.cxx | 133 ++
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 | 60 +
104 files changed, 11372 insertions(+), 1676 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