[Javabdd-checkins] SF.net SVN: javabdd: [469] trunk/JavaBDD_tests
Brought to you by:
joewhaley
Menu
▾
▴
[Javabdd-checkins] SF.net SVN: javabdd: [469] trunk/JavaBDD_tests
|
From: <joe...@us...> - 2006-11-29 08:07:33
|
Revision: 469
http://svn.sourceforge.net/javabdd/?rev=469&view=rev
Author: joewhaley
Date: 2006-11-29 00:07:31 -0800 (Wed, 29 Nov 2006)
Log Message:
-----------
Improved ZDD support. load(), support(), quant methods now work.
Modified Paths:
--------------
trunk/JavaBDD_tests/bdd/BDDTestCase.java
trunk/JavaBDD_tests/bdd/BasicTests.java
trunk/JavaBDD_tests/bdd/IteratorTests.java
trunk/JavaBDD_tests/highlevel/NQueensTest.java
trunk/JavaBDD_tests/regression/R2.java
trunk/JavaBDD_tests/trace/TraceDriver.java
Modified: trunk/JavaBDD_tests/bdd/BDDTestCase.java
===================================================================
--- trunk/JavaBDD_tests/bdd/BDDTestCase.java 2006-11-29 08:07:13 UTC (rev 468)
+++ trunk/JavaBDD_tests/bdd/BDDTestCase.java 2006-11-29 08:07:31 UTC (rev 469)
@@ -21,6 +21,7 @@
public static final String[] factoryNames = {
"net.sf.javabdd.JFactory",
+ "zdd",
"net.sf.javabdd.BuDDyFactory",
"net.sf.javabdd.MicroFactory",
//"net.sf.javabdd.CUDDFactory",
@@ -38,10 +39,15 @@
for (int k = 0; k < factoryNames.length; ++k) {
String bddpackage = factoryNames[k];
try {
- Class c = Class.forName(bddpackage);
- Method m = c.getMethod("init", new Class[] { int.class, int.class });
- BDDFactory b = (BDDFactory) m.invoke(null, new Object[] { new Integer(nodenum), new Integer(cachesize) });
- f.add(b);
+ if (bddpackage.indexOf('.') == -1) {
+ BDDFactory b = BDDFactory.init(bddpackage, nodenum, cachesize);
+ f.add(b);
+ } else {
+ Class c = Class.forName(bddpackage);
+ Method m = c.getMethod("init", new Class[] { int.class, int.class });
+ BDDFactory b = (BDDFactory) m.invoke(null, new Object[] { new Integer(nodenum), new Integer(cachesize) });
+ f.add(b);
+ }
}
catch (Throwable _) {
if (_ instanceof InvocationTargetException)
Modified: trunk/JavaBDD_tests/bdd/BasicTests.java
===================================================================
--- trunk/JavaBDD_tests/bdd/BasicTests.java 2006-11-29 08:07:13 UTC (rev 468)
+++ trunk/JavaBDD_tests/bdd/BasicTests.java 2006-11-29 08:07:31 UTC (rev 469)
@@ -473,7 +473,7 @@
if (bdd.varNum() < 5) bdd.setVarNum(5);
BDD a, b, c, d, e;
a = bdd.ithVar(1);
- b = bdd.one();
+ b = bdd.universe();
c = bdd.zero();
d = a.ite(b, c);
Assert.assertEquals(a, d);
@@ -648,7 +648,7 @@
for (int i = 0; i < f.numberOfDomains(); ++i) {
list.add(f.getDomain(i));
}
- BDD result = f.one();
+ BDD result = f.universe();
for (int i = 0; i < k; ++i) {
int x = random.nextInt(f.numberOfDomains() - i);
BDDDomain d = (BDDDomain) list.remove(x);
Modified: trunk/JavaBDD_tests/bdd/IteratorTests.java
===================================================================
--- trunk/JavaBDD_tests/bdd/IteratorTests.java 2006-11-29 08:07:13 UTC (rev 468)
+++ trunk/JavaBDD_tests/bdd/IteratorTests.java 2006-11-29 08:07:31 UTC (rev 469)
@@ -44,7 +44,7 @@
} catch (NoSuchElementException x) {
}
- b = bdd.one();
+ b = bdd.universe();
Iterator i1 = b.iterator(var);
Iterator i2 = new MyBDDIterator(b, var);
b.free();
Modified: trunk/JavaBDD_tests/highlevel/NQueensTest.java
===================================================================
--- trunk/JavaBDD_tests/highlevel/NQueensTest.java 2006-11-29 08:07:13 UTC (rev 468)
+++ trunk/JavaBDD_tests/highlevel/NQueensTest.java 2006-11-29 08:07:31 UTC (rev 469)
@@ -52,7 +52,7 @@
if (B.varNum() < N * N) B.setVarNum(N * N);
- queen = B.one();
+ queen = B.universe();
int i, j;
@@ -92,7 +92,7 @@
}
private static void build(int i, int j) {
- BDD a = B.one(), b = B.one(), c = B.one(), d = B.one();
+ BDD a = B.universe(), b = B.universe(), c = B.universe(), d = B.universe();
int k, l;
/* No one in the same column */
Modified: trunk/JavaBDD_tests/regression/R2.java
===================================================================
--- trunk/JavaBDD_tests/regression/R2.java 2006-11-29 08:07:13 UTC (rev 468)
+++ trunk/JavaBDD_tests/regression/R2.java 2006-11-29 08:07:31 UTC (rev 469)
@@ -25,9 +25,9 @@
while (hasNext()) {
BDDFactory bdd = nextFactory();
BDD zero = bdd.zero();
- BDD one = bdd.one();
+ BDD one = bdd.universe();
Assert.assertTrue(bdd.getVersion(), zero.isZero());
- Assert.assertTrue(bdd.getVersion(), one.isOne());
+ Assert.assertTrue(bdd.getVersion(), one.isUniverse());
BDDVarSet s0 = zero.support();
BDDVarSet s1 = one.support();
Assert.assertTrue(bdd.getVersion(), s0.isEmpty());
Modified: trunk/JavaBDD_tests/trace/TraceDriver.java
===================================================================
--- trunk/JavaBDD_tests/trace/TraceDriver.java 2006-11-29 08:07:13 UTC (rev 468)
+++ trunk/JavaBDD_tests/trace/TraceDriver.java 2006-11-29 08:07:31 UTC (rev 469)
@@ -211,7 +211,7 @@
if(ops == 2) ret.bdd = op1.bdd.or(op2.bdd);
else {
for (Enumeration e = operands.elements() ; e.hasMoreElements() ;)
- if(((TracedVariable)e.nextElement()).bdd.isOne()) { ret.bdd = bdd.one(); return; }
+ if(((TracedVariable)e.nextElement()).bdd.isUniverse()) { ret.bdd = bdd.universe(); return; }
BDD tmp = bdd.zero();
for (Enumeration e = operands.elements() ; e.hasMoreElements() ;) {
@@ -230,7 +230,7 @@
for (Enumeration e = operands.elements() ; e.hasMoreElements() ;)
if(((TracedVariable)e.nextElement()).bdd.isZero()) { ret.bdd = bdd.zero(); return; }
- BDD tmp = bdd.one();
+ BDD tmp = bdd.universe();
for (Enumeration e = operands.elements() ; e.hasMoreElements() ;) {
TracedVariable v = (TracedVariable)e.nextElement();
BDD tmp2 = tmp.and(v.bdd);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
