[Javabdd-checkins] JavaBDD/org/sf/javabdd JDDFactory.java,1.5,1.6

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

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

Modified Files:
	JDDFactory.java 
Log Message:
Fix ordering bug.



Index: JDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/JDDFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JDDFactory.java	15 Sep 2004 00:34:02 -0000	1.5
--- JDDFactory.java	15 Sep 2004 03:03:39 -0000	1.6
***************
*** 737,747 ****
          for (int i = 0; i < bdd.numberOfVariables(); ++i) {
              int k = neworder[i];
!             //System.out.println("Var "+i+" (node "+vars[i]+") in original order -> var "+k+" (node "+vars[k]+") in new order");
!             newvars[i] = vars[k];
!             var2level[i] = k;
!             level2var[k] = i;
          }
          vars = newvars;
          
          for (int i = 0; i < numberOfDomains(); ++i) {
              BDDDomain d = getDomain(i);
--- 737,748 ----
          for (int i = 0; i < bdd.numberOfVariables(); ++i) {
              int k = neworder[i];
!             //System.out.println("Var "+k+" (node "+vars[k]+") in original order -> var "+i+" (node "+vars[i]+") in new order");
!             newvars[k] = vars[i];
!             var2level[k] = i;
!             level2var[i] = k;
          }
          vars = newvars;
          
+         //System.out.println("Number of domains: "+numberOfDomains());
          for (int i = 0; i < numberOfDomains(); ++i) {
              BDDDomain d = getDomain(i);