[opengm] 266/386: add Multicut

[Ghislain Vaillant]

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 600c35b6cfbc24320a09bfc06b1360ef123748e8
Author: joergkappes <kappes at math.uni-heidelberg.de>
Date:   Tue Jan 20 16:55:13 2015 +0100

    add Multicut
---
 src/interfaces/python/opengm/learning/helper.hxx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/interfaces/python/opengm/learning/helper.hxx b/src/interfaces/python/opengm/learning/helper.hxx
index d6e68a6..77abf88 100644
--- a/src/interfaces/python/opengm/learning/helper.hxx
+++ b/src/interfaces/python/opengm/learning/helper.hxx
@@ -15,6 +15,7 @@
 
 #ifdef WITH_CPLEX
 #include <opengm/inference/lpcplex.hxx>
+#include <opengm/inference/multicut.hxx>
 #endif
 
 #ifdef WITH_QPBO
@@ -194,6 +195,7 @@ public:
 
         #ifdef WITH_CPLEX
             typedef opengm::LPCplex<GMType, ACC> Cplex;
+            typedef opengm::Multicut<GMType, ACC> Multicut;
         #endif
 
         #ifdef WITH_QPBO
@@ -209,7 +211,8 @@ public:
             .def("_learn",&pyLearn_Inf<LazyFlipperInf>)
             .def("_learn",&pyLearn_Inf<BpInf>)
             #ifdef WITH_CPLEX
-            .def("_learn",&pyLearn_Inf<Cplex>)
+            .def("_learn",&pyLearn_Inf<Cplex>) 
+            .def("_learn",&pyLearn_Inf<Multicut>)
             #endif
             #ifdef WITH_QPBO
             .def("_learn",&pyLearn_Inf<QpboExternal>)
@@ -278,6 +281,7 @@ public:
 
 #ifdef WITH_CPLEX
        typedef opengm::LPCplex<GMType, ACC> Cplex;
+       typedef opengm::Multicut<GMType, ACC> Multicut;
 #endif
 #ifdef WITH_QPBO
        typedef opengm::external::QPBO<GMType>  QpboExternal;
@@ -301,6 +305,8 @@ public:
 #ifdef WITH_CPLEX
           .def("_getLoss",&pyGetLossWithInf<Cplex>)
           .def("_getTotalLoss",&pyGetTotalLossWithInf<Cplex>)
+          .def("_getLoss",&pyGetLossWithInf<Multicut>)
+          .def("_getTotalLoss",&pyGetTotalLossWithInf<Multicut>)
 #endif
 #ifdef WITH_QPBO
           .def("_getLoss",&pyGetLossWithInf<QpboExternal>)

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