Changeset 1031 for trunk/yat/statistics/pearson_distance.h

Timestamp:

Feb 4, 2008, 4:44:44 PM (15 years ago)

Author:

Markus Ringnér

Message:

Fixes #272

File:

• trunk/yat/statistics/pearson_distance.h (moved) (moved from trunk/yat/statistics/pearson_vector_distance.h) (5 diffs)

trunk/yat/statistics/pearson_distance.h

@@ -1 @@
-#ifndef theplu_yat_statistics_pearson_vector_distance_h
-#define theplu_yat_statistics_pearson_vector_distance_h
+#ifndef theplu_yat_statistics_pearson_distance_h
+#define theplu_yat_statistics_pearson_distance_h
 
 // $Id$
@@ -25 +25 @@
 */
 
-#include "vector_distance.h"
+#include "distance.h"
 
 #include "AveragerPair.h"
@@ -40 +40 @@
   /// the Pearson distance measure.
   ///
-  struct pearson_vector_distance_tag 
-    : public vector_distance_tag
+  struct pearson_distance_tag 
+    : public distance_tag
   {
     /// \brief tag for pearson distance
-    typedef pearson_vector_distance_tag distance;
+    typedef pearson_distance_tag distance;
   };
 
@@ -54 +54 @@
   /// 
   template <class Iter>
-  double vector_distance(Iter beg1,Iter end1, Iter beg2,
-                         const pearson_vector_distance_tag& disttype,
+  double distance(Iter beg1,Iter end1, Iter beg2,
+                         const pearson_distance_tag& disttype,
                          utility::unweighted_type)
   {
@@ -69 +69 @@
   /// 
   template <class Iter>
-  double vector_distance(Iter beg1,Iter end1, Iter beg2,
-                         const pearson_vector_distance_tag& disttype,
+  double distance(Iter beg1,Iter end1, Iter beg2,
+                         const pearson_distance_tag& disttype,
                          utility::weighted_type)
   {