Changeset 1352:bdbb9144a49e in lemon-0.x for src/lemon/xy.h

Timestamp:

04/14/05 14:30:18 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• Bugfix in XMap/YMap
• NormSquareMap? added

File:

• src/lemon/xy.h (modified) (3 diffs)

src/lemon/xy.h

@@ -340 +340 @@
     XMap(M &map) : _map(map) {}
     Value operator[](Key k) const {return _map[k].x;}
-    Value set(Key k,Value v) {_map.set(k,typename M::Value(v,_map[k].y));}
+    void set(Key k,Value v) {_map.set(k,typename M::Value(v,_map[k].y));}
   };
     
@@ -397 +397 @@
     YMap(M &map) : _map(map) {}
     Value operator[](Key k) const {return _map[k].y;}
-    Value set(Key k,Value v) {_map.set(k,typename M::Value(_map[k].x,v));}
+    void set(Key k,Value v) {_map.set(k,typename M::Value(_map[k].x,v));}
   };
 
@@ -441 +441 @@
 
 
+  ///Map of the \ref xy::normSquare() "normSquare()" of an \ref xy "xy"-map
+
+  ///Map of the \ref xy::normSquare() "normSquare()" of an \ref xy "xy"-map
+  ///\ingroup maps
+  ///
+  template<class M>
+  class NormSquareMap 
+  {
+    const M &_map;
+  public:
+    typedef typename M::Value::Value Value;
+    typedef typename M::Key Key;
+    ///\e
+    NormSquareMap(const M &map) : _map(map) {}
+    Value operator[](Key k) const {return _map[k].normSquare();}
+  };
+    
+  ///Returns a \ref NormSquareMap class
+
+  ///This function just returns an \ref NormSquareMap class.
+  ///
+  ///\ingroup maps
+  ///\relates NormSquareMap
+  template<class M> 
+  inline NormSquareMap<M> normSquareMap(const M &m) 
+  {
+    return NormSquareMap<M>(m);
+  }
+
   /// @}