javabdd-checkins Mailing List for JavaBDD (Page 15)
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...> - 2004-07-22 22:01:08
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9716 Modified Files: buddy_jni.c Log Message: Index: buddy_jni.c =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/buddy_jni.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** buddy_jni.c 23 Jun 2004 06:23:05 -0000 1.18 --- buddy_jni.c 22 Jul 2004 22:00:53 -0000 1.19 *************** *** 32,36 **** #define INVALID_BDD -1 ! //#define TRACE_BUDDYLIB static int bdd_error; --- 32,36 ---- #define INVALID_BDD -1 ! #undef TRACE_BUDDYLIB static int bdd_error; *************** *** 690,694 **** { #if defined(TRACE_BUDDYLIB) ! printf("bdd_addvarblock(%d, %d)\n", b, fixed); #endif bdd_addvarblock(var, fixed); --- 690,694 ---- { #if defined(TRACE_BUDDYLIB) ! printf("bdd_addvarblock(%d, %d)\n", var , fixed); #endif bdd_addvarblock(var, fixed); |
|
From: John W. <joe...@us...> - 2004-07-22 20:04:13
|
Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20433/org/sf/javabdd Modified Files: JavaFactory.java JFactory.java CALFactory.java Log Message: Index: JavaFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/JavaFactory.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** JavaFactory.java 11 Jul 2004 11:47:14 -0000 1.17 --- JavaFactory.java 22 Jul 2004 20:03:53 -0000 1.18 *************** *** 2003,2007 **** if (r < 2) ! return bddfalse; /* On-demand allocation of support set */ --- 2003,2007 ---- if (r < 2) ! return bddtrue; /* On-demand allocation of support set */ Index: JFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/JFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JFactory.java 20 Jul 2004 21:48:28 -0000 1.1 --- JFactory.java 22 Jul 2004 20:03:59 -0000 1.2 *************** *** 2005,2009 **** if (r < 2) ! return bddfalse; /* On-demand allocation of support set */ --- 2005,2009 ---- if (r < 2) ! return bddtrue; /* On-demand allocation of support set */ Index: CALFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/CALFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CALFactory.java 11 Jul 2004 11:47:14 -0000 1.2 --- CALFactory.java 22 Jul 2004 20:03:59 -0000 1.3 *************** *** 212,231 **** /* (non-Javadoc) - * @see org.sf.javabdd.BDDFactory#load(java.lang.String) - */ - public BDD load(String filename) { - // TODO Implement this. - throw new UnsupportedOperationException(); - } - - /* (non-Javadoc) - * @see org.sf.javabdd.BDDFactory#save(java.lang.String, org.sf.javabdd.BDD) - */ - public void save(String filename, BDD var) { - // TODO Implement this. - throw new UnsupportedOperationException(); - } - - /* (non-Javadoc) * @see org.sf.javabdd.BDDFactory#level2Var(int) */ --- 212,215 ---- |
|
From: John W. <joe...@us...> - 2004-07-20 21:50:33
|
Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8329/org/sf/javabdd Modified Files: BDDFactory.java Log Message: Change default to JFactory. Index: BDDFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/BDDFactory.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** BDDFactory.java 23 Jun 2004 04:13:34 -0000 1.22 --- BDDFactory.java 20 Jul 2004 21:50:24 -0000 1.23 *************** *** 43,49 **** /** Initializes a BDD factory of the given type with the given initial * node table size and operation cache size. The type is a string that ! * can be "buddy", "cudd", "java", "test", or a name of a class that ! * has an init() method that returns a BDDFactory. If it fails, it ! * falls back to the "java" factory. * * @param bddpackage BDD package string identifier --- 43,49 ---- /** Initializes a BDD factory of the given type with the given initial * node table size and operation cache size. The type is a string that ! * can be "buddy", "cudd", "cal", "j", "java", "jdd", "test", "typed", or ! * a name of a class that has an init() method that returns a BDDFactory. ! * If it fails, it falls back to the "j" factory. * * @param bddpackage BDD package string identifier *************** *** 60,63 **** --- 60,65 ---- if (bddpackage.equals("cal")) return CALFactory.init(nodenum, cachesize); + if (bddpackage.equals("j")) + return JFactory.init(nodenum, cachesize); if (bddpackage.equals("java")) return JavaFactory.init(nodenum, cachesize); *************** *** 81,85 **** catch (InvocationTargetException _) {} // falling back to default java implementation. ! return JavaFactory.init(nodenum, cachesize); } --- 83,87 ---- catch (InvocationTargetException _) {} // falling back to default java implementation. ! return JFactory.init(nodenum, cachesize); } |
|
From: John W. <joe...@us...> - 2004-07-20 21:48:39
|
Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7947/org/sf/javabdd Added Files: JFactory.java Log Message: Improved version of JavaFactory. --- NEW FILE: JFactory.java --- // JavaFactory.java, created Aug 1, 2003 7:06:47 PM by joewhaley // Copyright (C) 2003 John Whaley <jw...@al...> // Licensed under the terms of the GNU LGPL; see COPYING for details. package org.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.util.StringTokenizer; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.io.PrintStream; /** [...5953 lines suppressed...] INSTANCE.domain = new BDDDomain[this.domain.length]; for (int i = 0; i < INSTANCE.domain.length; ++i) { INSTANCE.domain[i] = INSTANCE.createDomain(i, this.domain[i].realsize); } return INSTANCE; } /** * 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 new bdd(b._index); } } |
|
From: CS343 s. <cs...@us...> - 2004-07-15 07:08:59
|
Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3896/org/sf/javabdd Modified Files: FindBestOrder.java Log Message: Index: FindBestOrder.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/FindBestOrder.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FindBestOrder.java 8 May 2004 10:50:24 -0000 1.6 --- FindBestOrder.java 15 Jul 2004 07:08:47 -0000 1.7 *************** *** 22,25 **** --- 22,31 ---- public class FindBestOrder { + static BDDFactory bdd = null; + boolean newbdd = true; + BDD b1 = null; + BDD b2 = null; + BDD b3 = null; + String filename0 = "fbo.bi"; String filename1 = "fbo.1"; *************** *** 79,82 **** --- 85,91 ---- f2.delete(); f3.delete(); + if (b1 != null) b1.free(); + if (b2 != null) b2.free(); + if (b3 != null) b3.free(); } *************** *** 107,110 **** --- 116,127 ---- } t.stop(); + if (t.totalTime == Long.MAX_VALUE) { + b1 = null; + b2 = null; + b3 = null; + bdd = null; + newbdd = true; + System.gc(); + } if (t.time < bestCalcTime) { bestOrder = varOrder; *************** *** 132,153 **** public void run() { long total = System.currentTimeMillis(); ! BDDFactory bdd = JavaFactory.init(nodeTableSize, cacheSize); ! bdd.setMaxIncrease(maxIncrease); ! readBDDConfig(bdd); int[] varorder = bdd.makeVarOrdering(reverse, varOrderToTry); bdd.setVarOrder(varorder); //System.out.println("\nTrying ordering "+varOrderToTry); try { ! BDD b1 = bdd.load(filename1); ! BDD b2 = bdd.load(filename2); ! BDD b3 = bdd.load(filename3); long t = System.currentTimeMillis(); BDD result = b1.applyEx(b2, op, b3); time = System.currentTimeMillis() - t; ! b1.free(); b2.free(); b3.free(); result.free(); } catch (IOException x) { } System.out.println("Ordering: "+varOrderToTry+" time: "+time); ! bdd.done(); totalTime = System.currentTimeMillis() - total; } --- 149,176 ---- public void run() { long total = System.currentTimeMillis(); ! if (bdd == null) { ! bdd = JavaFactory.init(nodeTableSize, cacheSize); ! bdd.setMaxIncrease(maxIncrease); ! readBDDConfig(bdd); ! } int[] varorder = bdd.makeVarOrdering(reverse, varOrderToTry); bdd.setVarOrder(varorder); //System.out.println("\nTrying ordering "+varOrderToTry); try { ! if (newbdd) { ! b1 = bdd.load(filename1); ! b2 = bdd.load(filename2); ! b3 = bdd.load(filename3); ! newbdd = false; ! } long t = System.currentTimeMillis(); BDD result = b1.applyEx(b2, op, b3); time = System.currentTimeMillis() - t; ! //b1.free(); b2.free(); b3.free(); ! result.free(); } catch (IOException x) { } System.out.println("Ordering: "+varOrderToTry+" time: "+time); ! //bdd.done(); totalTime = System.currentTimeMillis() - total; } |
|
From: John W. <joe...@us...> - 2004-07-12 07:09:07
|
Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20068/org/sf/javabdd Modified Files: JDDFactory.java Log Message: Index: JDDFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/JDDFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JDDFactory.java 23 Jun 2004 04:13:06 -0000 1.1 --- JDDFactory.java 12 Jul 2004 07:08:58 -0000 1.2 *************** *** 15,21 **** private final jdd.bdd.BDD bdd; ! private int[] vars; ! private int[] level2var; ! private int[] var2level; private JDDFactory(int nodenum, int cachesize) { --- 15,21 ---- private final jdd.bdd.BDD bdd; ! private int[] vars; // indexed by EXTERNAL ! private int[] level2var; // internal -> external ! private int[] var2level; // external -> internal private JDDFactory(int nodenum, int cachesize) { *************** *** 746,749 **** --- 746,750 ---- BDDDomain d = getDomain(i); d.var = makeSet(d.ivar); + //System.out.println("Set for domain "+d+": "+d.var.toStringWithDomains()); } } |
|
From: John W. <joe...@us...> - 2004-07-11 11:47:23
|
Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3266/org/sf/javabdd Modified Files: JavaFactory.java CALFactory.java TypedBDDFactory.java TestBDDFactory.java Log Message: Fix constructors. Index: JavaFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/JavaFactory.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** JavaFactory.java 9 Jul 2004 02:14:03 -0000 1.16 --- JavaFactory.java 11 Jul 2004 11:47:14 -0000 1.17 *************** *** 30,33 **** --- 30,35 ---- static final boolean VERIFY_ASSERTIONS = false; + private JavaFactory() { } + /* (non-Javadoc) * @see org.sf.javabdd.BDDFactory#init(int, int) Index: TestBDDFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/TestBDDFactory.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TestBDDFactory.java 1 Nov 2003 06:19:07 -0000 1.7 --- TestBDDFactory.java 11 Jul 2004 11:47:14 -0000 1.8 *************** *** 24,28 **** BDDFactory f1, f2; ! TestBDDFactory(BDDFactory a, BDDFactory b) { f1 = a; f2 = b; } --- 24,28 ---- BDDFactory f1, f2; ! public TestBDDFactory(BDDFactory a, BDDFactory b) { f1 = a; f2 = b; } Index: CALFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/CALFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CALFactory.java 1 Dec 2003 04:07:10 -0000 1.1 --- CALFactory.java 11 Jul 2004 11:47:14 -0000 1.2 *************** *** 1,904 **** ! /* ! * CALFactory.java ! * ! * Created on Mar 24, 2003 ! * ! */ ! package org.sf.javabdd; ! ! import java.util.Collection; ! import java.util.List; [...1779 lines suppressed...] ! for (int j=0; j<ivar.length; ++j) { ! System.out.print(' '); ! System.out.print(j); ! System.out.print(':'); ! System.out.print(ivar[j]); ! } ! System.out.println(); ! } ! ! BDDPairing p = bdd.makePair(doms[2], doms[doms.length-1]); ! System.out.println("Pairing: "+p); ! ! System.out.println("Before replace(): "+b); ! BDD c = b.replace(p); ! System.out.println("After replace(): "+c); ! ! c.printDot(); ! } ! ! } Index: TypedBDDFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/TypedBDDFactory.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** TypedBDDFactory.java 16 Mar 2004 06:27:33 -0000 1.15 --- TypedBDDFactory.java 11 Jul 2004 11:47:14 -0000 1.16 *************** *** 32,36 **** BDDFactory factory; ! TypedBDDFactory(BDDFactory f) { this.factory = f; } --- 32,36 ---- BDDFactory factory; ! public TypedBDDFactory(BDDFactory f) { this.factory = f; } |
|
From: John W. <joe...@us...> - 2004-07-09 02:14:13
|
Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18981/org/sf/javabdd Modified Files: JavaFactory.java Log Message: Added cloneFactory() Index: JavaFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/JavaFactory.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** JavaFactory.java 30 Jun 2004 21:43:05 -0000 1.15 --- JavaFactory.java 9 Jul 2004 02:14:03 -0000 1.16 *************** *** 28,31 **** --- 28,33 ---- public class JavaFactory extends BDDFactory { + static final boolean VERIFY_ASSERTIONS = false; + /* (non-Javadoc) * @see org.sf.javabdd.BDDFactory#init(int, int) *************** *** 421,424 **** --- 423,436 ---- int next; + BddNode copy() { + BddNode that = new BddNode(); + that.refcou_and_level = this.refcou_and_level; + that.low = this.low; + that.high = this.high; + that.hash = this.hash; + that.next = this.next; + return that; + } + static final int REF_MASK = 0xFFC00000; static final int MARK_MASK = 0x00200000; *************** *** 476,480 **** void setLevel(int val) { ! _assert(val == (val & LEV_MASK)); refcou_and_level &= ~LEV_MASK; refcou_and_level |= val; --- 488,492 ---- void setLevel(int val) { ! if (VERIFY_ASSERTIONS) _assert(val == (val & LEV_MASK)); refcou_and_level &= ~LEV_MASK; refcou_and_level |= val; *************** *** 482,486 **** void setLevelAndMarked(int val) { ! _assert(val == (val & (LEV_MASK | MARK_MASK))); refcou_and_level &= ~(LEV_MASK | MARK_MASK); refcou_and_level |= val; --- 494,498 ---- void setLevelAndMarked(int val) { ! if (VERIFY_ASSERTIONS) _assert(val == (val & (LEV_MASK | MARK_MASK))); refcou_and_level &= ~(LEV_MASK | MARK_MASK); refcou_and_level |= val; *************** *** 505,516 **** --- 517,539 ---- abstract static class BddCacheData { int a, b, c; + abstract BddCacheData copy(); } static class BddCacheDataI extends BddCacheData { int res; + BddCacheData copy() { + BddCacheDataI that = new BddCacheDataI(); + that.res = this.res; + return that; + } } static class BddCacheDataD extends BddCacheData { double dres; + BddCacheData copy() { + BddCacheDataD that = new BddCacheDataD(); + that.dres = this.dres; + return that; + } } *************** *** 518,521 **** --- 541,554 ---- BddCacheData table[]; int tablesize; + + BddCache copy() { + BddCache that = new BddCache(); + that.table = new BddCacheData[this.table.length]; + that.tablesize = this.tablesize; + for (int i = 0; i < table.length; ++i) { + that.table[i] = this.table[i].copy(); + } + return that; + } } *************** *** 528,531 **** --- 561,576 ---- int opMiss; int swapCount; + + bddCacheStat copy() { + bddCacheStat that = new bddCacheStat(); + that.uniqueAccess = this.uniqueAccess; + that.uniqueChain = this.uniqueChain; + that.uniqueHit = this.uniqueHit; + that.uniqueMiss = this.uniqueMiss; + that.opHit = this.opHit; + that.opMiss = this.opMiss; + that.swapCount = this.swapCount; + return that; + } } *************** *** 5823,5829 **** //// Prime stuff below. ! static Random rng = new Random(); ! static final int Random(int i) { return rng.nextInt(i) + 1; } --- 5868,5874 ---- //// Prime stuff below. ! Random rng = new Random(); ! final int Random(int i) { return rng.nextInt(i) + 1; } *************** *** 5884,5888 **** } ! static boolean isMillerRabinPrime(int src) { int n; --- 5929,5933 ---- } ! boolean isMillerRabinPrime(int src) { int n; *************** *** 5909,5913 **** } ! static boolean isPrime(int src) { if (hasEasyFactors(src)) return false; --- 5954,5958 ---- } ! boolean isPrime(int src) { if (hasEasyFactors(src)) return false; *************** *** 5940,5953 **** } ! public static void main(String[] a) throws IOException { ! BDDFactory bdd = init(1000, 1000); ! BDD b = bdd.load(a[0]); ! b.printSet(); ! ! bdd.printTable(b); ! bdd.save("testfile2", b); ! bdd.printStat(); } } --- 5985,6051 ---- } ! public JavaFactory cloneFactory() { ! JavaFactory INSTANCE = new JavaFactory(); ! INSTANCE.applycache = this.applycache.copy(); ! INSTANCE.itecache = this.itecache.copy(); ! INSTANCE.quantcache = this.quantcache.copy(); ! INSTANCE.appexcache = this.appexcache.copy(); ! INSTANCE.replacecache = this.replacecache.copy(); ! INSTANCE.misccache = this.misccache.copy(); ! INSTANCE.countcache = this.countcache.copy(); ! // TODO: potential difference here (!) ! INSTANCE.rng = new Random(); ! INSTANCE.verbose = this.verbose; ! INSTANCE.bddcachestats = this.bddcachestats.copy(); ! ! INSTANCE.bddrunning = this.bddrunning; ! INSTANCE.bdderrorcond = this.bdderrorcond; ! INSTANCE.bddnodesize = this.bddnodesize; ! INSTANCE.bddmaxnodesize = this.bddmaxnodesize; ! INSTANCE.bddmaxnodeincrease = this.bddmaxnodeincrease; ! INSTANCE.bddfreepos = this.bddfreepos; ! INSTANCE.bddfreenum = this.bddfreenum; ! INSTANCE.bddproduced = this.bddproduced; ! INSTANCE.bddvarnum = this.bddvarnum; ! INSTANCE.gbcollectnum = this.gbcollectnum; ! INSTANCE.cachesize = this.cachesize; ! INSTANCE.gbcclock = this.gbcclock; ! INSTANCE.usednodes_nextreorder = this.usednodes_nextreorder; ! INSTANCE.bddrefstacktop = this.bddrefstacktop; ! INSTANCE.bddresized = this.bddresized; ! INSTANCE.minfreenodes = this.minfreenodes; ! INSTANCE.bddnodes = new BddNode[this.bddnodes.length]; ! for (int i = 0; i < INSTANCE.bddnodes.length; ++i) { ! INSTANCE.bddnodes[i] = this.bddnodes[i].copy(); ! } ! INSTANCE.bddrefstack = new int[this.bddrefstack.length]; ! System.arraycopy(this.bddrefstack, 0, INSTANCE.bddrefstack, 0, this.bddrefstack.length); ! INSTANCE.bddvar2level = new int[this.bddvar2level.length]; ! System.arraycopy(this.bddvar2level, 0, INSTANCE.bddvar2level, 0, this.bddvar2level.length); ! INSTANCE.bddlevel2var = new int[this.bddlevel2var.length]; ! System.arraycopy(this.bddlevel2var, 0, INSTANCE.bddlevel2var, 0, this.bddlevel2var.length); ! INSTANCE.bddvarset = new int[this.bddvarset.length]; ! System.arraycopy(this.bddvarset, 0, INSTANCE.bddvarset, 0, this.bddvarset.length); ! ! INSTANCE.domain = new BDDDomain[this.domain.length]; ! for (int i = 0; i < INSTANCE.domain.length; ++i) { ! INSTANCE.domain[i] = INSTANCE.createDomain(i, this.domain[i].realsize); ! } ! return INSTANCE; ! } ! ! /** ! * 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 new bdd(b._index); } } |
|
From: John W. <joe...@us...> - 2004-06-30 21:43:14
|
Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30083/org/sf/javabdd Modified Files: JavaFactory.java Log Message: Update to use stats. Index: JavaFactory.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/JavaFactory.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** JavaFactory.java 23 Jun 2004 03:24:00 -0000 1.14 --- JavaFactory.java 30 Jun 2004 21:43:05 -0000 1.15 *************** *** 2719,2723 **** } ! static final boolean CACHESTATS = false; int bdd_makenode(int level, int low, int high) { --- 2719,2723 ---- } ! public static final boolean CACHESTATS = false; int bdd_makenode(int level, int low, int high) { *************** *** 2897,2908 **** bdderrorcond = 0; ! bddcachestats = new bddCacheStat(); ! bddcachestats.uniqueAccess = 0; ! bddcachestats.uniqueChain = 0; ! bddcachestats.uniqueHit = 0; ! bddcachestats.uniqueMiss = 0; ! bddcachestats.opHit = 0; ! bddcachestats.opMiss = 0; ! bddcachestats.swapCount = 0; //bdd_gbc_hook(bdd_default_gbchandler); --- 2897,2903 ---- bdderrorcond = 0; ! if (CACHESTATS) { ! bddcachestats = new bddCacheStat(); ! } //bdd_gbc_hook(bdd_default_gbchandler); |
|
From: John W. <joe...@us...> - 2004-06-29 08:39:56
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25486 Modified Files: .cvsignore Log Message: Ignore .class files. Index: .cvsignore =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** .cvsignore 23 Jun 2004 11:30:46 -0000 1.6 --- .cvsignore 29 Jun 2004 08:39:47 -0000 1.7 *************** *** 7,10 **** --- 7,11 ---- *.lib *.o + *.class buddy22 cudd-2.3.1 |
|
From: John W. <joe...@us...> - 2004-06-28 08:02:56
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15524 Modified Files: javabdd.jardesc Log Message: change jar file name. Index: javabdd.jardesc =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/javabdd.jardesc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** javabdd.jardesc 1 Nov 2003 03:51:09 -0000 1.2 --- javabdd.jardesc 28 Jun 2004 08:02:45 -0000 1.3 *************** *** 1,5 **** <?xml version="1.0" encoding="UTF-8"?> <jardesc> ! <jar path="JavaBDD/javabdd_0.6.jar"/> <options overwrite="true" compress="true" exportErrors="true" exportWarnings="true" saveDescription="true" --- 1,5 ---- <?xml version="1.0" encoding="UTF-8"?> <jardesc> ! <jar path="JavaBDD/javabdd.jar"/> <options overwrite="true" compress="true" exportErrors="true" exportWarnings="true" saveDescription="true" |
|
From: John W. <joe...@us...> - 2004-06-24 08:59:07
|
Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30545/org/sf/javabdd Modified Files: BDDDomain.java Log Message: Tabs are evil. Index: BDDDomain.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/BDDDomain.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** BDDDomain.java 28 Apr 2004 17:42:03 -0000 1.15 --- BDDDomain.java 24 Jun 2004 08:58:56 -0000 1.16 *************** *** 324,328 **** */ public long [] getVarIndices(BDD bdd, int max) { ! BDD myvarset = set(); // can't use var here, must respect subclass a factory may provide int n = (int)bdd.satCount(myvarset); if (max != -1 && n > max) --- 324,328 ---- */ public long [] getVarIndices(BDD bdd, int max) { ! BDD myvarset = set(); // can't use var here, must respect subclass a factory may provide int n = (int)bdd.satCount(myvarset); if (max != -1 && n > max) *************** *** 334,338 **** res[i] = bi.scanVar(this); } ! myvarset.free(); return res; } --- 334,338 ---- res[i] = bi.scanVar(this); } ! myvarset.free(); return res; } |
|
From: John W. <joe...@us...> - 2004-06-23 11:30:54
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8820 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** .cvsignore 23 Jun 2004 11:30:16 -0000 1.5 --- .cvsignore 23 Jun 2004 11:30:46 -0000 1.6 *************** *** 1,4 **** --- 1,5 ---- buddy_jni.h cudd_jni.h + cal_jni.h *.jar *.dll |
|
From: John W. <joe...@us...> - 2004-06-23 11:30:25
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8667 Modified Files: .cvsignore Log Message: Ignore cal-2.1 directory. Index: .cvsignore =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .cvsignore 23 Jun 2004 06:09:53 -0000 1.4 --- .cvsignore 23 Jun 2004 11:30:16 -0000 1.5 *************** *** 9,10 **** --- 9,11 ---- cudd-2.3.1 cudd-2.4.0 + cal-2.1 |
|
From: John W. <joe...@us...> - 2004-06-23 11:29:33
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8387 Modified Files: Makefile Log Message: Index: Makefile =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile 23 Jun 2004 10:49:48 -0000 1.19 --- Makefile 23 Jun 2004 11:29:24 -0000 1.20 *************** *** 19,22 **** --- 19,23 ---- CC = gcc CFLAGS = -Wall -O2 -mno-cygwin + CAL_CFLAGS = $(CFLAGS) -DTEST -DCLOCK_RESOLUTION=60 -DRLIMIT_DATA_DEFAULT=16777216 -DNDEBUG=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_ERRNO_H=1 -DHAVE_ASSERT_H=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_PWD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_TIMES_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_STDARG_H=1 -DSIZEOF_VOID_P=4 -DSIZEOF_INT=4 -DHAVE_IEEE_754=1 -DPAGE_SIZE=4096 -DLG_PAGE_SIZE=12 -DRETSIGTYPE=void -DHAVE_STRCOLL=1 -DHAVE_SYSCONF=1 -DHAVE_GETHOSTNAME=1 -DHAVE_STRCSPN=1 -DHAVE_STRERROR=1 -DHAVE_STRSPN=1 -DHAVE_STRSTR=1 -DHAVE_GETENV=1 -DHAVE_STRCHR=1 -DHAVE_GETRLIMIT=1 -DHAVE_GETRUSAGE=1 -DHAVE_VALLOC=0 OBJECT_OUTPUT_OPTION = -o$(space) LINK = dllwrap *************** *** 34,37 **** --- 35,39 ---- ifeq (${CC},icl) # Intel Windows compiler CFLAGS = -O2 + CAL_CFLAGS = $(CFLAGS) -DTEST -DCLOCK_RESOLUTION=60 -DRLIMIT_DATA_DEFAULT=16777216 -DNDEBUG=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_UNISTD_H=0 -DHAVE_ERRNO_H=1 -DHAVE_ASSERT_H=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_PWD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_TIMES_H=1 -DHAVE_SYS_TIME_H=0 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_STDARG_H=1 -DSIZEOF_VOID_P=4 -DSIZEOF_INT=4 -DHAVE_IEEE_754=1 -DPAGE_SIZE=4096 -DLG_PAGE_SIZE=12 -DRETSIGTYPE=void -DHAVE_STRCOLL=1 -DHAVE_SYSCONF=1 -DHAVE_GETHOSTNAME=1 -DHAVE_STRCSPN=1 -DHAVE_STRERROR=1 -DHAVE_STRSPN=1 -DHAVE_STRSTR=1 -DHAVE_GETENV=1 -DHAVE_STRCHR=1 -DHAVE_GETRLIMIT=1 -DHAVE_GETRUSAGE=1 -DHAVE_VALLOC=0 OBJECT_OUTPUT_OPTION = -Fo LINK = xilink |
|
From: John W. <joe...@us...> - 2004-06-23 10:49:57
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32248 Modified Files: Makefile Log Message: Better options for intel compiler on windows. Index: Makefile =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile 23 Jun 2004 10:26:58 -0000 1.18 --- Makefile 23 Jun 2004 10:49:48 -0000 1.19 *************** *** 33,37 **** CAL_DLL_NAME = cal.dll ifeq (${CC},icl) # Intel Windows compiler ! CFLAGS = -O3 -Ob2 -QaxW OBJECT_OUTPUT_OPTION = -Fo LINK = xilink --- 33,37 ---- CAL_DLL_NAME = cal.dll ifeq (${CC},icl) # Intel Windows compiler ! CFLAGS = -O2 OBJECT_OUTPUT_OPTION = -Fo LINK = xilink |
|
From: John W. <joe...@us...> - 2004-06-23 10:31:48
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29388 Modified Files: NQueens.java Log Message: Index: NQueens.java =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/NQueens.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** NQueens.java 19 Aug 2003 18:16:58 -0000 1.8 --- NQueens.java 23 Jun 2004 10:31:40 -0000 1.9 *************** *** 25,30 **** /* Initialize with reasonable nodes and cache size and NxN variables */ ! int numberOfNodes = (int) (Math.pow(4.4, N-6))*1000; ! int cacheSize = 1000; numberOfNodes = Math.max(1000, numberOfNodes); B = BDDFactory.init(numberOfNodes, cacheSize); --- 25,40 ---- /* Initialize with reasonable nodes and cache size and NxN variables */ ! String numOfNodes = System.getProperty("bddnodes"); ! int numberOfNodes; ! if (numOfNodes == null) ! numberOfNodes = (int) (Math.pow(4.4, N-6))*1000; ! else ! numberOfNodes = Integer.parseInt(numOfNodes); ! String cache = System.getProperty("bddcache"); ! int cacheSize; ! if (cache == null) ! cacheSize = 1000; ! else ! cacheSize = Integer.parseInt(cache); numberOfNodes = Math.max(1000, numberOfNodes); B = BDDFactory.init(numberOfNodes, cacheSize); |
|
From: John W. <joe...@us...> - 2004-06-23 10:27:09
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28630 Modified Files: Makefile Log Message: Index: Makefile =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile 23 Jun 2004 10:19:40 -0000 1.17 --- Makefile 23 Jun 2004 10:26:58 -0000 1.18 *************** *** 18,26 **** CLASSPATH = .\;jdd.jar CC = gcc ! CFLAGS = -Wall -O3 -mno-cygwin OBJECT_OUTPUT_OPTION = -o$(space) LINK = dllwrap ! LINKFLAGS = -s -mno-cygwin -mwindows --target=i386-mingw32 \ ! --add-stdcall-alias --driver-name gcc DLL_OUTPUT_OPTION = -o$(space) INCLUDES = -I. -I$(JDK_ROOT)/include \ --- 18,25 ---- CLASSPATH = .\;jdd.jar CC = gcc ! CFLAGS = -Wall -O2 -mno-cygwin OBJECT_OUTPUT_OPTION = -o$(space) LINK = dllwrap ! LINKFLAGS = -s --target=i386-mingw32 --add-underscore --driver-name gcc -mno-cygwin DLL_OUTPUT_OPTION = -o$(space) INCLUDES = -I. -I$(JDK_ROOT)/include \ *************** *** 34,38 **** CAL_DLL_NAME = cal.dll ifeq (${CC},icl) # Intel Windows compiler ! CFLAGS = -O3 -QaxW OBJECT_OUTPUT_OPTION = -Fo LINK = xilink --- 33,37 ---- CAL_DLL_NAME = cal.dll ifeq (${CC},icl) # Intel Windows compiler ! CFLAGS = -O3 -Ob2 -QaxW OBJECT_OUTPUT_OPTION = -Fo LINK = xilink *************** *** 50,55 **** JDK_ROOT = $(firstword $(wildcard /usr/java/j2sdk*)) CLASSPATH = .:jdd.jar ! CFLAGS = -D_REENTRANT -D_GNU_SOURCE -O3 ! CAL_CFLAGS = -DTEST -O3 -DCLOCK_RESOLUTION=60 -DRLIMIT_DATA_DEFAULT=16777216 -DNDEBUG=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_ERRNO_H=1 -DHAVE_ASSERT_H=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_PWD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_TIMES_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_RESOURCE_H=1 -DHAVE_STDARG_H=1 -DHAVE_VARARGS_H=1 -DSIZEOF_VOID_P=4 -DSIZEOF_INT=4 -DHAVE_IEEE_754=1 -DPAGE_SIZE=4096 -DLG_PAGE_SIZE=12 -DRETSIGTYPE=void -DHAVE_STRCOLL=1 -DHAVE_SYSCONF=1 -DHAVE_GETHOSTNAME=1 -DHAVE_STRCSPN=1 -DHAVE_STRERROR=1 -DHAVE_STRSPN=1 -DHAVE_STRSTR=1 -DHAVE_GETENV=1 -DHAVE_STRCHR=1 -DHAVE_GETRLIMIT=1 -DHAVE_GETRUSAGE=1 -DHAVE_VALLOC=1 OBJECT_OUTPUT_OPTION = -o$(space) LINK = $(CC) --- 49,54 ---- JDK_ROOT = $(firstword $(wildcard /usr/java/j2sdk*)) CLASSPATH = .:jdd.jar ! CFLAGS = -D_REENTRANT -D_GNU_SOURCE -O2 ! CAL_CFLAGS = -DTEST -O2 -DCLOCK_RESOLUTION=60 -DRLIMIT_DATA_DEFAULT=16777216 -DNDEBUG=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_ERRNO_H=1 -DHAVE_ASSERT_H=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_PWD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_TIMES_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_RESOURCE_H=1 -DHAVE_STDARG_H=1 -DHAVE_VARARGS_H=1 -DSIZEOF_VOID_P=4 -DSIZEOF_INT=4 -DHAVE_IEEE_754=1 -DPAGE_SIZE=4096 -DLG_PAGE_SIZE=12 -DRETSIGTYPE=void -DHAVE_STRCOLL=1 -DHAVE_SYSCONF=1 -DHAVE_GETHOSTNAME=1 -DHAVE_STRCSPN=1 -DHAVE_STRERROR=1 -DHAVE_STRSPN=1 -DHAVE_STRSTR=1 -DHAVE_GETENV=1 -DHAVE_STRCHR=1 -DHAVE_GETRLIMIT=1 -DHAVE_GETRUSAGE=1 -DHAVE_VALLOC=1 OBJECT_OUTPUT_OPTION = -o$(space) LINK = $(CC) |
|
From: John W. <joe...@us...> - 2004-06-23 10:19:49
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27174 Modified Files: Makefile Log Message: Index: Makefile =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile 23 Jun 2004 07:52:31 -0000 1.16 --- Makefile 23 Jun 2004 10:19:40 -0000 1.17 *************** *** 66,70 **** CAL_DLL_NAME = libcal.so ifeq (${CC},icc) # Intel Linux compiler ! CFLAGS = -D_REENTRANT -D_GNU_SOURCE -O2 -unroll -ipo -ipo_obj LINKFLAGS = -shared -static-libcxa endif --- 66,70 ---- CAL_DLL_NAME = libcal.so ifeq (${CC},icc) # Intel Linux compiler ! CFLAGS = -D_REENTRANT -D_GNU_SOURCE -O2 -Ob2 -ip LINKFLAGS = -shared -static-libcxa endif *************** *** 218,228 **** ipo: buddy_jni.h ! icc -D_REENTRANT -D_GNU_SOURCE -O2 -unroll -ipo $(INCLUDES) -shared -static-libcxa $(DLL_OUTPUT_OPTION)libbuddy.so $(BUDDY_SRCS) pdogen: buddy_jni.h ! icc -D_REENTRANT -D_GNU_SOURCE -O2 -unroll -prof_gen $(INCLUDES) -shared -static-libcxa $(DLL_OUTPUT_OPTION)libbuddy.so $(BUDDY_SRCS) pdouse: buddy_jni.h ! icc -D_REENTRANT -D_GNU_SOURCE -O2 -unroll -prof_use -ipo $(INCLUDES) -shared -static-libcxa $(DLL_OUTPUT_OPTION)libbuddy.so $(BUDDY_SRCS) opt_report: --- 218,228 ---- ipo: buddy_jni.h ! icc -D_REENTRANT -D_GNU_SOURCE -O2 -Ob2 -ipo $(INCLUDES) -shared -static-libcxa $(DLL_OUTPUT_OPTION)libbuddy.so $(BUDDY_SRCS) pdogen: buddy_jni.h ! icc -D_REENTRANT -D_GNU_SOURCE -O2 -Ob2 -prof_gen $(INCLUDES) -shared -static-libcxa $(DLL_OUTPUT_OPTION)libbuddy.so $(BUDDY_SRCS) pdouse: buddy_jni.h ! icc -D_REENTRANT -D_GNU_SOURCE -O2 -Ob2 -prof_use -ipo $(INCLUDES) -shared -static-libcxa $(DLL_OUTPUT_OPTION)libbuddy.so $(BUDDY_SRCS) opt_report: |
|
From: John W. <joe...@us...> - 2004-06-23 07:52:40
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1509 Modified Files: Makefile Log Message: Added java factory test. Index: Makefile =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile 23 Jun 2004 07:49:50 -0000 1.15 --- Makefile 23 Jun 2004 07:52:31 -0000 1.16 *************** *** 233,236 **** --- 233,237 ---- $(JAVA) -Dbdd=cudd NQueens 8 $(JAVA) -Dbdd=cal NQueens 8 + $(JAVA) -Dbdd=java NQueens 8 $(JAVA) -Dbdd=jdd -cp $(CLASSPATH) NQueens 8 |
|
From: John W. <joe...@us...> - 2004-06-23 07:49:58
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1035 Modified Files: Makefile Log Message: Updates to support CAL. Index: Makefile =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 23 Jun 2004 07:49:19 -0000 1.14 --- Makefile 23 Jun 2004 07:49:50 -0000 1.15 *************** *** 66,69 **** --- 66,70 ---- CAL_DLL_NAME = libcal.so ifeq (${CC},icc) # Intel Linux compiler + CFLAGS = -D_REENTRANT -D_GNU_SOURCE -O2 -unroll -ipo -ipo_obj LINKFLAGS = -shared -static-libcxa endif *************** *** 165,169 **** $(BUDDY_DLL_NAME): $(BUDDY_OBJS) $(LINK) $(DLL_OUTPUT_OPTION)$@ $(BUDDY_OBJS) $(LINKFLAGS) ! # $(LINK) $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)$@ $(DLL_SRCS) -MLd -LDd -Zi /link /libpath:$(JDK_ROOT)/lib $(CUDD_DLL_NAME): $(CUDD_OBJS) --- 166,170 ---- $(BUDDY_DLL_NAME): $(BUDDY_OBJS) $(LINK) $(DLL_OUTPUT_OPTION)$@ $(BUDDY_OBJS) $(LINKFLAGS) ! # $(LINK) $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)$@ $(BUDDY_SRCS) -MLd -LDd -Zi /link /libpath:$(JDK_ROOT)/lib $(CUDD_DLL_NAME): $(CUDD_OBJS) *************** *** 173,184 **** $(LINK) $(DLL_OUTPUT_OPTION)$@ $(CAL_OBJS) $(LINKFLAGS) ! buddy_jni.o: buddy_jni.c $(BUDDY_INCLUDE) ! $(CC) $(CFLAGS) $(INCLUDES) -c $(OBJECT_OUTPUT_OPTION)$@ $< ! cudd_jni.o: cudd_jni.c $(CUDD_INCLUDE) ! $(CC) $(CFLAGS) $(INCLUDES) -c $(OBJECT_OUTPUT_OPTION)$@ $< ! cal_jni.o: cal_jni.c $(CAL_INCLUDE) ! $(CC) $(CFLAGS) $(INCLUDES) -c $(OBJECT_OUTPUT_OPTION)$@ $< .c.o: --- 174,185 ---- $(LINK) $(DLL_OUTPUT_OPTION)$@ $(CAL_OBJS) $(LINKFLAGS) ! buddy_jni.o: $(BUDDY_INCLUDE) ! cudd_jni.o: $(CUDD_INCLUDE) ! cal_jni.o: $(CAL_INCLUDE) ! ! $(CAL_OBJS): %.o: %.c ! $(CC) $(CAL_CFLAGS) $(INCLUDES) -c $(OBJECT_OUTPUT_OPTION)$@ $< .c.o: *************** *** 211,221 **** pdo: ! icl -Qprof_gen $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)$(BUDDY_DLL_NAME) $(DLL_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib $(JAVA) NQueens 12 ! icl -Qprof_use $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)$(BUDDY_DLL_NAME) $(DLL_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib $(JAVA) NQueens 12 opt_report: ! icl -Qopt_report -Qopt_report_phase all $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)buddy.dll $(DLL_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib test: $(EXAMPLE_CLASSFILES) --- 212,231 ---- pdo: ! icl -Qprof_gen $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)$(BUDDY_DLL_NAME) $(BUDDY_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib $(JAVA) NQueens 12 ! icl -Qprof_use $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)$(BUDDY_DLL_NAME) $(BUDDY_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib $(JAVA) NQueens 12 + ipo: buddy_jni.h + icc -D_REENTRANT -D_GNU_SOURCE -O2 -unroll -ipo $(INCLUDES) -shared -static-libcxa $(DLL_OUTPUT_OPTION)libbuddy.so $(BUDDY_SRCS) + + pdogen: buddy_jni.h + icc -D_REENTRANT -D_GNU_SOURCE -O2 -unroll -prof_gen $(INCLUDES) -shared -static-libcxa $(DLL_OUTPUT_OPTION)libbuddy.so $(BUDDY_SRCS) + + pdouse: buddy_jni.h + icc -D_REENTRANT -D_GNU_SOURCE -O2 -unroll -prof_use -ipo $(INCLUDES) -shared -static-libcxa $(DLL_OUTPUT_OPTION)libbuddy.so $(BUDDY_SRCS) + opt_report: ! icl -Qopt_report -Qopt_report_phase all $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)buddy.dll $(BUDDY_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib test: $(EXAMPLE_CLASSFILES) |
|
From: John W. <joe...@us...> - 2004-06-23 07:49:28
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv977 Modified Files: Makefile Log Message: Added commit and update targets. Index: Makefile =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile 23 Jun 2004 06:24:36 -0000 1.13 --- Makefile 23 Jun 2004 07:49:19 -0000 1.14 *************** *** 229,232 **** --- 229,238 ---- $(RM) -rf javadoc + update: + ( export CVS_RSH=ssh ; cvs update -Pd ) + + commit: + ( export CVS_RSH=ssh ; cvs commit ) + empty := space := $(empty) $(empty) |
|
From: John W. <joe...@us...> - 2004-06-23 06:24:45
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18621 Modified Files: Makefile Log Message: Fix classpath. Index: Makefile =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 23 Jun 2004 06:20:27 -0000 1.12 --- Makefile 23 Jun 2004 06:24:36 -0000 1.13 *************** *** 223,227 **** $(JAVA) -Dbdd=cudd NQueens 8 $(JAVA) -Dbdd=cal NQueens 8 ! $(JAVA) -Dbdd=jdd NQueens 8 clean: --- 223,227 ---- $(JAVA) -Dbdd=cudd NQueens 8 $(JAVA) -Dbdd=cal NQueens 8 ! $(JAVA) -Dbdd=jdd -cp $(CLASSPATH) NQueens 8 clean: |
|
From: John W. <joe...@us...> - 2004-06-23 06:23:14
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18281 Modified Files: buddy_jni.c Log Message: Get rid of spurious warning. Index: buddy_jni.c =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/buddy_jni.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** buddy_jni.c 1 Nov 2003 03:51:31 -0000 1.17 --- buddy_jni.c 23 Jun 2004 06:23:05 -0000 1.18 *************** *** 459,465 **** BDD r; int rc; ! jbyte *str; ! str = (jbyte*) (*env)->GetStringUTFChars(env, fname, NULL); if (str == NULL) return -1; #if defined(TRACE_BUDDYLIB) --- 459,465 ---- BDD r; int rc; ! char *str; ! str = (char*) (*env)->GetStringUTFChars(env, fname, NULL); if (str == NULL) return -1; #if defined(TRACE_BUDDYLIB) *************** *** 481,487 **** { int rc; ! jbyte *str; ! str = (jbyte*) (*env)->GetStringUTFChars(env, fname, NULL); if (str == NULL) return; #if defined(TRACE_BUDDYLIB) --- 481,487 ---- { int rc; ! char *str; ! str = (char*) (*env)->GetStringUTFChars(env, fname, NULL); if (str == NULL) return; #if defined(TRACE_BUDDYLIB) |
|
From: John W. <joe...@us...> - 2004-06-23 06:20:35
|
Update of /cvsroot/javabdd/JavaBDD In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17928 Modified Files: Makefile Log Message: Test all BDD factories. Index: Makefile =================================================================== RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 23 Jun 2004 06:08:54 -0000 1.11 --- Makefile 23 Jun 2004 06:20:27 -0000 1.12 *************** *** 211,217 **** pdo: ! icl -Qprof_gen $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)buddy.dll $(DLL_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib $(JAVA) NQueens 12 ! icl -Qprof_use $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)buddy.dll $(DLL_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib $(JAVA) NQueens 12 --- 211,217 ---- pdo: ! icl -Qprof_gen $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)$(BUDDY_DLL_NAME) $(DLL_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib $(JAVA) NQueens 12 ! icl -Qprof_use $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)$(BUDDY_DLL_NAME) $(DLL_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib $(JAVA) NQueens 12 *************** *** 219,224 **** icl -Qopt_report -Qopt_report_phase all $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)buddy.dll $(DLL_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib ! test: $(DLL_NAME) $(EXAMPLE_CLASSFILES) $(JAVA) NQueens 8 clean: --- 219,227 ---- icl -Qopt_report -Qopt_report_phase all $(INCLUDES) $(CFLAGS) $(DLL_OUTPUT_OPTION)buddy.dll $(DLL_SRCS) -LD /link /libpath:$(JDK_ROOT)/lib ! test: $(EXAMPLE_CLASSFILES) $(JAVA) NQueens 8 + $(JAVA) -Dbdd=cudd NQueens 8 + $(JAVA) -Dbdd=cal NQueens 8 + $(JAVA) -Dbdd=jdd NQueens 8 clean: |
