Merge branch 'master' of https://github.com/ageron/handson-ml into upstream

03_classification.ipynb

@@ -4040,7 +4040,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "It seems that the ham emails are more often plain text, while spam has quite a lot of HTML. Moreover, quite a few ham emails are signed using PGP, while no spam is. In short, it seems that the email structure is a usual information to have."
+    "It seems that the ham emails are more often plain text, while spam has quite a lot of HTML. Moreover, quite a few ham emails are signed using PGP, while no spam is. In short, it seems that the email structure is useful information to have."
    ]
   },
   {
@@ -4659,8 +4659,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Precision: 0.95%\n",
-      "Recall: 0.98%\n"
+      "Precision: 95.00%\n",
+      "Recall: 98.00%\n"
      ]
     }
    ],
@@ -4674,8 +4674,8 @@
     "\n",
     "y_pred = log_clf.predict(X_test_transformed)\n",
     "\n",
-    "print(\"Precision: {:.2f}%\".format(precision_score(y_test, y_pred)))\n",
-    "print(\"Recall: {:.2f}%\".format(recall_score(y_test, y_pred)))"
+    "print(\"Precision: {:.2f}%\".format(100 * precision_score(y_test, y_pred)))\n",
+    "print(\"Recall: {:.2f}%\".format(100 * recall_score(y_test, y_pred)))"
    ]
   }
  ],

datasets/housing/README.md

@@ -1,7 +1,7 @@
 # California Housing
 
 ## Source
-This dataset is a modified version of the California Housing dataset available from [http://www.dcc.fc.up.pt/~ltorgo/Regression/cal_housing.html](Luís Torgo's page) (University of Porto). Luís Torgo obtained it from the StatLib repository (which is closed now). The dataset may also be downloaded from StatLib mirrors.
+This dataset is a modified version of the California Housing dataset available from [Luís Torgo's page](http://www.dcc.fc.up.pt/~ltorgo/Regression/cal_housing.html) (University of Porto). Luís Torgo obtained it from the StatLib repository (which is closed now). The dataset may also be downloaded from StatLib mirrors.
 
 This dataset appeared in a 1997 paper titled *Sparse Spatial Autoregressions* by Pace, R. Kelley and Ronald Barry, published in the *Statistics and Probability Letters* journal. They built it using the 1990 California census data. It contains one row per census block group. A block group is the smallest geographical unit for which the U.S. Census Bureau publishes sample data (a block group typically has a population of 600 to 3,000 people).
 
@@ -60,4 +60,4 @@ Note that the block groups are called "districts" in the Jupyter notebooks, simp
     50%        433.000000   1164.000000    408.000000       3.541400  
     75%        644.000000   1718.000000    602.000000       4.745000  
     max       6210.000000  35682.000000   5358.000000      15.000100
- 
+