Changeset 1751:a2a454f1232d in lemon-0.x for lemon

Timestamp:

11/02/05 16:24:38 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2280

Message:

Swap col and row map

File:

• lemon/matrix_maps.h (modified) (14 diffs)

lemon/matrix_maps.h

@@ -36 +36 @@
   /// Map for the coloumn view of the matrix.
   template <typename _MatrixMap>
-  class MatrixColMap : public MapTraits<_MatrixMap> {
+  class MatrixRowMap : public MapTraits<_MatrixMap> {
   public:
     typedef _MatrixMap MatrixMap;
@@ -43 +43 @@
 
 
-    MatrixColMap(MatrixMap& _matrix, typename MatrixMap::FirstKey _col) 
-      : matrix(_matrix), col(_col) {}
+    MatrixRowMap(MatrixMap& _matrix, typename MatrixMap::FirstKey _row) 
+      : matrix(_matrix), row(_row) {}
 
     /// \brief Subscription operator
@@ -50 +50 @@
     /// Subscription operator.
     typename MapTraits<MatrixMap>::ReturnValue
-    operator[](Key row) {
-      return matrix(col, row);
+    operator[](Key col) {
+      return matrix(row, col);
     }
 
@@ -57 +57 @@
     ///
     /// Setter function.
-    void set(Key row, const Value& val) {
-      matrix.set(col, row, val);
+    void set(Key col, const Value& val) {
+      matrix.set(row, col, val);
     }
       
@@ -65 +65 @@
     /// Subscription operator.
     typename MapTraits<MatrixMap>::ConstReturnValue
-    operator[](Key row) const {
-      return matrix(col, row);
+    operator[](Key col) const {
+      return matrix(row, col);
     }
 
   private:
     MatrixMap& matrix;
-    typename MatrixMap::FirstKey col;
-  };
-
-  /// \brief Map for the coloumn view of the matrix
-  ///
-  /// Map for the coloumn view of the matrix.
+    typename MatrixMap::FirstKey row;
+  };
+
+  /// \brief Map for the row view of the matrix
+  ///
+  /// Map for the row view of the matrix.
   template <typename _MatrixMap>
-  class ConstMatrixColMap : public MapTraits<_MatrixMap> {
+  class ConstMatrixRowMap : public MapTraits<_MatrixMap> {
   public:
     typedef _MatrixMap MatrixMap;
@@ -85 +85 @@
 
 
-    ConstMatrixColMap(const MatrixMap& _matrix, 
-                      typename MatrixMap::FirstKey _col) 
-      : matrix(_matrix), col(_col) {}
+    ConstMatrixRowMap(const MatrixMap& _matrix, 
+                      typename MatrixMap::FirstKey _row) 
+      : matrix(_matrix), row(_row) {}
 
     /// \brief Subscription operator
@@ -93 +93 @@
     /// Subscription operator.
     typename MapTraits<MatrixMap>::ConstReturnValue
-    operator[](Key row) const {
-      return matrix(col, row);
+    operator[](Key col) const {
+      return matrix(row, col);
     }
 
   private:
     const MatrixMap& matrix;
-    typename MatrixMap::FirstKey col;
-  };
-
-  /// \brief Gives back a coloumn view of the matrix map
-  ///
-  /// Gives back a coloumn view of the matrix map.
+    typename MatrixMap::FirstKey row;
+  };
+
+  /// \brief Gives back a row view of the matrix map
+  ///
+  /// Gives back a row view of the matrix map.
   template <typename MatrixMap>
-  MatrixColMap<MatrixMap> matrixColMap(MatrixMap& matrixMap,
-                                       typename MatrixMap::FirstKey col) {
-    return MatrixColMap<MatrixMap>(matrixMap, col);
+  MatrixRowMap<MatrixMap> matrixRowMap(MatrixMap& matrixMap,
+                                       typename MatrixMap::FirstKey row) {
+    return MatrixRowMap<MatrixMap>(matrixMap, row);
   }
 
   template <typename MatrixMap>
-  ConstMatrixColMap<MatrixMap>
-  matrixColMap(const MatrixMap& matrixMap, typename MatrixMap::FirstKey col) {
-    return ConstMatrixColMap<MatrixMap>(matrixMap, col);
+  ConstMatrixRowMap<MatrixMap>
+  matrixRowMap(const MatrixMap& matrixMap, typename MatrixMap::FirstKey row) {
+    return ConstMatrixRowMap<MatrixMap>(matrixMap, row);
   }
 
@@ -121 +121 @@
   /// Map for the row view of the matrix.
   template <typename _MatrixMap>
-  class MatrixRowMap : public MapTraits<_MatrixMap> {
+  class MatrixColMap : public MapTraits<_MatrixMap> {
   public:
     typedef _MatrixMap MatrixMap;
@@ -127 +127 @@
     typedef typename MatrixMap::Value Value;
 
-    MatrixRowMap(MatrixMap& _matrix, typename MatrixMap::SecondKey _row) 
-      : matrix(_matrix), row(_row) {}
+    MatrixColMap(MatrixMap& _matrix, typename MatrixMap::SecondKey _col) 
+      : matrix(_matrix), col(_col) {}
 
     /// \brief Subscription operator
@@ -134 +134 @@
     /// Subscription operator.
     typename MapTraits<MatrixMap>::ReturnValue
-    operator[](Key col) {
-      return matrix(col, row);
+    operator[](Key row) {
+      return matrix(row, col);
     }
 
@@ -141 +141 @@
     ///
     /// Setter function.
-    void set(Key col, const Value& val) {
-      matrix.set(col, row, val);
+    void set(Key row, const Value& val) {
+      matrix.set(row, col, val);
     }
       
@@ -149 +149 @@
     /// Subscription operator.
     typename MapTraits<MatrixMap>::ConstReturnValue
-    operator[](Key col) const {
-      return matrix(col, row);
+    operator[](Key row) const {
+      return matrix(row, col);
     }
 
   private:
     MatrixMap& matrix;
-    typename MatrixMap::SecondKey row;
-  };
-
-  /// \brief Map for the row view of the matrix
-  ///
-  /// Map for the row view of the matrix.
+    typename MatrixMap::SecondKey col;
+  };
+
+  /// \brief Map for the col view of the matrix
+  ///
+  /// Map for the col view of the matrix.
   template <typename _MatrixMap>
-  class ConstMatrixRowMap : public MapTraits<_MatrixMap> {
+  class ConstMatrixColMap : public MapTraits<_MatrixMap> {
   public:
     typedef _MatrixMap MatrixMap;
@@ -168 +168 @@
     typedef typename MatrixMap::Value Value;
 
-    ConstMatrixRowMap(const MatrixMap& _matrix, 
-                      typename MatrixMap::SecondKey _row) 
-      : matrix(_matrix), row(_row) {}
+    ConstMatrixColMap(const MatrixMap& _matrix, 
+                      typename MatrixMap::SecondKey _col) 
+      : matrix(_matrix), col(_col) {}
 
     /// \brief Subscription operator
@@ -176 +176 @@
     /// Subscription operator.
     typename MapTraits<MatrixMap>::ConstReturnValue
-    operator[](Key col) const {
-      return matrix(col, row);
+    operator[](Key row) const {
+      return matrix(row, col);
     }
 
   private:
     const MatrixMap& matrix;
-    typename MatrixMap::SecondKey row;
-  };
-
-  /// \brief Gives back a row view of the matrix map
-  ///
-  /// Gives back a row view of the matrix map.
+    typename MatrixMap::SecondKey col;
+  };
+
+  /// \brief Gives back a col view of the matrix map
+  ///
+  /// Gives back a col view of the matrix map.
   template <typename MatrixMap>
-  MatrixRowMap<MatrixMap> matrixRowMap(MatrixMap& matrixMap,
-                                       typename MatrixMap::SecondKey row) {
-    return MatrixRowMap<MatrixMap>(matrixMap, row);
+  MatrixColMap<MatrixMap> matrixColMap(MatrixMap& matrixMap,
+                                       typename MatrixMap::SecondKey col) {
+    return MatrixColMap<MatrixMap>(matrixMap, col);
   }
 
   template <typename MatrixMap>
-  ConstMatrixRowMap<MatrixMap> 
-  matrixRowMap(const MatrixMap& matrixMap, typename MatrixMap::SecondKey row) {
-    return ConstMatrixRowMap<MatrixMap>(matrixMap, row);
+  ConstMatrixColMap<MatrixMap> 
+  matrixColMap(const MatrixMap& matrixMap, typename MatrixMap::SecondKey col) {
+    return ConstMatrixColMap<MatrixMap>(matrixMap, col);
   }