Changeset 4132

Timestamp:

Jan 21, 2022, 2:12:39 AM (20 months ago)

Author:

Peter

Message:

fixes #976 concept for Container2D now works with abstract class

Location:

trunk

Files:

• test/matrix.cc (modified) (2 diffs)
• test/matrix_view.cc (modified) (3 diffs)
• yat/utility/concept_check.h (modified) (4 diffs)

trunk/test/matrix.cc

@@ -27 +27 @@
 #include "Suite.h"
 
+#include "yat/utility/concept_check.h"
 #include "yat/utility/Matrix.h"
+
+#include <boost/concept_check.hpp>
 
 #include <cmath>
@@ -284 +287 @@
 
   test_assignment(suite);
+
+  // test concepts
+  BOOST_CONCEPT_ASSERT((utility::Container2D<utility::MatrixBase>));
+  BOOST_CONCEPT_ASSERT((utility::Mutable_Container2D<utility::MatrixMutable>));
+  BOOST_CONCEPT_ASSERT((utility::Mutable_Container2D<utility::Matrix>));
+
   return suite.return_value();
 }

trunk/test/matrix_view.cc

@@ -24 +24 @@
 #include "Suite.h"
 
+#include "yat/utility/concept_check.h"
 #include "yat/utility/Matrix.h"
 #include "yat/utility/MatrixConstView.h"
 #include "yat/utility/MatrixView.h"
+
+#include <boost/concept_check.hpp>
 
 using namespace theplu::yat;
@@ -197 +200 @@
 void test_matrix_view(test::Suite& suite)
 {
+  BOOST_CONCEPT_ASSERT((utility::Mutable_Container2D<utility::MatrixView>));
   suite.out() << "=== " << __func__ << "===\n";
   using utility::MatrixView;
@@ -213 +217 @@
 void test_matrix_const_view(test::Suite& suite)
 {
+  BOOST_CONCEPT_ASSERT((utility::Container2D<utility::MatrixConstView>));
   suite.out() << "=== " << __func__ << "===\n";
   using utility::MatrixConstView;

trunk/yat/utility/concept_check.h

@@ -87 +87 @@
     BOOST_CONCEPT_USAGE(Container2D)
     {
-      const_iterator iter_ = t_.begin();
-      iter_ = t_.end();
+      const_iterator iter_ = t_->begin();
+      iter_ = t_->end();
       detail::avoid_compiler_warning(iter_);
-      const_row_iterator row_iter_ = t_.begin_row(0);
-      row_iter_ = t_.end_row(0);
+      const_row_iterator row_iter_ = t_->begin_row(0);
+      row_iter_ = t_->end_row(0);
       detail::avoid_compiler_warning(row_iter_);
-      const_column_iterator col_iter_ = t_.begin_column(0);
-      col_iter_ = t_.end_column(0);
+      const_column_iterator col_iter_ = t_->begin_column(0);
+      col_iter_ = t_->end_column(0);
       detail::avoid_compiler_warning(col_iter_);
-      const_reference r = t_(0,0);
+      const_reference r = (*t_)(0,0);
       value_ = r;
-      size_t n = t_.rows();
-      n = t_.columns();
+      size_t n = t_->rows();
+      n = t_->columns();
       detail::avoid_compiler_warning(n);
       using boost_concepts::ReadableIterator;
@@ -108 +108 @@
 
   private:
-    T t_;
+    T* t_;
     value_type value_;
   };
@@ -148 +148 @@
     BOOST_CONCEPT_USAGE(Mutable_Container2D)
     {
-      iterator iter_ = t_.begin();
-      iter_ = t_.end();
+      iterator iter_ = t_->begin();
+      iter_ = t_->end();
       detail::avoid_compiler_warning(iter_);
-      row_iterator row_iter_ = t_.begin_row(0);
-      row_iter_ = t_.end_row(0);
+      row_iterator row_iter_ = t_->begin_row(0);
+      row_iter_ = t_->end_row(0);
       detail::avoid_compiler_warning(row_iter_);
-      column_iterator col_iter_ = t_.begin_column(0);
-      col_iter_ = t_.end_column(0);
+      column_iterator col_iter_ = t_->begin_column(0);
+      col_iter_ = t_->end_column(0);
       detail::avoid_compiler_warning(col_iter_);
-      reference r = t_(0,0);
-      t_(0,0) = r;
+      reference r = (*t_)(0,0);
+      (*t_)(0,0) = r;
       detail::avoid_compiler_warning(r);
       using boost::Mutable_RandomAccessIterator; // just to avoid long lines
@@ -166 +166 @@
     }
   private:
-    T t_;
+    T* t_;
   };