[opengm] 263/386: minor changes

[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 55317d4aae0277fa6d0d09162fd24c4c4ffbb736
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Tue Jan 20 15:05:58 2015 +0100

    minor changes
---
 include/opengm/learning/loss/flexibleloss.hxx     | 3 ---
 src/interfaces/python/opengm/learning/__init__.py | 1 +
 src/interfaces/python/opengm/learning/pyLoss.cxx  | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/opengm/learning/loss/flexibleloss.hxx b/include/opengm/learning/loss/flexibleloss.hxx
index 38f67f4..bad9466 100644
--- a/include/opengm/learning/loss/flexibleloss.hxx
+++ b/include/opengm/learning/loss/flexibleloss.hxx
@@ -293,9 +293,6 @@ void FlexibleLoss::addLoss(GM& gm, IT gt) const
                 gm.addFactor(gm.addFunction(pf), vis,vis+2);
             }
         }
-
-
-        throw opengm::RuntimeError("Partition / Multicut Loss is not yet implemented");
     }
     else{
         throw opengm::RuntimeError("INTERNAL ERROR: unknown Loss Type");
diff --git a/src/interfaces/python/opengm/learning/__init__.py b/src/interfaces/python/opengm/learning/__init__.py
index ded6d1d..86e2c09 100644
--- a/src/interfaces/python/opengm/learning/__init__.py
+++ b/src/interfaces/python/opengm/learning/__init__.py
@@ -478,6 +478,7 @@ def secondOrderImageDataset(imgs, gts, numberOfLabels, fUnary, fBinary, addConst
             fU = binaryFeat[vis2Order[:,0],:]
             fV = binaryFeat[vis2Order[:,1],:]
             fB  = (fU +  fV / 2.0)
+            
             lp = lPottsFunctions(weights=weights, numberOfLabels=numberOfLabels,
                                           features=fB, weightIds=bWeightIds,
                                           addConstFeature=addConstFeature)
diff --git a/src/interfaces/python/opengm/learning/pyLoss.cxx b/src/interfaces/python/opengm/learning/pyLoss.cxx
index 614620c..951559e 100644
--- a/src/interfaces/python/opengm/learning/pyLoss.cxx
+++ b/src/interfaces/python/opengm/learning/pyLoss.cxx
@@ -55,7 +55,7 @@ void export_loss(){
       .value("hamming", PyFlexibleLoss::Parameter::Hamming)
       .value("l1",  PyFlexibleLoss::Parameter::L1)
       .value("l2",  PyFlexibleLoss::Parameter::L2)
-      .value("partiton",  PyFlexibleLoss::Parameter::Partition)
+      .value("partition",  PyFlexibleLoss::Parameter::Partition)
       .value("ConfMat",  PyFlexibleLoss::Parameter::ConfMat)
     ;
 

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