Changeset 2143 for trunk/test/Suite.h

Timestamp:

Jan 15, 2010, 3:12:56 PM (13 years ago)

Author:

Peter

Message:

fixes #449

File:

• trunk/test/Suite.h (modified) (2 diffs)

trunk/test/Suite.h

@@ -123 +123 @@
     template<typename RandomAccessIterator>
     void test_random_access_iterator(RandomAccessIterator);
+
+    template<typename Container2D>
+    void test_concept_container2d(const Container2D&);
+
+    template<typename MutableContainer2D>
+    void test_concept_mutable_container2d(MutableContainer2D&);
 
     /**
@@ -320 +326 @@
   }
 
+  template<typename Container2D>
+  void Suite::test_concept_container2d(const Container2D& c)
+  {
+    typedef typename Container2D::value_type value_type;
+    typedef typename Container2D::const_reference const_reference;
+    typedef typename Container2D::const_iterator const_iterator;
+    typedef typename Container2D::const_column_iterator const_column_iterator;
+    typedef typename Container2D::const_row_iterator const_row_iterator;
+    const_iterator ci = c.begin();
+    const_column_iterator cci = c.begin_column(0);
+    const_row_iterator cri = c.begin_row(0);
+    ci = c.end();
+    cci = c.end_column(0);
+    cri = c.end_row(0);
+    size_t cols = c.columns();
+    size_t rows = c.rows();
+    cols = rows; // just to avoid compiler warning
+    const_reference x = c(0,0);
+    value_type y;
+    y = x;
+  }
+
+  template<typename MutableContainer2D>
+  void Suite::test_concept_mutable_container2d(MutableContainer2D& mc)
+  {
+    test_concept_container2d(mc);
+    typedef typename MutableContainer2D::reference reference;
+    typedef typename MutableContainer2D::iterator iterator;
+    typedef typename MutableContainer2D::column_iterator column_iterator;
+    typedef typename MutableContainer2D::row_iterator row_iterator;
+    iterator i = mc.begin();
+    column_iterator ci = mc.begin_column(0);
+    row_iterator ri = mc.begin_row(0);
+    *i = *ci; 
+    *ci = *i; 
+    *ri = *i; 
+    i = mc.end();
+    ci = mc.end_column(0);
+    ri = mc.end_row(0);
+    reference x = mc(0,0);
+    x = *mc.begin();
+  }
+
 }}}