Changeset 755:a8c2e828ce0b in lemon-0.x for src/work

Timestamp:

08/04/04 21:04:42 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• 'KruskalPairVec?' is changed to 'KruskalMapInput?'.
• Changes in KruskalMapVec?. Still does not work.

File:

• src/work/johanna/kruskal.h (modified) (7 diffs)

src/work/johanna/kruskal.h

@@ -118 +118 @@
   ///
   template<typename Graph, typename Map>
-  class KruskalPairVec
+  class KruskalMapInput
     : public std::vector< std::pair<typename Graph::Edge,
                                     typename Map::ValueType> > {
@@ -144 +144 @@
 
     // FIXME: kell ez?
-    // KruskalPairVec(Parent const& p) : Parent(p) {}
+    // KruskalMapInput(Parent const& p) : Parent(p) {}
     
     void sort() {
@@ -151 +151 @@
 
     // FIXME: nem nagyon illik ez ide...
-    KruskalPairVec(Graph const& G, Map const& m) {
+    KruskalMapInput(Graph const& G, Map const& m) {
       typedef typename Graph::EdgeIt EdgeIt;
       
@@ -170 +170 @@
 
 
-//   template <typename Map>
-//   class KruskalMapVec : public std::vector<typename Map::KeyType> {
+//   template<typename Graph, typename Map>
+//   class KruskalMapVec {
 //   public:
     
-//     typedef typename Map::KeyType KeyType;
-//     typedef typename Map::ValueType ValueType;
-
-//     typedef typename std::vector<KeyType> Parent;
-//     typedef typename Parent::iterator iterator;
-//     typedef typename Parent::const_iterator const_iterator;
-
+//     typedef std::pair<typename Map::KeyType, Map::ValueType> value_type;
+    
+//     typedef std::vector<KeyType> Container;
+//     Container container;
+//     std::vector<typename Map::KeyType> container
+//     const Map &m;
+    
+    
+//     class iterator
+//     {
+//       Container::iterator i;
+//     public:
+//       iterator &operator ++() {++i;return *this;}
+//       valuetype operator *() {return value_type(container(i),m[container(i)]);}
+//       bool operator==(iterator b) {return i==b.i;}
+//       iterator() {}
+//       iterator(Container::iterator _i) i(_i) {}
+//     };
+//     class const_iterator
+//     {
+//       Container::const_iterator i;
+//     public:
+//       iterator &operator ++() {++i;return *this;}
+//       valuetype operator *() {return value_type(container(i),m[container(i)]);}
+//       bool operator==(iterator b) {return i==b.i;}
+//       const_iterator() {}
+//       const_iterator(Container::iterator _i) i(_i) {}
+//     };
+
+//     iterator begin() { return iterator(container.begin());}
+//     const_iterator begin() const { return iterator(container.begin());}
+//     iterator end() { return iterator(container.end());}
+//     const_iterator end() const { return iterator(container.end());}
+    
 //   private:
-
-//     const Map &m;
-
+    
 //     class compareKeys {
 //       const Map &m;
@@ -222 +247 @@
 //   };
 
+
   /* ** ** Wrapper fuggvenyek ** ** */
 
@@ -237 +263 @@
                         RetEdgeBoolMap &ret_bool_map) {
     
-    typedef KruskalPairVec<Graph,EdgeCostMap> InputVec;
+    typedef KruskalMapInput<Graph,EdgeCostMap> InputVec;
     
     InputVec iv(G, edge_costs);
@@ -261 +287 @@
     OutMap out(ret_iterator);
 
-    typedef KruskalPairVec<Graph, EdgeCostMap> InputVec;
+    typedef KruskalMapInput<Graph, EdgeCostMap> InputVec;
 
     InputVec iv(G, edge_costs);