Changeset 891

Timestamp:

Sep 25, 2007, 4:26:33 PM (14 years ago)

Author:

Markus Ringnér

Message:

Minor modifications

Location:

trunk

Files:

• test/vector_distance_test.cc (modified) (2 diffs)
• yat/statistics/euclidean_vector_distance.h (modified) (2 diffs)
• yat/statistics/vector_distance.h (modified) (1 diff)

trunk/test/vector_distance_test.cc

@@ -78 +78 @@
   }
 
+
+  // Test with reference to a vector_distance_tag
+  statistics::euclidean_vector_distance_tag tag;
+  statistics::vector_distance_tag& tagref=tag;
+  dist=statistics::vector_distance(aw.begin(),aw.end(),bw.begin(),tagref);
+  *error << "Dist: " << dist << std::endl;
+
   if (error!=&std::cerr)
     delete error;
@@ -87 +94 @@
 
 
-

trunk/yat/statistics/euclidean_vector_distance.h

@@ -31 +31 @@
   /// distance measure and iterators to unweighted containers.
   /// 
-  template <class Iter>
-  double vector_distance(Iter beg1,Iter end1, Iter beg2,
+  template <typename Iter1, typename Iter2>
+  double vector_distance(Iter1 beg1,Iter1 end1, Iter2 beg2,
                          const euclidean_vector_distance_tag& disttype,
                          std::random_access_iterator_tag)
@@ -47 +47 @@
   /// distance measure and iterators to weighted containers.
   /// 
-  template <class Iter>
-  double vector_distance(Iter beg1,Iter end1, Iter beg2,
+  template <typename Iter1, typename Iter2>
+  double vector_distance(Iter1 beg1, Iter1 end1, Iter2 beg2,
                          const euclidean_vector_distance_tag& disttype,
                          std::weighted_random_access_iterator_tag)

trunk/yat/statistics/vector_distance.h

@@ -43 +43 @@
   /// (templatized as Dist). It can also call separate implementations
   /// for iterators to weighted and unweighted iterators based on the
-  /// trait of the iterator (templatized as Iter).
+  /// trait of the iterators (templatized as Iter1 and Iter2).
   ///
-  template <typename Iter, typename Dist>
-  double vector_distance(Iter beg1, Iter end1, Iter beg2, const Dist& disttag)
+  template <typename Iter1, typename Iter2, typename Dist>
+  double vector_distance(Iter1 beg1, Iter1 end1, Iter2 beg2, const Dist disttag)
   {
-    return vector_distance(beg1,end1,beg2,typename vector_distance_traits<Dist>::distance(),
-                           typename std::iterator_traits<Iter>::iterator_category());
+    return vector_distance(beg1,end1,beg2,
+                           typename vector_distance_traits<Dist>::distance(),
+                           typename std::iterator_traits<Iter1>::iterator_category());
   }       
   
+  // Temporary function of where I end up when calling with a reference to distance_tag
+  template <typename Iter1, typename Iter2>
+  double vector_distance(Iter1 beg1, Iter1 end1, Iter2 beg2, 
+                         const vector_distance_tag& disttag)
+  {
+    std::cout << "Hello" << std::endl;
+    return 0;
+  }       
+
+  
 }}} // of namespace statistics, yat, and theplu
-    
+
 #endif