Point notebooks to handson-ml2, improve save_fig and add Colab link

wszczawinski · Mar 24, 2021 · d730f0a · d730f0a
1 parent 2065ef5
commit d730f0a
Show file tree

Hide file tree

Showing 28 changed files with 988 additions and 875 deletions.
diff --git a/01_the_machine_learning_landscape.ipynb b/01_the_machine_learning_landscape.ipynb
@@ -6,7 +6,20 @@
    "source": [
     "**Chapter 1 – The Machine Learning landscape**\n",
     "\n",
-    "_This is the code used to generate some of the figures in chapter 1._"
+    "_This is the code used to generate some of the figures in chapter 1._\n",
+    "\n",
+    "<table align=\"left\">\n",
+    "  <td>\n",
+    "    <a target=\"_blank\" href=\"https://colab.research.google.com/github/ageron/handson-ml/blob/master/01_the_machine_learning_landscape.ipynb\"><img src=\"https://www.tensorflow.org/images/colab_logo_32px.png\" />Run in Google Colab</a>\n",
+    "  </td>\n",
+    "</table>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "**Warning**: this is the code for the 1st edition of the book. Please visit https://github.com/ageron/handson-ml2 for the 2nd edition code, with up-to-date notebooks using the latest library versions."
    ]
   },
   {
@@ -54,17 +67,15 @@
     "# Where to save the figures\n",
     "PROJECT_ROOT_DIR = \".\"\n",
     "CHAPTER_ID = \"fundamentals\"\n",
+    "IMAGES_PATH = os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID)\n",
+    "os.makedirs(IMAGES_PATH, exist_ok=True)\n",
     "\n",
-    "def save_fig(fig_id, tight_layout=True):\n",
-    "    path = os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID, fig_id + \".png\")\n",
+    "def save_fig(fig_id, tight_layout=True, fig_extension=\"png\", resolution=300):\n",
+    "    path = os.path.join(IMAGES_PATH, fig_id + \".\" + fig_extension)\n",
     "    print(\"Saving figure\", fig_id)\n",
     "    if tight_layout:\n",
     "        plt.tight_layout()\n",
-    "    plt.savefig(path, format='png', dpi=300)\n",
-    "\n",
-    "# Ignore useless warnings (see SciPy issue #5998)\n",
-    "import warnings\n",
-    "warnings.filterwarnings(action=\"ignore\", message=\"^internal gelsd\")"
+    "    plt.savefig(path, format=fig_extension, dpi=resolution)"
    ]
   },
   {
@@ -2982,7 +2993,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.6"
+   "version": "3.7.10"
   },
   "nav_menu": {},
   "toc": {

diff --git a/02_end_to_end_machine_learning_project.ipynb b/02_end_to_end_machine_learning_project.ipynb
@@ -8,7 +8,20 @@
     "\n",
     "*Welcome to Machine Learning Housing Corp.! Your task is to predict median house values in Californian districts, given a number of features from these districts.*\n",
     "\n",
-    "*This notebook contains all the sample code and solutions to the exercices in chapter 2.*"
+    "*This notebook contains all the sample code and solutions to the exercices in chapter 2.*\n",
+    "\n",
+    "<table align=\"left\">\n",
+    "  <td>\n",
+    "    <a target=\"_blank\" href=\"https://colab.research.google.com/github/ageron/handson-ml/blob/master/02_end_to_end_machine_learning_project.ipynb\"><img src=\"https://www.tensorflow.org/images/colab_logo_32px.png\" />Run in Google Colab</a>\n",
+    "  </td>\n",
+    "</table>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "**Warning**: this is the code for the 1st edition of the book. Please visit https://github.com/ageron/handson-ml2 for the 2nd edition code, with up-to-date notebooks using the latest library versions."
    ]
   },
   {
@@ -60,17 +73,14 @@
     "PROJECT_ROOT_DIR = \".\"\n",
     "CHAPTER_ID = \"end_to_end_project\"\n",
     "IMAGES_PATH = os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID)\n",
+    "os.makedirs(IMAGES_PATH, exist_ok=True)\n",
     "\n",
     "def save_fig(fig_id, tight_layout=True, fig_extension=\"png\", resolution=300):\n",
     "    path = os.path.join(IMAGES_PATH, fig_id + \".\" + fig_extension)\n",
     "    print(\"Saving figure\", fig_id)\n",
     "    if tight_layout:\n",
     "        plt.tight_layout()\n",
-    "    plt.savefig(path, format=fig_extension, dpi=resolution)\n",
-    "\n",
-    "# Ignore useless warnings (see SciPy issue #5998)\n",
-    "import warnings\n",
-    "warnings.filterwarnings(action=\"ignore\", message=\"^internal gelsd\")"
+    "    plt.savefig(path, format=fig_extension, dpi=resolution)"
    ]
   },
   {
@@ -5879,7 +5889,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.10"
   },
   "nav_menu": {
    "height": "279px",

diff --git a/03_classification.ipynb b/03_classification.ipynb
@@ -6,7 +6,20 @@
    "source": [
     "**Chapter 3 – Classification**\n",
     "\n",
-    "_This notebook contains all the sample code and solutions to the exercises in chapter 3._"
+    "_This notebook contains all the sample code and solutions to the exercises in chapter 3._\n",
+    "\n",
+    "<table align=\"left\">\n",
+    "  <td>\n",
+    "    <a target=\"_blank\" href=\"https://colab.research.google.com/github/ageron/handson-ml/blob/master/03_classification.ipynb\"><img src=\"https://www.tensorflow.org/images/colab_logo_32px.png\" />Run in Google Colab</a>\n",
+    "  </td>\n",
+    "</table>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "**Warning**: this is the code for the 1st edition of the book. Please visit https://github.com/ageron/handson-ml2 for the 2nd edition code, with up-to-date notebooks using the latest library versions."
    ]
   },
   {
@@ -50,13 +63,15 @@
     "# Where to save the figures\n",
     "PROJECT_ROOT_DIR = \".\"\n",
     "CHAPTER_ID = \"classification\"\n",
+    "IMAGES_PATH = os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID)\n",
+    "os.makedirs(IMAGES_PATH, exist_ok=True)\n",
     "\n",
-    "def save_fig(fig_id, tight_layout=True):\n",
-    "    path = os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID, fig_id + \".png\")\n",
+    "def save_fig(fig_id, tight_layout=True, fig_extension=\"png\", resolution=300):\n",
+    "    path = os.path.join(IMAGES_PATH, fig_id + \".\" + fig_extension)\n",
     "    print(\"Saving figure\", fig_id)\n",
     "    if tight_layout:\n",
     "        plt.tight_layout()\n",
-    "    plt.savefig(path, format='png', dpi=300)"
+    "    plt.savefig(path, format=fig_extension, dpi=resolution)"
    ]
   },
   {
@@ -4462,7 +4477,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.6"
+   "version": "3.7.10"
   },
   "nav_menu": {},
   "toc": {

diff --git a/04_training_linear_models.ipynb b/04_training_linear_models.ipynb
@@ -11,7 +11,20 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "_This notebook contains all the sample code and solutions to the exercises in chapter 4._"
+    "_This notebook contains all the sample code and solutions to the exercises in chapter 4._\n",
+    "\n",
+    "<table align=\"left\">\n",
+    "  <td>\n",
+    "    <a target=\"_blank\" href=\"https://colab.research.google.com/github/ageron/handson-ml/blob/master/04_training_linear_models.ipynb\"><img src=\"https://www.tensorflow.org/images/colab_logo_32px.png\" />Run in Google Colab</a>\n",
+    "  </td>\n",
+    "</table>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "**Warning**: this is the code for the 1st edition of the book. Please visit https://github.com/ageron/handson-ml2 for the 2nd edition code, with up-to-date notebooks using the latest library versions."
    ]
   },
   {
@@ -55,17 +68,15 @@
     "# Where to save the figures\n",
     "PROJECT_ROOT_DIR = \".\"\n",
     "CHAPTER_ID = \"training_linear_models\"\n",
+    "IMAGES_PATH = os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID)\n",
+    "os.makedirs(IMAGES_PATH, exist_ok=True)\n",
     "\n",
-    "def save_fig(fig_id, tight_layout=True):\n",
-    "    path = os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID, fig_id + \".png\")\n",
+    "def save_fig(fig_id, tight_layout=True, fig_extension=\"png\", resolution=300):\n",
+    "    path = os.path.join(IMAGES_PATH, fig_id + \".\" + fig_extension)\n",
     "    print(\"Saving figure\", fig_id)\n",
     "    if tight_layout:\n",
     "        plt.tight_layout()\n",
-    "    plt.savefig(path, format='png', dpi=300)\n",
-    "\n",
-    "# Ignore useless warnings (see SciPy issue #5998)\n",
-    "import warnings\n",
-    "warnings.filterwarnings(action=\"ignore\", message=\"^internal gelsd\")"
+    "    plt.savefig(path, format=fig_extension, dpi=resolution)"
    ]
   },
   {
@@ -2684,7 +2695,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.6"
+   "version": "3.7.10"
   },
   "nav_menu": {},
   "toc": {

diff --git a/05_support_vector_machines.ipynb b/05_support_vector_machines.ipynb
@@ -6,7 +6,20 @@
    "source": [
     "**Chapter 5 – Support Vector Machines**\n",
     "\n",
-    "_This notebook contains all the sample code and solutions to the exercises in chapter 5._"
+    "_This notebook contains all the sample code and solutions to the exercises in chapter 5._\n",
+    "\n",
+    "<table align=\"left\">\n",
+    "  <td>\n",
+    "    <a target=\"_blank\" href=\"https://colab.research.google.com/github/ageron/handson-ml/blob/master/05_support_vector_machines.ipynb\"><img src=\"https://www.tensorflow.org/images/colab_logo_32px.png\" />Run in Google Colab</a>\n",
+    "  </td>\n",
+    "</table>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "**Warning**: this is the code for the 1st edition of the book. Please visit https://github.com/ageron/handson-ml2 for the 2nd edition code, with up-to-date notebooks using the latest library versions."
    ]
   },
   {
@@ -50,13 +63,15 @@
     "# Where to save the figures\n",
     "PROJECT_ROOT_DIR = \".\"\n",
     "CHAPTER_ID = \"svm\"\n",
+    "IMAGES_PATH = os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID)\n",
+    "os.makedirs(IMAGES_PATH, exist_ok=True)\n",
     "\n",
-    "def save_fig(fig_id, tight_layout=True):\n",
-    "    path = os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID, fig_id + \".png\")\n",
+    "def save_fig(fig_id, tight_layout=True, fig_extension=\"png\", resolution=300):\n",
+    "    path = os.path.join(IMAGES_PATH, fig_id + \".\" + fig_extension)\n",
     "    print(\"Saving figure\", fig_id)\n",
     "    if tight_layout:\n",
     "        plt.tight_layout()\n",
-    "    plt.savefig(path, format='png', dpi=300)"
+    "    plt.savefig(path, format=fig_extension, dpi=resolution)"
    ]
   },
   {
@@ -2920,7 +2935,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.6"
+   "version": "3.7.10"
   },
   "nav_menu": {},
   "toc": {

diff --git a/06_decision_trees.ipynb b/06_decision_trees.ipynb
@@ -11,7 +11,20 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "_This notebook contains all the sample code and solutions to the exercises in chapter 6._"
+    "_This notebook contains all the sample code and solutions to the exercises in chapter 6._\n",
+    "\n",
+    "<table align=\"left\">\n",
+    "  <td>\n",
+    "    <a target=\"_blank\" href=\"https://colab.research.google.com/github/ageron/handson-ml/blob/master/06_decision_trees.ipynb\"><img src=\"https://www.tensorflow.org/images/colab_logo_32px.png\" />Run in Google Colab</a>\n",
+    "  </td>\n",
+    "</table>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "**Warning**: this is the code for the 1st edition of the book. Please visit https://github.com/ageron/handson-ml2 for the 2nd edition code, with up-to-date notebooks using the latest library versions."
    ]
   },
   {
@@ -55,15 +68,15 @@
     "# Where to save the figures\n",
     "PROJECT_ROOT_DIR = \".\"\n",
     "CHAPTER_ID = \"decision_trees\"\n",
+    "IMAGES_PATH = os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID)\n",
+    "os.makedirs(IMAGES_PATH, exist_ok=True)\n",
     "\n",
-    "def image_path(fig_id):\n",
-    "    return os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID, fig_id)\n",
-    "\n",
-    "def save_fig(fig_id, tight_layout=True):\n",
+    "def save_fig(fig_id, tight_layout=True, fig_extension=\"png\", resolution=300):\n",
+    "    path = os.path.join(IMAGES_PATH, fig_id + \".\" + fig_extension)\n",
     "    print(\"Saving figure\", fig_id)\n",
     "    if tight_layout:\n",
     "        plt.tight_layout()\n",
-    "    plt.savefig(image_path(fig_id) + \".png\", format='png', dpi=300)"
+    "    plt.savefig(path, format=fig_extension, dpi=resolution)"
    ]
   },
   {
@@ -114,6 +127,9 @@
    "source": [
     "from sklearn.tree import export_graphviz\n",
     "\n",
+    "def image_path(fig_id):\n",
+    "    return os.path.join(IMAGES_PATH, fig_id)\n",
+    "\n",
     "export_graphviz(\n",
     "        tree_clf,\n",
     "        out_file=image_path(\"iris_tree.dot\"),\n",
@@ -1009,7 +1025,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.6"
+   "version": "3.7.10"
   },
   "nav_menu": {
    "height": "309px",

diff --git a/07_ensemble_learning_and_random_forests.ipynb b/07_ensemble_learning_and_random_forests.ipynb
@@ -11,7 +11,20 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "_This notebook contains all the sample code and solutions to the exercises in chapter 7._"
+    "_This notebook contains all the sample code and solutions to the exercises in chapter 7._\n",
+    "\n",
+    "<table align=\"left\">\n",
+    "  <td>\n",
+    "    <a target=\"_blank\" href=\"https://colab.research.google.com/github/ageron/handson-ml/blob/master/07_ensemble_learning_and_random_forests.ipynb\"><img src=\"https://www.tensorflow.org/images/colab_logo_32px.png\" />Run in Google Colab</a>\n",
+    "  </td>\n",
+    "</table>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "**Warning**: this is the code for the 1st edition of the book. Please visit https://github.com/ageron/handson-ml2 for the 2nd edition code, with up-to-date notebooks using the latest library versions."
    ]
   },
   {
@@ -55,15 +68,15 @@
     "# Where to save the figures\n",
     "PROJECT_ROOT_DIR = \".\"\n",
     "CHAPTER_ID = \"ensembles\"\n",
+    "IMAGES_PATH = os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID)\n",
+    "os.makedirs(IMAGES_PATH, exist_ok=True)\n",
     "\n",
-    "def image_path(fig_id):\n",
-    "    return os.path.join(PROJECT_ROOT_DIR, \"images\", CHAPTER_ID, fig_id)\n",
-    "\n",
-    "def save_fig(fig_id, tight_layout=True):\n",
+    "def save_fig(fig_id, tight_layout=True, fig_extension=\"png\", resolution=300):\n",
+    "    path = os.path.join(IMAGES_PATH, fig_id + \".\" + fig_extension)\n",
     "    print(\"Saving figure\", fig_id)\n",
     "    if tight_layout:\n",
     "        plt.tight_layout()\n",
-    "    plt.savefig(image_path(fig_id) + \".png\", format='png', dpi=300)"
+    "    plt.savefig(path, format=fig_extension, dpi=resolution)"
    ]
   },
   {
@@ -2560,7 +2573,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.6"
+   "version": "3.7.10"
   },
   "nav_menu": {
    "height": "252px",