Changeset 1544

Timestamp:

Oct 1, 2008, 4:25:09 PM (14 years ago)

Author:

Peter

Message:

making RowNormalizer? and ColumnNormalizer? more general

Location:

trunk/yat/normalizer

Files:

• ColumnNormalizer.h (modified) (1 diff)
• RowNormalizer.h (modified) (1 diff)

trunk/yat/normalizer/ColumnNormalizer.h

@@ -61 +61 @@
        assigned to Matrix \a result.
 
+       Template argument Container2D1 should be a class modelling the
+       concept \ref concept_container_2d. The template argument
+       Container2D2 should be a class modelling the concept \ref
+       concept_mutable_container_2d.
+
        \note \a result must have same dimensions as \a matrix.
      */
-    void operator()(const utility::Matrix& matrix, 
-                    utility::Matrix& result) const;
+    template<class Container2D1, class Container2D2>
+    void operator()(const Container2D1& matrix, Container2D2& result) const
+    {
+      using utility::yat_assert;
+      yat_assert<std::runtime_error>(matrix.rows()==result.rows(),
+                                     "ColumnNormalizer: rows mismatch");
+      yat_assert<std::runtime_error>(matrix.columns()==result.columns(),
+                                     "ColumnNormalizer: columns mismatch");
+      for (size_t i=0; i<matrix.columns(); ++i)
+        normalizer_(matrix.begin_column(i), matrix.end_column(i),
+                    result.begin_column(i));
+      
+    }
+
   private:
     T normalizer_;
   };
 
-  template<class T>
-  void ColumnNormalizer<T>::operator()(const utility::Matrix& matrix, 
-                                       utility::Matrix& result) const
-  {
-    using utility::yat_assert;
-    yat_assert<std::runtime_error>(matrix.rows()==result.rows(),
-                                   "ColumnNormalizer: rows mismatch");
-    yat_assert<std::runtime_error>(matrix.columns()==result.columns(),
-                                   "ColumnNormalizer: columns mismatch");
-    for (size_t i=0; i<matrix.columns(); ++i)
-      normalizer_(matrix.begin_column(i), matrix.end_column(i),
-                  result.begin_column(i));
-
-  }
-
-
 }}} // end of namespace normalizer, yat and thep
 #endif

trunk/yat/normalizer/RowNormalizer.h

@@ -61 +61 @@
        assigned to Matrix \a result.
 
+       Template argument Container2D1 should be a class modelling the
+       concept \ref concept_container_2d. The template argument
+       Container2D2 should be a class modelling the concept \ref
+       concept_mutable_container_2d.
+
        \note \a result must have same dimensions as \a matrix.
      */
-    void operator()(const utility::Matrix& matrix, 
-                    utility::Matrix& result) const;
+    template<class Container2D1, class Container2D2>
+    void operator()(const Container2D1& matrix, 
+                    Container2D2& result) const
+    {
+      using utility::yat_assert;
+      yat_assert<std::runtime_error>(matrix.rows()==result.rows(),
+                                     "RowNormalizer: rows mismatch");
+      yat_assert<std::runtime_error>(matrix.columns()==result.columns(),
+                                     "RowNormalizer: columns mismatch");
+      for (size_t i=0; i<matrix.rows(); ++i)
+        normalizer_(matrix.begin_row(i), matrix.end_row(i),
+                  result.begin_row(i));
+    }
+
   private:
     T normalizer_;
   };
 
-  template<class T>
-  void RowNormalizer<T>::operator()(const utility::Matrix& matrix, 
-                                    utility::Matrix& result) const
-  {
-    using utility::yat_assert;
-    yat_assert<std::runtime_error>(matrix.rows()==result.rows(),
-                                   "RowNormalizer: rows mismatch");
-    yat_assert<std::runtime_error>(matrix.columns()==result.columns(),
-                                   "RowNormalizer: columns mismatch");
-    for (size_t i=0; i<matrix.rows(); ++i)
-      normalizer_(matrix.begin_row(i), matrix.end_row(i),
-                  result.begin_row(i));
-
-  }
-
-
 }}} // end of namespace normalizer, yat and thep
 #endif