javabdd-checkins Mailing List for JavaBDD (Page 13)

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

Flat | Threaded

<< < 1 .. 11 12 13 14 15 .. 17 > >> (Page 13 of 17)

[Javabdd-checkins] JavaBDD_tests NQueensTest.java,1.2,1.3

From: John W. <joe...@us...> - 2004-07-28 10:21:04

Update of /cvsroot/javabdd/JavaBDD_tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15848

Modified Files:
	NQueensTest.java 
Log Message:
Updates.


Index: NQueensTest.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD_tests/NQueensTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NQueensTest.java	28 Jul 2004 09:35:24 -0000	1.2
--- NQueensTest.java	28 Jul 2004 10:20:53 -0000	1.3
***************
*** 3,7 ****
  // Licensed under the terms of the GNU LGPL; see COPYING for details.
  import junit.framework.Assert;
! import junit.framework.TestCase;
  
  /**
--- 3,7 ----
  // Licensed under the terms of the GNU LGPL; see COPYING for details.
  import junit.framework.Assert;
! import bdd.BDDTestCase;
  
  /**
***************
*** 11,15 ****
   * @version $Id$
   */
! public class NQueensTest extends TestCase {
      public static void main(String[] args) {
          junit.textui.TestRunner.run(NQueensTest.class);
--- 11,15 ----
   * @version $Id$
   */
! public class NQueensTest extends BDDTestCase {
      public static void main(String[] args) {
          junit.textui.TestRunner.run(NQueensTest.class);
***************
*** 24,35 ****
      
      public void testNQueens() {
!         for (int i = 1; i <= CHECK; ++i) {
!             NQueens.N = i;
!             double n = NQueens.runTest();
!             Assert.assertEquals(n, ANSWERS[i-1], 0.1);
!             NQueens.freeAll();
          }
-         NQueens.B.done();
-         NQueens.B = null;
      }
  }
--- 24,36 ----
      
      public void testNQueens() {
!         while (hasNext()) {
!             NQueens.B = nextFactory();
!             for (int i = 1; i <= CHECK; ++i) {
!                 NQueens.N = i;
!                 double n = NQueens.runTest();
!                 Assert.assertEquals(n, ANSWERS[i-1], 0.1);
!                 NQueens.freeAll();
!             }
          }
      }
  }

[Javabdd-checkins] JavaBDD_tests/bdd BDDTestCase.java,NONE,1.1

From: John W. <joe...@us...> - 2004-07-28 10:21:03

Update of /cvsroot/javabdd/JavaBDD_tests/bdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15848/bdd

Added Files:
	BDDTestCase.java 
Log Message:
Updates.


--- NEW FILE: BDDTestCase.java ---
// BDDTestCase.java, created Jul 28, 2004 3:00:14 AM by joewhaley
// Copyright (C) 2004 John Whaley <jw...@al...>
// Licensed under the terms of the GNU LGPL; see COPYING for details.
package bdd;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
import java.lang.reflect.Method;
import junit.framework.TestCase;
import org.sf.javabdd.BDDFactory;

/**
 * BDDTestCase
 * 
 * @author John Whaley
 * @version $Id: BDDTestCase.java,v 1.1 2004/07/28 10:20:53 joewhaley Exp $
 */
public abstract class BDDTestCase extends TestCase implements Iterator {
    
    static volatile Collection factories;
    static final String[] factoryNames = {
        "org.sf.javabdd.BuDDyFactory",
        "org.sf.javabdd.CUDDFactory",
        "org.sf.javabdd.CALFactory",
        "org.sf.javabdd.JFactory",
        //"org.sf.javabdd.JDDFactory",
    };
    
    static void initFactories(int nodenum, int cachesize) {
        if (factories != null) return;
        synchronized (BDDTestCase.class) {
            if (factories != null) return;
            Collection f = new LinkedList();
            for (int k = 0; k < factoryNames.length; ++k) {
                String bddpackage = factoryNames[k];
                try {
                    Class c = Class.forName(bddpackage);
                    Method m = c.getMethod("init", new Class[] { int.class, int.class });
                    BDDFactory b = (BDDFactory) m.invoke(null, new Object[] { new Integer(nodenum), new Integer(cachesize) });
                    f.add(b);
                }
                catch (Throwable _) {}
            }
            factories = f;
        }
    }
    
    protected Iterator i;
    
    public BDDTestCase(int nodenum, int cachesize) {
        initFactories(nodenum, cachesize);
        i = factories.iterator();
    }
    public BDDTestCase() {
        this(1000, 1000);
    }
    
    public BDDFactory nextFactory() {
        return (BDDFactory) i.next();
    }
    
    public Object next() {
        return i.next();
    }
    
    public boolean hasNext() {
        return i.hasNext();
    }
    
    public void remove() {
        i.remove();
    }
    
}

[Javabdd-checkins] JavaBDD_tests/bdd - New directory

From: John W. <joe...@us...> - 2004-07-28 10:20:52

Update of /cvsroot/javabdd/JavaBDD_tests/bdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15821/bdd

Log Message:
Directory /cvsroot/javabdd/JavaBDD_tests/bdd added to the repository

[Javabdd-checkins] JavaBDD_tests/regression R2.java,NONE,1.1

From: John W. <joe...@us...> - 2004-07-28 09:58:31

Update of /cvsroot/javabdd/JavaBDD_tests/regression
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12805/regression

Added Files:
	R2.java 
Log Message:


--- NEW FILE: R2.java ---
// R2.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 org.sf.javabdd.BDD;
import org.sf.javabdd.BDDDomain;
import org.sf.javabdd.BDDFactory;
import junit.framework.Assert;
import junit.framework.TestCase;

/**
 * support() bug
 * 
 * @author John Whaley
 * @version $Id: R2.java,v 1.1 2004/07/28 09:58:21 joewhaley Exp $
 */
public class R2 extends TestCase {
    public static void main(String[] args) {
        junit.textui.TestRunner.run(R2.class);
    }
    
    public void testR2() {
        BDDFactory bdd = BDDFactory.init(1000, 1000);
        BDD zero = bdd.zero();
        BDD one = bdd.one();
        Assert.assertTrue(zero.isZero());
        Assert.assertTrue(one.isOne());
        BDD s0 = zero.support();
        BDD s1 = one.support();
        Assert.assertTrue(s0.isOne());
        Assert.assertTrue(s1.isOne());
        bdd.done();
    }
}

[Javabdd-checkins] JavaBDD_tests/regression R1.java,1.1,1.2

From: John W. <joe...@us...> - 2004-07-28 09:38:43

Update of /cvsroot/javabdd/JavaBDD_tests/regression
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10150/regression

Modified Files:
	R1.java 
Log Message:


Index: R1.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD_tests/regression/R1.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** R1.java	28 Jul 2004 09:35:25 -0000	1.1
--- R1.java	28 Jul 2004 09:38:34 -0000	1.2
***************
*** 30,33 ****
--- 30,35 ----
          double s2 = x.satCount(set);
          Assert.assertEquals(s1, s2, 0.00001);
+         x.free(); set.free();
+         bdd.done();
      }
  }

[Javabdd-checkins] JavaBDD/org/sf/javabdd BDDFactory.java,1.23,1.24 JavaFactory.java,1.18,NONE

From: John W. <joe...@us...> - 2004-07-28 09:37:11

Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9880/org/sf/javabdd

Modified Files:
	BDDFactory.java 
Removed Files:
	JavaFactory.java 
Log Message:
Removed JavaFactory, as it has been completely subsumed by JFactory.

--- JavaFactory.java DELETED ---

Index: BDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/BDDFactory.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** BDDFactory.java	20 Jul 2004 21:50:24 -0000	1.23
--- BDDFactory.java	28 Jul 2004 09:36:57 -0000	1.24
***************
*** 60,67 ****
              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);
              if (bddpackage.equals("jdd"))
                  return JDDFactory.init(nodenum, cachesize);
--- 60,65 ----
              if (bddpackage.equals("cal"))
                  return CALFactory.init(nodenum, cachesize);
!             if (bddpackage.equals("j") || bddpackage.equals("java"))
                  return JFactory.init(nodenum, cachesize);
              if (bddpackage.equals("jdd"))
                  return JDDFactory.init(nodenum, cachesize);

[Javabdd-checkins] JavaBDD_tests NQueensTest.java,1.1,1.2

From: John W. <joe...@us...> - 2004-07-28 09:35:34

Update of /cvsroot/javabdd/JavaBDD_tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9692

Modified Files:
	NQueensTest.java 
Log Message:
Regression tests.

Index: NQueensTest.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD_tests/NQueensTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NQueensTest.java	28 Jul 2004 09:20:39 -0000	1.1
--- NQueensTest.java	28 Jul 2004 09:35:24 -0000	1.2
***************
*** 2,6 ****
  // Copyright (C) 2004 John Whaley <jw...@al...>
  // Licensed under the terms of the GNU LGPL; see COPYING for details.
- import org.sf.javabdd.BDDFactory;
  import junit.framework.Assert;
  import junit.framework.TestCase;
--- 2,5 ----

[Javabdd-checkins] JavaBDD_tests/regression R1.java,NONE,1.1

From: John W. <joe...@us...> - 2004-07-28 09:35:34

Update of /cvsroot/javabdd/JavaBDD_tests/regression
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9692/regression

Added Files:
	R1.java 
Log Message:
Regression tests.

--- NEW FILE: R1.java ---
// R1.java, created Jul 28, 2004 2:22:19 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 junit.framework.TestCase;
import org.sf.javabdd.BDD;
import org.sf.javabdd.BDDDomain;
import org.sf.javabdd.BDDFactory;

/**
 * satCount bug
 * 
 * @author John Whaley
 * @version $Id: R1.java,v 1.1 2004/07/28 09:35:25 joewhaley Exp $
 */
public class R1 extends TestCase {
    public static void main(String[] args) {
        junit.textui.TestRunner.run(R1.class);
    }
    
    public void testR1() {
        BDDFactory bdd = BDDFactory.init(1000, 1000);
        BDDDomain d = bdd.extDomain(new int[] { 16 })[0];
        BDD x = d.ithVar(6).orWith(d.ithVar(13));
        BDD set = d.set();
        double s1 = x.satCount(set);
        bdd.setVarNum(20);
        double s2 = x.satCount(set);
        Assert.assertEquals(s1, s2, 0.00001);
    }
}

[Javabdd-checkins] JavaBDD_tests/regression - New directory

From: John W. <joe...@us...> - 2004-07-28 09:35:29

Update of /cvsroot/javabdd/JavaBDD_tests/regression
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9680/regression

Log Message:
Directory /cvsroot/javabdd/JavaBDD_tests/regression added to the repository

[Javabdd-checkins] JavaBDD_tests .classpath,NONE,1.1 NQueensTest.java,NONE,1.1 .project,NONE,1.1

From: John W. <joe...@us...> - 2004-07-28 09:20:48

Update of /cvsroot/javabdd/JavaBDD_tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7859

Added Files:
	.classpath NQueensTest.java .project 
Log Message:
Test suite for JavaBDD.

--- NEW FILE: .project ---
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>JavaBDD_tests</name>
	<comment></comment>
	<projects>
		<project>JavaBDD</project>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>

--- NEW FILE: NQueensTest.java ---
// NQueensTest.java, created Jul 28, 2004 1:44:28 AM by joewhaley
// Copyright (C) 2004 John Whaley <jw...@al...>
// Licensed under the terms of the GNU LGPL; see COPYING for details.
import org.sf.javabdd.BDDFactory;
import junit.framework.Assert;
import junit.framework.TestCase;

/**
 * NQueensTest
 * 
 * @author John Whaley
 * @version $Id: NQueensTest.java,v 1.1 2004/07/28 09:20:39 joewhaley Exp $
 */
public class NQueensTest extends TestCase {
    public static void main(String[] args) {
        junit.textui.TestRunner.run(NQueensTest.class);
    }
    
    public static final int CHECK = 10;
    public static final double[] ANSWERS =
    { 1., 0., 0., 2., 10., 4., 40., 92., 352., 724., 2680., 14200.,
      73712., 365596., 2279184., 14772512., 95815104., 666090624.,
      4968057848., 39029188884., 314666222712., 2691008701644.,
      24233937684440. };
    
    public void testNQueens() {
        for (int i = 1; i <= CHECK; ++i) {
            NQueens.N = i;
            double n = NQueens.runTest();
            Assert.assertEquals(n, ANSWERS[i-1], 0.1);
            NQueens.freeAll();
        }
        NQueens.B.done();
        NQueens.B = null;
    }
}

--- NEW FILE: .classpath ---
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path=""/>
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
	<classpathentry sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.0.0/src/org.junit_3.8.1/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
	<classpathentry kind="src" path="/JavaBDD"/>
	<classpathentry kind="output" path=""/>
</classpath>

[Javabdd-checkins] JavaBDD_tests - New directory

From: John W. <joe...@us...> - 2004-07-28 09:19:58

Update of /cvsroot/javabdd/JavaBDD_tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7686/JavaBDD_tests

Log Message:
Directory /cvsroot/javabdd/JavaBDD_tests added to the repository

[Javabdd-checkins] JavaBDD NQueens.java,1.13,1.14

From: John W. <joe...@us...> - 2004-07-28 09:19:43

Update of /cvsroot/javabdd/JavaBDD
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7639

Modified Files:
	NQueens.java 
Log Message:
Refactored for use in test cases.

Index: NQueens.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/NQueens.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NQueens.java	28 Jul 2004 08:39:12 -0000	1.13
--- NQueens.java	28 Jul 2004 09:19:29 -0000	1.14
***************
*** 7,13 ****
--- 7,15 ----
      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) {
***************
*** 21,43 ****
              return;
          }
! 
          long time = System.currentTimeMillis();
  
!         /* 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.42, 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);
!         B.setVarNum(N * N);
  
          queen = B.one();
--- 23,57 ----
              return;
          }
!         
!         TRACE = true;
          long time = System.currentTimeMillis();
+         runTest();
+         freeAll();
+         time = System.currentTimeMillis() - time;
+         System.out.println("Time: "+time/1000.+" seconds");
+         B.done();
+         B = null;
+     }
  
!     public static double runTest() {
! 
!         if (B == null) {
!             /* 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.42, 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);
!         }
!         if (B.varNum() < N * N) B.setVarNum(N * N);
  
          queen = B.one();
***************
*** 63,92 ****
          for (i = 0; i < N; i++)
              for (j = 0; j < N; j++) {
!                 System.out.print("Adding position " + i + "," + j+"   \r");
                  build(i, j);
              }
  
          /* Print the results */
!         System.out.println("There are " + (long) queen.satCount() + " solutions.");
!         BDD solution = queen.satOne();
!         System.out.println("Here is "+(long) solution.satCount() + " solution:");
!         solution.printSet();
!         System.out.println();
! 
!         solution.free();
!         freeAll();
!         B.done();
  
!         time = System.currentTimeMillis() - time;
!         System.out.println("Time: "+time/1000.+" seconds");
      }
  
!     static void freeAll() {
!         queen.free();
          for (int i = 0; i < N; i++)
              for (int j = 0; j < N; j++)
                  X[i][j].free();
      }
! 
      static void build(int i, int j) {
          BDD a = B.one(), b = B.one(), c = B.one(), d = B.one();
--- 77,107 ----
          for (i = 0; i < N; i++)
              for (j = 0; j < N; j++) {
!                 if (TRACE) System.out.print("Adding position " + i + "," + j+"   \r");
                  build(i, j);
              }
  
+         solution = queen.satOne();
+         
+         double result = queen.satCount();
          /* Print the results */
!         if (TRACE) {
!             System.out.println("There are " + (long) result + " solutions.");
!             double result2 = solution.satCount();
!             System.out.println("Here is "+(long) result2 + " solution:");
!             solution.printSet();
!             System.out.println();
!         }
  
!         return result;
      }
  
!     public static void freeAll() {
          for (int i = 0; i < N; i++)
              for (int j = 0; j < N; j++)
                  X[i][j].free();
+         queen.free();
+         solution.free();
      }
!     
      static void build(int i, int j) {
          BDD a = B.one(), b = B.one(), c = B.one(), d = B.one();

[Javabdd-checkins] JavaBDD NQueens.java,1.12,1.13

From: John W. <joe...@us...> - 2004-07-28 08:39:22

Update of /cvsroot/javabdd/JavaBDD
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1143

Modified Files:
	NQueens.java 
Log Message:
Change to public.


Index: NQueens.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/NQueens.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NQueens.java	27 Jul 2004 18:24:59 -0000	1.12
--- NQueens.java	28 Jul 2004 08:39:12 -0000	1.13
***************
*** 7,13 ****
      public static BDDFactory B;
  
!     static int N; /* Size of the chess board */
!     static BDD[][] X; /* BDD variable array */
!     static BDD queen; /* N-queen problem express as a BDD */
  
      public static void main(String[] args) {
--- 7,13 ----
      public static BDDFactory B;
  
!     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 void main(String[] args) {

[Javabdd-checkins] JavaBDD Makefile,1.23,1.24

From: John W. <joe...@us...> - 2004-07-28 07:47:22

Update of /cvsroot/javabdd/JavaBDD
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25984

Modified Files:
	Makefile 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Makefile	28 Jul 2004 03:44:48 -0000	1.23
--- Makefile	28 Jul 2004 07:47:12 -0000	1.24
***************
*** 18,22 ****
    CLASSPATH = .\;jdd.jar
    CC = gcc
!   CFLAGS = -Wall -O2 -mno-cygwin
    CAL_CFLAGS = $(CFLAGS) -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)
--- 18,22 ----
    CLASSPATH = .\;jdd.jar
    CC = gcc
!   CFLAGS = -Wall -O2 -mno-cygwin $(EXTRA_CFLAGS)
    CAL_CFLAGS = $(CFLAGS) -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)
***************
*** 34,38 ****
    CAL_DLL_NAME = cal.dll
    ifeq (${CC},icl)    # Intel Windows compiler
!     CFLAGS = -O2
      CAL_CFLAGS = $(CFLAGS) -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
--- 34,38 ----
    CAL_DLL_NAME = cal.dll
    ifeq (${CC},icl)    # Intel Windows compiler
!     CFLAGS = $(EXTRA_CFLAGS)
      CAL_CFLAGS = $(CFLAGS) -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
***************
*** 42,46 ****
    endif
    ifeq (${CC},cl)     # Microsoft Visual C++ compiler
!     CFLAGS = -O2
      CAL_CFLAGS = $(CFLAGS) -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
--- 42,46 ----
    endif
    ifeq (${CC},cl)     # Microsoft Visual C++ compiler
!     CFLAGS = -O2 $(EXTRA_CFLAGS)
      CAL_CFLAGS = $(CFLAGS) -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
***************
*** 52,57 ****
    JDK_ROOT = $(firstword $(wildcard /usr/java/j2sdk*))
    CLASSPATH = .:jdd.jar
!   CFLAGS = -D_REENTRANT -D_GNU_SOURCE -O2
!   CAL_CFLAGS = -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)
--- 52,57 ----
    JDK_ROOT = $(firstword $(wildcard /usr/java/j2sdk*))
    CLASSPATH = .:jdd.jar
!   CFLAGS = -D_REENTRANT -D_GNU_SOURCE -O2 $(EXTRA_CFLAGS)
!   CAL_CFLAGS = -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 $(EXTRA_CFLAGS)
    OBJECT_OUTPUT_OPTION = -o$(space)
    LINK = $(CC)
***************
*** 68,72 ****
    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
--- 68,72 ----
    CAL_DLL_NAME = libcal.so
    ifeq (${CC},icc)    # Intel Linux compiler
!     CFLAGS = -D_REENTRANT -D_GNU_SOURCE -O2 -Ob2 -ip $(EXTRA_CFLAGS)
      LINKFLAGS = -shared -static-libcxa
    endif

[Javabdd-checkins] JavaBDD/xdocs compiling.xml,1.2,1.3 navigation.xml,1.3,1.4 performance.xml,1.4,1.5

From: John W. <joe...@us...> - 2004-07-28 06:41:50

Update of /cvsroot/javabdd/JavaBDD/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16960/xdocs

Modified Files:
	compiling.xml navigation.xml performance.xml 
Log Message:


Index: navigation.xml
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/xdocs/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** navigation.xml	27 Jul 2004 22:17:19 -0000	1.3
--- navigation.xml	28 Jul 2004 06:41:39 -0000	1.4
***************
*** 15,19 ****
      </menu>
      <menu name="Documentation">
!       <item name="Javadoc"
              href="apidocs/index.html" />
        <item name="Build Instructions"
--- 15,19 ----
      </menu>
      <menu name="Documentation">
!       <item name="API (Javadoc)"
              href="apidocs/index.html" />
        <item name="Build Instructions"

Index: performance.xml
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/xdocs/performance.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** performance.xml	28 Jul 2004 03:41:56 -0000	1.4
--- performance.xml	28 Jul 2004 06:41:39 -0000	1.5
***************
*** 16,20 ****
        was:
        <br/>
!       <code>java -ms180m -mx180m -Dbdd=<i>package</i> -jar javabdd_0.6.jar 12</code>
        <br/>
        </p>
--- 16,20 ----
        was:
        <br/>
!       <code>java -mx512m -Dbdd=<i>package</i> -jar javabdd_0.6.jar 12</code>
        <br/>
        </p>

Index: compiling.xml
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/xdocs/compiling.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** compiling.xml	27 Jul 2004 20:50:53 -0000	1.2
--- compiling.xml	28 Jul 2004 06:41:39 -0000	1.3
***************
*** 34,38 ****
        native code.  Edit the Makefile to specify the path where to find
        the native code.
!       (The default in the Makefile is <code>buddy22/src</code> for BuDDy,
        <code>cudd-2.4.0</code> for CUDD, and <code>cal-2.1</code> for CAL.)
        It will automatically identify the path to the JDK, as long as you have
--- 34,38 ----
        native code.  Edit the Makefile to specify the path where to find
        the native code.
!       (The default in the Makefile is <code>buddy/src</code> for BuDDy,
        <code>cudd-2.4.0</code> for CUDD, and <code>cal-2.1</code> for CAL.)
        It will automatically identify the path to the JDK, as long as you have

[Javabdd-checkins] JavaBDD Makefile,1.22,1.23

From: John W. <joe...@us...> - 2004-07-28 03:45:04

Update of /cvsroot/javabdd/JavaBDD
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24724

Modified Files:
	Makefile 
Log Message:
Fix for microsoft compiler on CAL.

Index: Makefile
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Makefile	28 Jul 2004 03:42:33 -0000	1.22
--- Makefile	28 Jul 2004 03:44:48 -0000	1.23
***************
*** 43,46 ****
--- 43,47 ----
    ifeq (${CC},cl)     # Microsoft Visual C++ compiler
      CFLAGS = -O2
+     CAL_CFLAGS = $(CFLAGS) -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 = cl

[Javabdd-checkins] JavaBDD Makefile,1.21,1.22

From: John W. <joe...@us...> - 2004-07-28 03:42:43

Update of /cvsroot/javabdd/JavaBDD
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24518

Modified Files:
	Makefile 
Log Message:
Fixes for CAL.

Index: Makefile
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile	28 Jul 2004 01:47:18 -0000	1.21
--- Makefile	28 Jul 2004 03:42:33 -0000	1.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
--- 19,23 ----
    CC = gcc
    CFLAGS = -Wall -O2 -mno-cygwin
!   CAL_CFLAGS = $(CFLAGS) -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
***************
*** 25,29 ****
    DLL_OUTPUT_OPTION = -o$(space)
    INCLUDES = -I. -I$(JDK_ROOT)/include \
!              -I$(BUDDY_SRC) \
               -I$(CUDD_SRC)/cudd -I$(CUDD_SRC)/epd -I$(CUDD_SRC)/mtr \
               -I$(CUDD_SRC)/st -I$(CUDD_SRC)/util \
--- 25,29 ----
    DLL_OUTPUT_OPTION = -o$(space)
    INCLUDES = -I. -I$(JDK_ROOT)/include \
!              -I$(BUDDY_SRC) -I$(BUDDY_SRC)/.. \
               -I$(CUDD_SRC)/cudd -I$(CUDD_SRC)/epd -I$(CUDD_SRC)/mtr \
               -I$(CUDD_SRC)/st -I$(CUDD_SRC)/util \
***************
*** 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
--- 35,39 ----
    ifeq (${CC},icl)    # Intel Windows compiler
      CFLAGS = -O2
!     CAL_CFLAGS = $(CFLAGS) -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
***************
*** 52,56 ****
    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)
--- 52,56 ----
    CLASSPATH = .:jdd.jar
    CFLAGS = -D_REENTRANT -D_GNU_SOURCE -O2
!   CAL_CFLAGS = -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)
***************
*** 58,62 ****
    DLL_OUTPUT_OPTION = -o$(space)
    INCLUDES = -I. -I$(JDK_ROOT)/include \
!              -I$(BUDDY_SRC) \
               -I$(CUDD_SRC)/cudd -I$(CUDD_SRC)/epd -I$(CUDD_SRC)/mtr \
               -I$(CUDD_SRC)/st -I$(CUDD_SRC)/util \
--- 58,62 ----
    DLL_OUTPUT_OPTION = -o$(space)
    INCLUDES = -I. -I$(JDK_ROOT)/include \
!              -I$(BUDDY_SRC) -I$(BUDDY_SRC)/.. \
               -I$(CUDD_SRC)/cudd -I$(CUDD_SRC)/epd -I$(CUDD_SRC)/mtr \
               -I$(CUDD_SRC)/st -I$(CUDD_SRC)/util \
***************
*** 156,160 ****
  	  $(CAL_SRC)/calPrintProfile.c $(CAL_SRC)/calQuant.c $(CAL_SRC)/calReduce.c $(CAL_SRC)/calReorderBF.c \
  	  $(CAL_SRC)/calReorderDF.c $(CAL_SRC)/calReorderUtil.c \
! 	  $(CAL_SRC)/calTerminal.c $(CAL_SRC)/calUtil.c
  CAL_OBJS = $(CAL_SRCS:.c=.o)
  
--- 156,160 ----
  	  $(CAL_SRC)/calPrintProfile.c $(CAL_SRC)/calQuant.c $(CAL_SRC)/calReduce.c $(CAL_SRC)/calReorderBF.c \
  	  $(CAL_SRC)/calReorderDF.c $(CAL_SRC)/calReorderUtil.c \
! 	  $(CAL_SRC)/calTerminal.c $(CAL_SRC)/calUtil.c $(CAL_SRC)/sbrk.c
  CAL_OBJS = $(CAL_SRCS:.c=.o)

[Javabdd-checkins] JavaBDD/xdocs performance.xml,1.3,1.4

From: John W. <joe...@us...> - 2004-07-28 03:42:05

Update of /cvsroot/javabdd/JavaBDD/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24422/xdocs

Modified Files:
	performance.xml 
Log Message:


Index: performance.xml
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/xdocs/performance.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** performance.xml	27 Jul 2004 21:49:14 -0000	1.3
--- performance.xml	28 Jul 2004 03:41:56 -0000	1.4
***************
*** 11,40 ****
        <p>
        Here are the timings of solving the 12x12 NQueens problem on
!       my home machine (2.4GHz P4, 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 -ms320m -mx320m -Dbdd=<i>package</i> -jar javabdd_0.6.jar 12</code>
        <br/>
        </p>
        <table border="2">
          <tr>
!           <td>Package      </td> <td>Time  </td> <td>Peak Memory Usage</td>
          </tr>
          <tr>
!           <td>buddy        </td> <td> 77s  </td> <td> 150mb </td>
          </tr>
          <tr>
!           <td>cudd         </td> <td> 82s  </td> <td> 171mb </td>
          </tr>
          <tr>
!           <td>java -server </td> <td> 90s  </td> <td> 155mb </td>
          </tr>
          <tr>
!           <td>java -client </td> <td> 107s </td> <td> 155mb </td>
          </tr>
        </table>
        <p>
        Don't make any assumptions from these results about the relative
        efficiency of C and Java.  The Java source code is a direct translation
--- 11,56 ----
        <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 -ms180m -mx180m -Dbdd=<i>package</i> -jar javabdd_0.6.jar 12</code>
        <br/>
        </p>
        <table border="2">
          <tr>
!           <td>Package        </td> <td>Time  </td> <td>Peak Memory Usage</td>
          </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>
        <p>
+       As you can see, buddy seems to be the fastest of the native libraries.
+       However, the Java version is not far behind in performance and the
+       memory usage is comparable.  jdd looks promising here but it
+       currently has poor performance on other operations like relprod, which
+       the simple NQueens benchmark doesn't test.
+       </p>
+       <p>
        Don't make any assumptions from these results about the relative
        efficiency of C and Java.  The Java source code is a direct translation

[Javabdd-checkins] JavaBDD/org/sf/javabdd CALFactory.java,1.3,1.4

From: John W. <joe...@us...> - 2004-07-28 03:40:19

Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24176/org/sf/javabdd

Modified Files:
	CALFactory.java 
Log Message:


Index: CALFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/CALFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CALFactory.java	22 Jul 2004 20:03:59 -0000	1.3
--- CALFactory.java	28 Jul 2004 03:39:55 -0000	1.4
***************
*** 677,680 ****
--- 677,681 ----
              return satCount0(_ddnode_ptr);
          }
+         // TODO: debug CAL satCount.
          private static native double satCount0(long b);

[Javabdd-checkins] JavaBDD/org/sf/javabdd JFactory.java,1.3,1.4

From: John W. <joe...@us...> - 2004-07-28 01:58:15

Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8463/org/sf/javabdd

Modified Files:
	JFactory.java 
Log Message:
Fix satcount() bug.

Index: JFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/JFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JFactory.java	23 Jul 2004 01:04:03 -0000	1.3
--- JFactory.java	28 Jul 2004 01:58:06 -0000	1.4
***************
*** 3044,3047 ****
--- 3044,3048 ----
          BddCache_reset(replacecache);
          BddCache_reset(misccache);
+         BddCache_reset(countcache);
      }
  
***************
*** 3054,3057 ****
--- 3055,3060 ----
          //memset(quantvarset, 0, sizeof(int)*bddvarnum);
          quantvarsetID = 0;
+         
+         BddCache_reset(countcache);
      }
  
***************
*** 3066,3069 ****
--- 3069,3073 ----
              BddCache_resize(replacecache, newcachesize);
              BddCache_resize(misccache, newcachesize);
+             BddCache_resize(countcache, newcachesize);
          }
      }

[Javabdd-checkins] JavaBDD Makefile,1.20,1.21

From: John W. <joe...@us...> - 2004-07-28 01:47:28

Update of /cvsroot/javabdd/JavaBDD
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6953

Modified Files:
	Makefile 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile	23 Jun 2004 11:29:24 -0000	1.20
--- Makefile	28 Jul 2004 01:47:18 -0000	1.21
***************
*** 10,14 ****
  #
  
! BUDDY_SRC = buddy22/src
  CUDD_SRC = cudd-2.4.0
  CAL_SRC = cal-2.1
--- 10,14 ----
  #
  
! BUDDY_SRC = buddy/src
  CUDD_SRC = cudd-2.4.0
  CAL_SRC = cal-2.1

[Javabdd-checkins] JavaBDD jdd.jar,1.1,1.2

From: John W. <joe...@us...> - 2004-07-28 01:36:33

Update of /cvsroot/javabdd/JavaBDD
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5355

Modified Files:
	jdd.jar 
Log Message:
Updated jdd to the latest version from CVS.

Index: jdd.jar
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/jdd.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsQrVafV and /tmp/cvsh4IpxD differ

[Javabdd-checkins] JavaBDD .project,1.3,1.4

From: John W. <joe...@us...> - 2004-07-27 23:39:00

Update of /cvsroot/javabdd/JavaBDD
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18727

Modified Files:
	.project 
Log Message:
Remove Makefile builder.

Index: .project
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/.project,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .project	22 Feb 2003 23:52:52 -0000	1.3
--- .project	27 Jul 2004 23:38:51 -0000	1.4
***************
*** 11,25 ****
  			</arguments>
  		</buildCommand>
- 		<buildCommand>
- 			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- 			<arguments>
- 				<dictionary>
- 					<key>LaunchConfigHandle</key>
- 					<value>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
- &lt;launchConfiguration local=&quot;false&quot; path=&quot;/JavaBDD/.externalToolBuilders/Makefile builder.launch&quot;/&gt;
- </value>
- 				</dictionary>
- 			</arguments>
- 		</buildCommand>
  	</buildSpec>
  	<natures>
--- 11,14 ----

[Javabdd-checkins] JavaBDD/org/sf/javabdd FindBestOrder.java,1.7,1.8

From: John W. <joe...@us...> - 2004-07-27 23:20:12

Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15189/org/sf/javabdd

Modified Files:
	FindBestOrder.java 
Log Message:
Change to JFactory by default.

Index: FindBestOrder.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/FindBestOrder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FindBestOrder.java	15 Jul 2004 07:08:47 -0000	1.7
--- FindBestOrder.java	27 Jul 2004 23:20:03 -0000	1.8
***************
*** 150,154 ****
              long total = System.currentTimeMillis();
              if (bdd == null) {
!                 bdd = JavaFactory.init(nodeTableSize, cacheSize);
                  bdd.setMaxIncrease(maxIncrease);
                  readBDDConfig(bdd);
--- 150,154 ----
              long total = System.currentTimeMillis();
              if (bdd == null) {
!                 bdd = JFactory.init(nodeTableSize, cacheSize);
                  bdd.setMaxIncrease(maxIncrease);
                  readBDDConfig(bdd);

[Javabdd-checkins] JavaBDD project.xml,1.5,1.6

From: John W. <joe...@us...> - 2004-07-27 23:01:46

Update of /cvsroot/javabdd/JavaBDD
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12088

Modified Files:
	project.xml 
Log Message:


Index: project.xml
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** project.xml	27 Jul 2004 22:54:10 -0000	1.5
--- project.xml	27 Jul 2004 23:01:23 -0000	1.6
***************
*** 5,9 ****
    <id>javabdd</id>
    <currentVersion>0.6</currentVersion>
!   <logo>/images/logo_mid.jpg</logo> 
    <organization>
      <name>Sourceforge</name>
--- 5,9 ----
    <id>javabdd</id>
    <currentVersion>0.6</currentVersion>
!   <logo>/images/logo2_mid.jpg</logo> 
    <organization>
      <name>Sourceforge</name>

Flat | Threaded

<< < 1 .. 11 12 13 14 15 .. 17 > >> (Page 13 of 17)