Skip to content

Commit 0d442df

Browse files
author
GuangxiaoSong
committed
from sklearn.model_selection import train_test_split
1 parent e2cae1c commit 0d442df

5 files changed

+10
-8
lines changed

0100_rawdata_svm.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from __future__ import print_function
1010
import data.load_raw_data_file_to_array as f2a
1111
import numpy as np
12-
from sklearn.cross_validation import train_test_split
12+
from sklearn.model_selection import train_test_split
1313
from sklearn.svm import SVC
1414

1515
import time

0200_svm.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from __future__ import print_function
1010
import numpy as np
11-
from sklearn.cross_validation import train_test_split
11+
from sklearn.model_selection import train_test_split
1212
from sklearn.svm import SVC
1313

1414
data = np.loadtxt('data/transAllData.txt')
@@ -32,4 +32,6 @@
3232
gamma=0.00024, kernel='rbf', max_iter=-1, probability=False,
3333
random_state=None, shrinking=True, tol=0.001, verbose=False)
3434
clf.fit(data_train, label_train)
35+
print (clf.predict(data_test))
36+
print (label_test)
3537
print (clf.score(data_test, label_test))

0300_multi-layer_perceptron.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from __future__ import print_function
1010
import numpy as np
1111
from sklearn.neural_network import MLPClassifier
12-
from sklearn.cross_validation import train_test_split
12+
from sklearn.model_selection import train_test_split
1313

1414
data = np.loadtxt('data/transAllData.txt')
1515
num = 100 # 每种风格音乐文件个数

0400_nearest_centroid.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"""
88

99
import numpy as np
10-
from sklearn.cross_validation import train_test_split
10+
from sklearn.model_selection import train_test_split
1111
from sklearn.neighbors.nearest_centroid import NearestCentroid
1212

1313
data = np.loadtxt('data/transAllData.txt')

0504_tf_full_connect_NN.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def multilayer_perceptron(x, weights, biases):
136136
# Start input enqueue threads.
137137
coord = tf.train.Coordinator()
138138
threads = tf.train.start_queue_runners(sess=sess, coord=coord)
139-
for epoch in range(10000):
139+
for epoch in range(100):
140140
# pass it in through the feed_dict
141141
audio_batch_vals, label_batch_vals = sess.run([audio_batch, label_batch])
142142

@@ -187,8 +187,8 @@ def multilayer_perceptron(x, weights, biases):
187187
9
188188
'''
189189

190-
if (label_test_val == pred_class_index[0]):
190+
if label_test_val == pred_class_index[0]:
191191
correct_num += 1
192-
print (("%i / %i is correct.") % (correct_num, test_example_number))
193-
print (("Accuracy is %f .") % (float(correct_num) / test_example_number))
192+
print("%i / %i is correct." % (correct_num, test_example_number))
193+
print("Accuracy is %f ." % (float(correct_num) / test_example_number))
194194
sess.close()

0 commit comments

Comments
 (0)