[Javabdd-checkins] JavaBDD/net/sf/javabdd JFactory.java,1.18,1.19 BDDDomain.java,1.5,1.6 BDDFactory.java,1.7,1.8

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

Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4104/net/sf/javabdd

Modified Files:
	JFactory.java BDDDomain.java BDDFactory.java 
Log Message:
More updates.

Index: BDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BDDFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BDDFactory.java	8 Apr 2005 05:27:52 -0000	1.7
--- BDDFactory.java	14 Apr 2005 23:58:41 -0000	1.8
***************
*** 1525,1528 ****
--- 1525,1534 ----
                      int di = d.getIndex();
                      int local = localOrders[di][bitNumber];
+                     if (local >= d.vars().length) {
+                         System.out.println("bug!");
+                     }
+                     if (bitIndex >= varorder.length) {
+                         System.out.println("bug2!");
+                     }
                      varorder[bitIndex++] = d.vars()[local];
                  }

Index: BDDDomain.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BDDDomain.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BDDDomain.java	8 Apr 2005 05:27:52 -0000	1.5
--- BDDDomain.java	14 Apr 2005 23:58:41 -0000	1.6
***************
*** 308,314 ****
          if (range.compareTo(realsize) < 0)
              return ivar.length;
!         this.realsize = range;
          int binsize = 1;
!         while (calcsize.compareTo(range) < 0) {
             binsize++;
             calcsize = calcsize.shiftLeft(1);
--- 308,314 ----
          if (range.compareTo(realsize) < 0)
              return ivar.length;
!         this.realsize = range.add(BigInteger.ONE);
          int binsize = 1;
!         while (calcsize.compareTo(range) <= 0) {
             binsize++;
             calcsize = calcsize.shiftLeft(1);
***************
*** 321,324 ****
--- 321,325 ----
          for (int i = ivar.length; i < new_ivar.length; ++i) {
              int newVar = factory.duplicateVar(new_ivar[i-1]);
+             factory.firstbddvar++;
              new_ivar[i] = newVar;
          }

Index: JFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/JFactory.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** JFactory.java	8 Apr 2005 05:27:52 -0000	1.18
--- JFactory.java	14 Apr 2005 23:58:41 -0000	1.19
***************
*** 3571,3575 ****
  
          for (n = 0; n < bddvarnum; n++)
!             p.result[n] = bdd_ithvar(n);
          p.last = 0;
      }
--- 3571,3575 ----
  
          for (n = 0; n < bddvarnum; n++)
!             p.result[n] = bdd_ithvar(bddlevel2var[n]);
          p.last = 0;
      }
***************
*** 3603,3609 ****
              StringBuffer sb = new StringBuffer();
              sb.append('{');
              for (int i = 0; i < result.length; ++i) {
                  if (result[i] != bdd_ithvar(bddlevel2var[i])) {
!                     if (i > 0) sb.append(", ");
                      sb.append(bddlevel2var[i]);
                      sb.append('=');
--- 3603,3611 ----
              StringBuffer sb = new StringBuffer();
              sb.append('{');
+             boolean any = false;
              for (int i = 0; i < result.length; ++i) {
                  if (result[i] != bdd_ithvar(bddlevel2var[i])) {
!                     if (any) sb.append(", ");
!                     any = true;
                      sb.append(bddlevel2var[i]);
                      sb.append('=');