Pushing the docs to dev/ for branch: master, commit 9f84658efbf40e05a1687e97e3ac25c3b25983f9

Author: sklearn-ci

dev/_downloads/auto_examples_jupyter.zip

@@ -26,7 +26,7 @@
       },
       "outputs": [],
       "source": [
-        "print(__doc__)\n\nimport numpy as np\nimport matplotlib.pyplot as plt\n\nfrom sklearn.metrics import r2_score\n\n# #############################################################################\n# Generate some sparse data to play with\nnp.random.seed(42)\n\nn_samples, n_features = 50, 100\nX = np.random.randn(n_samples, n_features)\n\n# Decreasing coef w. alternated signs for visualization\nidx = np.arange(n_features)\ncoef = (-1) ** idx * np.exp(-idx / 10)\ncoef[10:] = 0  # sparsify coef\ny = np.dot(X, coef)\n\n# Add noise\ny += 0.01 * np.random.normal(size=n_samples)\n\n# Split data in train set and test set\nn_samples = X.shape[0]\nX_train, y_train = X[:n_samples // 2], y[:n_samples // 2]\nX_test, y_test = X[n_samples // 2:], y[n_samples // 2:]\n\n# #############################################################################\n# Lasso\nfrom sklearn.linear_model import Lasso\n\nalpha = 0.1\nlasso = Lasso(alpha=alpha)\n\ny_pred_lasso = lasso.fit(X_train, y_train).predict(X_test)\nr2_score_lasso = r2_score(y_test, y_pred_lasso)\nprint(lasso)\nprint(\"r^2 on test data : %f\" % r2_score_lasso)\n\n# #############################################################################\n# ElasticNet\nfrom sklearn.linear_model import ElasticNet\n\nenet = ElasticNet(alpha=alpha, l1_ratio=0.7)\n\ny_pred_enet = enet.fit(X_train, y_train).predict(X_test)\nr2_score_enet = r2_score(y_test, y_pred_enet)\nprint(enet)\nprint(\"r^2 on test data : %f\" % r2_score_enet)\n\nm, s, _ = plt.stem(np.where(enet.coef_)[0], enet.coef_[enet.coef_ != 0],\n                   markerfmt='x', label='Elastic net coefficients')\nplt.setp([m, s], color=\"#2ca02c\")\nm, s, _ = plt.stem(np.where(lasso.coef_)[0], lasso.coef_[lasso.coef_ != 0],\n                   markerfmt='x', label='Lasso coefficients')\nplt.setp([m, s], color='#ff7f0e')\nplt.stem(np.where(coef)[0], coef[coef != 0], label='true coefficients',\n         markerfmt='bx')\n\nplt.legend(loc='best')\nplt.title(\"Lasso $R^2$: %.3f, Elastic Net $R^2$: %.3f\"\n          % (r2_score_lasso, r2_score_enet))\nplt.show()"
+        "print(__doc__)\n\nimport numpy as np\nimport matplotlib.pyplot as plt\n\nfrom sklearn.metrics import r2_score\n\n# #############################################################################\n# Generate some sparse data to play with\nnp.random.seed(42)\n\nn_samples, n_features = 50, 100\nX = np.random.randn(n_samples, n_features)\n\n# Decreasing coef w. alternated signs for visualization\nidx = np.arange(n_features)\ncoef = (-1) ** idx * np.exp(-idx / 10)\ncoef[10:] = 0  # sparsify coef\ny = np.dot(X, coef)\n\n# Add noise\ny += 0.01 * np.random.normal(size=n_samples)\n\n# Split data in train set and test set\nn_samples = X.shape[0]\nX_train, y_train = X[:n_samples // 2], y[:n_samples // 2]\nX_test, y_test = X[n_samples // 2:], y[n_samples // 2:]\n\n# #############################################################################\n# Lasso\nfrom sklearn.linear_model import Lasso\n\nalpha = 0.1\nlasso = Lasso(alpha=alpha)\n\ny_pred_lasso = lasso.fit(X_train, y_train).predict(X_test)\nr2_score_lasso = r2_score(y_test, y_pred_lasso)\nprint(lasso)\nprint(\"r^2 on test data : %f\" % r2_score_lasso)\n\n# #############################################################################\n# ElasticNet\nfrom sklearn.linear_model import ElasticNet\n\nenet = ElasticNet(alpha=alpha, l1_ratio=0.7)\n\ny_pred_enet = enet.fit(X_train, y_train).predict(X_test)\nr2_score_enet = r2_score(y_test, y_pred_enet)\nprint(enet)\nprint(\"r^2 on test data : %f\" % r2_score_enet)\n\nm, s, _ = plt.stem(np.where(enet.coef_)[0], enet.coef_[enet.coef_ != 0],\n                   markerfmt='x', label='Elastic net coefficients',\n                   use_line_collection=True)\nplt.setp([m, s], color=\"#2ca02c\")\nm, s, _ = plt.stem(np.where(lasso.coef_)[0], lasso.coef_[lasso.coef_ != 0],\n                   markerfmt='x', label='Lasso coefficients',\n                   use_line_collection=True)\nplt.setp([m, s], color='#ff7f0e')\nplt.stem(np.where(coef)[0], coef[coef != 0], label='true coefficients',\n         markerfmt='bx', use_line_collection=True)\n\nplt.legend(loc='best')\nplt.title(\"Lasso $R^2$: %.3f, Elastic Net $R^2$: %.3f\"\n          % (r2_score_lasso, r2_score_enet))\nplt.show()"
       ]
     }
   ],

dev/_downloads/auto_examples_python.zip

@@ -60,13 +60,15 @@
 print("r^2 on test data : %f" % r2_score_enet)
 
 m, s, _ = plt.stem(np.where(enet.coef_)[0], enet.coef_[enet.coef_ != 0],
-                   markerfmt='x', label='Elastic net coefficients')
+                   markerfmt='x', label='Elastic net coefficients',
+                   use_line_collection=True)
 plt.setp([m, s], color="#2ca02c")
 m, s, _ = plt.stem(np.where(lasso.coef_)[0], lasso.coef_[lasso.coef_ != 0],
-                   markerfmt='x', label='Lasso coefficients')
+                   markerfmt='x', label='Lasso coefficients',
+                   use_line_collection=True)
 plt.setp([m, s], color='#ff7f0e')
 plt.stem(np.where(coef)[0], coef[coef != 0], label='true coefficients',
-         markerfmt='bx')
+         markerfmt='bx', use_line_collection=True)
 
 plt.legend(loc='best')
 plt.title("Lasso $R^2$: %.3f, Elastic Net $R^2$: %.3f"