Skip to content

Commit d8a1422

Browse files
committed
Minor k_means_.py cleanup.
Fixed two PEP8 warnings about breaking line before binary operator by simply putting the binary operator on the line before. Fixed one PEP8 warning about line being too long (extending 79 symbols limit). Removed `best_inertia = np.infty` line, because `best_inertia` is initialized again few lines after and never used in between.
1 parent 85f2900 commit d8a1422

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

sklearn/cluster/k_means_.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ def k_means(X, n_clusters, init='k-means++', precompute_distances='auto',
279279
raise ValueError('Number of iterations should be a positive number,'
280280
' got %d instead' % max_iter)
281281

282-
best_inertia = np.infty
283282
X = as_float_array(X, copy=copy_x)
284283
tol = _tolerance(X, tol)
285284

@@ -883,7 +882,8 @@ def fit(self, X, y=None):
883882
self.cluster_centers_, self.labels_, self.inertia_, self.n_iter_ = \
884883
k_means(
885884
X, n_clusters=self.n_clusters, init=self.init,
886-
n_init=self.n_init, max_iter=self.max_iter, verbose=self.verbose,
885+
n_init=self.n_init, max_iter=self.max_iter,
886+
verbose=self.verbose,
887887
precompute_distances=self.precompute_distances,
888888
tol=self.tol, random_state=random_state, copy_x=self.copy_x,
889889
n_jobs=self.n_jobs, algorithm=self.algorithm,
@@ -1165,8 +1165,8 @@ def _mini_batch_convergence(model, iteration_idx, n_iter, tol,
11651165
else:
11661166
no_improvement += 1
11671167

1168-
if (model.max_no_improvement is not None
1169-
and no_improvement >= model.max_no_improvement):
1168+
if (model.max_no_improvement is not None and
1169+
no_improvement >= model.max_no_improvement):
11701170
if verbose:
11711171
print('Converged (lack of improvement in inertia)'
11721172
' at iteration %d/%d'
@@ -1487,8 +1487,8 @@ def partial_fit(self, X, y=None):
14871487
x_squared_norms = row_norms(X, squared=True)
14881488
self.random_state_ = getattr(self, "random_state_",
14891489
check_random_state(self.random_state))
1490-
if (not hasattr(self, 'counts_')
1491-
or not hasattr(self, 'cluster_centers_')):
1490+
if (not hasattr(self, 'counts_') or
1491+
not hasattr(self, 'cluster_centers_')):
14921492
# this is the first call partial_fit on this object:
14931493
# initialize the cluster centers
14941494
self.cluster_centers_ = _init_centroids(

0 commit comments

Comments
 (0)