Menu
▾
▴
[Javabdd-checkins] JavaBDD buddy_jni.c,1.22,1.23 project.properties,1.7,1.8 project.xml,1.13,1.14 NQueens.java,1.15,1.16
|
From: John W. <joe...@us...> - 2004-10-19 11:12:25
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28273 Modified Files: buddy_jni.c project.properties project.xml NQueens.java Log Message: More updates in preparation for release. Index: project.properties =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/project.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** project.properties 21 Aug 2004 02:22:40 -0000 1.7 --- project.properties 19 Oct 2004 11:11:54 -0000 1.8 *************** *** 30,34 **** # Properties for Javadoc generation. maven.javadoc.links = http://java.sun.com/j2se/1.4.2/docs/api/ ! maven.javadoc.protected = true maven.javadoc.private = false #maven.javadoc.overview = docs/overview.html --- 30,34 ---- # Properties for Javadoc generation. maven.javadoc.links = http://java.sun.com/j2se/1.4.2/docs/api/ ! maven.javadoc.protected = false maven.javadoc.private = false #maven.javadoc.overview = docs/overview.html *************** *** 36,37 **** --- 36,40 ---- # Properties for dashboard #maven.dashboard.aggregators = junittests,junitfailures,juniterrors,junitpassrate + + # JUnit tests use JNI, so we need either -noloading or to fork. + maven.junit.fork = true Index: NQueens.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/NQueens.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** NQueens.java 16 Oct 2004 02:58:57 -0000 1.15 --- NQueens.java 19 Oct 2004 11:11:54 -0000 1.16 *************** *** 5,15 **** */ public class NQueens { ! public static BDDFactory B; ! public static boolean TRACE; ! public static int N; /* Size of the chess board */ ! public static BDD[][] X; /* BDD variable array */ ! public static BDD queen; /* N-queen problem expressed as a BDD */ ! public static BDD solution; /* One solution */ public static void main(String[] args) { --- 5,15 ---- */ public class NQueens { ! static BDDFactory B; ! static boolean TRACE; ! static int N; /* Size of the chess board */ ! static BDD[][] X; /* BDD variable array */ ! static BDD queen; /* N-queen problem expressed as a BDD */ ! static BDD solution; /* One solution */ public static void main(String[] args) { Index: project.xml =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/project.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** project.xml 16 Oct 2004 02:58:57 -0000 1.13 --- project.xml 19 Oct 2004 11:11:54 -0000 1.14 *************** *** 4,8 **** <name>JavaBDD</name> <id>javabdd</id> ! <currentVersion>0.6</currentVersion> <logo>/images/logo2_mid.jpg</logo> <organization> --- 4,8 ---- <name>JavaBDD</name> <id>javabdd</id> ! <currentVersion>1.0b1</currentVersion> <logo>/images/logo2_mid.jpg</logo> <organization> *************** *** 84,90 **** </version> <version> ! <id>1.0beta</id> ! <name>1.0beta</name> ! <tag>HEAD</tag> </version> </versions> --- 84,90 ---- </version> <version> ! <id>1.0b1</id> ! <name>1.0b1</name> ! <tag>v1_0b1</tag> </version> </versions> *************** *** 186,191 **** <includes> <include>**/*Test.java</include> ! </includes> ! <includes> <include>regression/*.java</include> </includes> --- 186,190 ---- <includes> <include>**/*Test.java</include> ! <include>**/*Tests.java</include> <include>regression/*.java</include> </includes> *************** *** 245,248 **** --- 244,250 ---- </report> <report> + maven-junit-report-plugin + </report> + <report> maven-findbugs-plugin </report> *************** *** 250,253 **** --- 252,261 ---- maven-linkcheck-plugin </report> + <report> + maven-statcvs-plugin + </report> + <report> + maven-changes-plugin + </report> <!-- TOO EXPENSIVE <report> Index: buddy_jni.c =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/buddy_jni.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** buddy_jni.c 19 Oct 2004 09:14:10 -0000 1.22 --- buddy_jni.c 19 Oct 2004 11:11:54 -0000 1.23 *************** *** 85,89 **** case BDD_SIZE: /* Illegal size argument */ case BVEC_SHIFT: /* Illegal shift-left/right parameter */ ! clsname = "java/lang/IllegalArgumentException"; break; default: --- 85,90 ---- case BDD_SIZE: /* Illegal size argument */ case BVEC_SHIFT: /* Illegal shift-left/right parameter */ ! //clsname = "java/lang/IllegalArgumentException"; ! clsname = "net/sf/javabdd/BDDException"; break; default: *************** *** 330,333 **** --- 331,356 ---- /* * Class: net_sf_javabdd_BuDDyFactory + * Method: setNodeTableSize0 + * Signature: (I)I + */ + JNIEXPORT jint JNICALL Java_net_sf_javabdd_BuDDyFactory_setNodeTableSize0 + (JNIEnv *env, jclass cl, jint size) + { + int result; + jnienv = env; + #if defined(TRACE_BUDDYLIB) + printf("bdd_getallocnum()\n"); + #endif + result = bdd_getallocnum(); + #if defined(TRACE_BUDDYLIB) + printf("bdd_noderesize2(%d, %d, %d)\n", 1, result, size); + #endif + bdd_noderesize2(1, result, size); + check_error(env); + return result; + } + + /* + * Class: net_sf_javabdd_BuDDyFactory * Method: setMinFreeNodes0 * Signature: (I)I *************** *** 912,915 **** --- 935,956 ---- /* * Class: net_sf_javabdd_BuDDyFactory + * Method: getCacheSize0 + * Signature: ()I + */ + JNIEXPORT jint JNICALL Java_net_sf_javabdd_BuDDyFactory_getCacheSize0 + (JNIEnv *env, jclass c) + { + int result; + bddStat stats; + #if defined(TRACE_BUDDYLIB) + printf("bdd_stats(%p)\n", &stats); + #endif + bdd_stats(&stats); + result = stats.cachesize; + return result; + } + + /* + * Class: net_sf_javabdd_BuDDyFactory * Method: getNodeNum0 * Signature: ()I |
