put "if" in correct order

amueller · amueller · commit f3044acbf86e · 2015-06-04T17:31:41.000-04:00
diff --git a/sklearn/neural_network/multilayer_perceptron.py b/sklearn/neural_network/multilayer_perceptron.py
@@ -503,19 +503,19 @@ def _fit_sgd(self, X, y, activations, deltas, coef_grads, intercept_grads,
                         self._no_improvement_count = 0
 
                 else:
-                    if self.loss_curve_[-1] < self.best_loss_:
-                        self.best_loss_ = self.loss_curve_[-1]
                     if self.loss_curve_[-1] > self.best_loss_ - self.tol:
                         self._no_improvement_count += 1
                     else:
                         self._no_improvement_count = 0
+                    if self.loss_curve_[-1] < self.best_loss_:
+                        self.best_loss_ = self.loss_curve_[-1]
 
                 # stopping criteria
                 if self._no_improvement_count > 2:
                     # not better than last two iterations by tol.
                     # stop or decreate learning rate
-                    msg = ("Training loss did not improve more than tol for two"
-                           " consecutive epochs.")
+                    msg = ("Training loss did not improve more than tol=%f for two"
+                           " consecutive epochs." % self.tol)
                     if self.learning_rate == 'adaptive':
                         if self.learning_rate_ > 1e-6:
                             self.learning_rate_ /= 5
