[Javabdd-checkins] JavaBDD/buddy/src reorder.c,1.5,1.6

[John W. <joe...@us...>]

Update of /cvsroot/javabdd/JavaBDD/buddy/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11182/buddy/src

Modified Files:
	reorder.c 
Log Message:
Call the reorder handler on every reorder, not just automatic reorders.

Index: reorder.c
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/buddy/src/reorder.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** reorder.c	28 Jan 2005 04:07:10 -0000	1.5
--- reorder.c	29 Jan 2005 11:33:58 -0000	1.6
***************
*** 1651,1662 ****
        return;
     
-    if (reorder_handler != NULL)
-       reorder_handler(1);
- 
     bdd_reorder(bddreordermethod);
     bddreordertimes--;
     
-    if (reorder_handler != NULL)
-       reorder_handler(0);
  }
  
--- 1651,1657 ----
***************
*** 1669,1672 ****
--- 1664,1670 ----
        return -1;
     
+    if (reorder_handler != NULL)
+       reorder_handler(1);
+ 
     for (n=0 ; n<bddvarnum ; n++)
     {
***************
*** 1728,1731 ****
--- 1726,1733 ----
     imatrixDelete(iactmtx);
     bdd_gbc();
+    
+    if (reorder_handler != NULL)
+       reorder_handler(0);
+ 
  }
  
***************
*** 1836,1861 ****
     bddreordertimes = 1;
  
!    if ((top=bddtree_new(-1)) == NULL)
!       RETURN();
!    if (reorder_init() < 0)
!       RETURN();
  
!    usednum_before = bddnodesize - bddfreenum;
     
!    top->first = 0;
!    top->last = bdd_varnum()-1;
!    top->fixed = 0;
!    top->next = NULL;
!    top->nextlevel = vartree;
  
!    reorder_block(top, method);
!    vartree = top->nextlevel;
!    free(top);
     
!    usednum_after = bddnodesize - bddfreenum;
     
-    reorder_done();
-    bddreordermethod = savemethod;
-    bddreordertimes = savetimes;
     RETURN();
  }
--- 1838,1864 ----
     bddreordertimes = 1;
  
!    if ((top=bddtree_new(-1)) != NULL) {
!       if (reorder_init() >= 0) {
  
!          usednum_before = bddnodesize - bddfreenum;
     
!          top->first = 0;
!          top->last = bdd_varnum()-1;
!          top->fixed = 0;
!          top->next = NULL;
!          top->nextlevel = vartree;
  
!          reorder_block(top, method);
!          vartree = top->nextlevel;
!          free(top);
     
!          usednum_after = bddnodesize - bddfreenum;
!    
!          reorder_done();
!          bddreordermethod = savemethod;
!          bddreordertimes = savetimes;
!       }
!    }
     
     RETURN();
  }