Changeset 2334

Timestamp:

Oct 15, 2010, 4:35:09 AM (13 years ago)

Author:

Peter

Message:

fixes #625

Location:

trunk

Files:

• test/distance_test.cc (modified) (3 diffs)
• yat/classifier/IGP.h (modified) (3 diffs)
• yat/classifier/KNN.h (modified) (3 diffs)
• yat/classifier/NCC.h (modified) (4 diffs)
• yat/utility/concept_check.h (modified) (6 diffs)

trunk/test/distance_test.cc

@@ -28 +28 @@
 #include "yat/statistics/EuclideanDistance.h"
 #include "yat/statistics/PearsonDistance.h"
+#include "yat/utility/concept_check.h"
 #include "yat/utility/DataIterator.h"
 #include "yat/utility/Matrix.h"
@@ -35 +36 @@
 
 #include <boost/concept_archetype.hpp>
+#include <boost/concept_check.hpp>
 
 #include <cassert>
@@ -193 +195 @@
                    unsigned int long N)
 {
+  BOOST_CONCEPT_ASSERT((utility::DistanceConcept<Distance>));
   test_duplicate(dist, suite, N);
   test_rescaling(dist, suite, N);

trunk/yat/classifier/IGP.h

@@ -27 +27 @@
 #include "MatrixLookup.h"
 #include "Target.h"
+#include "yat/utility/concept_check.h"
 #include "yat/utility/Vector.h"
 #include "yat/utility/yat_assert.h"
+
+#include <boost/concept_check.hpp>
 
 #include <cmath>
@@ -92 +95 @@
     : matrix_(data), target_(target)
   {   
+    BOOST_CONCEPT_ASSERT((utility::DistanceConcept<Distance>));
     calculate();
   }
@@ -99 +103 @@
     : matrix_(data), target_(target), distance_(dist)
   {   
+    BOOST_CONCEPT_ASSERT((utility::DistanceConcept<Distance>));
     calculate();
   }

trunk/yat/classifier/KNN.h

@@ -31 +31 @@
 #include "SupervisedClassifier.h"
 #include "Target.h"
+#include "yat/utility/concept_check.h"
 #include "yat/utility/Exception.h"
 #include "yat/utility/Matrix.h"
 #include "yat/utility/yat_assert.h"
+
+#include <boost/concept_check.hpp>
 
 #include <cmath>
@@ -191 +194 @@
     : SupervisedClassifier(),data_ml_(0),data_mlw_(0),target_(0),k_(3)
   {
+    BOOST_CONCEPT_ASSERT((utility::DistanceConcept<Distance>));
   }
 
@@ -197 +201 @@
     : SupervisedClassifier(),data_ml_(0),data_mlw_(0),target_(0),k_(3), distance_(dist)
   {
+    BOOST_CONCEPT_ASSERT((utility::DistanceConcept<Distance>));
   }
 

trunk/yat/classifier/NCC.h

@@ -32 +32 @@
 #include "yat/statistics/Averager.h"
 #include "yat/statistics/AveragerWeighted.h"
+#include "yat/utility/concept_check.h"
 #include "yat/utility/Exception.h"
 #include "yat/utility/Matrix.h"
@@ -38 +39 @@
 #include "yat/utility/stl_utility.h"
 #include "yat/utility/yat_assert.h"
+
+#include <boost/concept_check.hpp>
 
 #include <iterator>
@@ -179 +182 @@
     : SupervisedClassifier(), centroids_nan_(false)
   {
+    BOOST_CONCEPT_ASSERT((utility::DistanceConcept<Distance>));
   }
 
@@ -185 +189 @@
     : SupervisedClassifier(), centroids_nan_(false), distance_(dist)
   {
+    BOOST_CONCEPT_ASSERT((utility::DistanceConcept<Distance>));
   }
 

trunk/yat/utility/concept_check.h

@@ -25 +25 @@
 #include "iterator_traits.h"
 
+#include <boost/concept_archetype.hpp>
 #include <boost/concept_check.hpp>
 
@@ -46 +47 @@
      }
      \endcode
+
+     \since New in yat 0.7
   */
   template <class T>
@@ -102 +105 @@
      }
      \endcode
+
+     \since New in yat 0.7
   */
   template <class T>
@@ -154 +159 @@
      }
      \endcode
+
+     \since New in yat 0.7
   */
   template <class T>
@@ -201 +208 @@
      }
      \endcode
+
+     \since New in yat 0.7
   */
   template <class T>
@@ -230 +239 @@
       BOOST_CONCEPT_ASSERT((boost::Convertible<value_type, DataWeight>));
     }
-
+  };
+
+
+  /**
+     \brief Concept check for a \ref concept_distance
+
+     This class is intended to be used in a <a 
+     href="\boost_url/concept_check/using_concept_check.htm">
+     BOOST_CONCEPT_ASSERT </a>
+
+     \code
+     template<class Distance>
+     void some_function(double x)
+     {
+     BOOST_CONCEPT_ASSERT((DistanceConcept<Distance>));
+     ...
+     }
+     \endcode
+
+     \since New in yat 0.7
+  */
+  template <class T>
+  class DistanceConcept
+  {
+  public:
+    /**
+       \brief function doing the concept test
+     */
+    BOOST_CONCEPT_USAGE(DistanceConcept)
+    {
+      boost::random_access_iterator_archetype<double> unweighted;
+      boost::random_access_iterator_archetype<DataWeight> weighted;
+      double d;
+      d = distance_(unweighted, unweighted, unweighted);
+      d = distance_(unweighted, unweighted, weighted);
+      d = distance_(weighted, weighted, unweighted);
+      d = distance_(weighted, weighted, weighted);
+    }
+  private:
+    T distance_;
   };