Changeset 7308:6c42f4172672 in orange

Timestamp:

02/03/11 11:55:01 (2 years ago)

Author:

mocnik <mocnik@…>

Branch:

default

Convert:

41e72285017a3a522d875bf67402f931440cd730

Message:

• cleaning mistakes

Location:

orange/doc/Orange/rst/code

Files:

• knnExample1.py (modified) (1 diff)
• knnExample2.py (modified) (1 diff)
• knnInstanceDistance.py (modified) (1 diff)

orange/doc/Orange/rst/code/knnExample1.py

@@ -2 +2 @@
 table = Orange.data.Table("iris")
 
-rndind = Orange.core.MakeRandomIndices2(data, p0=0.8)
+rndind = Orange.core.MakeRandomIndices2(table, p0=0.8)
 train = table.select(rndind, 0)
 test = table.select(rndind, 1)
 
-knn = Orange.classifier.kNNLearner(train, k=10)
+knn = Orange.classification.knn.kNNLearner(train, k=10)
 for i in range(5):
     instance = test.randomexample()

orange/doc/Orange/rst/code/knnExample2.py

@@ -1 @@
-knn = Orange.classification.kNNLearner()
+import Orange
+table = Orange.data.Table("iris")
+
+knn = Orange.classification.knn.kNNLearner()
 knn.k = 10
 knn.distanceConstructor = Orange.core.ExamplesDistanceConstructor_Hamming()
-knn = knn(train)
+knn = knn(table)
 for i in range(5):
-    instance = test.randomexample()
+    instance = table.randomexample()
     print instance.getclass(), knn(instance)

orange/doc/Orange/rst/code/knnInstanceDistance.py

@@ -3 +3 @@
 table = Orange.data.Table("lenses")
 
-nnc = Orange.classifier.knn.FindNearestConstructore()
+nnc = Orange.classification.knn.FindNearestConstructor()
 nnc.distanceConstructor = Orange.core.ExamplesDistanceConstructor_Euclidean()