Changeset 352:4b89077ab715 in lemon-0.x for src

Timestamp:

04/17/04 23:50:48 (20 years ago)

Author:

beckerjc

Branch:

default

Phase:

public

Convert:

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

Message:

A successful work-around for using const map reference as an output
parameter to Kruskal().

Location:

src/work/johanna

Files:

• kruskal.h (modified) (5 diffs)
• kruskal_test.cc (modified) (1 diff)

src/work/johanna/kruskal.h

@@ -38 +38 @@
   }
 
+  /* A work-around for running Kruskal with const-reference bool maps... */
+
+  template<typename Map>
+  class NonConstMapWr {
+    const Map &m;
+  public:
+    typedef typename Map::ValueType ValueType;
+
+    NonConstMapWr(const Map &_m) : m(_m) {}
+
+    template<typename KeyType>
+    void set(KeyType const& k, ValueType const &v) const { m.set(k,v); }
+  };
+
+  template <typename Graph, typename InputEdgeOrder, typename OutBoolMap>
+  inline
+  typename InputEdgeOrder::ValueType
+  Kruskal(Graph const& G, InputEdgeOrder const& edges, 
+          OutBoolMap const& out_map)
+  {
+    NonConstMapWr<OutBoolMap> map_wr(out_map);
+    return Kruskal(G, edges, map_wr);
+  }  
 
   
@@ -50 +73 @@
   template<typename Iterator>
   class SequenceOutput {
-    Iterator it;
+    mutable Iterator it;
 
   public:
@@ -58 +81 @@
 
     template<typename KeyType>
-    void set(KeyType const& k, bool v) { if(v) {*it=k; ++it;} }
+    void set(KeyType const& k, bool v) const { if(v) {*it=k; ++it;} }
   };
 
@@ -178 +201 @@
   /// Input is from an EdgeMap, output is a plain boolmap.
   template <typename Graph, typename EdgeCostMap, typename RetEdgeBoolMap>
+  inline
   typename EdgeCostMap::ValueType
   Kruskal_EdgeCostMapIn_BoolMapOut(Graph const& G,
@@ -194 +218 @@
   /// Input is from an EdgeMap, output is to a sequence.
   template <typename Graph, typename EdgeCostMap, typename RetIterator>
+  inline
   typename EdgeCostMap::ValueType
   Kruskal_EdgeCostMapIn_IteratorOut(Graph const& G,

src/work/johanna/kruskal_test.cc

@@ -101 +101 @@
 
   tree_edge_vec.clear();
-  SequenceOutput< back_insert_iterator< vector<Edge> > > 
-    vec_filler(back_inserter(tree_edge_vec));
+//   SequenceOutput< back_insert_iterator< vector<Edge> > > 
+//     vec_filler(back_inserter(tree_edge_vec));
+//   cout << "Nemkonst koltseggel tarhatekonyabban: "
+//        << Kruskal(G,
+//                KruskalMapVec<ECostMap>(G, edge_cost_map),
+//                vec_filler)
+//        << endl;
   cout << "Nemkonst koltseggel tarhatekonyabban: "
        << Kruskal(G,
                   KruskalMapVec<ECostMap>(G, edge_cost_map),
-                  vec_filler)
+                  makeSequenceOutput(back_inserter(tree_edge_vec))
+                  )
        << endl;