COIN-OR::LEMON - Graph Library

Changeset 1413:e68f0ef37e77 in lemon


Ignore:
Timestamp:
10/07/17 17:03:30 (2 years ago)
Author:
Peter Kovacs <kpeter@…>
Branch:
default
Phase:
public
Message:

Remove unused auxiliary class in Vf2 (#597)

Location:
lemon
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/vf2.h

    r1410 r1413  
    2525#include <lemon/core.h>
    2626#include <lemon/concepts/graph.h>
    27 #include <lemon/dfs.h>
    2827#include <lemon/bfs.h>
    2928#include <lemon/bits/vf2_internals.h>
     
    5150        bool operator()(typename M1::Key k1, typename M2::Key k2) const {
    5251          return _m1[k1] == _m2[k2];
    53         }
    54       };
    55 
    56       template <class G>
    57       class DfsLeaveOrder : public DfsVisitor<G> {
    58         const G &_g;
    59         std::vector<typename G::Node> &_order;
    60         int i;
    61       public:
    62         DfsLeaveOrder(const G &g, std::vector<typename G::Node> &order)
    63           : i(countNodes(g)), _g(g), _order(order) { }
    64         void leave(const typename G::Node &node) {
    65           _order[--i]=node;
    6652        }
    6753      };
     
    123109    NEQ _nEq;
    124110
    125     //Current depth in the DFS tree.
     111    //Current depth in the search tree
    126112    int _depth;
    127113
     
    234220
    235221    void initOrder() {
    236       // we will find pairs for the nodes of g1 in this order
    237 
    238       // bits::vf2::DfsLeaveOrder<G1> v(_g1,_order);
    239       //   DfsVisit<G1,bits::vf2::DfsLeaveOrder<G1> >dfs(_g1, v);
    240       //   dfs.run();
    241 
    242       //it is more efficient in practice than DFS
     222      //determine the order in which we will find pairs for the nodes of g1
     223      //BFS order is more efficient in practice than DFS
    243224      bits::vf2::BfsLeaveOrder<G1> v(_g1,_order);
    244       BfsVisit<G1,bits::vf2::BfsLeaveOrder<G1> >bfs(_g1, v);
     225      BfsVisit<G1,bits::vf2::BfsLeaveOrder<G1> > bfs(_g1, v);
    245226      bfs.run();
    246227    }
  • lemon/vf2pp.h

    r1412 r1413  
    7373    const G2 &_g2;
    7474
    75     //Current depth in the search tree.
     75    //Current depth in the search tree
    7676    int _depth;
    7777
Note: See TracChangeset for help on using the changeset viewer.