Changeset 2260

Timestamp:

May 26, 2010, 1:48:54 AM (13 years ago)

Author:

Peter

Message:

fixes #626

Location:

trunk

Files:

• test/Suite.h (modified) (1 diff)
• test/concept_test.cc (modified) (3 diffs)
• yat/utility/concept_check.h (modified) (1 diff)

trunk/test/Suite.h

@@ -217 +217 @@
     column_iterator end_column(size_t) { return NULL; }
     iterator end_row(size_t) { return NULL; }
-    reference operator()(size_t row, size_t column) const 
+    reference operator()(size_t row, size_t column)
     { return this->element_; }
   };

trunk/test/concept_test.cc

@@ -24 +24 @@
 #include "yat/utility/concept_check.h"
 #include "yat/utility/DataWeight.h"
+#include "yat/utility/Matrix.h"
+#include "yat/utility/MatrixWeighted.h"
 
 #include "yat/classifier/MatrixLookup.h"
@@ -36 +38 @@
   test::Suite suite(argc, argv);
   using namespace utility;
+  using namespace test;
 
   BOOST_CONCEPT_ASSERT((Container2D<test::container2d_archetype<double> >));
@@ -44 +47 @@
   //  BOOST_CONCEPT_ASSERT((Container2D<classifier::KernelLookup>));
 
+  // concept Mutable_Container2D
+  BOOST_CONCEPT_ASSERT((Mutable_Container2D<mutable_container2d_archetype<double> >));
+  BOOST_CONCEPT_ASSERT((Mutable_Container2D<mutable_container2d_archetype<DataWeight> >));
+  BOOST_CONCEPT_ASSERT((Mutable_Container2D<Matrix>));
+  BOOST_CONCEPT_ASSERT((Mutable_Container2D<MatrixWeighted>));
+  
+
+
   return suite.return_value();
 }

trunk/yat/utility/concept_check.h

@@ -85 +85 @@
   };
 
+  /**
+     \brief Concept check for \ref concept_mutable_container_2d
+
+     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 T>
+     void some_function(const T& t)
+     {
+     BOOST_CONCEPT_ASSERT((Mutable_Container2D<T>));
+     ...
+     }
+     \endcode
+  */
+  template <class T>
+  class Mutable_Container2D : public Container2D<T>
+  {
+  public:
+    /// reference
+    typedef typename T::reference reference;
+    /// iterator
+    typedef typename T::iterator iterator;
+    /// row_iterator
+    typedef typename T::row_iterator row_iterator;
+    /// column_iterator
+    typedef typename T::column_iterator column_iterator;
+
+    /**
+       \brief function doing the concept test
+     */
+    BOOST_CONCEPT_USAGE(Mutable_Container2D)
+    {
+      iterator iter_ = t_.begin();
+      iter_ = t_.end();
+      row_iterator row_iter_ = t_.begin_row(0);
+      row_iter_ = t_.end_row(0);
+      column_iterator col_iter_ = t_.begin_column(0);
+      col_iter_ = t_.end_column(0);
+      reference r = t_(0,0);
+      t_(0,0) = r;
+      using boost::Mutable_RandomAccessIterator; // just to avoid long lines
+      BOOST_CONCEPT_ASSERT((Mutable_RandomAccessIterator<iterator>));
+      BOOST_CONCEPT_ASSERT((Mutable_RandomAccessIterator<row_iterator>));
+      BOOST_CONCEPT_ASSERT((Mutable_RandomAccessIterator<column_iterator>));
+    }
+  private:
+    T t_;
+  };
+
 }}} // of namespace utility, yat, and theplu
 #endif