Changeset 1420:e37cca875667 in lemon-0.x for src/lemon/xy.h

Timestamp:

05/14/05 19:37:33 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Smart reference handling in map adaptors

File:

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

src/lemon/xy.h

@@ -19 +19 @@
 
 #include <iostream>
+#include <lemon/utility.h>
 
 ///\ingroup misc
@@ -351 +352 @@
   class XMap 
   {
-    M &_map;
+    typename SmartReference<M>::Type _map;
   public:
+    typedef True NeedCopy;
+
     typedef typename M::Value::Value Value;
     typedef typename M::Key Key;
     ///\e
-    XMap(M &map) : _map(map) {}
+    XMap(typename SmartParameter<M>::Type map) : _map(map) {}
     Value operator[](Key k) const {return _map[k].x;}
     void set(Key k,Value v) {_map.set(k,typename M::Value(v,_map[k].y));}
@@ -373 +376 @@
   }
 
+  template<class M> 
+  inline XMap<M> xMap(const M &m) 
+  {
+    return XMap<M>(m);
+  }
+
   ///Constant (read only) version of \ref XMap
 
@@ -380 +389 @@
   class ConstXMap 
   {
-    const M &_map;
+    typename SmartConstReference<M>::Type _map;
   public:
+    typedef True NeedCopy;
+
     typedef typename M::Value::Value Value;
     typedef typename M::Key Key;
@@ -408 +419 @@
   class YMap 
   {
-    M &_map;
+    typename SmartReference<M>::Type _map;
   public:
+    typedef True NeedCopy;
+
     typedef typename M::Value::Value Value;
     typedef typename M::Key Key;
     ///\e
-    YMap(M &map) : _map(map) {}
+    YMap(typename SmartParameter<M>::Type map) : _map(map) {}
     Value operator[](Key k) const {return _map[k].y;}
     void set(Key k,Value v) {_map.set(k,typename M::Value(_map[k].x,v));}
@@ -430 +443 @@
   }
 
+  template<class M> 
+  inline YMap<M> yMap(const M &m) 
+  {
+    return YMap<M>(m);
+  }
+
   ///Constant (read only) version of \ref YMap
 
@@ -437 +456 @@
   class ConstYMap 
   {
-    const M &_map;
+    typename SmartConstReference<M>::Type _map;
   public:
+    typedef True NeedCopy;
+
     typedef typename M::Value::Value Value;
     typedef typename M::Key Key;
@@ -467 +488 @@
   class NormSquareMap 
   {
-    const M &_map;
+    typename SmartConstReference<M>::Type _map;
   public:
+    typedef True NeedCopy;
+
     typedef typename M::Value::Value Value;
     typedef typename M::Key Key;