diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of yap.dcc.fc.up.pt:yap-6

Browse Source
This commit is contained in:
Vitor Santos Costa 2010-07-30 12:08:37 +01:00
commit f59f8e3f1a
4 changed files with 12210 additions and 2583 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -577,6 +577,7 @@ install_unix: startup.yss libYap.a
$(INSTALL) config.h $(DESTDIR)$(INCLUDEDIR)/config.h $(INSTALL) config.h $(DESTDIR)$(INCLUDEDIR)/config.h
$(INSTALL) parms.h $(DESTDIR)$(INCLUDEDIR)/parms.h $(INSTALL) parms.h $(DESTDIR)$(INCLUDEDIR)/parms.h
@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install)
@ENABLE_CPLINT@ (cd packages/cplint/simplecuddLPADs; $(MAKE) install)
@USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install) @USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install)

14782
configure vendored
View File

File diff suppressed because it is too large Load Diff

2
configure.in
View File

@ -1235,7 +1235,7 @@ if test ! "$yap_cv_cplint" = "no"
then then
CPLINT_LDFLAGS+=" -L${yap_cv_cplint}/cudd -L${yap_cv_cplint}/mtr -L${yap_cv_cplint}/st -L${yap_cv_cplint}/util -L${yap_cv_cplint}/epd " CPLINT_LDFLAGS+=" -L${yap_cv_cplint}/cudd -L${yap_cv_cplint}/mtr -L${yap_cv_cplint}/st -L${yap_cv_cplint}/util -L${yap_cv_cplint}/epd "
CPLINT_CFLAGS+=" -I${yap_cv_cplint}/include" CPLINT_CFLAGS+=" -I${yap_cv_cplint}/include"
CPLINT_LIBS="-lcudd -lmtr -lst -lutil -lepd -lm "$CPLINT_LIBS CPLINT_LIBS="-lcudd -lmtr -lst -lepd -lutil -lm "$CPLINT_LIBS
fi fi
#AC_SEARCH_LIBS([g_hash_table_new], [glib-2.0], [], [AC_MSG_ERROR([This package needs glib >=2.0.], [1])], []) #AC_SEARCH_LIBS([g_hash_table_new], [glib-2.0], [], [AC_MSG_ERROR([This package needs glib >=2.0.], [1])], [])
#AC_SEARCH_LIBS([Cudd_Init], [cudd], [], [AC_MSG_ERROR([This package needs CUDD.], [1])], [-lcudd -lmtr -lst -lutil -lepd -lm]) #AC_SEARCH_LIBS([Cudd_Init], [cudd], [], [AC_MSG_ERROR([This package needs CUDD.], [1])], [-lcudd -lmtr -lst -lutil -lepd -lm])

8
packages/cplint/approx/simplecuddLPADs/ProblogBDD.c
View File

@ -288,7 +288,7 @@ int main(int argc, char **arg) {
if (params.debug) DEBUGON; if (params.debug) DEBUGON;
RAPIDLOADON; RAPIDLOADON;
SETMAXBUFSIZE(params.maxbufsize); SETMAXBUFSIZE(params.maxbufsize);
#ifndef _WIN32
signal(SIGINT, termhandler); signal(SIGINT, termhandler);
if (params.ppid != NULL) { if (params.ppid != NULL) {
signal(SIGALRM, pidhandler); signal(SIGALRM, pidhandler);
@ -297,6 +297,7 @@ int main(int argc, char **arg) {
signal(SIGALRM, handler); signal(SIGALRM, handler);
alarm(params.timeout); alarm(params.timeout);
} }
#endif
if (params.online) { if (params.online) {
MyManager.manager = simpleBDDinit(0); MyManager.manager = simpleBDDinit(0);
MyManager.t = HIGH(MyManager.manager); MyManager.t = HIGH(MyManager.manager);
@ -344,8 +345,9 @@ int main(int argc, char **arg) {
break; break;
} }
} }
#ifndef _WIN32
alarm(0); alarm(0);
#endif
// problem specifics // problem specifics
if (bdd != NULL) { if (bdd != NULL) {
@ -625,8 +627,10 @@ void pidhandler(int num) {
s = (char *) malloc(sizeof(char) * (19 + strlen(params.ppid))); s = (char *) malloc(sizeof(char) * (19 + strlen(params.ppid)));
strcpy(s, "ps "); strcat(s, params.ppid); strcat(s, " >/dev/null"); strcpy(s, "ps "); strcat(s, params.ppid); strcat(s, " >/dev/null");
if (system(s) != 0) exit(4); if (system(s) != 0) exit(4);
#ifndef _WIN32
signal(SIGALRM, pidhandler); signal(SIGALRM, pidhandler);
alarm(5); alarm(5);
#endif
free(s); free(s);
} }