Changeset 1194:e68f0ef37e77 in lemon-main

Timestamp:

10/07/17 17:03:30 (7 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Remove unused auxiliary class in Vf2 (#597)

Location:

lemon

Files:

• vf2.h (modified) (4 diffs)
• vf2pp.h (modified) (1 diff)

lemon/vf2.h

@@ -25 +25 @@
 #include <lemon/core.h>
 #include <lemon/concepts/graph.h>
-#include <lemon/dfs.h>
 #include <lemon/bfs.h>
 #include <lemon/bits/vf2_internals.h>
@@ -51 +50 @@
         bool operator()(typename M1::Key k1, typename M2::Key k2) const {
           return _m1[k1] == _m2[k2];
-        }
-      };
-
-      template <class G>
-      class DfsLeaveOrder : public DfsVisitor<G> {
-        const G &_g;
-        std::vector<typename G::Node> &_order;
-        int i;
-      public:
-        DfsLeaveOrder(const G &g, std::vector<typename G::Node> &order)
-          : i(countNodes(g)), _g(g), _order(order) { }
-        void leave(const typename G::Node &node) {
-          _order[--i]=node;
         }
       };
@@ -123 +109 @@
     NEQ _nEq;
 
-    //Current depth in the DFS tree.
+    //Current depth in the search tree
     int _depth;
 
@@ -234 +220 @@
 
     void initOrder() {
-      // we will find pairs for the nodes of g1 in this order
-
-      // bits::vf2::DfsLeaveOrder<G1> v(_g1,_order);
-      //   DfsVisit<G1,bits::vf2::DfsLeaveOrder<G1> >dfs(_g1, v);
-      //   dfs.run();
-
-      //it is more efficient in practice than DFS
+      //determine the order in which we will find pairs for the nodes of g1
+      //BFS order is more efficient in practice than DFS
       bits::vf2::BfsLeaveOrder<G1> v(_g1,_order);
-      BfsVisit<G1,bits::vf2::BfsLeaveOrder<G1> >bfs(_g1, v);
+      BfsVisit<G1,bits::vf2::BfsLeaveOrder<G1> > bfs(_g1, v);
       bfs.run();
     }

lemon/vf2pp.h

@@ -73 +73 @@
     const G2 &_g2;
 
-    //Current depth in the search tree.
+    //Current depth in the search tree
     int _depth;