[Javabdd-checkins] JavaBDD/buddy/src kernel.c,1.3,1.4 bdd.h,1.2,1.3

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

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

Modified Files:
	kernel.c bdd.h 
Log Message:
Support for more features.

Index: kernel.c
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/buddy/src/kernel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kernel.c	1 Oct 2004 02:17:20 -0000	1.3
--- kernel.c	19 Oct 2004 11:11:21 -0000	1.4
***************
*** 1442,1447 ****
  int bdd_noderesize(int doRehash)
  {
-    BddNode *newnodes;
     int oldsize = bddnodesize;
     int n;
  
--- 1442,1447 ----
  int bdd_noderesize(int doRehash)
  {
     int oldsize = bddnodesize;
+    int newsize;
     int n;
  
***************
*** 1449,1461 ****
        return -1;
     
!    bddnodesize = bddnodesize << 1;
  
!    if (bddnodesize > oldsize + bddmaxnodeincrease)
!       bddnodesize = oldsize + bddmaxnodeincrease;
  
!    if (bddnodesize > bddmaxnodesize  &&  bddmaxnodesize > 0)
!       bddnodesize = bddmaxnodesize;
  
!    bddnodesize = bdd_prime_lte(bddnodesize);
     
     if (resize_handler != NULL)
--- 1449,1473 ----
        return -1;
     
!    newsize = bddnodesize << 1;
  
!    if (newsize > oldsize + bddmaxnodeincrease)
!       newsize = oldsize + bddmaxnodeincrease;
  
!    if (newsize > bddmaxnodesize  &&  bddmaxnodesize > 0)
!       newsize = bddmaxnodesize;
!    
!    return bdd_noderesize2(doRehash, oldsize, newsize);
! }
  
! int bdd_noderesize2(int doRehash, int oldsize, int newsize)
! {
!    int n;
!    
!    newsize = bdd_prime_lte(newsize);
!    
!    if (oldsize > newsize) {
!      return 0;
!    }
!    bddnodesize = newsize;
     
     if (resize_handler != NULL)

Index: bdd.h
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/buddy/src/bdd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bdd.h	29 Sep 2004 10:00:49 -0000	1.2
--- bdd.h	19 Oct 2004 11:11:21 -0000	1.3
***************
*** 237,240 ****
--- 237,241 ----
  extern int      bdd_getnodenum(void);
  extern int      bdd_getallocnum(void);
+ extern int      bdd_noderesize2(int, int, int);
  extern char*    bdd_versionstr(void);
  extern int      bdd_versionnum(void);