From 40014cf564aad61a6a4736619e600aca6ba624ff Mon Sep 17 00:00:00 2001 From: Jaguar Date: Thu, 30 Jan 2020 23:43:41 +1300 Subject: [PATCH 1/2] update deprecated package and parameters --- sklearnTUT/sk10_cross_validation3.py | 4 ++-- sklearnTUT/sk7_normalization.py | 2 +- sklearnTUT/sk8_cross_validation/full_code.py | 6 +++--- sklearnTUT/sk9_cross_validation2.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sklearnTUT/sk10_cross_validation3.py b/sklearnTUT/sk10_cross_validation3.py index ef99499..dff07bf 100644 --- a/sklearnTUT/sk10_cross_validation3.py +++ b/sklearnTUT/sk10_cross_validation3.py @@ -7,7 +7,7 @@ Please note, this code is only for python 3+. If you are using python 2+, please modify the code accordingly. """ from __future__ import print_function -from sklearn.learning_curve import validation_curve +from sklearn.model_selection import validation_curve from sklearn.datasets import load_digits from sklearn.svm import SVC import matplotlib.pyplot as plt @@ -19,7 +19,7 @@ param_range = np.logspace(-6, -2.3, 5) train_loss, test_loss = validation_curve( SVC(), X, y, param_name='gamma', param_range=param_range, cv=10, - scoring='mean_squared_error') + scoring='neg_mean_squared_error') train_loss_mean = -np.mean(train_loss, axis=1) test_loss_mean = -np.mean(test_loss, axis=1) diff --git a/sklearnTUT/sk7_normalization.py b/sklearnTUT/sk7_normalization.py index 539134d..305ef5e 100644 --- a/sklearnTUT/sk7_normalization.py +++ b/sklearnTUT/sk7_normalization.py @@ -10,7 +10,7 @@ from sklearn import preprocessing import numpy as np from sklearn.model_selection import train_test_split -from sklearn.datasets.samples_generator import make_classification +from sklearn.datasets import make_classification from sklearn.svm import SVC import matplotlib.pyplot as plt diff --git a/sklearnTUT/sk8_cross_validation/full_code.py b/sklearnTUT/sk8_cross_validation/full_code.py index 8876c3d..ed02176 100644 --- a/sklearnTUT/sk8_cross_validation/full_code.py +++ b/sklearnTUT/sk8_cross_validation/full_code.py @@ -8,7 +8,7 @@ """ from __future__ import print_function from sklearn.datasets import load_iris -from sklearn.cross_validation import train_test_split +from sklearn.model_selection import train_test_split from sklearn.neighbors import KNeighborsClassifier iris = load_iris() @@ -23,13 +23,13 @@ print(knn.score(X_test, y_test)) # this is cross_val_score # -from sklearn.cross_validation import cross_val_score +from sklearn.model_selection import cross_val_score knn = KNeighborsClassifier(n_neighbors=5) scores = cross_val_score(knn, X, y, cv=5, scoring='accuracy') print(scores) # this is how to use cross_val_score to choose model and configs # -from sklearn.cross_validation import cross_val_score +from sklearn.model_selection import cross_val_score import matplotlib.pyplot as plt k_range = range(1, 31) k_scores = [] diff --git a/sklearnTUT/sk9_cross_validation2.py b/sklearnTUT/sk9_cross_validation2.py index eeda072..ed2cd0d 100644 --- a/sklearnTUT/sk9_cross_validation2.py +++ b/sklearnTUT/sk9_cross_validation2.py @@ -7,7 +7,7 @@ Please note, this code is only for python 3+. If you are using python 2+, please modify the code accordingly. """ from __future__ import print_function -from sklearn.learning_curve import learning_curve +from sklearn.model_selection import learning_curve from sklearn.datasets import load_digits from sklearn.svm import SVC import matplotlib.pyplot as plt @@ -17,7 +17,7 @@ X = digits.data y = digits.target train_sizes, train_loss, test_loss= learning_curve( - SVC(gamma=0.01), X, y, cv=10, scoring='mean_squared_error', + SVC(gamma=0.01), X, y, cv=10, scoring='neg_mean_squared_error', train_sizes=[0.1, 0.25, 0.5, 0.75, 1]) train_loss_mean = -np.mean(train_loss, axis=1) test_loss_mean = -np.mean(test_loss, axis=1) From ba8fd1d455f47abae552b7fe56e1c574d315ff58 Mon Sep 17 00:00:00 2001 From: Jaguar Date: Fri, 31 Jan 2020 00:17:34 +1300 Subject: [PATCH 2/2] update joblib import --- .gitignore | 4 +++- sklearnTUT/sk11_save.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 723ef36..e3dff09 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -.idea \ No newline at end of file +.idea +.DS_Store +sklearnTUT/save \ No newline at end of file diff --git a/sklearnTUT/sk11_save.py b/sklearnTUT/sk11_save.py index cb45ab7..461d422 100644 --- a/sklearnTUT/sk11_save.py +++ b/sklearnTUT/sk11_save.py @@ -26,7 +26,7 @@ print(clf2.predict(X[0:1])) # method 2: joblib -from sklearn.externals import joblib +import joblib # Save joblib.dump(clf, 'save/clf.pkl') # restore