[opengm] 352/386: Merge pull request #442 from svenpeter42/master
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Aug 31 08:38:32 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 f76737ed5ba22ad0823e864ffd135db6e2d97d13
Merge: cb21dba 00163b3
Author: Joerg Kappes <kappes at math.uni-heidelberg.de>
Date: Thu Mar 31 21:29:37 2016 +0200
Merge pull request #442 from svenpeter42/master
git surgery part #1 - remove merged branch
.gitignore | 7 -
CMakeLists.txt | 16 +-
README.md | 4 +-
fubar/brown_horse.py | 127 ----------
fubar/brown_horse2.py | 136 ----------
fubar/brown_horse_sp.py | 206 ---------------
fubar/example1.py | 35 ---
fubar/make_grid_potts_dset.py | 1 -
fubar/make_mc_dset.py | 19 --
fubar/max_likelihood_example.py | 40 ---
fubar/noisy_squares_3_labels.py | 121 ---------
fubar/pascal_voc/convertPascalVOC.py | 94 -------
fubar/pascal_voc/convertPascalVOCNew.py | 108 --------
fubar/pascal_voc/learnPascalVOC.py | 35 ---
fubar/python_stuff.py | 102 --------
fubar/real_example.py | 96 -------
fubar/real_example_2.py | 150 -----------
fubar/simple_sp.py | 165 ------------
fubar/toy_dataset.py | 125 ---------
fubar/whorse.py | 79 ------
.../opengm/datastructures/marray/marray_hdf5.hxx | 25 --
.../opengm/functions/function_properties_base.hxx | 11 +-
include/opengm/functions/l_potts.hxx | 202 +++++++++++++++
include/opengm/functions/potts.hxx | 4 +-
include/opengm/functions/readme.txt | 3 -
include/opengm/functions/unary_loss_function.hxx | 151 -----------
include/opengm/functions/view_convert_function.hxx | 36 +--
include/opengm/graphicalmodel/graphicalmodel.hxx | 44 +---
.../graphicalmodel/graphicalmodel_factor.hxx | 27 --
.../graphicalmodel_function_wrapper.hxx | 79 ------
include/opengm/graphicalmodel/parameters.hxx | 44 ++++
include/opengm/graphicalmodel/weights.hxx | 282 ---------------------
include/opengm/inference/alphabetaswap.hxx | 33 +--
include/opengm/inference/alphaexpansion.hxx | 85 +++----
include/opengm/inference/alphaexpansionfusion.hxx | 75 ++----
include/opengm/inference/astar.hxx | 129 ++++------
.../auxiliary/fusion_move/fusion_mover.hxx | 27 --
.../auxiliary/lp_solver/lp_solver_interface.hxx | 12 +-
include/opengm/inference/bruteforce.hxx | 21 +-
include/opengm/inference/combilp.hxx | 11 -
.../dualdecomposition/dualdecomposition_bundle.hxx | 28 --
.../dualdecomposition_subgradient.hxx | 37 +--
include/opengm/inference/dynamicprogramming.hxx | 20 --
include/opengm/inference/external/ad3.hxx | 23 --
include/opengm/inference/external/daoopt.hxx | 26 --
include/opengm/inference/external/fastPD.hxx | 16 --
include/opengm/inference/external/mrflib.hxx | 15 --
include/opengm/inference/external/qpbo.hxx | 35 +--
include/opengm/inference/external/trws.hxx | 38 +--
include/opengm/inference/fusion_based_inf.hxx | 23 +-
include/opengm/inference/graphcut.hxx | 29 +--
include/opengm/inference/greedygremlin.hxx | 19 +-
include/opengm/inference/hqpbo.hxx | 23 +-
include/opengm/inference/icm.hxx | 63 ++---
include/opengm/inference/infandflip.hxx | 23 --
include/opengm/inference/inference.hxx | 9 -
include/opengm/inference/lazyflipper.hxx | 161 +++++-------
include/opengm/inference/loc.hxx | 29 ---
include/opengm/inference/lp_inference_base.hxx | 1 +
include/opengm/inference/lpcplex.hxx | 99 ++------
include/opengm/inference/lpcplex2.hxx | 10 -
include/opengm/inference/lpgurobi.hxx | 80 ++----
include/opengm/inference/lpgurobi2.hxx | 10 -
include/opengm/inference/lsatr.hxx | 26 +-
.../inference/messagepassing/messagepassing.hxx | 30 ---
.../inference/messagepassing/messagepassing_bp.hxx | 11 -
.../messagepassing/messagepassing_trbp.hxx | 9 -
include/opengm/inference/movemaker.hxx | 8 -
include/opengm/inference/mqpbo.hxx | 31 +--
include/opengm/inference/multicut.hxx | 39 +--
include/opengm/inference/partition-move.hxx | 15 +-
include/opengm/inference/qpbo.hxx | 17 +-
include/opengm/inference/reducedinference.hxx | 26 --
include/opengm/inference/sat.hxx | 18 +-
include/opengm/inference/self_fusion.hxx | 47 +---
include/opengm/python/numpyview.hxx | 22 +-
include/opengm/python/opengmpython.hxx | 62 ++---
include/opengm/utilities/metaprogramming.hxx | 83 +-----
include/opengm/utilities/shape_accessor.hxx | 78 +-----
src/examples/unsorted-examples/inference_types.cxx | 9 +-
.../commandline/double/opengm_min_sum.cxx | 9 +-
src/interfaces/python/opengm/CMakeLists.txt | 1 -
src/interfaces/python/opengm/__init__.py | 2 +-
.../opengm/_inference_interface_generator.py | 59 -----
src/interfaces/python/opengm/functionhelper.py | 4 +-
.../python/opengm/inference/inf_def_visitor.hxx | 1 -
.../python/opengm/inference/pyFusionMoves.cxx | 4 +-
.../python/opengm/opengmcore/__init__.py | 19 +-
.../python/opengm/opengmcore/function_injector.py | 11 +-
.../python/opengm/opengmcore/opengmcore.cpp | 64 +----
.../python/opengm/opengmcore/pyFunctionGen.cxx | 57 -----
.../python/opengm/opengmcore/pyFunctionTypes.cxx | 83 +++---
src/interfaces/python/opengm/opengmcore/pyGm.cxx | 14 +-
src/interfaces/python/test.py | 115 +--------
src/tutorials/c++/basics/doMinSumInference.cxx | 2 +-
src/tutorials/c++/basics/doSumProdInference.cxx | 2 +-
src/unittest/CMakeLists.txt | 5 +-
src/unittest/inference/test_graphcut.cxx | 6 +-
src/unittest/inference/test_lazyflipper.cxx | 2 +-
src/unittest/inference/test_messagepassing.cxx | 20 +-
src/unittest/test_gm_learning_functions.cxx | 23 +-
src/unittest/test_linear_constraint.cxx | 1 -
102 files changed, 704 insertions(+), 4115 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