[Javabdd-checkins] JavaBDD/org/sf/javabdd BDDDomain.java,1.16,1.17

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

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

Modified Files:
	BDDDomain.java 
Log Message:
In buildAdd, support domains of different sizes.

Index: BDDDomain.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/BDDDomain.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** BDDDomain.java	24 Jun 2004 08:58:56 -0000	1.16
--- BDDDomain.java	30 Jul 2004 21:04:40 -0000	1.17
***************
*** 126,132 ****
                  result.andWith(b);
              }
!             for ( ; n < that.varNum(); n++) {
!                 BDD b = bdd.nithVar(this.ivar[n]);
!                 b.andWith(bdd.nithVar(that.ivar[n]));
                  result.andWith(b);
              }
--- 126,132 ----
                  result.andWith(b);
              }
!             for ( ; n < Math.max(this.varNum(), that.varNum()); n++) {
!                 BDD b = (n < this.varNum()) ? bdd.nithVar(this.ivar[n]) : bdd.one();
!                 b.andWith((n < that.varNum()) ? bdd.nithVar(that.ivar[n]) : bdd.one());
                  result.andWith(b);
              }
***************
*** 149,155 ****
              result.andWith(b);
          }
!         for ( ; n < that.varNum(); n++) {
!             BDD b = bdd.nithVar(this.ivar[n]);
!             b.andWith(bdd.nithVar(that.ivar[n]));
              result.andWith(b);
          }
--- 149,155 ----
              result.andWith(b);
          }
!         for ( ; n < Math.max(this.varNum(), that.varNum()); n++) {
!             BDD b = (n < this.varNum()) ? bdd.nithVar(this.ivar[n]) : bdd.one();
!             b.andWith((n < that.varNum()) ? bdd.nithVar(that.ivar[n]) : bdd.one());
              result.andWith(b);
          }