FIX the threshold by taking the opposite (to be adapted to the decisi…

…on function)

metric_learn/base_metric.py

@@ -332,7 +332,7 @@ def predict(self, pairs):
       The predicted learned metric value between samples in every pair.
     """
     check_is_fitted(self, ['threshold_', 'transformer_'])
-    return - 2 * (self.decision_function(pairs) > self.threshold_) + 1
+    return 2 * (self.decision_function(pairs) > self.threshold_) - 1
 
   def decision_function(self, pairs):
     """Returns the decision function used to classify the pairs.
@@ -387,13 +387,13 @@ def score(self, pairs, y):
     return roc_auc_score(y, self.decision_function(pairs))
 
   def set_default_threshold(self, pairs, y):
-    """Returns a threshold that is the mean between the similar metrics
-    mean, and the dissimilar metrics mean"""
-    similar_threshold = np.mean(self.decision_function(
+    """Returns a threshold that is the opposite of the mean between the similar
+    metrics mean and the dissimilar metrics mean"""
+    similar_threshold = np.mean(self.score_pairs(
         pairs[(y == 1).ravel()]))
-    dissimilar_threshold = np.mean(self.decision_function(
+    dissimilar_threshold = np.mean(self.score_pairs(
         pairs[(y == -1).ravel()]))
-    self.threshold_ = np.mean([similar_threshold, dissimilar_threshold])
+    self.threshold_ = - np.mean([similar_threshold, dissimilar_threshold])
 
 
 class _QuadrupletsClassifierMixin(BaseMetricLearner):

metric_learn/itml.py

@@ -187,7 +187,7 @@ def fit(self, pairs, y, bounds=None):
         Returns the instance.
     """
     self._fit(pairs, y, bounds=bounds)
-    self.threshold_ = np.mean(self.bounds_)
+    self.threshold_ = - np.mean(self.bounds_)
     return self