Merge pull request #3134 from jrouly/string_values

jnothman · jnothman · commit 5aa53577e15b · 2014-05-06T15:36:59.000+10:00
Use == instead of is for string comparison in Affinity Propagation
diff --git a/sklearn/cluster/affinity_propagation_.py b/sklearn/cluster/affinity_propagation_.py
@@ -249,7 +249,7 @@ def __init__(self, damping=.5, max_iter=200, convergence_iter=15,
 
     @property
     def _pairwise(self):
-        return self.affinity is "precomputed"
+        return self.affinity == "precomputed"
 
     def fit(self, X):
         """ Create affinity matrix from negative euclidean distances, then
@@ -263,9 +263,9 @@ def fit(self, X):
             similarities / affinities.
         """
 
-        if self.affinity is "precomputed":
+        if self.affinity == "precomputed":
             self.affinity_matrix_ = X
-        elif self.affinity is "euclidean":
+        elif self.affinity == "euclidean":
             self.affinity_matrix_ = -euclidean_distances(X, squared=True)
         else:
             raise ValueError("Affinity must be 'precomputed' or "
