[Javabdd-checkins] JavaBDD/org/sf/javabdd BDD.java,1.32,1.33 BDDDomain.java,1.17,1.18

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

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

Modified Files:
	BDD.java BDDDomain.java 
Log Message:


Index: BDD.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/BDD.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** BDD.java	9 Aug 2004 21:31:19 -0000	1.32
--- BDD.java	9 Aug 2004 21:48:42 -0000	1.33
***************
*** 1406,1420 ****
              Iterator i1 = b.iterator(var);
              Iterator i2 = b.iterator2(var);
!             var.free(); b.free();
              Set s1 = new HashSet();
              Set s2 = new HashSet();
              while (i1.hasNext()) {
                  BDD b1 = (BDD) i1.next();
                  s1.add(b1);
              }
              while (i2.hasNext()) {
                  BDD b2 = (BDD) i2.next();
                  s2.add(b2);
              }
              if (!s1.equals(s2)) {
                  Set s1_minus_s2 = new HashSet(s1);
--- 1406,1429 ----
              Iterator i1 = b.iterator(var);
              Iterator i2 = b.iterator2(var);
!             b.free();
              Set s1 = new HashSet();
              Set s2 = new HashSet();
              while (i1.hasNext()) {
                  BDD b1 = (BDD) i1.next();
+                 double sc = b1.satCount(var); 
+                 if (sc != 1.) {
+                     System.out.println("Error, iterator() returned BDD with satcount "+sc+" : "+b1);
+                 }
                  s1.add(b1);
              }
              while (i2.hasNext()) {
                  BDD b2 = (BDD) i2.next();
+                 double sc = b2.satCount(var); 
+                 if (sc != 1.) {
+                     System.out.println("Error, iterator2() returned BDD with satcount "+sc+" : "+b2);
+                 }
                  s2.add(b2);
              }
+             var.free();
              if (!s1.equals(s2)) {
                  Set s1_minus_s2 = new HashSet(s1);

Index: BDDDomain.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/BDDDomain.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** BDDDomain.java	30 Jul 2004 21:04:40 -0000	1.17
--- BDDDomain.java	9 Aug 2004 21:48:42 -0000	1.18
***************
*** 114,118 ****
          if (bits > this.varNum() ||
              bits > that.varNum())
!             throw new BDDException();
          
          BDDFactory bdd = getFactory();
--- 114,118 ----
          if (bits > this.varNum() ||
              bits > that.varNum())
!             throw new BDDException("Number of bits requested ("+bits+") is larger than domain sizes "+this.varNum()+","+that.varNum());
          
          BDDFactory bdd = getFactory();