Changeset 925 for trunk/test

Timestamp:

Oct 2, 2007, 4:02:08 PM (16 years ago)

Author:

Markus Ringnér

Message:

NCC and IGP have been changed to templates on Distance

File:

• trunk/test/ncc_test.cc (modified) (4 diffs)

trunk/test/ncc_test.cc

@@ -28 +28 @@
 #include "yat/classifier/Target.h"
 #include "yat/utility/matrix.h"
-#include "yat/statistics/vector_distance_ptr.h"
 #include "yat/statistics/pearson_vector_distance.h"
 #include "yat/utility/utility.h"
@@ -60 +59 @@
   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);
+  classifier::NCC<statistics::pearson_vector_distance_tag> ncctmp(ml,target);
   *error << "training...\n";
   ncctmp.train();
@@ -79 +76 @@
       
   classifier::MatrixLookupWeighted dataviewweighted(data,weights);
-  statistics::vector_distance_lookup_weighted_ptr distance=
-    statistics::vector_distance<statistics::pearson_vector_distance_tag>;
-  classifier::NCC ncc(dataviewweighted,targets,distance);
+  classifier::NCC<statistics::pearson_vector_distance_tag> ncc(dataviewweighted,targets);
   *error << "training...\n";
   ncc.train();
@@ -147 +142 @@
   if(ok) 
     return 0;
-  return -1;
-  
+  return -1;  
 }