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

lemon/vf2.h

@@ -232 +232 @@
       }
     }
 
-    void setOrder() {
+    void initOrder() {
       // we will find pairs for the nodes of g1 in this order
 
       // bits::vf2::DfsLeaveOrder<G1> v(_g1,_order);
@@ -324 +324 @@
     }
 
     //calculate the lookup table for cutting the search tree
-    void setRNew1tRInOut1t() {
+    void initRNew1tRInOut1t() {
       typename G1::template NodeMap<int> tmp(_g1,0);
       for(unsigned int i=0; i<_order.size(); ++i) {
         const typename G1::Node& orderI = _order[i];
@@ -360 +360 @@
       _currEdgeIts(countNodes(g1),INVALID), _rNew1t(g1,0), _rInOut1t(g1,0),
       _mapping_type(SUBGRAPH), _deallocMappingAfterUse(0)
     {
-      setOrder();
-      setRNew1tRInOut1t();
+      initOrder();
+      initRNew1tRInOut1t();
       for(typename G1::NodeIt n(g1);n!=INVALID;++n)
         m[n]=INVALID;
     }

lemon/vf2pp.h

@@ -352 +352 @@
 
 
     //we will find pairs for the nodes of g1 in this order
-    void setOrder(){
+    void initOrder(){
       for(typename G2::NodeIt n2(_g2); n2!=INVALID; ++n2)
         ++_labelTmp1[_intLabels2[n2]];
 
@@ -464 +464 @@
     }
 
     //calculate the lookup table for cutting the search tree
-    void setRNew1tRInOut1t(){
+    void initRNew1tRInOut1t(){
       typename G1::template NodeMap<int> tmp(_g1,0);
       for(unsigned int i=0; i<_order.size(); ++i) {
         tmp[_order[i]]=-1;
@@ -537 +537 @@
       _mapping_type(SUBGRAPH), _deallocMappingAfterUse(0),
       _deallocLabelsAfterUse(0)
     {
-      setOrder();
-      setRNew1tRInOut1t();
+      initOrder();
+      initRNew1tRInOut1t();
 
       //reset mapping
       for(typename G1::NodeIt n(g1);n!=INVALID;++n)