COIN-OR::LEMON - Graph Library

Ticket #597: 597-4-c89884c1737b-rename-methods.patch

File 597-4-c89884c1737b-rename-methods.patch, 2.0 KB (added by Peter Kovacs, 2 years ago)
  • lemon/vf2.h

    # HG changeset patch
    # User Peter Kovacs <kpeter@inf.elte.hu>
    # Date 1507383988 -7200
    # Node ID c89884c1737b4b54e16d5c704a99f14df639d777
    # Parent  b9fad0f9f8ab31b73eb9179793d72c0aa15c7406
    Rename private methods in Vf2 and Vf2pp (#597)
    
    diff --git a/lemon/vf2.h b/lemon/vf2.h
    a b  
    232232      }
    233233    }
    234234
    235     void setOrder() {
     235    void initOrder() {
    236236      // we will find pairs for the nodes of g1 in this order
    237237
    238238      // bits::vf2::DfsLeaveOrder<G1> v(_g1,_order);
     
    324324    }
    325325
    326326    //calculate the lookup table for cutting the search tree
    327     void setRNew1tRInOut1t() {
     327    void initRNew1tRInOut1t() {
    328328      typename G1::template NodeMap<int> tmp(_g1,0);
    329329      for(unsigned int i=0; i<_order.size(); ++i) {
    330330        const typename G1::Node& orderI = _order[i];
     
    360360      _currEdgeIts(countNodes(g1),INVALID), _rNew1t(g1,0), _rInOut1t(g1,0),
    361361      _mapping_type(SUBGRAPH), _deallocMappingAfterUse(0)
    362362    {
    363       setOrder();
    364       setRNew1tRInOut1t();
     363      initOrder();
     364      initRNew1tRInOut1t();
    365365      for(typename G1::NodeIt n(g1);n!=INVALID;++n)
    366366        m[n]=INVALID;
    367367    }
  • lemon/vf2pp.h

    diff --git a/lemon/vf2pp.h b/lemon/vf2pp.h
    a b  
    352352
    353353
    354354    //we will find pairs for the nodes of g1 in this order
    355     void setOrder(){
     355    void initOrder(){
    356356      for(typename G2::NodeIt n2(_g2); n2!=INVALID; ++n2)
    357357        ++_labelTmp1[_intLabels2[n2]];
    358358
     
    464464    }
    465465
    466466    //calculate the lookup table for cutting the search tree
    467     void setRNew1tRInOut1t(){
     467    void initRNew1tRInOut1t(){
    468468      typename G1::template NodeMap<int> tmp(_g1,0);
    469469      for(unsigned int i=0; i<_order.size(); ++i) {
    470470        tmp[_order[i]]=-1;
     
    537537      _mapping_type(SUBGRAPH), _deallocMappingAfterUse(0),
    538538      _deallocLabelsAfterUse(0)
    539539    {
    540       setOrder();
    541       setRNew1tRInOut1t();
     540      initOrder();
     541      initRNew1tRInOut1t();
    542542
    543543      //reset mapping
    544544      for(typename G1::NodeIt n(g1);n!=INVALID;++n)