Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv461/net/sf/javabdd
Modified Files:
BDDFactory.java
Log Message:
Added support in makeVarOrdering for when some variables are not in BDDDomains.
Index: BDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BDDFactory.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** BDDFactory.java 27 Sep 2005 22:56:19 -0000 1.17
--- BDDFactory.java 12 Oct 2005 10:27:08 -0000 1.18
***************
*** 6,10 ****
import java.util.Arrays;
import java.util.Collection;
- import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
--- 6,9 ----
***************
*** 1576,1582 ****
throw new BDDException("missing domain #"+i+": "+getDomain(i));
}
- doms[i] = getDomain(i);
}
int[] test = new int[varorder.length];
System.arraycopy(varorder, 0, test, 0, varorder.length);
--- 1575,1585 ----
throw new BDDException("missing domain #"+i+": "+getDomain(i));
}
}
+ while (bitIndex < varorder.length) {
+ varorder[bitIndex] = bitIndex;
+ ++bitIndex;
+ }
+
int[] test = new int[varorder.length];
System.arraycopy(varorder, 0, test, 0, varorder.length);
|