Merge pull request #12 from lannerate/master

add kNNTest
pbharrin · Dec 25, 2017 · c1ea22f · c1ea22f
2 parents 61141e4 + ca7c282
commit c1ea22f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/Ch02/EXTRAS/createFirstPlot.py b/Ch02/EXTRAS/createFirstPlot.py
@@ -4,12 +4,13 @@
 @author: Peter
 '''
 from numpy import *
-import kNN
 import matplotlib
 import matplotlib.pyplot as plt
+from Ch02 import kNN
+
 fig = plt.figure()
 ax = fig.add_subplot(111)
-datingDataMat,datingLabels = kNN.file2matrix('datingTestSet.txt')
+datingDataMat,datingLabels = kNN.file2matrix('../datingTestSet.txt')
 #ax.scatter(datingDataMat[:,1], datingDataMat[:,2])
 ax.scatter(datingDataMat[:,1], datingDataMat[:,2], 15.0*array(datingLabels), 15.0*array(datingLabels))
 ax.axis([-2,25,-0.2,2.0])

diff --git a/Ch02/kNNTest.py b/Ch02/kNNTest.py
@@ -0,0 +1,23 @@
+'''
+Created on Oct 27, 2010
+
+@author: Peter
+'''
+from numpy import *
+import matplotlib
+import matplotlib.pyplot as plt
+
+from Ch02 import kNN
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+datingDataMat,datingLabels = kNN.file2matrix('datingTestSet.txt')
+# ax.scatter(datingDataMat[:,1], datingDataMat[:,2])
+ax.scatter(datingDataMat[:,1], datingDataMat[:,2], 15.0*array(datingLabels), 15.0*array(datingLabels))
+ax.axis([-2,25,-0.2,2.0])
+plt.xlabel('Percentage of Time Spent Playing Video Games')
+plt.ylabel('Liters of Ice Cream Consumed Per Week')
+plt.show()
+
+#Test dating class
+# kNN.datingClassTest()