check compat of ch02-07

tatz1101 · Jul 2, 2018 · 36219d8 · 36219d8
1 parent 9c9e714
commit 36219d8
Show file tree

Hide file tree

Showing 10 changed files with 532 additions and 604 deletions.
diff --git a/code/ch02/ch02.ipynb b/code/ch02/ch02.ipynb
diff --git a/code/ch02/ch02.py b/code/ch02/ch02.py
@@ -587,8 +587,3 @@ def predict(self, X):
 
 
 
-
-
-
-
-
diff --git a/code/ch03/ch03.ipynb b/code/ch03/ch03.ipynb
diff --git a/code/ch04/ch04.ipynb b/code/ch04/ch04.ipynb
diff --git a/code/ch04/ch04.py b/code/ch04/ch04.py
@@ -184,9 +184,9 @@
 
 
 
-df = pd.DataFrame([['green', 'M', 10.1, 'class1'],
-                   ['red', 'L', 13.5, 'class2'],
-                   ['blue', 'XL', 15.3, 'class1']])
+df = pd.DataFrame([['green', 'M', 10.1, 'class2'],
+                   ['red', 'L', 13.5, 'class1'],
+                   ['blue', 'XL', 15.3, 'class2']])
 
 df.columns = ['color', 'size', 'price', 'classlabel']
 df
@@ -253,6 +253,8 @@
 class_le.inverse_transform(y)
 
 
+# Note: The deprecation warning shown above is due to an implementation detail in scikit-learn. It was already addressed in a pull request (https://github.com/scikit-learn/scikit-learn/pull/9816), and the patch will be released with the next version of scikit-learn (i.e., v. 0.20.0).
+
 
 # ## Performing one-hot encoding on nominal features
 
@@ -411,6 +413,9 @@
 
 
 lr = LogisticRegression(penalty='l1', C=1.0)
+# Note that C=1.0 is the default. You can increase
+# or decrease it to make the regulariztion effect
+# stronger or weaker, respectively.
 lr.fit(X_train_std, y_train)
 print('Training accuracy:', lr.score(X_train_std, y_train))
 print('Test accuracy:', lr.score(X_test_std, y_test))

diff --git a/code/ch05/ch05.ipynb b/code/ch05/ch05.ipynb
diff --git a/code/ch05/ch05.py b/code/ch05/ch05.py
@@ -797,7 +797,7 @@ def rbf_kernel_pca(X, gamma, n_components):
     Returns
     ------------
      alphas: {NumPy ndarray}, shape = [n_samples, k_features]
-       Projected dataset   
+       Projected dataset 
      
      lambdas: list
        Eigenvalues

diff --git a/code/ch06/ch06.ipynb b/code/ch06/ch06.ipynb
diff --git a/code/ch07/ch07.ipynb b/code/ch07/ch07.ipynb
diff --git a/code/ch07/ch07.py b/code/ch07/ch07.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 
-from scipy.misc import comb
+from scipy.special import comb
 import math
 import numpy as np
 import matplotlib.pyplot as plt