javabdd-checkins Mailing List for JavaBDD (Page 7)
Brought to you by:
joewhaley
Menu
▾
▴
javabdd-checkins — CVS updates. High traffic.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
|
Mar
(6) |
Apr
(6) |
May
(4) |
Jun
(31) |
Jul
(64) |
Aug
(19) |
Sep
(28) |
Oct
(50) |
Nov
(25) |
Dec
|
| 2005 |
Jan
(44) |
Feb
(8) |
Mar
(2) |
Apr
(15) |
May
(48) |
Jun
(8) |
Jul
(7) |
Aug
|
Sep
(1) |
Oct
(3) |
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(2) |
Jul
(14) |
Aug
|
Sep
|
Oct
|
Nov
(6) |
Dec
(4) |
| 2007 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
| 2011 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: John W. <joe...@us...> - 2005-01-30 14:42:45
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31402 Modified Files: javabdd.jardesc Log Message: Update. Index: javabdd.jardesc =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/javabdd.jardesc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** javabdd.jardesc 16 Oct 2004 02:58:57 -0000 1.5 --- javabdd.jardesc 30 Jan 2005 14:42:37 -0000 1.6 *************** *** 10,15 **** </manifest> <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false"> - <javaElement handleIdentifier="=JavaBDD/<net.sf.javabdd"/> <javaElement handleIdentifier="=JavaBDD/<"/> </selectedElements> </jardesc> --- 10,15 ---- </manifest> <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false"> <javaElement handleIdentifier="=JavaBDD/<"/> + <javaElement handleIdentifier="=JavaBDD/<net.sf.javabdd"/> </selectedElements> </jardesc> |
|
From: John W. <joe...@us...> - 2005-01-30 14:42:31
|
Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31349/net/sf/javabdd Modified Files: JFactory.java BDDFactory.java Added Files: MicroFactory.java Log Message: Added new microBDD factory: each BDD node is only 4 words. Index: BDDFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BDDFactory.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BDDFactory.java 29 Jan 2005 11:37:20 -0000 1.5 --- BDDFactory.java 30 Jan 2005 14:42:23 -0000 1.6 *************** *** 68,71 **** --- 68,73 ---- if (bddpackage.equals("j") || bddpackage.equals("java")) return JFactory.init(nodenum, cachesize); + if (bddpackage.equals("u") || bddpackage.equals("micro")) + return MicroFactory.init(nodenum, cachesize); if (bddpackage.equals("jdd")) return JDDFactory.init(nodenum, cachesize); Index: JFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/JFactory.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** JFactory.java 29 Jan 2005 11:37:20 -0000 1.11 --- JFactory.java 30 Jan 2005 14:42:22 -0000 1.12 *************** *** 47,50 **** --- 47,51 ---- static final boolean USE_FINALIZER = false; + public static boolean FLUSH_CACHE_ON_GC = false; /** *************** *** 2911,2915 **** } ! bdd_operator_reset(); c2 = clock(); --- 2912,2920 ---- } ! if (FLUSH_CACHE_ON_GC) { ! bdd_operator_reset(); ! } else { ! bdd_operator_clean(); ! } c2 = clock(); *************** *** 3367,3370 **** --- 3372,3385 ---- } + void bdd_operator_clean() { + BddCache_clean_ab(applycache); + BddCache_clean_abc(itecache); + BddCache_clean_a(quantcache); + BddCache_clean_ab(appexcache); + BddCache_clean_ab(replacecache); + BddCache_clean_ab(misccache); + BddCache_clean_d(countcache); + } + void bdd_operator_varresize() { if (quantvarset != null) *************** *** 3490,3493 **** --- 3505,3561 ---- } + void BddCache_clean_d(BddCache cache) { + if (cache == null) return; + int n; + for (n = 0; n < cache.tablesize; n++) { + int a = cache.table[n].a; + if (a >= 0 && LOW(a) == -1) { + cache.table[n].a = -1; + } + } + } + + void BddCache_clean_a(BddCache cache) { + if (cache == null) return; + int n; + for (n = 0; n < cache.tablesize; n++) { + int a = cache.table[n].a; + if (a < 0) continue; + if (LOW(a) == -1 || + LOW(((BddCacheDataI)cache.table[n]).res) == -1) { + cache.table[n].a = -1; + } + } + } + + void BddCache_clean_ab(BddCache cache) { + if (cache == null) return; + int n; + for (n = 0; n < cache.tablesize; n++) { + int a = cache.table[n].a; + if (a < 0) continue; + if (LOW(a) == -1 || + (cache.table[n].b != 0 && LOW(cache.table[n].b) == -1) || + LOW(((BddCacheDataI)cache.table[n]).res) == -1) { + cache.table[n].a = -1; + } + } + } + + void BddCache_clean_abc(BddCache cache) { + if (cache == null) return; + int n; + for (n = 0; n < cache.tablesize; n++) { + int a = cache.table[n].a; + if (a < 0) continue; + if (LOW(a) == -1 || + LOW(cache.table[n].b) == -1 || + LOW(cache.table[n].c) == -1 || + LOW(((BddCacheDataI)cache.table[n]).res) == -1) { + cache.table[n].a = -1; + } + } + } + void bdd_setpair(bddPair pair, int oldvar, int newvar) { if (pair == null) *************** *** 3601,3605 **** for (p = pairs; p != null; p = p.next) p.id = pairsid++; ! bdd_operator_reset(); } --- 3669,3674 ---- for (p = pairs; p != null; p = p.next) p.id = pairsid++; ! //bdd_operator_reset(); ! BddCache_reset(replacecache); } --- NEW FILE: MicroFactory.java --- // MicroFactory.java, created Jan 29, 2005 8:24:17 PM by joewhaley // Copyright (C) 2005 John Whaley <jw...@al...> // Licensed under the terms of the GNU LGPL; see COPYING for details. package net.sf.javabdd; import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Random; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; import java.io.PrintStream; import java.math.BigInteger; /** [...6197 lines suppressed...] /** * Use this function to translate BDD's from a JavaFactory into its clone. * This will only work immediately after cloneFactory() is called, and * before any other BDD operations are performed. * * @param that BDD in old factory * @return a BDD in the new factory */ public BDD copyNode(BDD that) { bdd b = (bdd) that; return makeBDD(b._index); } public static final String REVISION = "$Revision: 1.1 $"; public String getVersion() { return "MicroFactory "+REVISION.substring(11, REVISION.length()-2); } } |
|
From: John W. <joe...@us...> - 2005-01-29 11:38:12
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12121 Modified Files: Makefile Log Message: Can't use JAVA_CLASSFILES as a make dependency because it uses *. Index: Makefile =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Makefile 27 Jan 2005 02:06:40 -0000 1.38 --- Makefile 29 Jan 2005 11:38:03 -0000 1.39 *************** *** 218,222 **** jar: $(JAR_NAME) ! $(JAR_NAME): $(BUDDY_CLASSFILE) $(CUDD_CLASSFILE) $(CAL_CLASSFILE) $(JAVA_CLASSFILES) $(EXAMPLE_CLASSFILES) $(JAR) cfm $(JAR_NAME) javabddManifest $(JAVA_CLASSFILES) $(EXAMPLE_CLASSFILES) --- 218,222 ---- jar: $(JAR_NAME) ! $(JAR_NAME): $(BUDDY_CLASSFILE) $(CUDD_CLASSFILE) $(CAL_CLASSFILE) $(JAVA_SOURCES:%.java=%.class) $(EXAMPLE_CLASSFILES) $(JAR) cfm $(JAR_NAME) javabddManifest $(JAVA_CLASSFILES) $(EXAMPLE_CLASSFILES) |
|
From: John W. <joe...@us...> - 2005-01-29 11:37:32
|
Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11927/net/sf/javabdd Modified Files: JFactory.java BuDDyFactory.java BDDFactory.java Log Message: Added complete support for callbacks, including passing stats objects, etc. Index: BuDDyFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BuDDyFactory.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BuDDyFactory.java 19 Oct 2004 21:45:19 -0000 1.6 --- BuDDyFactory.java 29 Jan 2005 11:37:20 -0000 1.7 *************** *** 1143,1155 **** private static void gc_callback(int i) { ! INSTANCE.doCallbacks(INSTANCE.gc_callbacks, i); } private static void reorder_callback(int i) { ! INSTANCE.doCallbacks(INSTANCE.reorder_callbacks, i); } private static void resize_callback(int i, int j) { ! INSTANCE.doCallbacks(INSTANCE.resize_callbacks, i); } } --- 1143,1155 ---- private static void gc_callback(int i) { ! INSTANCE.gbc_handler(i!=0, INSTANCE.gcstats); } private static void reorder_callback(int i) { ! INSTANCE.reorder_handler(i!=0, INSTANCE.reorderstats); } private static void resize_callback(int i, int j) { ! INSTANCE.resize_handler(i, j); } } Index: JFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/JFactory.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** JFactory.java 29 Jan 2005 01:10:33 -0000 1.10 --- JFactory.java 29 Jan 2005 11:37:20 -0000 1.11 *************** *** 2637,2654 **** } - void gbc_handler(boolean pre, GCStats s) { - if (gc_callbacks == null) { - bdd_default_gbchandler(pre, s); - } else { - doCallbacks(gc_callbacks, pre?1:0); - } - } - - void bdd_default_gbchandler(boolean pre, GCStats s) { - if (!pre) { - System.err.println(s.toString()); - } - } - void bdd_gbc_rehash() { int n; --- 2637,2640 ---- *************** *** 3133,3140 **** } - void resize_handler(int oldsize, int newsize) { - super.doCallbacks(resize_callbacks, oldsize); - } - int bdd_noderesize(boolean doRehash) { int oldsize = bddnodesize; --- 3119,3122 ---- *************** *** 3698,3723 **** bddreordertimes = 1; ! if ((top = bddtree_new(-1)) == null) ! return; ! if (reorder_init() < 0) ! return; ! ! usednum_before = bddnodesize - bddfreenum; ! ! top.first = 0; ! top.last = bdd_varnum() - 1; ! top.fixed = false; ! top.next = null; ! top.nextlevel = vartree; ! ! reorder_block(top, method); ! vartree = top.nextlevel; ! free(top); ! ! usednum_after = bddnodesize - bddfreenum; ! ! reorder_done(); ! bddreordermethod = savemethod; ! bddreordertimes = savetimes; } --- 3680,3705 ---- bddreordertimes = 1; ! if ((top = bddtree_new(-1)) != null) { ! if (reorder_init() >= 0) { ! ! usednum_before = bddnodesize - bddfreenum; ! ! top.first = 0; ! top.last = bdd_varnum() - 1; ! top.fixed = false; ! top.next = null; ! top.nextlevel = vartree; ! ! reorder_block(top, method); ! vartree = top.nextlevel; ! free(top); ! ! usednum_after = bddnodesize - bddfreenum; ! ! reorder_done(); ! bddreordermethod = savemethod; ! bddreordertimes = savetimes; ! } ! } } *************** *** 4391,4410 **** return; - //if (reorder_handler != null) - reorder_handler(true); - bdd_reorder(bddreordermethod); bddreordertimes--; - - //if (reorder_handler != null) - reorder_handler(false); - } - - void reorder_handler(boolean b) { - if (reorder_callbacks == null) { - bdd_default_reohandler(b?1:0); - } else { - doCallbacks(reorder_callbacks, b?1:0); - } } --- 4373,4378 ---- *************** *** 4892,4915 **** static long c1; - void bdd_default_reohandler(int prestate) { - - if (verbose > 0) { - if (prestate != 0) { - System.out.println("Start reordering"); - c1 = clock(); - } else { - long c2 = clock(); - System.out.println( - "End reordering. Went from " - + usednum_before - + " to " - + usednum_after - + " nodes (" - + (float) (c2 - c1) / (float) 1000 - + " sec)"); - } - } - } - void bdd_reorder_done() { bddtree_del(vartree); --- 4860,4863 ---- *************** *** 5379,5382 **** --- 5327,5332 ---- int n; + reorder_handler(true, reorderstats); + levels = new levelData[bddvarnum]; *************** *** 5556,5559 **** --- 5506,5511 ---- imatrixDelete(iactmtx); bdd_gbc(); + + reorder_handler(false, reorderstats); } Index: BDDFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BDDFactory.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BDDFactory.java 19 Oct 2004 11:11:35 -0000 1.4 --- BDDFactory.java 29 Jan 2005 11:37:20 -0000 1.5 *************** *** 1027,1032 **** public int num; ! private GCStats() { } public String toString() { StringBuffer sb = new StringBuffer(); --- 1027,1035 ---- public int num; ! protected GCStats() { } + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ public String toString() { StringBuffer sb = new StringBuffer(); *************** *** 1051,1058 **** * Singleton object for GC statistics. */ ! protected final GCStats gcstats = new GCStats(); /** ! * <p>Return the current GC statistics.</p> * * @return GC statistics --- 1054,1061 ---- * Singleton object for GC statistics. */ ! protected GCStats gcstats = new GCStats(); /** ! * <p>Return the current GC statistics for this BDD factory.</p> * * @return GC statistics *************** *** 1063,1066 **** --- 1066,1118 ---- /** + * Stores statistics about reordering. + * + * @author jwhaley + * @version $Id$ + */ + public static class ReorderStats { + + public long time; + public int usednum_before, usednum_after; + + protected ReorderStats() { } + + public int gain() { + if (usednum_before == 0) + return 0; + + return (100 * (usednum_before - usednum_after)) / usednum_before; + } + + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append("Went from "); + sb.append(usednum_before); + sb.append(" to "); + sb.append(usednum_after); + sb.append(" nodes, gain = "); + sb.append(gain()); + sb.append("% ("); + sb.append((float) time / 1000f); + sb.append(" sec)"); + return sb.toString(); + } + } + + /** + * Singleton object for reorder statistics. + */ + protected ReorderStats reorderstats = new ReorderStats(); + + /** + * <p>Return the current reordering statistics for this BDD factory.</p> + * + * @return reorder statistics + */ + public ReorderStats getReorderStats() { + return reorderstats; + } + + /** * Stores statistics about the operator cache. * *************** *** 1077,1081 **** public int swapCount; ! private CacheStats() { } void copyFrom(CacheStats that) { --- 1129,1133 ---- public int swapCount; ! protected CacheStats() { } void copyFrom(CacheStats that) { *************** *** 1141,1145 **** * Singleton object for cache statistics. */ ! protected final CacheStats cachestats = new CacheStats(); // TODO: bdd_sizeprobe_hook --- 1193,1206 ---- * Singleton object for cache statistics. */ ! protected CacheStats cachestats = new CacheStats(); ! ! /** ! * <p>Return the current cache statistics for this BDD factory.</p> ! * ! * @return cache statistics ! */ ! public CacheStats getCacheStats() { ! return cachestats; ! } // TODO: bdd_sizeprobe_hook *************** *** 1553,1556 **** --- 1614,1630 ---- /** + * <p>Unregister a garbage collection callback that was previously + * registered.</p> + * + * @param o base object + * @param m method + */ + public void unregisterGCCallback(Object o, Method m) { + if (gc_callbacks == null) throw new BDDException(); + if (!unregisterCallback(gc_callbacks, o, m)) + throw new BDDException(); + } + + /** * <p>Register a callback that is called when reordering is about * to occur.</p> *************** *** 1565,1568 **** --- 1639,1655 ---- /** + * <p>Unregister a reorder callback that was previously + * registered.</p> + * + * @param o base object + * @param m method + */ + public void unregisterReorderCallback(Object o, Method m) { + if (reorder_callbacks == null) throw new BDDException(); + if (!unregisterCallback(reorder_callbacks, o, m)) + throw new BDDException(); + } + + /** * <p>Register a callback that is called when node table resizing is about * to occur.</p> *************** *** 1576,1581 **** } protected void registerCallback(List callbacks, Object o, Method m) { ! if (!m.isAccessible()) { throw new BDDException("Callback method not accessible"); } --- 1663,1740 ---- } + /** + * <p>Unregister a reorder callback that was previously + * registered.</p> + * + * @param o base object + * @param m method + */ + public void unregisterResizeCallback(Object o, Method m) { + if (resize_callbacks == null) throw new BDDException(); + if (!unregisterCallback(resize_callbacks, o, m)) + throw new BDDException(); + } + + protected void gbc_handler(boolean pre, GCStats s) { + if (gc_callbacks == null) { + bdd_default_gbchandler(pre, s); + } else { + doCallbacks(gc_callbacks, new Integer(pre?1:0), s); + } + } + + protected static void bdd_default_gbchandler(boolean pre, GCStats s) { + if (!pre) { + System.err.println(s.toString()); + } + } + + void reorder_handler(boolean b, ReorderStats s) { + if (b) { + s.usednum_before = getNodeNum(); + s.time = System.currentTimeMillis(); + } else { + s.time = System.currentTimeMillis() - s.time; + s.usednum_after = getNodeNum(); + } + if (reorder_callbacks == null) { + bdd_default_reohandler(b, s); + } else { + doCallbacks(reorder_callbacks, new Integer(b?1:0), s); + } + } + + protected void bdd_default_reohandler(boolean prestate, ReorderStats s) { + int verbose = 1; + if (verbose > 0) { + if (prestate) { + System.out.println("Start reordering"); + s.usednum_before = getNodeNum(); + s.time = System.currentTimeMillis(); + } else { + s.time = System.currentTimeMillis() - s.time; + s.usednum_after = getNodeNum(); + System.out.println("End reordering. "+s); + } + } + } + + protected void resize_handler(int oldsize, int newsize) { + if (resize_callbacks == null) { + bdd_default_reshandler(oldsize, newsize); + } else { + doCallbacks(resize_callbacks, new Integer(oldsize), new Integer(newsize)); + } + } + + protected static void bdd_default_reshandler(int oldsize, int newsize) { + int verbose = 1; + if (verbose > 0) { + System.out.println("Resizing node table from "+oldsize+" to "+newsize); + } + } + protected void registerCallback(List callbacks, Object o, Method m) { ! if (!Modifier.isPublic(m.getModifiers()) && !m.isAccessible()) { throw new BDDException("Callback method not accessible"); } *************** *** 1588,1594 **** } } ! Class[] params = m.getParameterTypes(); ! if (params.length != 1 || params[0] != int.class) { ! throw new BDDException("Wrong signature for callback"); } callbacks.add(new Object[] { o, m }); --- 1747,1755 ---- } } ! if (false) { ! Class[] params = m.getParameterTypes(); ! if (params.length != 1 || params[0] != int.class) { ! throw new BDDException("Wrong signature for callback"); ! } } callbacks.add(new Object[] { o, m }); *************** *** 1608,1612 **** } ! protected void doCallbacks(List callbacks, int val) { if (callbacks != null) { for (Iterator i = callbacks.iterator(); i.hasNext(); ) { --- 1769,1773 ---- } ! protected void doCallbacks(List callbacks, Object arg1, Object arg2) { if (callbacks != null) { for (Iterator i = callbacks.iterator(); i.hasNext(); ) { *************** *** 1615,1619 **** Method m = (Method) cb[1]; try { ! m.invoke(o, new Object[] { new Integer(val) } ); } catch (IllegalArgumentException e) { e.printStackTrace(); --- 1776,1792 ---- Method m = (Method) cb[1]; try { ! switch (m.getParameterTypes().length) { ! case 0: ! m.invoke(o, new Object[] { } ); ! break; ! case 1: ! m.invoke(o, new Object[] { arg1 } ); ! break; ! case 2: ! m.invoke(o, new Object[] { arg1, arg2 } ); ! break; ! default: ! throw new BDDException("Wrong number of arguments for "+m); ! } } catch (IllegalArgumentException e) { e.printStackTrace(); |
|
From: John W. <joe...@us...> - 2005-01-29 11:37:31
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11927 Modified Files: buddy_jni.c Log Message: Added complete support for callbacks, including passing stats objects, etc. Index: buddy_jni.c =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/buddy_jni.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** buddy_jni.c 17 Nov 2004 23:00:23 -0000 1.24 --- buddy_jni.c 29 Jan 2005 11:37:22 -0000 1.25 *************** *** 108,117 **** static void bdd_gbchandler(int code, bddGbcStat *s) { ! jclass cls = (*jnienv)->FindClass(jnienv, "net/sf/javabdd/BuDDyFactory"); ! jmethodID mid = (*jnienv)->GetStaticMethodID(jnienv, cls, "gc_callback", "(I)V"); ! if (mid == 0) { return; } ! (*jnienv)->CallStaticVoidMethod(jnienv, cls, mid, code); } --- 108,164 ---- static void bdd_gbchandler(int code, bddGbcStat *s) { ! jclass bdd_cls, buddy_cls, gc_cls; ! jobject factory_obj, gc_obj; ! jfieldID fid, fid2; ! jmethodID mid; ! ! bdd_cls = (*jnienv)->FindClass(jnienv, "net/sf/javabdd/BDDFactory"); ! buddy_cls = (*jnienv)->FindClass(jnienv, "net/sf/javabdd/BuDDyFactory"); ! gc_cls = (*jnienv)->FindClass(jnienv, "net/sf/javabdd/BDDFactory$GCStats"); ! if (!bdd_cls || !buddy_cls || !gc_cls) { return; } ! ! mid = (*jnienv)->GetStaticMethodID(jnienv, buddy_cls, "gc_callback", "(I)V"); ! fid2 = (*jnienv)->GetStaticFieldID(jnienv, buddy_cls, "INSTANCE", "Lnet/sf/javabdd/BuDDyFactory;"); ! fid = (*jnienv)->GetFieldID(jnienv, bdd_cls, "gcstats", "Lnet/sf/javabdd/BDDFactory$GCStats;"); ! if (!mid || !fid2 || !fid) { ! return; ! } ! ! factory_obj = (*jnienv)->GetStaticObjectField(jnienv, buddy_cls, fid2); ! if (!factory_obj) { ! printf("Error: BuDDyFactory.INSTANCE is null\n"); ! return; ! } ! ! gc_obj = (*jnienv)->GetObjectField(jnienv, factory_obj, fid); ! if (!gc_obj) { ! printf("Error: gcstats is null\n"); ! return; ! } ! ! fid = (*jnienv)->GetFieldID(jnienv, gc_cls, "nodes", "I"); ! if (fid) { ! (*jnienv)->SetIntField(jnienv, gc_obj, fid, s->nodes); ! } ! fid = (*jnienv)->GetFieldID(jnienv, gc_cls, "freenodes", "I"); ! if (fid) { ! (*jnienv)->SetIntField(jnienv, gc_obj, fid, s->freenodes); ! } ! fid = (*jnienv)->GetFieldID(jnienv, gc_cls, "time", "J"); ! if (fid) { ! (*jnienv)->SetLongField(jnienv, gc_obj, fid, s->time); ! } ! fid = (*jnienv)->GetFieldID(jnienv, gc_cls, "sumtime", "J"); ! if (fid) { ! (*jnienv)->SetLongField(jnienv, gc_obj, fid, s->sumtime); ! } ! fid = (*jnienv)->GetFieldID(jnienv, gc_cls, "num", "I"); ! if (fid) { ! (*jnienv)->SetIntField(jnienv, gc_obj, fid, s->num); ! } ! ! (*jnienv)->CallStaticVoidMethod(jnienv, buddy_cls, mid, code); } |
|
From: John W. <joe...@us...> - 2005-01-29 11:34:07
|
Update of /cvsroot/javabdd/JavaBDD/buddy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11182/buddy/src Modified Files: reorder.c Log Message: Call the reorder handler on every reorder, not just automatic reorders. Index: reorder.c =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/buddy/src/reorder.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** reorder.c 28 Jan 2005 04:07:10 -0000 1.5 --- reorder.c 29 Jan 2005 11:33:58 -0000 1.6 *************** *** 1651,1662 **** return; - if (reorder_handler != NULL) - reorder_handler(1); - bdd_reorder(bddreordermethod); bddreordertimes--; - if (reorder_handler != NULL) - reorder_handler(0); } --- 1651,1657 ---- *************** *** 1669,1672 **** --- 1664,1670 ---- return -1; + if (reorder_handler != NULL) + reorder_handler(1); + for (n=0 ; n<bddvarnum ; n++) { *************** *** 1728,1731 **** --- 1726,1733 ---- imatrixDelete(iactmtx); bdd_gbc(); + + if (reorder_handler != NULL) + reorder_handler(0); + } *************** *** 1836,1861 **** bddreordertimes = 1; ! if ((top=bddtree_new(-1)) == NULL) ! RETURN(); ! if (reorder_init() < 0) ! RETURN(); ! usednum_before = bddnodesize - bddfreenum; ! top->first = 0; ! top->last = bdd_varnum()-1; ! top->fixed = 0; ! top->next = NULL; ! top->nextlevel = vartree; ! reorder_block(top, method); ! vartree = top->nextlevel; ! free(top); ! usednum_after = bddnodesize - bddfreenum; - reorder_done(); - bddreordermethod = savemethod; - bddreordertimes = savetimes; RETURN(); } --- 1838,1864 ---- bddreordertimes = 1; ! if ((top=bddtree_new(-1)) != NULL) { ! if (reorder_init() >= 0) { ! usednum_before = bddnodesize - bddfreenum; ! top->first = 0; ! top->last = bdd_varnum()-1; ! top->fixed = 0; ! top->next = NULL; ! top->nextlevel = vartree; ! reorder_block(top, method); ! vartree = top->nextlevel; ! free(top); ! usednum_after = bddnodesize - bddfreenum; ! ! reorder_done(); ! bddreordermethod = savemethod; ! bddreordertimes = savetimes; ! } ! } RETURN(); } |
|
From: John W. <joe...@us...> - 2005-01-29 11:32:35
|
Update of /cvsroot/javabdd/JavaBDD_tests/bdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10912/bdd Added Files: CallbackTests.java Log Message: Test callback functions. --- NEW FILE: CallbackTests.java --- // CallbackTests.java, created Oct 18, 2004 10:42:34 PM by jwhaley // Copyright (C) 2004 jwhaley // Licensed under the terms of the GNU LGPL; see COPYING for details. package bdd; import java.lang.reflect.Method; import junit.framework.Assert; import net.sf.javabdd.BDD; import net.sf.javabdd.BDDFactory; /** * CallbackTests * * @author jwhaley * @version $Id: CallbackTests.java,v 1.1 2005/01/29 11:32:25 joewhaley Exp $ */ public class CallbackTests extends BDDTestCase { public static void main(String[] args) { junit.textui.TestRunner.run(CallbackTests.class); } volatile int gc_called; public void my_gc_callback(int x, BDDFactory.GCStats stats) { if (x == 0) { System.out.println(stats); gc_called++; } } public void testGCCallback() { reset(); Method m; try { m = CallbackTests.class.getDeclaredMethod("my_gc_callback", new Class[] { int.class, BDDFactory.GCStats.class }); } catch (SecurityException e) { Assert.fail(e.toString()); return; } catch (NoSuchMethodException e) { Assert.fail(e.toString()); return; } Assert.assertTrue(hasNext()); while (hasNext()) { BDDFactory bdd = nextFactory(); bdd.registerGCCallback(this, m); gc_called = 0; final int numBits = 16; final int max = (1 << numBits) - 1; if (bdd.varNum() < numBits) bdd.setVarNum(numBits); int[] vars = new int[numBits]; for (int i = 0; i < numBits; ++i) { vars[i] = i; } for (int i = 0; i < max; ++i) { if (gc_called > 1) break; BDD v = bdd.buildCube(i, vars); v.free(); } Assert.assertTrue(gc_called > 0); bdd.unregisterGCCallback(this, m); } } volatile boolean reorder_called; public void my_reorder_callback(int k, BDDFactory.ReorderStats stats) { if (k == 0) { System.out.println(stats); reorder_called = true; } } public void testReorderCallback() { reset(); Method m; try { m = CallbackTests.class.getDeclaredMethod("my_reorder_callback", new Class[] { int.class, BDDFactory.ReorderStats.class }); } catch (SecurityException e) { Assert.fail(e.toString()); return; } catch (NoSuchMethodException e) { Assert.fail(e.toString()); return; } Assert.assertTrue(hasNext()); while (hasNext()) { BDDFactory bdd = nextFactory(); bdd.registerReorderCallback(this, m); reorder_called = false; if (bdd.varNum() < 5) bdd.setVarNum(5); BDD x = bdd.ithVar(0); x.andWith(bdd.ithVar(1)); x.andWith(bdd.ithVar(2)); x.andWith(bdd.ithVar(3)); bdd.reorder(BDDFactory.REORDER_SIFT); Assert.assertTrue(reorder_called); x.free(); bdd.unregisterReorderCallback(this, m); } } volatile boolean resize_called; public void my_resize_callback(int oldsize, int newsize) { System.out.println("old size = "+oldsize+", new size = "+newsize); resize_called = true; } public void testResizeCallback() { reset(); Method m; try { m = CallbackTests.class.getDeclaredMethod("my_resize_callback", new Class[] { int.class, int.class }); } catch (SecurityException e) { Assert.fail(e.toString()); return; } catch (NoSuchMethodException e) { Assert.fail(e.toString()); return; } Assert.assertTrue(hasNext()); while (hasNext()) { BDDFactory bdd = nextFactory(); bdd.registerResizeCallback(this, m); resize_called = false; int newSize = bdd.getNodeTableSize() * 2; bdd.setNodeTableSize(newSize); Assert.assertTrue(resize_called); bdd.unregisterResizeCallback(this, m); } } } |
|
From: John W. <joe...@us...> - 2005-01-29 01:10:48
|
Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16638/net/sf/javabdd Modified Files: JFactory.java Log Message: Fixed unique() and applyUni() Index: JFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/JFactory.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JFactory.java 28 Jan 2005 03:27:13 -0000 1.9 --- JFactory.java 29 Jan 2005 01:10:33 -0000 1.10 *************** *** 769,773 **** static boolean ISCONST(int r) { ! return r == bddfalse || r == bddtrue; } --- 769,774 ---- static boolean ISCONST(int r) { ! //return r == bddfalse || r == bddtrue; ! return r < 2; } *************** *** 775,779 **** if (!bddrunning) bdd_error(BDD_RUNNING); ! else if ((r) < 0 || (r) >= bddnodesize) bdd_error(BDD_ILLBDD); else if (r >= 2 && LOW(r) == -1) --- 776,780 ---- if (!bddrunning) bdd_error(BDD_RUNNING); ! else if (r < 0 || r >= bddnodesize) bdd_error(BDD_ILLBDD); else if (r >= 2 && LOW(r) == -1) *************** *** 1623,1626 **** --- 1624,1757 ---- } + int appuni_rec(int l, int r, int var) { + BddCacheDataI entry; + int res; + + int LEVEL_l, LEVEL_r, LEVEL_var; + LEVEL_l = LEVEL(l); + LEVEL_r = LEVEL(r); + LEVEL_var = LEVEL(var); + + if (LEVEL_l > LEVEL_var && LEVEL_r > LEVEL_var) { + // Skipped a quantified node, answer is zero. + return BDDZERO; + } + + if (ISCONST(l) && ISCONST(r)) + res = oprres[appexop][(l << 1) | r]; + else if (ISCONST(var)) { + int oldop = applyop; + applyop = appexop; + switch (applyop) { + case bddop_and: res = and_rec(l, r); break; + case bddop_or: res = or_rec(l, r); break; + default: res = apply_rec(l, r); break; + } + applyop = oldop; + } else { + entry = BddCache_lookupI(appexcache, APPEXHASH(l, r, appexop)); + if (entry.a == l && entry.b == r && entry.c == appexid) { + if (CACHESTATS) + cachestats.opHit++; + return entry.res; + } + if (CACHESTATS) + cachestats.opMiss++; + + int lev; + if (LEVEL_l == LEVEL_r) { + if (LEVEL_l == LEVEL_var) { + lev = -1; + var = HIGH(var); + } else { + lev = LEVEL_l; + } + PUSHREF(appuni_rec(LOW(l), LOW(r), var)); + PUSHREF(appuni_rec(HIGH(l), HIGH(r), var)); + lev = LEVEL_l; + } else if (LEVEL_l < LEVEL_r) { + if (LEVEL_l == LEVEL_var) { + lev = -1; + var = HIGH(var); + } else { + lev = LEVEL_l; + } + PUSHREF(appuni_rec(LOW(l), r, var)); + PUSHREF(appuni_rec(HIGH(l), r, var)); + } else { + if (LEVEL_r == LEVEL_var) { + lev = -1; + var = HIGH(var); + } else { + lev = LEVEL_r; + } + PUSHREF(appuni_rec(l, LOW(r), var)); + PUSHREF(appuni_rec(l, HIGH(r), var)); + } + if (lev == -1) { + int r2 = READREF(2), r1 = READREF(1); + switch (applyop) { + case bddop_and: res = and_rec(r2, r1); break; + case bddop_or: res = or_rec(r2, r1); break; + default: res = apply_rec(r2, r1); break; + } + } else { + res = bdd_makenode(lev, READREF(2), READREF(1)); + } + + POPREF(2); + + entry.a = l; + entry.b = r; + entry.c = appexid; + entry.res = res; + } + + return res; + } + + int unique_rec(int r, int q) { + BddCacheDataI entry; + int res; + int LEVEL_r, LEVEL_q; + + LEVEL_r = LEVEL(r); + LEVEL_q = LEVEL(q); + if (LEVEL_r > LEVEL_q) { + // Skipped a quantified node, answer is zero. + return BDDZERO; + } + + if (r < 2 || q < 2) + return r; + + entry = BddCache_lookupI(quantcache, QUANTHASH(r)); + if (entry.a == r && entry.c == quantid) { + if (CACHESTATS) + cachestats.opHit++; + return entry.res; + } + if (CACHESTATS) + cachestats.opMiss++; + + if (LEVEL_r == LEVEL_q) { + PUSHREF(unique_rec(LOW(r), HIGH(q))); + PUSHREF(unique_rec(HIGH(r), HIGH(q))); + res = apply_rec(READREF(2), READREF(1)); + } else { + PUSHREF(unique_rec(LOW(r), q)); + PUSHREF(unique_rec(HIGH(r), q)); + res = bdd_makenode(LEVEL(r), READREF(2), READREF(1)); + } + + POPREF(2); + + entry.a = r; + entry.c = quantid; + entry.res = res; + + return res; + } + int quant_rec(int r) { BddCacheDataI entry; *************** *** 2001,2006 **** again : for (;;) { - if (varset2vartable(var) < 0) - return bddfalse; try { INITREF(); --- 2132,2135 ---- *************** *** 2010,2014 **** if (firstReorder == 0) bdd_disable_reorder(); ! res = quant_rec(r); if (firstReorder == 0) bdd_enable_reorder(); --- 2139,2143 ---- if (firstReorder == 0) bdd_disable_reorder(); ! res = unique_rec(r, var); if (firstReorder == 0) bdd_enable_reorder(); *************** *** 2332,2337 **** again : for (;;) { - if (varset2vartable(var) < 0) - return bddfalse; try { INITREF(); --- 2461,2464 ---- *************** *** 2343,2347 **** if (firstReorder == 0) bdd_disable_reorder(); ! res = appquant_rec(l, r); if (firstReorder == 0) bdd_enable_reorder(); --- 2470,2474 ---- if (firstReorder == 0) bdd_disable_reorder(); ! res = appuni_rec(l, r, var); if (firstReorder == 0) bdd_enable_reorder(); |
|
From: John W. <joe...@us...> - 2005-01-29 01:02:59
|
Update of /cvsroot/javabdd/JavaBDD_tests/regression In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15035/regression Added Files: R3.java Log Message: unique() and applyUni() bug --- NEW FILE: R3.java --- // R3.java, created Jul 28, 2004 2:55:30 AM by joewhaley // Copyright (C) 2004 John Whaley <jw...@al...> // Licensed under the terms of the GNU LGPL; see COPYING for details. package regression; import junit.framework.Assert; import net.sf.javabdd.BDD; import net.sf.javabdd.BDDFactory; import bdd.BDDTestCase; /** * unique() and applyUni() bug * * @author John Whaley * @version $Id: R3.java,v 1.1 2005/01/29 01:02:46 joewhaley Exp $ */ public class R3 extends BDDTestCase { public static void main(String[] args) { junit.textui.TestRunner.run(R3.class); } public void testR2() { Assert.assertTrue(hasNext()); while (hasNext()) { BDDFactory bdd = nextFactory(); BDD x0,x1,y0,y1,z0,z1,t,or,one; bdd.setVarNum(5); x0 = bdd.ithVar(0); x1 = bdd.ithVar(1); one = bdd.one(); or = x0.or(x1); z0 = or.unique(x0); t = x1.not(); Assert.assertTrue(z0.toString(), z0.equals(t)); t.free(); z1 = or.unique(x1); t = x0.not(); Assert.assertTrue(z1.toString(), z1.equals(t)); t.free(); t = one.unique(x0); Assert.assertTrue(t.toString(), t.isZero()); t.free(); y0 = x0.applyUni(x1, BDDFactory.or, x0); t = x1.not(); Assert.assertTrue(y0.toString(), y0.equals(t)); t.free(); y1 = x0.applyUni(x1, BDDFactory.or, x1); t = x0.not(); Assert.assertTrue(y1.toString(), y1.equals(t)); t.free(); x0.free(); x1.free(); y0.free(); y1.free(); z0.free(); z1.free(); or.free(); one.free(); } } } |
|
From: John W. <joe...@us...> - 2005-01-28 04:07:19
|
Update of /cvsroot/javabdd/JavaBDD/buddy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21558/buddy/src Modified Files: reorder.c Log Message: Index: reorder.c =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/buddy/src/reorder.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** reorder.c 28 Jan 2005 03:24:31 -0000 1.4 --- reorder.c 28 Jan 2005 04:07:10 -0000 1.5 *************** *** 822,826 **** return; ! if (REF(r) == 0 && !MARKED(r)) { bddfreenum--; --- 822,826 ---- return; ! if (REF(r) == 0 || MARKED(r)) { bddfreenum--; |
|
From: John W. <joe...@us...> - 2005-01-28 03:27:26
|
Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13118/net/sf/javabdd Modified Files: JFactory.java Log Message: Fix for buddy bug #1111195: BDD corruption with GC and reordering Index: JFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/JFactory.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JFactory.java 27 Jan 2005 03:48:59 -0000 1.8 --- JFactory.java 28 Jan 2005 03:27:13 -0000 1.9 *************** *** 1489,1494 **** --- 1489,1496 ---- } + quantlast = -1; for (n = r; n > 1; n = HIGH(n)) { quantvarset[LEVEL(n)] = quantvarsetID; + if (VERIFY_ASSERTIONS) _assert(quantlast < LEVEL(n)); quantlast = LEVEL(n); } *************** *** 1513,1516 **** --- 1515,1519 ---- } + quantlast = 0; for (n = r; !ISCONST(n);) { if (ISZERO(LOW(n))) { *************** *** 1521,1524 **** --- 1524,1528 ---- n = LOW(n); } + if (VERIFY_ASSERTIONS) _assert(quantlast < LEVEL(n)); quantlast = LEVEL(n); } *************** *** 5338,5342 **** return; ! if (!HASREF(r)) { bddfreenum--; --- 5342,5346 ---- return; ! if (!HASREF(r) || MARKED(r)) { bddfreenum--; |
|
From: John W. <joe...@us...> - 2005-01-28 03:24:41
|
Update of /cvsroot/javabdd/JavaBDD/buddy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12563/buddy/src Modified Files: reorder.c Log Message: Fix for buddy bug #1111195: BDD corruption with GC and reordering Index: reorder.c =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/buddy/src/reorder.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** reorder.c 1 Oct 2004 02:17:20 -0000 1.3 --- reorder.c 28 Jan 2005 03:24:31 -0000 1.4 *************** *** 822,826 **** return; ! if (REF(r) == 0) { bddfreenum--; --- 822,826 ---- return; ! if (REF(r) == 0 && !MARKED(r)) { bddfreenum--; |
|
From: John W. <joe...@us...> - 2005-01-27 03:49:07
|
Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/net/sf/javabdd Modified Files: JFactory.java Log Message: Added validate routine. Index: JFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/JFactory.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JFactory.java 16 Nov 2004 02:00:45 -0000 1.7 --- JFactory.java 27 Jan 2005 03:48:59 -0000 1.8 *************** *** 1188,1191 **** --- 1188,1193 ---- } + //validate(res); + checkresize(); return res; *************** *** 2807,2810 **** --- 2809,2814 ---- gbc_handler(false, gcstats); } + + //validate_all(); } *************** *** 3232,3235 **** --- 3236,3240 ---- BddCache_done(replacecache); replacecache = null; BddCache_done(misccache); misccache = null; + BddCache_done(countcache); countcache = null; if (supportSet != null) { *************** *** 5991,5995 **** --- 5996,6031 ---- out.print(s.toString()); } + + public void validateAll() { + validate_all(); + } + public void validateBDD(BDD b) { + validate(((bdd)b)._index); + } + + void validate_all() { + int n; + for (n = bddnodesize - 1; n >= 2; n--) { + if (HASREF(n)) { + validate(n); + } + } + } + void validate(int k) { + validate(k, -1); + } + void validate(int k, int lastLevel) { + if (k < 2) return; + int lev = LEVEL(k); + //System.out.println("Level("+k+") = "+lev); + if (lev <= lastLevel) + throw new BDDException(lev+" <= "+lastLevel); + //System.out.println("Low:"); + validate(LOW(k), lev); + //System.out.println("High:"); + validate(HIGH(k), lev); + } + /* (non-Javadoc) * @see net.sf.javabdd.BDDFactory#createDomain(int, java.math.BigInteger) |
|
From: John W. <joe...@us...> - 2005-01-27 02:06:51
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24694 Modified Files: Makefile Log Message: Added dependency. Index: Makefile =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** Makefile 17 Nov 2004 23:33:25 -0000 1.37 --- Makefile 27 Jan 2005 02:06:40 -0000 1.38 *************** *** 218,222 **** jar: $(JAR_NAME) ! $(JAR_NAME): $(BUDDY_CLASSFILE) $(CUDD_CLASSFILE) $(CAL_CLASSFILE) $(EXAMPLE_CLASSFILES) $(JAR) cfm $(JAR_NAME) javabddManifest $(JAVA_CLASSFILES) $(EXAMPLE_CLASSFILES) --- 218,222 ---- jar: $(JAR_NAME) ! $(JAR_NAME): $(BUDDY_CLASSFILE) $(CUDD_CLASSFILE) $(CAL_CLASSFILE) $(JAVA_CLASSFILES) $(EXAMPLE_CLASSFILES) $(JAR) cfm $(JAR_NAME) javabddManifest $(JAVA_CLASSFILES) $(EXAMPLE_CLASSFILES) |
|
From: John W. <joe...@us...> - 2005-01-26 23:46:26
|
Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27112/net/sf/javabdd Modified Files: BDD.java Log Message: Duh. Index: BDD.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BDD.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BDD.java 26 Jan 2005 23:40:37 -0000 1.4 --- BDD.java 26 Jan 2005 23:46:17 -0000 1.5 *************** *** 776,785 **** sb.append(") not in iteration set:\n"); for (int k = 0; k < levels.length; ++k) { ! sb.append(factory.level2Var(k)); if (k < levels.length-1) sb.append(","); } sb.append("\n(levels: "); for (int k = 0; k < levels.length; ++k) { ! sb.append(k); if (k < levels.length-1) sb.append(","); } --- 776,785 ---- sb.append(") not in iteration set:\n"); for (int k = 0; k < levels.length; ++k) { ! sb.append(factory.level2Var(levels[k])); if (k < levels.length-1) sb.append(","); } sb.append("\n(levels: "); for (int k = 0; k < levels.length; ++k) { ! sb.append(levels[k]); if (k < levels.length-1) sb.append(","); } |
|
From: John W. <joe...@us...> - 2005-01-26 23:41:09
|
Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25787/net/sf/javabdd Modified Files: BDD.java Log Message: More debugging info. Index: BDD.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BDD.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BDD.java 19 Jan 2005 23:50:21 -0000 1.3 --- BDD.java 26 Jan 2005 23:40:37 -0000 1.4 *************** *** 772,780 **** sb.append("BDD contains variable "); sb.append(factory.level2Var(v)); ! sb.append(" not in iteration set: "); for (int k = 0; k < levels.length; ++k) { sb.append(factory.level2Var(k)); ! if (k < levels.length) sb.append(","); } throw new BDDException(sb.toString()); } --- 772,788 ---- sb.append("BDD contains variable "); sb.append(factory.level2Var(v)); ! sb.append("(level "); ! sb.append(v); ! sb.append(") not in iteration set:\n"); for (int k = 0; k < levels.length; ++k) { sb.append(factory.level2Var(k)); ! if (k < levels.length-1) sb.append(","); } + sb.append("\n(levels: "); + for (int k = 0; k < levels.length; ++k) { + sb.append(k); + if (k < levels.length-1) sb.append(","); + } + sb.append(")\n"); throw new BDDException(sb.toString()); } |
|
From: John W. <joe...@us...> - 2005-01-20 08:02:59
|
Update of /cvsroot/javabdd/JavaBDD/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22844/xdocs Modified Files: navigation.xml Log Message: URL for sourceforge download has changed. Index: navigation.xml =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/xdocs/navigation.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** navigation.xml 17 Nov 2004 23:49:12 -0000 1.5 --- navigation.xml 20 Jan 2005 08:02:50 -0000 1.6 *************** *** 23,34 **** <item name="Performance" href="performance.html"/> </menu> <menu name="Downloads"> <item name="JavaBDD for Windows" ! href="http://dl.sourceforge.net/javabdd/javabdd_1.0b1.zip"/> <item name="JavaBDD for Linux" ! href="http://dl.sourceforge.net/javabdd/javabdd_1.0b1.tar.gz"/> <item name="JavaBDD Source code" ! href="http://dl.sourceforge.net/javabdd/javabdd_src_1.0b1.tar.gz"/> </menu> </body> --- 23,36 ---- <item name="Performance" href="performance.html"/> + <item name="Links" + href="links.html"/> </menu> <menu name="Downloads"> <item name="JavaBDD for Windows" ! href="http://prdownloads.sourceforge.net/javabdd/javabdd_1.0b1.zip"/> <item name="JavaBDD for Linux" ! href="http://prdownloads.sourceforge.net/javabdd/javabdd_1.0b1.tar.gz"/> <item name="JavaBDD Source code" ! href="http://prdownloads.sourceforge.net/javabdd/javabdd_src_1.0b1.tar.gz"/> </menu> </body> |
|
From: John W. <joe...@us...> - 2005-01-20 07:50:38
|
Update of /cvsroot/javabdd/JavaBDD/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20266/xdocs Added Files: links.xml changes.xml Log Message: Added more pages to the maven-generated web site. --- NEW FILE: changes.xml --- <document> <properties> <title>Changes for JavaBDD</title> <author email="joe...@us...">John Whaley</author> </properties> <body> <release version="1.0b1" date="2004-10-17"> <action dev="joewhaley" type="update"> Many, many new features and enhancements. </action> <action dev="joewhaley" type="update"> Performance for the Java version has been greatly improved, by 2x or so. </action> <action dev="joewhaley" type="update"> Many new performance improvements for the native BuDDy library. Even if you are not using JavaBDD but are just using the BuDDy library with C or C++, you can use the included libbuddy.so to take advantage of these performance improvements. </action> </release> <release version="0.6" date="2003-10-31"> <action dev="joewhaley" type="fix"> Fixed security problems by adding better null and type checking. It should no longer be possible to crash the VM by passing in unexpected values. </action> <action dev="joewhaley" type="update"> Updated API: applyWith(), etc. methods return the 'this' pointer, for easier nested operations. </action> <action dev="joewhaley" type="add"> Addition of typed BDD factory, for type checking of BDD code. </action> <action dev="joewhaley" type="update"> Code cleanups. JNI interface was made a few percent faster by moving object allocations into Java code. </action> </release> <release version="0.5" date="2003-8-4"> <action dev="joewhaley" type="add"> Major update. Added a 100% Java implementation of the BDD factory, so the native library is no longer necessary. </action> <action dev="joewhaley" type="add"> Java implementation of variable domains. Domains can be up to 2^64 in size! </action> <action dev="joewhaley" type="add"> Java implementation of bit vectors, along with the associated operations (add, subtract, multiply, divide, etc.) </action> <action dev="joewhaley" type="fix"> Fixes and extensions to the CUDD interface. Now CUDD can run all of the test cases correctly. </action> <action dev="joewhaley" type="update"> More small refinements to the API. </action> </release> <release version="0.4" date="2003-6-18"> <action dev="joewhaley" type="add"> Added an interface to the CUDD library. Only basic operations have been implemented and tested. Many features (like variable domains) have not been implemented/ported yet. </action> <action dev="joewhaley" type="update"> Improved the support for printing of BDDs. Now you can specify an interface that will convert the domain indices/members into meaningful strings. </action> <action dev="joewhaley" type="update"> Some small updates to the API. Notably, scanSet() now takes a BDDDomain object, rather than a domain number. </action> </release> <release version="0.3" date="2003-2-21"> <action dev="joewhaley" type="fix"> Many bugs fixed. </action> <action dev="joewhaley" type="update"> Most functionality has been tested, so this version should be moreorless stable and useable. </action> </release> <release version="0.2" date="2003-2-1"> <action dev="joewhaley" type="update"> Still largely untested. Proceed at your own risk. </action> <action dev="joewhaley" type="add"> Added support for variable domains. </action> <action dev="joewhaley" type="add"> Added support for variable pairings. </action> <action dev="joewhaley" type="add"> Added support for defining variable orderings. </action> <action dev="joewhaley" type="fix"> Fixed some LinkageError exceptions. </action> </release> <release version="0.2" date="2003-1-30"> <action dev="joewhaley" type="add"> Initial release. Largely untested. </action> </release> </body> </document> --- NEW FILE: links.xml --- <?xml version="1.0" encoding="UTF-8"?> <document> <properties> <title>JavaBDD Links</title> <author email="joe...@us...">John Whaley</author> </properties> <body> <section name="Acknowledgements"> <ul> <li> <a href="http://www.itu.dk/people/jln">Jørn Lind-Nielsen</a>, the author of <a href="http://buddy.sourceforge.net">BuDDy</a>, for an outstanding package. </li> <li> <a href="http://vlsi.colorado.edu/~fabio/">Fabio Somenzi</a>, the author of <a href="http://vlsi.colorado.edu/~fabio/CUDD/cuddIntro.html">CUDD</a>. </li> <li> <a href="http://www.chl.chalmers.se/~vahidi/index.shtml">Arash Vahidi</a>, author of <a href="http://javaddlib.sourceforge.net/">JBDD</a>, a precursor to JavaBDD. </li> </ul> </section> <section name="Related Links"> <ul> <li> <a href="http://javaddlib.sourceforge.net/">JavaDD</a>, a decision diagram library for Java. </li> <li> <a href="http://buddy.sourceforge.net">BuDDy</a> </li> <li> <a href="http://vlsi.colorado.edu/~fabio/CUDD/cuddIntro.html">CUDD</a> </li> <li> <a href="http://www-cad.eecs.berkeley.edu/Research/cal_bdd/">CAL</a>: breadth-first-based BDD package </li> <li> <a href="http://www-2.cs.cmu.edu/~bwolen/software/">PPBF</a>: parallel BDD package based on partial breadth-first expansion </li> </ul> </section> </body> </document> |
|
From: John W. <joe...@us...> - 2005-01-19 23:50:30
|
Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15487/net/sf/javabdd Modified Files: BDD.java Log Message: Better error message. Index: BDD.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BDD.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BDD.java 19 Oct 2004 11:11:35 -0000 1.2 --- BDD.java 19 Jan 2005 23:50:21 -0000 1.3 *************** *** 768,773 **** ++j; } ! if (j == levels.length) ! throw new BDDException("BDD contains variable not in iteration set: "+factory.level2Var(v)); i = j; --- 768,782 ---- ++j; } ! if (j == levels.length) { ! StringBuffer sb = new StringBuffer(); ! sb.append("BDD contains variable "); ! sb.append(factory.level2Var(v)); ! sb.append(" not in iteration set: "); ! for (int k = 0; k < levels.length; ++k) { ! sb.append(factory.level2Var(k)); ! if (k < levels.length) sb.append(","); ! } ! throw new BDDException(sb.toString()); ! } i = j; |
|
From: John W. <joe...@us...> - 2005-01-04 02:02:08
|
Update of /cvsroot/javabdd/JavaBDD/.settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21889/.settings Added Files: org.eclipse.jdt.ui.prefs org.eclipse.jdt.core.prefs Log Message: Set default code style for JavaBDD project. --- NEW FILE: org.eclipse.jdt.core.prefs --- #Mon Jan 03 18:00:48 PST 2005 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert org.eclipse.jdt.core.formatter.blank_lines_before_method=1 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=0 org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=true org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=64 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert org.eclipse.jdt.core.formatter.alignment_for_compact_if=52 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.blank_lines_before_field=0 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 org.eclipse.jdt.core.formatter.lineSplit=80 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert org.eclipse.jdt.core.formatter.blank_lines_before_package=0 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=true org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert eclipse.preferences.version=1 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=64 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=0 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48 org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert org.eclipse.jdt.core.formatter.blank_lines_after_package=1 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert org.eclipse.jdt.core.formatter.compact_else_if=true org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert org.eclipse.jdt.core.formatter.continuation_indentation=1 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert --- NEW FILE: org.eclipse.jdt.ui.prefs --- #Mon Jan 03 18:00:48 PST 2005 comment_format_source_code=true comment_new_line_for_parameter=true comment_format_html=true comment_line_length=80 comment_format_header=true eclipse.preferences.version=1 comment_indent_parameter_description=true comment_format_comments=true comment_separate_root_tags=true comment_clear_blank_lines=false comment_indent_root_tags=true |
|
From: John W. <joe...@us...> - 2005-01-04 02:01:58
|
Update of /cvsroot/javabdd/JavaBDD/.settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21857/.settings Log Message: Directory /cvsroot/javabdd/JavaBDD/.settings added to the repository |
|
From: John W. <joe...@us...> - 2005-01-02 08:00:54
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20070 Modified Files: project.properties project.xml Log Message: Update Maven stuff. Index: project.properties =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/project.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** project.properties 17 Nov 2004 05:55:28 -0000 1.11 --- project.properties 2 Jan 2005 08:00:41 -0000 1.12 *************** *** 4,7 **** --- 4,8 ---- maven.compile.source = 1.3 + maven.compile.target = 1.3 # The string to look for in TODO tags, used by tasklist plugin. Index: project.xml =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/project.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** project.xml 17 Nov 2004 05:54:22 -0000 1.16 --- project.xml 2 Jan 2005 08:00:42 -0000 1.17 *************** *** 1,9 **** ! <?xml version="1.0"?> <project> <pomVersion>3</pomVersion> <name>JavaBDD</name> <id>javabdd</id> <currentVersion>1.0b1</currentVersion> ! <logo>/images/logo2_mid.jpg</logo> <organization> <name>John Whaley</name> --- 1,11 ---- ! <?xml version="1.0" encoding="UTF-8"?> <project> <pomVersion>3</pomVersion> + <artifactId>javabdd</artifactId> <name>JavaBDD</name> + <groupId>javabdd</groupId> <id>javabdd</id> <currentVersion>1.0b1</currentVersion> ! <logo>/images/logo2_mid.jpg</logo> <organization> <name>John Whaley</name> *************** *** 13,68 **** <inceptionYear>2003</inceptionYear> <package>net.sf.javabdd</package> - <shortDescription>Java Binary Decision Diagram library</shortDescription> - <description> ! <![CDATA[ ! <p>JavaBDD is a Java library for manipulating BDDs (Binary Decision Diagrams). Binary decision diagrams are widely used in model checking, formal verification, optimizing circuit diagrams, etc. For an excellent overview of ! the BDD data structure, see this set of <a href="http://www.itu.dk/people/hra/notes-index.html"> ! lecture notes</a> by Henrik Reif Andersen.</p> ! <p>The JavaBDD API is based on that of the popular <a href="http://www.itu.dk/research/buddy/"> ! BuDDy</a> package, a BDD package written in C by Jørn Lind-Nielsen. However, JavaBDD's API is designed to be object-oriented. The ugly C function interface and reference counting schemes have been hidden underneath a uniform, ! object-oriented interface.</p> ! <p>JavaBDD includes a 100% Java implementation. It can also interface with the ! <a href="http://javaddlib.sourceforge.net/jdd/">JDD</a> library, or with three ! popular BDD libraries written in C via a JNI interface: <a href="http://www.itu.dk/research/buddy/"> ! BuDDy</a>, <a href="http://vlsi.colorado.edu/~fabio/CUDD/cuddIntro.html">CUDD</a>, ! and <a href="http://www-cad.eecs.berkeley.edu/Research/cal_bdd/">CAL</a>. JavaBDD provides a uniform interface to all of these libraries, so you can easily switch between ! them without having to make changes to your application.</p> ! <p>JavaBDD is designed for high performance applications, so it also exposes many of the lower level options of the BDD library, like cache sizes and advanced ! variable reordering.</p> ! ]]> </description> - <url>http://javabdd.sourceforge.net/</url> ! <issueTrackingUrl> ! http://sourceforge.net/tracker/?group_id=72725 ! </issueTrackingUrl> <siteAddress>javabdd.sourceforge.net</siteAddress> ! <siteDirectory> ! /home/groups/j/ja/javabdd/htdocs/ ! </siteDirectory> ! <distributionDirectory> ! /home/groups/j/ja/javabdd/ ! </distributionDirectory> ! <repository> ! <connection> ! scm:cvs:pserver:ano...@cv...:/cvsroot/javabdd:JavaBDD ! </connection> ! <developerConnection> ! scm:cvs:ext:joe...@cv...:/cvsroot/javabdd:JavaBDD ! </developerConnection> ! <url> ! http://cvs.sourceforge.net/viewcvs.py/javabdd/ ! </url> </repository> - <versions> <version> --- 15,53 ---- <inceptionYear>2003</inceptionYear> <package>net.sf.javabdd</package> <shortDescription>Java Binary Decision Diagram library</shortDescription> <description> ! ! <p>JavaBDD is a Java library for manipulating BDDs (Binary Decision Diagrams). Binary decision diagrams are widely used in model checking, formal verification, optimizing circuit diagrams, etc. For an excellent overview of ! the BDD data structure, see this set of <a href="http://www.itu.dk/people/hra/notes-index.html"> ! lecture notes</a> by Henrik Reif Andersen.</p> ! <p>The JavaBDD API is based on that of the popular <a href="http://www.itu.dk/research/buddy/"> ! BuDDy</a> package, a BDD package written in C by Jørn Lind-Nielsen. However, JavaBDD's API is designed to be object-oriented. The ugly C function interface and reference counting schemes have been hidden underneath a uniform, ! object-oriented interface.</p> ! <p>JavaBDD includes a 100% Java implementation. It can also interface with the ! <a href="http://javaddlib.sourceforge.net/jdd/">JDD</a> library, or with three ! popular BDD libraries written in C via a JNI interface: <a href="http://www.itu.dk/research/buddy/"> ! BuDDy</a>, <a href="http://vlsi.colorado.edu/~fabio/CUDD/cuddIntro.html">CUDD</a>, ! and <a href="http://www-cad.eecs.berkeley.edu/Research/cal_bdd/">CAL</a>. JavaBDD provides a uniform interface to all of these libraries, so you can easily switch between ! them without having to make changes to your application.</p> ! <p>JavaBDD is designed for high performance applications, so it also exposes many of the lower level options of the BDD library, like cache sizes and advanced ! variable reordering.</p> ! </description> <url>http://javabdd.sourceforge.net/</url> ! <issueTrackingUrl>http://sourceforge.net/tracker/?group_id=72725</issueTrackingUrl> <siteAddress>javabdd.sourceforge.net</siteAddress> ! <siteDirectory>/home/groups/j/ja/javabdd/htdocs/</siteDirectory> ! <distributionDirectory>/home/groups/j/ja/javabdd/</distributionDirectory> <repository> ! <connection>scm:cvs:pserver:ano...@cv...:/cvsroot/javabdd:JavaBDD</connection> ! <developerConnection>scm:cvs:ext:joe...@cv...:/cvsroot/javabdd:JavaBDD</developerConnection> ! <url>http://cvs.sourceforge.net/viewcvs.py/javabdd/</url> </repository> <versions> <version> *************** *** 92,96 **** </version> </versions> - <mailingLists> <mailingList> --- 77,80 ---- *************** *** 131,137 **** </mailingList> </mailingLists> - <developers> - <developer> <name>John Whaley</name> --- 115,119 ---- *************** *** 139,168 **** <email>joe...@us...</email> <organization>Stanford University</organization> - <roles> - <role>Project Manager</role> - </roles> <timezone>-8</timezone> </developer> - </developers> - <dependencies> - <dependency> <groupId>jdd</groupId> <artifactId>jdd</artifactId> <version>1.00</version> ! <jar>jdd.jar</jar> <url>http://javaddlib.sourceforge.net/</url> </dependency> ! ! <dependency> ! <groupId>statcvs</groupId> ! <artifactId>maven-statcvs-plugin</artifactId> ! <version>2.5</version> ! <type>plugin</type> ! </dependency> ! ! <!-- TODO <dependency> <groupId>maven</groupId> --- 121,136 ---- <email>joe...@us...</email> <organization>Stanford University</organization> <timezone>-8</timezone> </developer> </developers> <dependencies> <dependency> <groupId>jdd</groupId> <artifactId>jdd</artifactId> <version>1.00</version> ! <jar>${basedir}/jdd.jar</jar> <url>http://javaddlib.sourceforge.net/</url> </dependency> ! <!-- TODO <dependency> <groupId>maven</groupId> *************** *** 179,195 **** </dependency> --> ! </dependencies> - <build> ! ! <nagEmailAddress> ! joe...@us... ! </nagEmailAddress> ! <sourceDirectory>.</sourceDirectory> <unitTestSourceDirectory>../JavaBDD_tests</unitTestSourceDirectory> - <aspectSourceDirectory/> - <!-- Unit test cases --> <unitTest> --- 147,161 ---- </dependency> --> ! <dependency> ! <groupId>statcvs</groupId> ! <artifactId>maven-statcvs-plugin</artifactId> ! <version>2.5</version> ! <type>plugin</type> ! </dependency> </dependencies> <build> ! <nagEmailAddress>joe...@us...</nagEmailAddress> <sourceDirectory>.</sourceDirectory> <unitTestSourceDirectory>../JavaBDD_tests</unitTestSourceDirectory> <!-- Unit test cases --> <unitTest> *************** *** 199,203 **** <include>regression/*.java</include> </includes> ! <!-- Not currently used. <excludes> <exclude>**/RepositoryTest.java</exclude> --- 165,169 ---- <include>regression/*.java</include> </includes> ! <!-- Not currently used. <excludes> <exclude>**/RepositoryTest.java</exclude> *************** *** 205,237 **** --> </unitTest> - <!-- J A R R E S O U R C E S --> <!-- Resources that are packaged up inside the JAR file --> - <resources> - - <!-- TODO - <resource> - <directory>${basedir}/src/resources/misc</directory> - <includes> - <include>*.xsd</include> - </includes> - </resource> - <resource> - <directory>${basedir}/src/resources/logging</directory> - <includes> - <include>log4j.properties</include> - </includes> - </resource> - --> - - </resources> - <!-- Integration unit test cases --> ! <integrationUnitTest/> ! ! <jars> ! </jars> </build> - <reports> <report> --- 171,188 ---- --> </unitTest> <!-- J A R R E S O U R C E S --> <!-- Resources that are packaged up inside the JAR file --> <!-- Integration unit test cases --> ! <sourceModifications> ! <sourceModification> ! <className>fakeClass</className> ! <excludes> ! <exclude>target/**</exclude> ! </excludes> ! </sourceModification> ! </sourceModifications> ! <integrationUnitTest /> ! <jars /> </build> <reports> <report> *************** *** 268,272 **** maven-changes-plugin </report> ! <!-- TOO EXPENSIVE <report> maven-checkstyle-plugin --- 219,223 ---- maven-changes-plugin </report> ! <!-- TOO EXPENSIVE <report> maven-checkstyle-plugin *************** *** 280,283 **** --> </reports> - </project> --- 231,234 ---- --> </reports> </project> + |
|
From: John W. <joe...@us...> - 2004-11-18 00:39:57
|
Update of /cvsroot/javabdd/JavaBDD/buddy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10679/buddy Added Files: config.h Log Message: Check in some version to avoid the autoreconf BS. --- NEW FILE: config.h --- /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ /* Defube to 1 to gather statistical information about operator and unique node caching (for debugging). */ /* #undef CACHESTATS */ /* Define to 1 if you have the <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 /* Define to 1 if you have the <strings.h> header file. */ #define HAVE_STRINGS_H 1 /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 /* BuDDy's major version. */ #define MAJOR_VERSION 2 /* BuDDy's minor version. */ #define MINOR_VERSION 4 /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" /* Define to the full name of this package. */ #define PACKAGE_NAME "buddy" /* Define to the full name and version of this package. */ #define PACKAGE_STRING "buddy 2.4" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "buddy" /* Define to the version of this package. */ #define PACKAGE_VERSION "2.4" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Define to 1 to count number of fundamental variable swaps (for debugging). */ /* #undef SWAPCOUNT */ /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ #define YYTEXT_POINTER 1 |
|
From: John W. <joe...@us...> - 2004-11-18 00:04:24
|
Update of /cvsroot/javabdd/JavaBDD/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2398/xdocs Modified Files: performance.xml Log Message: Update performance numbers. Index: performance.xml =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/xdocs/performance.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** performance.xml 17 Nov 2004 23:49:12 -0000 1.6 --- performance.xml 18 Nov 2004 00:04:14 -0000 1.7 *************** *** 25,47 **** </tr> <tr> ! <td>buddy </td> <td> 65s </td> <td> 153mb </td> </tr> <tr> ! <td>cudd </td> <td> 78s </td> <td> 172mb </td> </tr> <tr> ! <td>cal </td> <td> 114s </td> <td> 254mb </td> </tr> <tr> ! <td>java (-server) </td> <td> 80s </td> <td> 156mb </td> </tr> <tr> ! <td>java (-client) </td> <td> 90s </td> <td> 156mb </td> </tr> <tr> ! <td>jdd (-server) </td> <td> 78s </td> <td> 216mb </td> </tr> <tr> ! <td>jdd (-client) </td> <td> 83s </td> <td> 200mb </td> </tr> </table> --- 25,47 ---- </tr> <tr> ! <td>buddy </td> <td> 41s </td> <td> 152mb </td> </tr> <tr> ! <td>cudd </td> <td> 46s </td> <td> 171mb </td> </tr> <tr> ! <td>cal </td> <td> 68s </td> <td> 251mb </td> </tr> <tr> ! <td>java (-server) </td> <td> 53s </td> <td> 171mb </td> </tr> <tr> ! <td>java (-client) </td> <td> 54s </td> <td> 152mb </td> </tr> <tr> ! <td>jdd (-server) </td> <td> 50s </td> <td> 188mb </td> </tr> <tr> ! <td>jdd (-client) </td> <td> 49s </td> <td> 169mb </td> </tr> </table> |
|
From: John W. <joe...@us...> - 2004-11-17 23:49:21
|
Update of /cvsroot/javabdd/JavaBDD/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31082/xdocs Modified Files: compiling.xml navigation.xml installing.xml performance.xml Log Message: Getting ready for 1.0beta1 release. Index: installing.xml =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/xdocs/installing.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** installing.xml 27 Jul 2004 18:23:30 -0000 1.1 --- installing.xml 17 Nov 2004 23:49:12 -0000 1.2 *************** *** 24,28 **** queens problem. You can run this example by simply typing: <br/> ! <code>java -jar javabdd_0.6.jar <i>N</i></code> <br/> where <code><i>N</i></code> is the size of the board (e.g. <code>8</code>). --- 24,28 ---- queens problem. You can run this example by simply typing: <br/> ! <code>java -jar javabdd.jar <i>N</i></code> <br/> where <code><i>N</i></code> is the size of the board (e.g. <code>8</code>). Index: navigation.xml =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/xdocs/navigation.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** navigation.xml 28 Jul 2004 06:41:39 -0000 1.4 --- navigation.xml 17 Nov 2004 23:49:12 -0000 1.5 *************** *** 26,34 **** <menu name="Downloads"> <item name="JavaBDD for Windows" ! href="http://dl.sourceforge.net/javabdd/javabdd_0.6.zip"/> <item name="JavaBDD for Linux" ! href="http://dl.sourceforge.net/javabdd/javabdd_0.6.tar.gz"/> <item name="JavaBDD Source code" ! href="http://dl.sourceforge.net/javabdd/javabdd_src_0.6.tar.gz"/> </menu> </body> --- 26,34 ---- <menu name="Downloads"> <item name="JavaBDD for Windows" ! href="http://dl.sourceforge.net/javabdd/javabdd_1.0b1.zip"/> <item name="JavaBDD for Linux" ! href="http://dl.sourceforge.net/javabdd/javabdd_1.0b1.tar.gz"/> <item name="JavaBDD Source code" ! href="http://dl.sourceforge.net/javabdd/javabdd_src_1.0b1.tar.gz"/> </menu> </body> Index: performance.xml =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/xdocs/performance.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** performance.xml 28 Jul 2004 06:41:39 -0000 1.5 --- performance.xml 17 Nov 2004 23:49:12 -0000 1.6 *************** *** 11,20 **** <p> Here are the timings of solving the 12x12 NQueens problem on ! my laptop (1.6GHz P-M, WinXP, Sun JDK 1.5.0b2). This test simply does simple logic operations. It primarily tests the speed of node creation and BDD garbage collection. The command line I used to test was: <br/> ! <code>java -mx512m -Dbdd=<i>package</i> -jar javabdd_0.6.jar 12</code> <br/> </p> --- 11,21 ---- <p> Here are the timings of solving the 12x12 NQueens problem on ! an Opteron 150 (2.4GHz, RedHat Enterprise Linux 3 in 32 bit mode, ! Sun JDK 1.5.0). This test simply does simple logic operations. It primarily tests the speed of node creation and BDD garbage collection. The command line I used to test was: <br/> ! <code>java -mx512m -Dbdd=<i>package</i> -jar javabdd.jar 12</code> <br/> </p> Index: compiling.xml =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/xdocs/compiling.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** compiling.xml 28 Jul 2004 06:41:39 -0000 1.3 --- compiling.xml 17 Nov 2004 23:49:12 -0000 1.4 *************** *** 17,30 **** </p> <p> ! If you still want to build it yourself, you will first need the ! source code to the native library you want to interface to (BuDDy, ! CUDD, and/or CAL). They are available at the following locations: <ul> - <li><a href="http://buddy.sourceforge.net">BuDDy</a></li> <li><a href="http://vlsi.colorado.edu/~fabio/CUDD/cuddIntro.html">CUDD</a></li> <li><a href="http://www-cad.eecs.berkeley.edu/Respep/Research/bdd/cal_bdd/">CAL</a></li> </ul> <a href="http://buddy.sourceforge.net">BuDDy</a> seems to have the ! best performance and is the most tested, so I recommend BuDDy. </p> <p> --- 17,30 ---- </p> <p> ! If you still want to build it yourself, you will first need to decide ! which native library you want to interface with. JavaBDD can interface ! to BuDDy, CUDD, and/or CAL. The BuDDy source code is included; you ! can obtain the source for the others at the following locations: <ul> <li><a href="http://vlsi.colorado.edu/~fabio/CUDD/cuddIntro.html">CUDD</a></li> <li><a href="http://www-cad.eecs.berkeley.edu/Respep/Research/bdd/cal_bdd/">CAL</a></li> </ul> <a href="http://buddy.sourceforge.net">BuDDy</a> seems to have the ! best performance and is the most well-tested, so I recommend BuDDy. </p> <p> *************** *** 38,42 **** It will automatically identify the path to the JDK, as long as you have it installed in the default location (C:/j2sdk* on Windows, ! /usr/java/j2sdk* on Linux). </p> <p> --- 38,43 ---- It will automatically identify the path to the JDK, as long as you have it installed in the default location (C:/j2sdk* on Windows, ! /usr/java/j2sdk* on Linux). You may need to change this path if you are ! using JDK 1.5.0. </p> <p> *************** *** 50,55 **** You can also specify different compilers by setting the CC variable. In addition to <code>gcc</code>, the Makefile supports the Microsoft ! compiler (<code>cl</code>) and the Intel compiler (<code>icc</code> on Linux, ! <code>icl</code> on Windows). </p> <p> --- 51,56 ---- You can also specify different compilers by setting the CC variable. In addition to <code>gcc</code>, the Makefile supports the Microsoft ! compiler (<code>cl</code>), the Intel compiler (<code>icc</code> on Linux, ! <code>icl</code> on Windows), and the PathScale compiler (<code>pathcc</code> on Linux). </p> <p> |
