Changeset 916 for trunk/test/knn_test.cc

Timestamp:

Sep 30, 2007, 2:50:10 AM (16 years ago)

Author:

Peter

Message:

Sorry this commit is a bit to big.

Adding a yat_assert. The yat assert are turned on by providing a
'-DYAT_DEBUG' flag to preprocessor if normal cassert is turned
on. This flag is activated for developers running configure with
--enable-debug. The motivation is that we can use these yat_asserts in
header files and the yat_asserts will be invisible to the normal user
also if he uses C-asserts.

added output operator in DataLookup2D and removed output operator in
MatrixLookup?

Removed template function add_values in Averager and weighted version

Added function to AveragerWeighted? taking iterator to four ranges.

File:

• trunk/test/knn_test.cc (modified) (2 diffs)

trunk/test/knn_test.cc

@@ -4 +4 @@
 #include "yat/classifier/MatrixLookupWeighted.h"
 #include "yat/statistics/euclidean_vector_distance.h"
+#include "yat/statistics/pearson_vector_distance.h"
 #include "yat/utility/matrix.h"
 
@@ -42 +43 @@
   utility::matrix weights(data.rows(),data.columns(),0.0);
   utility::nan(data,weights);
-      
+
   classifier::MatrixLookupWeighted dataviewweighted(data,weights);
-  classifier::KNN<statistics::euclidean_vector_distance_tag> knn(dataviewweighted,targets);
+  classifier::KNN<statistics::pearson_vector_distance_tag> knn(dataviewweighted,targets);
+  *error << "Training KNN" << std::endl;
   knn.train();