Changeset 890

Timestamp:

Sep 25, 2007, 11:35:25 AM (16 years ago)

Author:

Markus Ringnér

Message:

Refs #245 #246 #247

Location:

trunk

Files:

• test/vector_distance_test.cc (modified) (3 diffs)
• yat/classifier/DataLookupWeighted1D.cc (modified) (1 diff)
• yat/classifier/DataLookupWeighted1D.h (modified) (3 diffs)
• yat/statistics/AveragerPairWeighted.cc (modified) (2 diffs)
• yat/statistics/AveragerPairWeighted.h (modified) (2 diffs)
• yat/statistics/euclidean_vector_distance.h (modified) (2 diffs)
• yat/statistics/pearson_vector_distance.h (modified) (1 diff)
• yat/utility/IteratorWeighted.h (added)

trunk/test/vector_distance_test.cc

@@ -1 +1 @@
 // $Id$
 
+#include "yat/classifier/DataLookupWeighted1D.h"
+#include "yat/classifier/MatrixLookupWeighted.h"
 #include "yat/statistics/euclidean_vector_distance.h"
 #include "yat/statistics/pearson_vector_distance.h"
+#include "yat/utility/matrix.h"
 #include "yat/utility/vector.h"
 
@@ -23 +26 @@
       std::cout << "vector_distance_test -v : for printing extra information\n";
   }
-  *error << "testing distance" << std::endl;
+  *error << "testing vector_distance" << std::endl;
   bool ok = true;
 
@@ -31 +34 @@
   b(2) = 1;
 
-  *error << "testing Euclidean vector_distance" << std::endl;
+  double tolerance=1e-4;
+
   double dist=statistics::vector_distance(a.begin(),a.end(),b.begin(),
                                           statistics::euclidean_vector_distance_tag());
+  if(fabs(dist-2.23607)>tolerance) {
+    *error << "Error in unweighted Euclidean vector_distance: " << std::endl;
+    ok=false;
+  }
 
-  *error << "Dist: " << dist << std::endl;
-
-
-  *error << "testing Pearson vector_distance" << std::endl;
   dist=statistics::vector_distance(a.begin(),a.end(),b.begin(),
                                           statistics::pearson_vector_distance_tag()); 
-  *error << "Dist: " << dist << std::endl;
+  if(fabs(dist-1.5)>tolerance) {
+    *error << "Error in unweighted Pearson vector_distance: " << std::endl;
+    ok=false;
+  }
 
+  
+  // Testing weighted versions
+  utility::matrix m(2,3,1);
+  m(0,1)=2;
+  m(1,0)=0;
+  m(1,1)=0;
+  utility::matrix w(2,3,1);
+  w(0,0)=0;
+  classifier::MatrixLookupWeighted mw(m,w);
+  classifier::DataLookupWeighted1D aw(mw,0,true);
+  classifier::DataLookupWeighted1D bw(mw,1,true);
+  
+  dist=statistics::vector_distance(aw.begin(),aw.end(),bw.begin(),
+                                          statistics::euclidean_vector_distance_tag());
+  
+  if(fabs(dist-2)>tolerance) {
+    *error << "Error in weighted Euclidean vector_distance: " << std::endl;
+    ok=false;
+  }
+
+  dist=statistics::vector_distance(aw.begin(),aw.end(),bw.begin(),
+                                          statistics::pearson_vector_distance_tag());
+  
+  if(fabs(dist-2)>tolerance) {
+    *error << "Error in weighted Pearson vector_distance: " << std::endl;
+    ok=false;
+  }
 
   if (error!=&std::cerr)

trunk/yat/classifier/DataLookupWeighted1D.cc

@@ -67 +67 @@
 
 
+  DataLookupWeighted1D::const_iterator DataLookupWeighted1D::begin(void) const
+  {
+    return DataLookupWeighted1D::const_iterator(*this, 0);
+  }
+
+
   double DataLookupWeighted1D::data(const size_t i) const
   {
     return column_vector_? matrix_->data(i,index_) : matrix_->data(index_,i);
   }
+
+
+  DataLookupWeighted1D::const_iterator DataLookupWeighted1D::end(void) const
+  {
+    return DataLookupWeighted1D::const_iterator(*this, size());
+  }
+
 
 

trunk/yat/classifier/DataLookupWeighted1D.h

@@ -26 +26 @@
 */
 
+#include "yat/utility/IteratorWeighted.h"
+
 #include <iostream>
 #include <vector>
@@ -44 +46 @@
   
   public:
+    
+    typedef utility::IteratorWeighted<const double, const classifier::DataLookupWeighted1D> 
+    const_iterator;
 
     ///
@@ -72 +77 @@
 
     /**
+     */
+    const_iterator begin() const;
+
+    /**
        \return data(i)
     */
     double data(const size_t i) const;
+    
+    /**
+     */
+    const_iterator end() const;
 
     ///

trunk/yat/statistics/AveragerPairWeighted.cc

@@ -96 +96 @@
   double AveragerPairWeighted::msd(void) const
   {
-    return ( x_.sum_wxx()+y_.sum_wxx()-2*wxy_)/w_;
+    return sum_squared_deviation()/w_;
   }
 
@@ -104 +104 @@
     x_.reset(); y_.reset(); wxy_=0; w_=0;
   }
+
+  double AveragerPairWeighted::sum_squared_deviation(void) const
+  {
+    return x_.sum_wxx()+y_.sum_wxx()-2*wxy_;
+  }
+  
 
   double AveragerPairWeighted::sum_w(void) const

trunk/yat/statistics/AveragerPairWeighted.h

@@ -133 +133 @@
 
     ///
+    /// @return Sum of weighted squared deviation between x and y \f$
+    /// \sum (w_xx-wyy)^2 \f$
+    ///
+    double sum_squared_deviation(void) const;
+
+    ///
     /// @return \f$ \sum w_xw_y \f$
     ///
@@ -169 +175 @@
 
   };
+
+  /**
+     \brief adding a ranges of values to AveragerPairWeighted \a ap
+  */
+  template <class Iter1, class Iter2>
+  void add(AveragerPairWeighted& ap, Iter1 first1, Iter1 last1, Iter2 first2)
+  {
+    for ( ; first1 != last1; ++first1, ++first2)
+      ap.add(first1.data(), first2.data(),first1.weight(),first2.weight());
+  }
+
+
+
 
   template <typename T1,typename T2,typename T3,typename T4>

trunk/yat/statistics/euclidean_vector_distance.h

@@ -5 +5 @@
 
 #include "AveragerPair.h"
+#include "AveragerPairWeighted.h"
 #include "vector_distance.h"
 
@@ -40 +41 @@
   }
   
+
+  ///
+  /// implementation for distances between vectors
+  /// (containers with random access iterators) using a Euclidean
+  /// distance measure and iterators to weighted containers.
+  /// 
+  template <class Iter>
+  double vector_distance(Iter beg1,Iter end1, Iter beg2,
+                         const euclidean_vector_distance_tag& disttype,
+                         std::weighted_random_access_iterator_tag)
+  {
+    AveragerPairWeighted ap;
+    add(ap,beg1,end1,beg2);
+    return sqrt(ap.sum_squared_deviation());
+  }
+
   
 }}} // of namespace statistics, yat, and theplu

trunk/yat/statistics/pearson_vector_distance.h

@@ -39 +39 @@
   }
   
+  ///
+  /// implementation for distances between vectors
+  /// (containers with random access iterators) using a Pearson
+  /// distance measure and iterators to unweighted containers.
+  /// 
+  template <class Iter>
+  double vector_distance(Iter beg1,Iter end1, Iter beg2,
+                         const pearson_vector_distance_tag& disttype,
+                         std::weighted_random_access_iterator_tag)
+  {
+    AveragerPairWeighted ap;
+    add(ap,beg1,end1,beg2);
+    return 1-ap.correlation();
+  }
+
   
 }}} // of namespace statistics, yat, and theplu