Changes in / [161:2c999941b871:160:b1bd0c2a7f57] in lemon-main

Files:

• lemon/maps.h (modified) (4 diffs)
• test/maps_test.cc (modified) (1 diff)

lemon/maps.h

@@ -1675 +1675 @@
   namespace _maps_bits {
 
+    template <typename Value>
+    struct Identity {
+      typedef Value argument_type;
+      typedef Value result_type;
+      Value operator()(const Value& val) const {
+        return val;
+      }
+    };
+
     template <typename _Iterator, typename Enable = void>
     struct IteratorTraits {
@@ -1691 +1700 @@
   /// \brief Writable bool map for logging each \c true assigned element
   ///
-  /// A \ref concepts::WriteMap "writable" bool map for logging
+  /// A \ref concepts::ReadWriteMap "read-write" bool map for logging
   /// each \c true assigned element, i.e it copies subsequently each
   /// keys set to \c true to the given iterator.
-  /// The most important usage of it is storing certain nodes or arcs
-  /// that were marked \c true by an algorithm.
-  ///
-  /// There are several algorithms that provide solutions through bool
-  /// maps and most of them assign \c true at most once for each key.
-  /// In these cases it is a natural request to store each \c true
-  /// assigned elements (in order of the assignment), which can be
-  /// easily done with StoreBoolMap.
-  ///
-  /// The simplest way of using this map is through the storeBoolMap()
-  /// function.
-  ///
-  /// \tparam It The type of the iterator.
-  /// \tparam Ke The key type of the map. The default value set
-  /// according to the iterator type should work in most cases.
+  ///
+  /// \tparam It the type of the Iterator.
+  /// \tparam Ke the type of the map's Key. The default value should
+  /// work in most cases.
   ///
   /// \note The container of the iterator must contain enough space
-  /// for the elements or the iterator should be an inserter iterator.
-#ifdef DOXYGEN
-  template <typename It, typename Ke>
-#else
+  /// for the elements. (Or it should be an inserter iterator).
+  ///
+  /// \todo Revise the name of this class and give an example code.
   template <typename It,
             typename Ke=typename _maps_bits::IteratorTraits<It>::Value>
-#endif
   class StoreBoolMap {
   public:
@@ -1740 +1736 @@
 
     /// The set function of the map
-    void set(const Key& key, Value value) {
+    void set(const Key& key, Value value) const {
       if (value) {
         *_end++ = key;
@@ -1748 +1744 @@
   private:
     Iterator _begin;
-    Iterator _end;
-  };
-  
-  /// Returns a \ref StoreBoolMap class
-
-  /// This function just returns a \ref StoreBoolMap class.
-  ///
-  /// The most important usage of it is storing certain nodes or arcs
-  /// that were marked \c true by an algorithm.
-  /// For example it makes easier to store the nodes in the processing
-  /// order of Dfs algorithm, as the following examples show.
-  /// \code
-  ///   std::vector<Node> v;
-  ///   dfs(g,s).processedMap(storeBoolMap(std::back_inserter(v))).run();
-  /// \endcode
-  /// \code
-  ///   std::vector<Node> v(countNodes(g));
-  ///   dfs(g,s).processedMap(storeBoolMap(v.begin())).run();
-  /// \endcode
-  ///
-  /// \note The container of the iterator must contain enough space
-  /// for the elements or the iterator should be an inserter iterator.
-  ///
-  /// \note StoreBoolMap is just \ref concepts::WriteMap "writable", so
-  /// it cannot be used when a readable map is needed, for example as
-  /// \c ReachedMap for Bfs, Dfs and Dijkstra algorithms.
-  ///
-  /// \relates StoreBoolMap
-  template<typename Iterator>
-  inline StoreBoolMap<Iterator> storeBoolMap(Iterator it) {
-    return StoreBoolMap<Iterator>(it);
-  }
+    mutable Iterator _end;
+  };
 
   /// @}

test/maps_test.cc

@@ -305 +305 @@
           "Something is wrong with EqualMap");
   }
-  
-  // StoreBoolMap
-  {
-    typedef std::vector<int> vec;
-    vec v1;
-    vec v2(10);
-    StoreBoolMap<std::back_insert_iterator<vec> > map1(std::back_inserter(v1));
-    StoreBoolMap<vec::iterator> map2(v2.begin());
-    map1.set(10, false);
-    map1.set(20, true);   map2.set(20, true);
-    map1.set(30, false);  map2.set(40, false);
-    map1.set(50, true);   map2.set(50, true);
-    map1.set(60, true);   map2.set(60, true);
-    check(v1.size() == 3 && v2.size() == 10 &&
-          v1[0]==20 && v1[1]==50 && v1[2]==60 && v2[0]==20 && v2[1]==50 && v2[2]==60,
-          "Something is wrong with StoreBoolMap");
-          
-    int i = 0;
-    for ( StoreBoolMap<vec::iterator>::Iterator it = map2.begin();
-          it != map2.end(); ++it )
-      check(v1[i++] == *it, "Something is wrong with StoreBoolMap");
-  }
 
   return 0;