Changeset 2340

Timestamp:

Oct 16, 2010, 5:08:19 PM (12 years ago)

Author:

Peter

Message:

closes #627

Location:

trunk/yat

Files:

• classifier/KNN.h (modified) (4 diffs)
• utility/concept_check.h (modified) (1 diff)

trunk/yat/classifier/KNN.h

@@ -34 +34 @@
 #include "yat/utility/Exception.h"
 #include "yat/utility/Matrix.h"
+#include "yat/utility/Vector.h"
 #include "yat/utility/VectorConstView.h"
 #include "yat/utility/VectorView.h"
@@ -192 +193 @@
   
   
-  // templates
+  /**
+     \brief Concept check for a \ref concept_neighbor_weighting
+
+     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 NeighborWeightingConcept 
+    : public boost::DefaultConstructible<T>, public boost::Assignable<T>
+  {
+  public:
+    /**
+       \brief function doing the concept test
+     */
+    BOOST_CONCEPT_USAGE(NeighborWeightingConcept)
+    {
+      T neighbor_weighting;
+      utility::Vector vec;
+      const utility::VectorBase& distance(vec);
+      utility::VectorMutable& prediction(vec);
+      std::vector<size_t> k_sorted;
+      Target target;
+      neighbor_weighting(distance, k_sorted, target, prediction);
+    }
+  private:
+  };
+
+  // template implementation
   
   template <typename Distance, typename NeighborWeighting>
@@ -199 +239 @@
   {
     BOOST_CONCEPT_ASSERT((utility::DistanceConcept<Distance>));
+    BOOST_CONCEPT_ASSERT((NeighborWeightingConcept<NeighborWeighting>));
   }
 
@@ -207 +248 @@
   {
     BOOST_CONCEPT_ASSERT((utility::DistanceConcept<Distance>));
+    //    BOOST_CONCEPT_ASSERT((NeighborWeightingConcept<NeighborWeighting>));
   }
 

trunk/yat/utility/concept_check.h

@@ -261 +261 @@
   */
   template <class T>
-  class DistanceConcept : boost::CopyConstructible<T>
+  class DistanceConcept : public boost::CopyConstructible<T>
   {
   public: