Changeset 916 for trunk/test/ncc_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/ncc_test.cc (modified) (3 diffs)

trunk/test/ncc_test.cc

@@ -56 +56 @@
   bool ok = true;
 
+  classifier::MatrixLookupWeighted ml(4,4);
+  std::vector<std::string> vec(4, "pos");
+  vec[3]="bjds";
+  classifier::Target target(vec);
+  statistics::vector_distance_lookup_weighted_ptr dist=
+    statistics::vector_distance<statistics::pearson_vector_distance_tag>;
+  classifier::NCC ncctmp(ml,target,dist);
+  *error << "training...\n";
+  ncctmp.train();
+  
   std::ifstream is("data/sorlie_centroid_data.txt");
   utility::matrix data(is,'\t');
@@ -72 +82 @@
     statistics::vector_distance<statistics::pearson_vector_distance_tag>;
   classifier::NCC ncc(dataviewweighted,targets,distance);
+  *error << "training...\n";
   ncc.train();
 
@@ -103 +114 @@
   }
 
+  *error << "prediction...\n";
   utility::matrix prediction;
   ncc.predict(dataviewweighted,prediction);