[Javabdd-checkins] JavaBDD Makefile,1.25,1.26 project.xml,1.6,1.7 cal_jni.c,1.1,1.2

[John W. <joe...@us...>]

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

Modified Files:
	Makefile project.xml cal_jni.c 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Makefile	28 Jul 2004 10:25:55 -0000	1.25
--- Makefile	28 Jul 2004 11:38:08 -0000	1.26
***************
*** 52,56 ****
    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)
--- 52,56 ----
    JDK_ROOT = $(firstword $(wildcard /usr/java/j2sdk*))
    CLASSPATH = .:jdd.jar
!   CFLAGS = -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)
***************
*** 68,73 ****
    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
  endif
--- 68,74 ----
    CAL_DLL_NAME = libcal.so
    ifeq (${CC},icc)    # Intel Linux compiler
!     CFLAGS = -O2 -Ob2 -ip $(EXTRA_CFLAGS)
!     LINK = icc
!     LINKFLAGS = -shared $(EXTRA_CFLAGS)
    endif
  endif
***************
*** 121,125 ****
  	$(BUDDY_SRC)/cache.c $(BUDDY_SRC)/fdd.c $(BUDDY_SRC)/imatrix.c \
  	$(BUDDY_SRC)/kernel.c $(BUDDY_SRC)/pairs.c $(BUDDY_SRC)/prime.c \
! 	$(BUDDY_SRC)/reorder.c $(BUDDY_SRC)/tree.c
  BUDDY_OBJS = $(BUDDY_SRCS:.c=.o)
  
--- 122,126 ----
  	$(BUDDY_SRC)/cache.c $(BUDDY_SRC)/fdd.c $(BUDDY_SRC)/imatrix.c \
  	$(BUDDY_SRC)/kernel.c $(BUDDY_SRC)/pairs.c $(BUDDY_SRC)/prime.c \
! 	$(BUDDY_SRC)/reorder.c $(BUDDY_SRC)/tree.c $(BUDDY_SRC)/trace.c
  BUDDY_OBJS = $(BUDDY_SRCS:.c=.o)
  

Index: cal_jni.c
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/cal_jni.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cal_jni.c	1 Dec 2003 04:07:10 -0000	1.1
--- cal_jni.c	28 Jul 2004 11:38:08 -0000	1.2
***************
*** 128,134 ****
      m = manager;
      manager = NULL; // race condition with delRef
-     printf("Calling Cal_BddManagerQuit(%x)...\n", m);
      Cal_BddManagerQuit(m);
-     printf("done.\n");
  }
  
--- 128,132 ----
***************
*** 499,506 ****
  {
      Cal_Bdd d;
      d = (Cal_Bdd) (intptr_cast_type) a;
!     printf("satCount not implemented.\n");
!     //return Cudd_CountMinterm(manager, d, varcount);
!     return 0;
  }
  
--- 497,505 ----
  {
      Cal_Bdd d;
+     double result = 1.0;
+     int k = Cal_BddVars(manager);
+     while (--k >= 0) result *= 2.0;
      d = (Cal_Bdd) (intptr_cast_type) a;
!     return Cal_BddSatisfyingFraction(manager, d) * result;
  }
  

Index: project.xml
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** project.xml	27 Jul 2004 23:01:23 -0000	1.6
--- project.xml	28 Jul 2004 11:38:08 -0000	1.7
***************
*** 175,194 ****
  
      <sourceDirectory>.</sourceDirectory>
! <!-- TODO
!     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
      <aspectSourceDirectory/>
- -->
  
      <!-- Unit test cases -->
- <!-- TODO
      <unitTest>
        <includes>
          <include>**/*Test.java</include>
        </includes>
        <excludes>
          <exclude>**/RepositoryTest.java</exclude>
        </excludes>
-     </unitTest>
  -->
                
      <!-- J A R  R E S O U R C E S -->
--- 175,195 ----
  
      <sourceDirectory>.</sourceDirectory>
!     <unitTestSourceDirectory>../JavaBDD_tests</unitTestSourceDirectory>
      <aspectSourceDirectory/>
  
      <!-- Unit test cases -->
      <unitTest>
        <includes>
          <include>**/*Test.java</include>
        </includes>
+       <includes>
+         <include>regression/*.java</include>
+       </includes>
+ <!-- Not currently used.
        <excludes>
          <exclude>**/RepositoryTest.java</exclude>
        </excludes>
  -->
+     </unitTest>
                
      <!-- J A R  R E S O U R C E S -->