Pushing the docs to dev/ for branch: master, commit 24d4b2c2f3bae149407db57182643405426f275c

Author: sklearn-ci

dev/_downloads/auto_examples_jupyter.zip

@@ -26,7 +26,7 @@
       },
       "outputs": [],
       "source": [
-        "print(__doc__)\nimport matplotlib.pyplot as plt\nfrom sklearn.neural_network import MLPClassifier\nfrom sklearn.preprocessing import MinMaxScaler\nfrom sklearn import datasets\n\n# different learning rate schedules and momentum parameters\nparams = [{'solver': 'sgd', 'learning_rate': 'constant', 'momentum': 0,\n           'learning_rate_init': 0.2},\n          {'solver': 'sgd', 'learning_rate': 'constant', 'momentum': .9,\n           'nesterovs_momentum': False, 'learning_rate_init': 0.2},\n          {'solver': 'sgd', 'learning_rate': 'constant', 'momentum': .9,\n           'nesterovs_momentum': True, 'learning_rate_init': 0.2},\n          {'solver': 'sgd', 'learning_rate': 'invscaling', 'momentum': 0,\n           'learning_rate_init': 0.2},\n          {'solver': 'sgd', 'learning_rate': 'invscaling', 'momentum': .9,\n           'nesterovs_momentum': True, 'learning_rate_init': 0.2},\n          {'solver': 'sgd', 'learning_rate': 'invscaling', 'momentum': .9,\n           'nesterovs_momentum': False, 'learning_rate_init': 0.2},\n          {'solver': 'adam', 'learning_rate_init': 0.01}]\n\nlabels = [\"constant learning-rate\", \"constant with momentum\",\n          \"constant with Nesterov's momentum\",\n          \"inv-scaling learning-rate\", \"inv-scaling with momentum\",\n          \"inv-scaling with Nesterov's momentum\", \"adam\"]\n\nplot_args = [{'c': 'red', 'linestyle': '-'},\n             {'c': 'green', 'linestyle': '-'},\n             {'c': 'blue', 'linestyle': '-'},\n             {'c': 'red', 'linestyle': '--'},\n             {'c': 'green', 'linestyle': '--'},\n             {'c': 'blue', 'linestyle': '--'},\n             {'c': 'black', 'linestyle': '-'}]\n\n\ndef plot_on_dataset(X, y, ax, name):\n    # for each dataset, plot learning for each learning strategy\n    print(\"\\nlearning on dataset %s\" % name)\n    ax.set_title(name)\n    X = MinMaxScaler().fit_transform(X)\n    mlps = []\n    if name == \"digits\":\n        # digits is larger but converges fairly quickly\n        max_iter = 15\n    else:\n        max_iter = 400\n\n    for label, param in zip(labels, params):\n        print(\"training: %s\" % label)\n        mlp = MLPClassifier(verbose=0, random_state=0,\n                            max_iter=max_iter, **param)\n        mlp.fit(X, y)\n        mlps.append(mlp)\n        print(\"Training set score: %f\" % mlp.score(X, y))\n        print(\"Training set loss: %f\" % mlp.loss_)\n    for mlp, label, args in zip(mlps, labels, plot_args):\n            ax.plot(mlp.loss_curve_, label=label, **args)\n\n\nfig, axes = plt.subplots(2, 2, figsize=(15, 10))\n# load / generate some toy datasets\niris = datasets.load_iris()\ndigits = datasets.load_digits()\ndata_sets = [(iris.data, iris.target),\n             (digits.data, digits.target),\n             datasets.make_circles(noise=0.2, factor=0.5, random_state=1),\n             datasets.make_moons(noise=0.3, random_state=0)]\n\nfor ax, data, name in zip(axes.ravel(), data_sets, ['iris', 'digits',\n                                                    'circles', 'moons']):\n    plot_on_dataset(*data, ax=ax, name=name)\n\nfig.legend(ax.get_lines(), labels, ncol=3, loc=\"upper center\")\nplt.show()"
+        "print(__doc__)\n\nimport warnings\n\nimport matplotlib.pyplot as plt\n\nfrom sklearn.neural_network import MLPClassifier\nfrom sklearn.preprocessing import MinMaxScaler\nfrom sklearn import datasets\nfrom sklearn.exceptions import ConvergenceWarning\n\n# different learning rate schedules and momentum parameters\nparams = [{'solver': 'sgd', 'learning_rate': 'constant', 'momentum': 0,\n           'learning_rate_init': 0.2},\n          {'solver': 'sgd', 'learning_rate': 'constant', 'momentum': .9,\n           'nesterovs_momentum': False, 'learning_rate_init': 0.2},\n          {'solver': 'sgd', 'learning_rate': 'constant', 'momentum': .9,\n           'nesterovs_momentum': True, 'learning_rate_init': 0.2},\n          {'solver': 'sgd', 'learning_rate': 'invscaling', 'momentum': 0,\n           'learning_rate_init': 0.2},\n          {'solver': 'sgd', 'learning_rate': 'invscaling', 'momentum': .9,\n           'nesterovs_momentum': True, 'learning_rate_init': 0.2},\n          {'solver': 'sgd', 'learning_rate': 'invscaling', 'momentum': .9,\n           'nesterovs_momentum': False, 'learning_rate_init': 0.2},\n          {'solver': 'adam', 'learning_rate_init': 0.01}]\n\nlabels = [\"constant learning-rate\", \"constant with momentum\",\n          \"constant with Nesterov's momentum\",\n          \"inv-scaling learning-rate\", \"inv-scaling with momentum\",\n          \"inv-scaling with Nesterov's momentum\", \"adam\"]\n\nplot_args = [{'c': 'red', 'linestyle': '-'},\n             {'c': 'green', 'linestyle': '-'},\n             {'c': 'blue', 'linestyle': '-'},\n             {'c': 'red', 'linestyle': '--'},\n             {'c': 'green', 'linestyle': '--'},\n             {'c': 'blue', 'linestyle': '--'},\n             {'c': 'black', 'linestyle': '-'}]\n\n\ndef plot_on_dataset(X, y, ax, name):\n    # for each dataset, plot learning for each learning strategy\n    print(\"\\nlearning on dataset %s\" % name)\n    ax.set_title(name)\n\n    X = MinMaxScaler().fit_transform(X)\n    mlps = []\n    if name == \"digits\":\n        # digits is larger but converges fairly quickly\n        max_iter = 15\n    else:\n        max_iter = 400\n\n    for label, param in zip(labels, params):\n        print(\"training: %s\" % label)\n        mlp = MLPClassifier(verbose=0, random_state=0,\n                            max_iter=max_iter, **param)\n\n        # some parameter combinations will not converge as can be seen on the\n        # plots so they are ignored here\n        with warnings.catch_warnings():\n            warnings.filterwarnings(\"ignore\", category=ConvergenceWarning,\n                                    module=\"sklearn\")\n            mlp.fit(X, y)\n\n        mlps.append(mlp)\n        print(\"Training set score: %f\" % mlp.score(X, y))\n        print(\"Training set loss: %f\" % mlp.loss_)\n    for mlp, label, args in zip(mlps, labels, plot_args):\n        ax.plot(mlp.loss_curve_, label=label, **args)\n\n\nfig, axes = plt.subplots(2, 2, figsize=(15, 10))\n# load / generate some toy datasets\niris = datasets.load_iris()\ndigits = datasets.load_digits()\ndata_sets = [(iris.data, iris.target),\n             (digits.data, digits.target),\n             datasets.make_circles(noise=0.2, factor=0.5, random_state=1),\n             datasets.make_moons(noise=0.3, random_state=0)]\n\nfor ax, data, name in zip(axes.ravel(), data_sets, ['iris', 'digits',\n                                                    'circles', 'moons']):\n    plot_on_dataset(*data, ax=ax, name=name)\n\nfig.legend(ax.get_lines(), labels, ncol=3, loc=\"upper center\")\nplt.show()"
       ]
     }
   ],

dev/_downloads/auto_examples_python.zip

@@ -14,10 +14,15 @@
 """
 
 print(__doc__)
+
+import warnings
+
 import matplotlib.pyplot as plt
+
 from sklearn.neural_network import MLPClassifier
 from sklearn.preprocessing import MinMaxScaler
 from sklearn import datasets
+from sklearn.exceptions import ConvergenceWarning
 
 # different learning rate schedules and momentum parameters
 params = [{'solver': 'sgd', 'learning_rate': 'constant', 'momentum': 0,
@@ -52,6 +57,7 @@ def plot_on_dataset(X, y, ax, name):
     # for each dataset, plot learning for each learning strategy
     print("\nlearning on dataset %s" % name)
     ax.set_title(name)
+
     X = MinMaxScaler().fit_transform(X)
     mlps = []
     if name == "digits":
@@ -64,12 +70,19 @@ def plot_on_dataset(X, y, ax, name):
         print("training: %s" % label)
         mlp = MLPClassifier(verbose=0, random_state=0,
                             max_iter=max_iter, **param)
-        mlp.fit(X, y)
+
+        # some parameter combinations will not converge as can be seen on the
+        # plots so they are ignored here
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=ConvergenceWarning,
+                                    module="sklearn")
+            mlp.fit(X, y)
+
         mlps.append(mlp)
         print("Training set score: %f" % mlp.score(X, y))
         print("Training set loss: %f" % mlp.loss_)
     for mlp, label, args in zip(mlps, labels, plot_args):
-            ax.plot(mlp.loss_curve_, label=label, **args)
+        ax.plot(mlp.loss_curve_, label=label, **args)
 
 
 fig, axes = plt.subplots(2, 2, figsize=(15, 10))