Merge remote-tracking branch 'origin/master'

Mofan Zhou · Mofan Zhou · commit e67801b4577b · 2016-09-11T12:24:21.000+10:00
diff --git a/README.md b/README.md
@@ -12,6 +12,9 @@ https://www.youtube.com/playlist?list=PLXO45tsB95cI7ZleLM5i3XXhhe9YmVrRO
 python theano 神经网络 机器学习 视频链接:
 https://www.youtube.com/playlist?list=PLXO45tsB95cKpDID642AjNkygrSR5X15T
 
+python matplotlib 图像可视化 视频教程:
+https://www.youtube.com/playlist?list=PLXO45tsB95cKiBRXYqNNCw8AUo6tYen3l
+
 python numpy & pandas 数据处理 学习教程 视频链接:
 https://www.youtube.com/playlist?list=PLXO45tsB95cKKyC45gatc8wEc3Ue7BlI4
 
diff --git a/numpy&pandas/11_pandas_intro.py b/numpy&pandas/11_pandas_intro.py
@@ -6,6 +6,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
 import pandas as pd
 import numpy as np
 
diff --git a/numpy&pandas/12_selection.py b/numpy&pandas/12_selection.py
@@ -5,6 +5,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
 import pandas as pd
 import numpy as np
 
diff --git a/numpy&pandas/13_set_value.py b/numpy&pandas/13_set_value.py
@@ -6,6 +6,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
 import pandas as pd
 import numpy as np
 
diff --git a/numpy&pandas/14_nan.py b/numpy&pandas/14_nan.py
@@ -6,6 +6,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
 import pandas as pd
 import numpy as np
 
diff --git a/numpy&pandas/15_read_to/15_read_to.py b/numpy&pandas/15_read_to/15_read_to.py
@@ -5,6 +5,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
 import pandas as pd
 
 # read from
diff --git a/numpy&pandas/16_concat.py b/numpy&pandas/16_concat.py
@@ -6,6 +6,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
 import pandas as pd
 import numpy as np
 
diff --git a/numpy&pandas/17_merge.py b/numpy&pandas/17_merge.py
@@ -6,6 +6,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
 import pandas as pd
 
 # merging two df by key/keys. (may be used in database)
diff --git a/numpy&pandas/18_plot.py b/numpy&pandas/18_plot.py
@@ -6,6 +6,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
 import pandas as pd
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/real world examples/bank_marketing_learning/bank_marketing_sk.py b/real world examples/bank_marketing_learning/bank_marketing_sk.py
@@ -59,37 +59,47 @@ def feature_utility(data, selected_feature_name, target_name):
     plt.legend([bar[0] for bar in bars], target_classes, loc='best')
     plt.show()
 
+def encode_label(data):
+    la_en = preprocessing.LabelEncoder()
+    for col in ['job', 'marital', 'education', 'default', 'housing', 'loan',
+                'contact', 'month', 'poutcome', 'y']:
+        data[col] = bank_data[col].astype('category')
+        data[col] = la_en.fit_transform(bank_data[col])
+    return data
+
 dataset_path = ['bank.csv', 'bank-full.csv']
 bank_data = pd.read_csv(dataset_path[1], sep=';')
+print(bank_data.head())
 
 # good categorical features: job, marital, education, housing, loan, contact, month, poutcome
 # bad categorical features: default
 # feature_utility(bank_data, 'housing', 'y')
 
-le_en = preprocessing.LabelEncoder()
-for col in ['job', 'marital', 'education', 'default', 'housing', 'loan',
-            'contact', 'month', 'poutcome', 'y']:
-    bank_data[col] = bank_data[col].astype('category')
-    bank_data[col] = le_en.fit_transform(bank_data[col])
+bank_data = encode_label(bank_data)
 # print(bank_data.dtypes)
 # print(bank_data.head())
 
 X_data, y_data = bank_data.iloc[:, :-1], bank_data.iloc[:, -1]
+# show the percentage of answer yes and no.
+answer_no, answer_yes = y_data.value_counts()
+print('Percentage of answering no: ', answer_no/(answer_no+answer_yes))
+
 X_train, X_test, y_train, y_test = train_test_split(
     X_data, y_data,
     test_size=0.2)
 
-dt_clf = DecisionTreeClassifier()
-rf_clf = RandomForestClassifier()
+dt_clf = DecisionTreeClassifier(class_weight='balanced',)
+rf_clf = RandomForestClassifier(class_weight='balanced')
+# randomize the data, and run the cross validation for 5 times
 cv = ShuffleSplit(X_data.shape[0], n_iter=5,
-        test_size=0.2, random_state=0)
-print(cross_val_score(dt_clf, X_data, y_data, cv=cv, scoring='accuracy').mean())
-print(cross_val_score(rf_clf, X_data, y_data, cv=cv, scoring='accuracy').mean())
-
-dt_clf.fit(X_train, y_train)
-print(dt_clf.score(X_test, y_test))
-rf_clf.fit(X_train, y_train)
-print(rf_clf.score(X_test, y_test))
+        test_size=0.3, random_state=0)
+print(cross_val_score(dt_clf, X_data, y_data, cv=cv, scoring='f1').mean())
+print(cross_val_score(rf_clf, X_data, y_data, cv=cv, scoring='f1').mean())
+
+# dt_clf.fit(X_train, y_train)
+# print(dt_clf.score(X_test, y_test))
+# rf_clf.fit(X_train, y_train)
+# print(rf_clf.score(X_test, y_test))
 
 # print(rf_clf.predict(X_test.iloc[10, :][np.newaxis, :]))
 # print(y_test.iloc[10])
diff --git a/sklearnTUT/sk10_cross_validation3.py b/sklearnTUT/sk10_cross_validation3.py
@@ -6,6 +6,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.datasets import load_digits
 from sklearn.svm import SVC
diff --git a/sklearnTUT/sk11_save.py b/sklearnTUT/sk11_save.py
@@ -6,6 +6,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 import svm
 from sklearn import datasets
 
diff --git a/sklearnTUT/sk4_learning_pattern.py b/sklearnTUT/sk4_learning_pattern.py
@@ -6,6 +6,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 import datasets
 from sklearn.cross_validation import train_test_split
 from sklearn.neighbors import KNeighborsClassifier
diff --git a/sklearnTUT/sk5_datasets.py b/sklearnTUT/sk5_datasets.py
@@ -6,6 +6,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 import datasets
 from sklearn.linear_model import LinearRegression
 import matplotlib.pyplot as plt
diff --git a/sklearnTUT/sk6_model_attribute_method.py b/sklearnTUT/sk6_model_attribute_method.py
@@ -6,6 +6,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 import datasets
 from sklearn.linear_model import LinearRegression
 
diff --git a/sklearnTUT/sk7_normalization.py b/sklearnTUT/sk7_normalization.py
@@ -6,6 +6,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 import preprocessing
 import numpy as np
 from sklearn.cross_validation import train_test_split
diff --git a/sklearnTUT/sk8_cross_validation/for_you_to_practice.py b/sklearnTUT/sk8_cross_validation/for_you_to_practice.py
@@ -6,6 +6,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.datasets import load_iris
 from sklearn.cross_validation import train_test_split
 from sklearn.neighbors import KNeighborsClassifier
diff --git a/sklearnTUT/sk8_cross_validation/full_code.py b/sklearnTUT/sk8_cross_validation/full_code.py
@@ -6,6 +6,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.datasets import load_iris
 from sklearn.cross_validation import train_test_split
 from sklearn.neighbors import KNeighborsClassifier
diff --git a/sklearnTUT/sk9_cross_validation2.py b/sklearnTUT/sk9_cross_validation2.py
@@ -6,6 +6,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.datasets import load_digits
 from sklearn.svm import SVC
diff --git a/tensorflowTUT/tensorflow10_def_add_layer.py b/tensorflowTUT/tensorflow10_def_add_layer.py
@@ -6,6 +6,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
 import tensorflow as tf
 
 
diff --git a/tensorflowTUT/tensorflow11_build_network.py b/tensorflowTUT/tensorflow11_build_network.py
@@ -6,6 +6,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
 import tensorflow as tf
 import numpy as np
 
diff --git a/tensorflowTUT/tensorflow12_plut_result.py b/tensorflowTUT/tensorflow12_plut_result.py
@@ -6,6 +6,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
 import tensorflow as tf
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/tensorflowTUT/tensorflow6_session.py b/tensorflowTUT/tensorflow6_session.py
@@ -6,6 +6,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
 import tensorflow as tf
 
 matrix1 = tf.constant([[3, 3]])
diff --git a/tensorflowTUT/tensorflow7_variable.py b/tensorflowTUT/tensorflow7_variable.py
@@ -6,6 +6,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
 import tensorflow as tf
 
 state = tf.Variable(0, name='counter')
diff --git a/tensorflowTUT/tensorflow8_feeds.py b/tensorflowTUT/tensorflow8_feeds.py
@@ -6,6 +6,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
 import tensorflow as tf
 
 input1 = tf.placeholder(tf.float32)
diff --git a/tensorflowTUT/tf11_build_network/for_you_to_practice.py b/tensorflowTUT/tf11_build_network/for_you_to_practice.py
@@ -6,6 +6,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
 import tensorflow as tf
 import numpy as np
 
diff --git a/tensorflowTUT/tf11_build_network/full_code.py b/tensorflowTUT/tf11_build_network/full_code.py
@@ -6,6 +6,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
 import tensorflow as tf
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/tensorflowTUT/tf12_plot_result/for_you_to_practice.py b/tensorflowTUT/tf12_plot_result/for_you_to_practice.py
@@ -6,6 +6,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
 import tensorflow as tf
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/tensorflowTUT/tf12_plot_result/full_code.py b/tensorflowTUT/tf12_plot_result/full_code.py
@@ -6,6 +6,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
 import tensorflow as tf
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/tensorflowTUT/tf14_tensorboard/for_you_to_practice.py b/tensorflowTUT/tf14_tensorboard/for_you_to_practice.py
@@ -6,6 +6,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
 import tensorflow as tf
 
 
diff --git a/tensorflowTUT/tf14_tensorboard/full_code.py b/tensorflowTUT/tf14_tensorboard/full_code.py
@@ -6,6 +6,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
 import tensorflow as tf
 
 
diff --git a/tensorflowTUT/tf15_tensorboard/for_you_to_practice.py b/tensorflowTUT/tf15_tensorboard/for_you_to_practice.py
@@ -6,6 +6,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
 import tensorflow as tf
 import numpy as np
 
diff --git a/tensorflowTUT/tf15_tensorboard/full_code.py b/tensorflowTUT/tf15_tensorboard/full_code.py
@@ -6,6 +6,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
 import tensorflow as tf
 import numpy as np
 
diff --git a/tensorflowTUT/tf16_classification/for_you_to_practice.py b/tensorflowTUT/tf16_classification/for_you_to_practice.py
@@ -6,6 +6,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
 import tensorflow as tf
 
 
diff --git a/tensorflowTUT/tf16_classification/full_code.py b/tensorflowTUT/tf16_classification/full_code.py
@@ -6,6 +6,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
 import tensorflow as tf
 from tensorflow.examples.tutorials.mnist import input_data
 # number 1 to 10 data
diff --git a/tensorflowTUT/tf17_dropout/for_you_to_practice.py b/tensorflowTUT/tf17_dropout/for_you_to_practice.py
@@ -6,6 +6,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
 import tensorflow as tf
 from sklearn.datasets import load_digits
 from sklearn.cross_validation import train_test_split
diff --git a/tensorflowTUT/tf17_dropout/full_code.py b/tensorflowTUT/tf17_dropout/full_code.py
@@ -6,6 +6,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
 import tensorflow as tf
 from sklearn.datasets import load_digits
 from sklearn.cross_validation import train_test_split
diff --git a/tensorflowTUT/tf18_CNN2/for_you_to_practice.py b/tensorflowTUT/tf18_CNN2/for_you_to_practice.py
@@ -6,6 +6,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
 import tensorflow as tf
 from tensorflow.examples.tutorials.mnist import input_data
 # number 1 to 10 data
diff --git a/tensorflowTUT/tf18_CNN2/full_code.py b/tensorflowTUT/tf18_CNN2/full_code.py
@@ -6,6 +6,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
 import tensorflow as tf
 from tensorflow.examples.tutorials.mnist import input_data
 # number 1 to 10 data
diff --git a/tensorflowTUT/tf18_CNN3/for_you_to_practice.py b/tensorflowTUT/tf18_CNN3/for_you_to_practice.py
@@ -6,6 +6,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
 import tensorflow as tf
 from tensorflow.examples.tutorials.mnist import input_data
 # number 1 to 10 data
diff --git a/tensorflowTUT/tf18_CNN3/full_code.py b/tensorflowTUT/tf18_CNN3/full_code.py
@@ -6,6 +6,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
 import tensorflow as tf
 from tensorflow.examples.tutorials.mnist import input_data
 # number 1 to 10 data
diff --git a/tensorflowTUT/tf19_saver.py b/tensorflowTUT/tf19_saver.py
@@ -6,6 +6,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
 import tensorflow as tf
 import numpy as np
 
diff --git a/tensorflowTUT/tf5_example2/for_you_to_practice.py b/tensorflowTUT/tf5_example2/for_you_to_practice.py
diff --git a/tensorflowTUT/tf5_example2/full_code.py b/tensorflowTUT/tf5_example2/full_code.py
diff --git a/theanoTUT/theano10_regression_visualization/for_you_to_practice.py b/theanoTUT/theano10_regression_visualization/for_you_to_practice.py
diff --git a/theanoTUT/theano10_regression_visualization/full_code.py b/theanoTUT/theano10_regression_visualization/full_code.py
diff --git a/theanoTUT/theano11_classification_nn/for_you_to_practice.py b/theanoTUT/theano11_classification_nn/for_you_to_practice.py
diff --git a/theanoTUT/theano11_classification_nn/full_code.py b/theanoTUT/theano11_classification_nn/full_code.py
diff --git a/theanoTUT/theano12_regularization/for_you_to_practice.py b/theanoTUT/theano12_regularization/for_you_to_practice.py
diff --git a/theanoTUT/theano12_regularization/full_code.py b/theanoTUT/theano12_regularization/full_code.py
diff --git a/theanoTUT/theano13_save/for_you_to_practice.py b/theanoTUT/theano13_save/for_you_to_practice.py
diff --git a/theanoTUT/theano13_save/full_code.py b/theanoTUT/theano13_save/full_code.py
diff --git a/theanoTUT/theano3_what_does_ML_do.py b/theanoTUT/theano3_what_does_ML_do.py
diff --git a/theanoTUT/theano4_basic_usage.py b/theanoTUT/theano4_basic_usage.py
diff --git a/theanoTUT/theano5_function.py b/theanoTUT/theano5_function.py
diff --git a/theanoTUT/theano6_shared_variable.py b/theanoTUT/theano6_shared_variable.py
diff --git a/theanoTUT/theano8_Layer_class.py b/theanoTUT/theano8_Layer_class.py
diff --git a/theanoTUT/theano9_regression_nn/for_you_to_practice.py b/theanoTUT/theano9_regression_nn/for_you_to_practice.py
diff --git a/theanoTUT/theano9_regression_nn/full_code.py b/theanoTUT/theano9_regression_nn/full_code.py
