From 78f2aca42dbe8e5cde53073a237f1ae55f14ca54 Mon Sep 17 00:00:00 2001 From: Heiko Strathmann Date: Mon, 29 Feb 2016 18:56:56 +0000 Subject: [PATCH] clean up knn example --- doc/cookbook/source/examples/classifier/knn.rst | 4 ++-- examples/meta/src/classifier/knn.sg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/cookbook/source/examples/classifier/knn.rst b/doc/cookbook/source/examples/classifier/knn.rst index d19ac6ae7b4..403f969d3f3 100644 --- a/doc/cookbook/source/examples/classifier/knn.rst +++ b/doc/cookbook/source/examples/classifier/knn.rst @@ -18,9 +18,9 @@ See :sgissue:`2996` for known issues. Example ------- -Load some training and test data. +Imagine we have files with training and test data. We create :sgclass:`CDenseFeatures` (here 64 bit floats aka RealFeatures) and :sgclass:`CMulticlassLabels` as -.. sgexample:: knn.sg:load_data +.. sgexample:: knn.sg:create_features In order to run :sgclass:`CKNN`, we need to choose a distance, for example :sgclass:`CEuclideanDistance`, or other sub-classes of :sgclass:`CDistance`. The distance is initialized with the data we want to classify. diff --git a/examples/meta/src/classifier/knn.sg b/examples/meta/src/classifier/knn.sg index d63fe326a19..019726ce358 100644 --- a/examples/meta/src/classifier/knn.sg +++ b/examples/meta/src/classifier/knn.sg @@ -1,15 +1,15 @@ -#![load_data] CSVFile f_feats_train("../data/classifier_4class_2d_linear_features_train.dat") CSVFile f_feats_test("../data/classifier_4class_2d_linear_features_test.dat") CSVFile f_labels_train("../data/classifier_4class_2d_linear_labels_train.dat") CSVFile f_labels_test("../data/classifier_4class_2d_linear_labels_test.dat") +#![create_features] RealFeatures features_train(f_feats_train) RealFeatures features_test(f_feats_test) MulticlassLabels labels_train(f_labels_train) MulticlassLabels labels_test(f_labels_test) +#![create_features] -#![load_data] #![choose_distance] EuclideanDistance distance(features_train, features_test)