[opengm] branch master updated (f0c167b -> d73e5a7)
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Aug 31 08:38:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a change to branch master
in repository opengm.
from f0c167b fix incomplete bugfix
new 53e5707 Merge pull request #104 from opengm/master
new c318a21 fix problems with VS 2010
new 3c0baa0 fix wrong namespace
new a78467e Merge pull request #9 from opengm/master
new e902ba7 udpated readme
new 71c6471 changed travis script
new 172f614 updated travis
new 6714242 updated travis
new c37e05f prototype for learnable functions with features
new 6db96d5 bugfixes and empty test for learnable functions
new ada59eb add test and learnable potts function
new 8d3aac3 replaced REDME.md content with TODO list
new 1ad49b1 Merge branch 'master' of https://github.com/joergkappes/opengm-learning
new 4ac8ec2 add I/O for LPotts
new 6977179 add LPotts IO-test and do bugfixes
new d71ee7c add directory structure for learning
new 15b1e1f typos
new b660f97 add interface for learnable functions
new d3b5061 start hammingloss
new f14f9c7 prototypical implementation for loss and learning, befor adding unittests some interfaces need to be specified
new 8c85eb3 todos
new bde49c1 add dumydataset - untested
new 3436626 syntax checking and bugfixes
new 88f57ab added test-learning, added scaffolds for bundle-optimizer and struct-max-margin, fixed compile errors in hammingloss and testdataset
new cd0436e checkin of linear and quadratic solver and Gurobi backend for learning
new cccd608 bundle-optimizer: added setup of QP
new 0b44279 add typedef and make it larger
new f100a4b add missing return value
new 61116cd now this solver do grid search learning (todo: rename file)
new e227545 add couts
new a747fd3 write test for grid search learning(todo: rename this file)
new d65ee00 formating
new 95079f9 renaming
new 2c8a5e0 comments
new 49cf0d3 Fix gurobi library dependency include for tests
new e4bb1ef Merge branch 'master' of https://github.com/joergkappes/opengm-learning
new 58a12e8 add second test-dataset (with 3 parameters) and add it to greidsearch test
new 7456dd9 change noise in datasets
new ae960f9 save and load datasets for learning
new 82eca14 add missing file for dataset-io
new c42d5e1 added Oracle stub to opengm/learning
new de02236 Rename opengm::Parameters (aka ModelParameters) for learning to opengm::learning::Weights, and graphicalmodel/parameters.hxx to graphicalmodel/weights.hxx
new aec27e0 start refactoring dataset
new 62e22c7 learnable functions in python seems to work
new 9cdf3b8 Fix header include guard for weights
new 686ef02 fixed operator[] for opengm::Weights
new d5e435b finished bundle method implementation
new 81d787f added *.swp to .gitignore
new 996961b renamed opengm::{Paramters -> Weights} in bundle method
new 66f954c Merge branch 'master' of github.com:joergkappes/opengm-learning
new 1e49cc8 learnable functions in python seems to work
new c3e7112 Merge branch 'master' of https://github.com/joergkappes/opengm-learning
new 7e1a686 fix learnablefunction renaming, method was called "paramaterGradient"...
new e425f55 Merge branch 'master' of https://github.com/joergkappes/opengm-learning
new d1d5fc0 add: unit test for dataset structure
new 4392b0b now models with loss are created too
new fb985d7 setting initial values from numpy array works
new c38ac8a Merge branch 'master' of https://github.com/joergkappes/opengm-learning
new db8b02a Merge branch 'master' of github.com:joergkappes/opengm-learning
new 0da9f7c finished implementation (not testing) of StructMaxMargin
new fbf4bd0 Add generalized hamming loss with small test
new 3f099a0 add: test for max margin learning that reproduces
new 947be2e make it compileable
new 76ad19a fix bug in deserialization of lpotts
new 0171e74 comment out test that does not stop
new 716ceba start refactoring datasets
new 7c396be change to new testmodels
new 4011970 reduce default testset size
new 805adf7 change sign of loss in lossargumented model
new ba46e2a adopt test to change in addloss
new 62f05bd move test
new fe1862f modify cmakefiles after move
new 636ef8c add missing resize
new df9f839 bugfix datasets
new ff9f288 added lunary to python
new 5df619d Merge branch 'master' of github.com:joergkappes/opengm-learning
new b8beabe Merge branch 'master' of https://github.com/joergkappes/opengm-learning
new 7194ff3 fixed gradient computation in struct-max-margin, re-enabled test
new dc1a4dd use trws in test-learning
new 082729c embarrassing bug fix in bundle method
new 31a2a73 Merge remote-tracking branch 'opengm/master'
new f174a14 Add cplex backend for quadratic solver. Compile learning test if cplex or gurobi is available.
new b4c312f rename argument, add missing include
new f1908d5 rename gt to gts and add another dataset constructor
new 2b878be add editable dataset and its python wrappers
new 07690a5 fix CMameFile for test
new 53ed656 add new acyclic testdataset
new 3edf711 new learning module
new c0f7e09 Merge commit '4c4667669a21f362e693c66fd2bfe38a7f303771'
new a392e7e Introducing loss parameters
new 59c90c9 Fix call operator of sum of experts which did not use the mapping of local to global weight indices yet.
new 16a3bed mychanges
new 359999d introduce default LossParameter
new 563716c Remove unnecessary write to labelOffset_ in LUnary constructor
new d18ac51 remove unnecessary include
new 63623e9 bring dataset IO to python and link against HDF5
new f99a75c merged
new 4df50c6 added const to param ref in grid search learner
new 8115665 inital version of grid search learner in python
new 3185fb7 bugfix: iterator was not dereferenced in sum_of_experts
new d2e7849 bugfix: gradient-accumulator needs to pass local configuration to function
new f7f459a added embarrassingly simple dataset
new 05ec209 updated test_learning
new 880c766 fixed testdatasets
new a1ee674 removed debug code from gradient-accumulator
new 9da4972 fixed test_gridsearch_learner
new 8649a8b BAZINGA bitches, its working
new 1c56b64 make arguments of pushBackInstance in EditableDataset const
new 101b8df Merge branch 'master' of github.com:joergkappes/opengm-learning
new 5dd8870 fixed: resize count_ and isCached_ vector for EditableDataset
new bb96229 Merge branch 'master' of github.com:joergkappes/opengm-learning
new 86d1b33 re-enabled all testdatasets in test_learning
new 78f7b1c Merge branch 'master' of github.com:joergkappes/opengm-learning
new e92907e added py helper function
new 6aba5d5 Make sumOfExperts available from Python
new 8cd242d improved python learning
new c33e85e improved python learning
new 267ca72 fudwefrew
new 5769514 bugfix
new 7ed1b51 update cmakelists
new 8b3530c add output
new 45d07c3 Remove Loss from StructMaxMargin template parameters. Update parameter object, and actually pass it to the optimizer. Use infParameter in Oracle. Use Gurobi OR Cplex as INF in test.
new 3fb35cd Merge branch 'master' of github.com:joergkappes/opengm-learning
new 39fbb8e python
new c44dd71 add: new test to test_learning
new 2d26d9c python loss param object
new beeee2e bring StructMaxMargin learner to python. needed inlining of all bundle optimizer methods.
new a5b9266 Merge branch 'master' of github.com:joergkappes/opengm-learning
new 7834ad3 i am so lazy, i do not write proper commit messages
new e76cc56 changing id of sum_of_experts
new 10ee816 adding more safeguards
new c1a05fe use #ifdef instead of #if in test_learning.cxx
new af44b6c Add visitor that defines the learn methods for each Learner and all Inference methods.
new d3b1ab9 bugfix: GradientAccumulator is not supposed to initialize gradient with zero
new db39600 Merge branch 'master' of github.com:joergkappes/opengm-learning
new 8e16060 fix: added lossParams_ to editabletestdataset constructor
new 30448b3 bla
new 1a1e177 use multiple models in test_learning
new e4b93b7 struct-max-margin: set data-weights only once for all models
new e869ad6 Merge branch 'master' of github.com:joergkappes/opengm-learning
new c26a004 Update real world example, add Cplex to available inference methods for solvers.
new 874061c Merge branch 'master' of github.com:joergkappes/opengm-learning
new 94af389 sumOfExperts serialization still to be debugged
new e841b8b Merge branch 'master' of github.com:joergkappes/opengm-learning
new 119d873 added loss serialization; test-dataset-io still fails for sum of experts
new 32572ee Merge branch 'master' of github.com:joergkappes/opengm-learning
new 1d003cc sumOfBi...Experts serialization fixed
new f0ac6aa improved lunary to remove number of parameters
new 0492f92 improved lunary
new 9762c5a changed loss interface
new 5978404 removed wrapped functions which will not work anyway...
new ae95a4d breaks all tests. Revert "removed wrapped functions which will not work anyway..."
new 7043133 breaks all tests. Revert "changed loss interface"
new 6748532 Merge branch 'master' of github.com:joergkappes/opengm-learning
new d74d2ac remove obsolete test datasets
new 45f3663 remove obsolete learnable functions
new 87c14d0 renamed sum_of_experts to lsum_of_experts for consistency
new 0d73385 Link opengm python learning module against CPLEX and/or Gurobi
new e2b2567 Merge branch 'master' of github.com:joergkappes/opengm-learning
new a2b8165 fix: change SumOfExperts to LSumOfExperts
new 0bfc949 removed unused header
new bb12313 lunary
new 98a5bbb Fix tests after learnablefunction.hxx and l_potts.hxx were removed (but probably still present in installation destination of some developers)
new 88ce0cd changed loss interface (+2 squashed commits) [051a8d8] Adjust test to calling the loss() function with a graphical model. [1c06923] removed wrapped functions which will not work anyway... [2f05d63] changed loss interface
new 83f6b0c lunary
new df610e9 fubar
new 5f57813 Update dataset constructor on python side to set up the weights vector as well
new ff15369 Store best weight vector in dataset when done.
new 4044885 new example
new fa7be11 more learners can be used
new 8271c50 make weights_ mutable to be able to deserialize with function functor
new 02dce35 added debug output to bundle-optimizer
new 8e6f4e4 Merge branch 'master' of github.com:joergkappes/opengm-learning
new a54a107 added EpsStrategy parameter to bundle method
new 785ffed Merge branch 'master' of github.com:joergkappes/opengm-learning
new 4091396 mychanges
new a62e8a9 Adapt python wrapper to changes in struct max margin learner
new 66af1fe Merge branch 'master' of github.com:joergkappes/opengm-learning
new 7fa6bc4 changes
new 705d2a9 colon missing
new 214b970 maximum likelihood files
new 84d20f8 New version for review
new 13d6c24 With likelihood function.
new 120aa3e Change in eta.
new 1d2c7c3 Latest test.
new 5eef794 No boundaries on the parameter, start at origin.
new a858a00 Merge branch 'master' of github.com:joergkappes/opengm-learning
new fe358c1 Update structure of maxLikelihood. Export to python, run from real example 2
new f25b5d8 Embarassingly simple example: one-variable model, with max likelihood learning
new d6c2a4f renamed file: pyMaxLikelihoodLearner.cxx
new 79f812d implemented getLoss for dataset and almost brought it to python, still to be fixed: pyDataset
new ca2d5ee python scripts to convert the pystruct pascal VOC dataset to openGM format and learn
new 3f283a6 fix ifdef
new d590ae7 fixed python wrapping, with @Steffen-Wolf
new 838308c fixed loss return
new 23298dd fixed bug in gridesearchlearning
new 93e10cc batch function gen for lpotts
new 6d1d005 batch function gen for lpotts
new 69f6f16 batch function gen for lpotts
new 4caa21c -impmeneted batch adding of python learnable functions, NICE AS FUCK! - removed pure 'python-function' from typelist - improved const correctness
new 0320870 started to add rebing to all inference methods
new c6466de fixed class vs struct bug
new 6aa0415 implemnted rebind for for almost all inference methods
new 27f2a5b implemented structured perceptron
new 7e04ac8 loss graphical model type can now be specified in the dataset but has a meaningfull default templatization
new e86cf8e better struct. perceptron
new 731812c better struct. perceptron
new 5fd1a86 implemented subgradient ssvm
new 48482cd fixed bugs...
new de44f28 new dataset, way
new 714e2af my local changes:
new aad5300 fixed minor bugs in examples
new 39a53e3 fixed minor bugs in examples
new ee65fce fixed stupid bugs
new e116f0a fixed stupid bugs
new cc25b05 new stuff
new d747e65 fixed major bug in editabledataset.hxx
new b939da9 fixed bug i introduced
new 652008f merged
new 543d9e5 added new dataset to python
new 5cc4982 minor stuff
new 0a672d8 added missing file
new 903cb5d bazinga
new 9b96a90 first bugfixes for maxlikelihoodlearning - need more
new de15f65 remove code from mll
new 7ea93fa Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning
new cd40760 refactor WeightGradientFunctor
new 266b8f7 Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning
new d8938b5 bazinga
new 31f4b1a added isPotts overload to potts function
new 6e89b49 minor changes
new f6a111e bazinga
new 136364c reimplement mll
new 1a04c56 Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning
new 93cd4cf change to reimplemeted mll - test-learning and test-subgradient-ssvm fails
new 9da0693 Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning
new 618d379 implemented py wrapper for maxlh-learning
new f66681f fubar
new e78a33b added weight constraints and weight regularizer to dataset
new a6d77ce Only build SelfFusion if QPBO is enabled
new b69a0ef Find package OpenMP and build the subgradient ssvm test with those flags set
new e82a0b0 WeightGradientFunctor global weight indexing (error) changed to local weight indexing. Gradient parameters and Belief Propagation parameters added to interface. Info printouts added to include file.
new d9a3ac0 Allow to build SubrgradientSSVM without OpenMP, and link the learning python module against openmp
new 8a64b03 update mll
new c5ee224 comment unet test out - jan/Thorsten plz check this
new 04f52f7 Merge branch 'master' of bitbucket.org:jkappes/opengm-learning
new de39420 add temperature to mll
new e9e0209 some learning python tests
new 81824ef Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning into maximum_likelihood
new 3384042 reduce test to shorter time
new 9e91646 add second dataset to mll test
new a116bff Belief Propagation parameters added to learner.
new c353d70 superpixel dataset creator
new f9041d9 minor improvements
new 10aa887 Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning
new 52b2d4c Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning
new 20ef017 Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning
new 2a4409a temp. disabled learn method from ml-learning in python binding
new 7a7d374 temp. disabled learn method from ml-learning in python binding
new 3df311b temp. disabled learn method from ml-learning in python binding
new 2ba1371 removed weight regularzier from ds (stupid idead of me to put it there)
new f96d68a Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning into maximum_likelihood
new 9ad0b1c made pyMh-learn build again
new e6bc1b0 fixed h5 bugs
new ab5ef13 Typo in cmakelist
new 13c0037 some minor fixes
new 480216b Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning
new 15342f8 Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning
new 55317d4 minor changes
new 377f74e All parameters added. C++ and Python tests added.
new b846e3c isActive added to the belief propagation parameters (trivial test is fubar/max_likelihood_example.py)
new 2786574 Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning
new e76ecc4 fix parameter rebind
new 600c35b add Multicut
new f71316b learning changes
new 1c9a6e1 seems to be working
new 3eafd2c add learning code (experimental)
new 5d98b60 fix ambiguities in names
new 79605eb Update lweightedsum_of_functions.hxx
new df11295 RebindGm added to LPCplex2
new b46caa6 lweighted sum of functions calls operator() on Marray with proper indices for dimension =2 (and 1)
new db4e221 corrects indexing call from a learnable function.weightGradient to a multidimensional marray (*begin ---> begin) (this was working correctly only for 1-dim marrays)
new 695964c add model print out in struct-max-margin iteration
new e19025f lweightedsum_of_functions OPENGM_ASSERT corrected
new 6fb9119 adding normalized weights print output (only for check of convergence - not to be used in calculation)
new b04442e paralellization added to struct-max-margin (triggered by WITH_OPENMP)
new b6a5d0d removed redundant print info
new 043e99a Add RebindGM to LPCplex2 so that it can be used for structured learning
new 7f0e04b Merge pull request #374 from chaubold/fix-lpcplex2-rebindgm
new c7cbe6c Fix an #elif statement to find the cplex backend for the struct-max-margin solver
new c34c57d Merge pull request #375 from chaubold/fix-solver-check-SSVM
new 6f4c408 Add LpGurobi2::RebindGm to allow learning with Gurobi solver
new 55666ae Merge pull request #376 from chaubold/fix-lpgurobi-rebindgm
new c8990ba Use IndexType instead of UInt16 in LearnableUnary, to allow large numbers of features
new ec66344 Merge pull request #378 from chaubold/fix-lunary-uint16
new f24715a Update README.md
new f8efc9c Update README.md
new 298b409 Update README.md
new 7c1b6f0 Update README.md
new adf58c8 Merge branch 'learning-experimental' of https://github.com/ilastikdev/opengm-1 into structured_learning_2
new 7bc0d74 verbose=false implemented in more detail
new 83d4f90 Merge pull request #399 from ilastikdev/structured_learning_2
new 442228d minor fix
new a052283 Merge branch 'learning-experimental' of https://github.com/opengm/opengm into structured_learning_2
new 646c60c Merge pull request #400 from ilastikdev/structured_learning_2
new cfe19a0 removed deprecated function
new 909a050 most certainly fixed bugs
new 59b9c35 max. lh learning test less time consuming
new cc10ea1 outsmarting travis
new a274bd6 outsmarting travis
new 48d551b update struct. perceptron
new 25cb927 update struct. perceptron
new 6bae4eb update struct. perceptron
new 35434ce fixed that shit
new b28b497 fixed that shit
new fc14dd2 fixed that shit
new 029cefb defined CI to detect travis
new 4964326 give travis another shot
new 5368bf5 Intersection Based and 3-cycles
new e3408d0 Merge pull request #419 from consti123/master
new ddd1c0c Merge branch 'master' of https://github.com/opengm/opengm into structured_learning_2
new 5b2bb5a commented out code removed
new 5855a40 Merge pull request #422 from ilastikdev/structured_learning_2
new f8f448c Merge pull request #423 from opengm/learning-experimental
new acc42b9 hotfix
new deedb18 Also install header files with extension .h -- needed for structured learning solvers
new 7eac546 Merge pull request #425 from chaubold/fix-header-patterns-when-installing
new e4b8e38 Merge pull request #10 from opengm/master
new 53b435c removed learning
new 53f3284 removed lfunctions
new d7f408f removed py learning
new 1487699 removed learning wip
new 7a9f6e4 Merge pull request #413 from DerThorsten/master
new 655291d fixed fusion for cc
new 8e88bf0 Merge pull request #426 from DerThorsten/master
new 20f60dc fixed include guards and WITH_*** problems for intersection based
new a89ac30 Merge pull request #427 from DerThorsten/master
new 029e2af fixing travis wip
new 04c47b2 fixing travis wip
new 28147e0 Merge pull request #428 from DerThorsten/master
new 5d607a8 trying hdf5 serial version
new 9c05e16 Merge pull request #429 from DerThorsten/master
new da0dc19 added different boost sources in travis
new f8a33ae Merge pull request #430 from DerThorsten/master
new b5da108 chaged find hdf5 script
new d1ca62c Merge pull request #431 from DerThorsten/master
new 4a58a3b huthut
new cb21dba Revert "huthut"
new 3a99a6a undo dirty pull request revert hack Revert "removed learning wip" This reverts commit 148769919324737ed258eb24db07904a9337e119.
new 00163b3 Revert "Merge pull request #423 from opengm/learning-experimental"
new f76737e Merge pull request #442 from svenpeter42/master
new d73b402 disable mem-logging by default, because it might not work on all systems
new 8792ec4 add libhdf5 to travis
new 1cf2f64 Disable a check in the test that results in an out-of-bounds access.
new 787e4e2 Merge pull request #438 from bluescarni/partitions_test_fix
new 193b93b Merge branch 'master' of https://github.com/opengm/opengm
new b1da2dd add libhdf5-serial-dev to travis
new 2c6eed7 add hdf5 for osx to travis
new d945748 add hdf5 for osx to travis
new f08611e add hdf5 for osx to travis (next try)
new 3eca408 Merge pull request #105 from opengm/master
new db15f66 Merge pull request #450 from joergkappes/master
new 8fa8c21 disable python on osx for travis
new 3088f1b Tentative fix for a memory leak in fast_sequence.hxx.
new 5d42729 Merge pull request #436 from bluescarni/memory_leak_fix
new 3ae6d00 Update README.md
new 561243f Merge pull request #106 from opengm/master
new d18e758 merge changes on inference methods from learning branch
new 00a338f merge changes on inference methods from learning branch
new bd965a0 some python fixes
new 5ecf60c Merge pull request #467 from joergkappes/master
new d3a7385 merge changes for functions and graphical model from the learning branch
new 74026da merge changes for functions and graphical model from the learning branch
new 14d5c0e Merge pull request #470 from joergkappes/master
new ef1a4dc merging changes from learning-branch into master
new a685857 Merge pull request #471 from joergkappes/master
new 408a124 Added logsumexp op for log semiring (to work in log space for sum product alg)
new cd1588d Python bindings for log semiring
new d73e5a7 Merge pull request #469 from yunesj/log_semiring
The 379 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 155 +++++--
CMakeLists.txt | 9 +
README.md | 6 +-
cmake/modules/FindHDF5.cmake | 130 +++---
cmake/modules/checkHDF5version.c | 8 +-
include/opengm/datastructures/fast_sequence.hxx | 2 +-
.../opengm/datastructures/marray/marray_hdf5.hxx | 25 ++
include/opengm/functions/constant.hxx | 1 +
.../linear_constraint_function_base.hxx | 9 +-
.../opengm/functions/function_properties_base.hxx | 11 +-
include/opengm/functions/l_potts.hxx | 202 ---------
include/opengm/functions/learnable/lpotts.hxx | 254 +++++++++++
include/opengm/functions/learnable/lunary.hxx | 478 +++++++++++++++++++++
.../learnable/lweightedsum_of_functions.hxx | 264 ++++++++++++
include/opengm/functions/potts.hxx | 4 +-
include/opengm/functions/readme.txt | 3 +
.../sum_constraint_function.hxx | 1 +
include/opengm/functions/unary_loss_function.hxx | 151 +++++++
include/opengm/functions/view_convert_function.hxx | 36 +-
include/opengm/graphicalmodel/graphicalmodel.hxx | 42 ++
.../graphicalmodel/graphicalmodel_factor.hxx | 27 ++
.../graphicalmodel_function_wrapper.hxx | 79 ++++
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 | 139 +++---
.../auxiliary/fusion_move/fusion_mover.hxx | 27 ++
.../fusion_move/permutable_label_fusion_mover.hxx | 237 ++--------
.../auxiliary/lp_solver/lp_solver_interface.hxx | 12 +-
.../opengm/inference/auxiliary/minstcutboost.hxx | 2 +-
include/opengm/inference/bruteforce.hxx | 21 +-
include/opengm/inference/combilp.hxx | 11 +
include/opengm/inference/dmc.hxx | 3 +-
.../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 | 31 +-
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 | 45 +-
include/opengm/inference/icm.hxx | 63 +--
include/opengm/inference/infandflip.hxx | 23 +
include/opengm/inference/inference.hxx | 9 +
.../opengm/inference/intersection_based_inf.hxx | 4 +-
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 | 96 +++--
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 | 150 ++++---
include/opengm/inference/sat.hxx | 18 +-
include/opengm/inference/self_fusion.hxx | 47 +-
.../opengm/inference/trws/smoothing_strategy.hxx | 1 +
.../inference/trws/trws_subproblemsolver.hxx | 2 +-
include/opengm/opengm.hxx | 33 +-
.../operations/{integrator.hxx => logsumexp.hxx} | 32 +-
include/opengm/python/numpyview.hxx | 22 +-
include/opengm/python/opengmpython.hxx | 63 +--
include/opengm/utilities/meminfo.hxx | 2 +-
include/opengm/utilities/metaprogramming.hxx | 105 +++--
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/__init__.py | 5 +-
.../opengm/_inference_interface_generator.py | 59 +++
src/interfaces/python/opengm/functionhelper.py | 4 +-
.../python/opengm/inference/CMakeLists.txt | 10 +-
.../python/opengm/inference/inf_def_visitor.hxx | 1 +
.../python/opengm/inference/inference.cpp | 29 +-
.../opengm/inference/param/multicut_param.hxx | 8 +-
src/interfaces/python/opengm/inference/pyBp.cxx | 2 +
.../python/opengm/inference/pyBruteforce.cxx | 3 +
.../python/opengm/inference/pyFusionMoves.cxx | 4 +-
.../opengm/inference/pyIntersectionBased.cxx | 4 +-
.../python/opengm/opengmcore/CMakeLists.txt | 9 +-
.../python/opengm/opengmcore/__init__.py | 19 +-
.../python/opengm/opengmcore/function_injector.py | 11 +-
.../python/opengm/opengmcore/opengmcore.cpp | 40 +-
.../python/opengm/opengmcore/pyFunctionGen.cxx | 57 +++
.../python/opengm/opengmcore/pyFunctionTypes.cxx | 241 +++++++++--
src/interfaces/python/opengm/opengmcore/pyGm.cxx | 25 +-
src/interfaces/python/test.py | 3 +-
src/tutorials/c++/basics/doMinSumInference.cxx | 2 +-
src/tutorials/c++/basics/doSumProdInference.cxx | 2 +-
src/unittest/CMakeLists.txt | 11 +-
src/unittest/inference/test_graphcut.cxx | 6 +-
src/unittest/inference/test_lazyflipper.cxx | 2 +-
src/unittest/inference/test_messagepassing.cxx | 20 +-
src/unittest/inference/test_nesterov.cxx | 7 +
src/unittest/test_gm_learning_functions.cxx | 23 +-
src/unittest/test_learnable_functions.cxx | 79 ++++
src/unittest/test_linear_constraint.cxx | 1 +
src/unittest/test_lp_solver.cxx | 11 +-
src/unittest/test_partitions.cxx | 2 +-
112 files changed, 4032 insertions(+), 1085 deletions(-)
delete mode 100644 include/opengm/functions/l_potts.hxx
create mode 100644 include/opengm/functions/learnable/lpotts.hxx
create mode 100644 include/opengm/functions/learnable/lunary.hxx
create mode 100644 include/opengm/functions/learnable/lweightedsum_of_functions.hxx
create mode 100644 include/opengm/functions/unary_loss_function.hxx
create mode 100644 include/opengm/graphicalmodel/weights.hxx
copy include/opengm/operations/{integrator.hxx => logsumexp.hxx} (65%)
create mode 100644 src/unittest/test_learnable_functions.cxx
--
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