1.1 --- a/lemon/vf2.h Sat Oct 07 15:45:56 2017 +0200
1.2 +++ b/lemon/vf2.h Sat Oct 07 15:46:28 2017 +0200
1.3 @@ -232,7 +232,7 @@
1.4 }
1.5 }
1.6
1.7 - void setOrder() {
1.8 + void initOrder() {
1.9 // we will find pairs for the nodes of g1 in this order
1.10
1.11 // bits::vf2::DfsLeaveOrder<G1> v(_g1,_order);
1.12 @@ -324,7 +324,7 @@
1.13 }
1.14
1.15 //calculate the lookup table for cutting the search tree
1.16 - void setRNew1tRInOut1t() {
1.17 + void initRNew1tRInOut1t() {
1.18 typename G1::template NodeMap<int> tmp(_g1,0);
1.19 for(unsigned int i=0; i<_order.size(); ++i) {
1.20 const typename G1::Node& orderI = _order[i];
1.21 @@ -360,8 +360,8 @@
1.22 _currEdgeIts(countNodes(g1),INVALID), _rNew1t(g1,0), _rInOut1t(g1,0),
1.23 _mapping_type(SUBGRAPH), _deallocMappingAfterUse(0)
1.24 {
1.25 - setOrder();
1.26 - setRNew1tRInOut1t();
1.27 + initOrder();
1.28 + initRNew1tRInOut1t();
1.29 for(typename G1::NodeIt n(g1);n!=INVALID;++n)
1.30 m[n]=INVALID;
1.31 }
2.1 --- a/lemon/vf2pp.h Sat Oct 07 15:45:56 2017 +0200
2.2 +++ b/lemon/vf2pp.h Sat Oct 07 15:46:28 2017 +0200
2.3 @@ -352,7 +352,7 @@
2.4
2.5
2.6 //we will find pairs for the nodes of g1 in this order
2.7 - void setOrder(){
2.8 + void initOrder(){
2.9 for(typename G2::NodeIt n2(_g2); n2!=INVALID; ++n2)
2.10 ++_labelTmp1[_intLabels2[n2]];
2.11
2.12 @@ -464,7 +464,7 @@
2.13 }
2.14
2.15 //calculate the lookup table for cutting the search tree
2.16 - void setRNew1tRInOut1t(){
2.17 + void initRNew1tRInOut1t(){
2.18 typename G1::template NodeMap<int> tmp(_g1,0);
2.19 for(unsigned int i=0; i<_order.size(); ++i) {
2.20 tmp[_order[i]]=-1;
2.21 @@ -537,8 +537,8 @@
2.22 _mapping_type(SUBGRAPH), _deallocMappingAfterUse(0),
2.23 _deallocLabelsAfterUse(0)
2.24 {
2.25 - setOrder();
2.26 - setRNew1tRInOut1t();
2.27 + initOrder();
2.28 + initRNew1tRInOut1t();
2.29
2.30 //reset mapping
2.31 for(typename G1::NodeIt n(g1);n!=INVALID;++n)