Changeset 1691:6be54bcc14ec in lemon-0.x

Timestamp:

09/30/05 15:12:39 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Handling C x A -> A multiplication

File:

• lemon/maps.h (modified) (8 diffs)

lemon/maps.h

@@ -334 +334 @@
   ///  AddMap<X, ConstMap<X::Key, X::Value> > sh(x,v);
   ///\endcode
-  template<typename M, typename NC = False> 
+  template<typename M, typename C = typename M::Value, typename NC = False> 
   class ShiftMap : public MapBase<typename M::Key, typename M::Value, NC> {
     typename SmartConstReference<M>::Type m;
-    typename M::Value v;
+    C v;
   public:
     typedef MapBase<typename M::Key, typename M::Value, NC> Parent;
@@ -348 +348 @@
     ///\param _m is the undelying map
     ///\param _v is the shift value
-    ShiftMap(const M &_m, const Value &_v ) : m(_m), v(_v) {};
-    Value operator[](Key k) const {return m[k]+v;}
+    ShiftMap(const M &_m, const C &_v ) : m(_m), v(_v) {};
+    Value operator[](Key k) const {return m[k] + v;}
   };
   
@@ -357 +357 @@
   ///\relates ShiftMap
   ///\todo A better name is required.
-  template<typename M> 
-  inline ShiftMap<M, True> shiftMap(const M &m,const typename M::Value &v) {
-    return ShiftMap<M, True>(m,v);
+  template<typename M, typename C> 
+  inline ShiftMap<M, C, True> shiftMap(const M &m,const C &v) {
+    return ShiftMap<M, C, True>(m,v);
   }
 
@@ -427 +427 @@
 
   ///This \ref concept::ReadMap "read only map" returns the value of the
-  ///given map multiplied with a constant value.
+  ///given map multiplied from the left side with a constant value.
   ///Its \c Key and \c Value is inherited from \c M.
   ///
@@ -439 +439 @@
   ///  MulMap<X, ConstMap<X::Key, X::Value> > sc(x,v);
   ///\endcode
-  template<typename M, typename NC = False> 
+  template<typename M, typename C = typename M::Value, typename NC = False> 
   class ScaleMap : public MapBase<typename M::Key, typename M::Value, NC> {
     typename SmartConstReference<M>::Type m;
-    typename M::Value v;
+    C v;
   public:
     typedef MapBase<typename M::Key, typename M::Value, NC> Parent;
@@ -453 +453 @@
     ///\param _m is the undelying map
     ///\param _v is the scaling value
-    ScaleMap(const M &_m,const Value &_v ) : m(_m), v(_v) {};
-    Value operator[](Key k) const {return m[k]*v;}
+    ScaleMap(const M &_m, const C &_v ) : m(_m), v(_v) {};
+    Value operator[](Key k) const {return v * m[k];}
   };
   
@@ -462 +462 @@
   ///\relates ScaleMap
   ///\todo A better name is required.
-  template<typename M> 
-  inline ScaleMap<M, True> scaleMap(const M &m,const typename M::Value &v) {
-    return ScaleMap<M, True>(m,v);
+  template<typename M, typename C> 
+  inline ScaleMap<M, C, True> scaleMap(const M &m,const C &v) {
+    return ScaleMap<M, C, True>(m,v);
   }
 
@@ -858 +858 @@
   }
 
-
-
-
-
   /// @}
 }