From e9eb030bb661d494c7d38190588048fbb1259d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Sat, 15 Mar 2014 22:21:54 +0000 Subject: [PATCH 1/5] catch warnings --- C/absmi.c | 2 ++ packages/ProbLog/simplecudd/simplecudd.c | 20 +++++++++---------- .../ProbLog/simplecudd_lfi/problogbdd_lfi.c | 17 +++++++++++----- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/C/absmi.c b/C/absmi.c index e2ce18e07..46c7646e0 100755 --- a/C/absmi.c +++ b/C/absmi.c @@ -9201,9 +9201,11 @@ Yap_absmi(int inp) GONext(); } } + break; case (CELL)FunctorLongInt: PREG = NEXTOP(PREG, xl); GONext(); + break; default: PREG = PREG->u.xl.F; GONext(); diff --git a/packages/ProbLog/simplecudd/simplecudd.c b/packages/ProbLog/simplecudd/simplecudd.c index 33f20ae78..bdf498a4d 100644 --- a/packages/ProbLog/simplecudd/simplecudd.c +++ b/packages/ProbLog/simplecudd/simplecudd.c @@ -1201,7 +1201,7 @@ char* getFileName(const char *function) { DdNode* LineParser(DdManager *manager, namedvars varmap, DdNode **inter, int maxinter, char *function, int iline) { int istart, iend, ilength, i, symbol, ivar, inegvar, inegoper, iconst; long startAt, endAt; - double secs; + //double secs; DdNode *bdd;//, *temp; char *term, curoper; bdd = HIGH(manager); @@ -1269,7 +1269,7 @@ DdNode* LineParser(DdManager *manager, namedvars varmap, DdNode **inter, int max } else { switch(curoper) { case '+': - if (inegvar ^ inegoper) ; else { + if (!(inegvar ^ inegoper)) { bdd = HIGH(manager); Cudd_Ref(bdd); } @@ -1281,12 +1281,12 @@ DdNode* LineParser(DdManager *manager, namedvars varmap, DdNode **inter, int max } break; case '#': - if (inegvar ^ inegoper) ; else bdd = NOT(bdd); + if (!(inegvar ^ inegoper)) bdd = NOT(bdd); break; } } endAt = clock(); - secs = ((double) (endAt - startAt)) / ((double) CLOCKS_PER_SEC); + //secs = ((double) (endAt - startAt)) / ((double) CLOCKS_PER_SEC); if (_debug) fprintf(stderr, "term: %s of line: %i took: %ld\n", term, iline, endAt - startAt); //if ((endAt - startAt) > 10000000) Cudd_AutodynDisable(manager); if (bdd == NULL) { @@ -1318,7 +1318,7 @@ DdNode* LineParser(DdManager *manager, namedvars varmap, DdNode **inter, int max if (inegvar) bdd = BDD_Operator(manager, NOT(inter[ivar]), bdd, curoper, inegoper); else bdd = BDD_Operator(manager, inter[ivar], bdd, curoper, inegoper); endAt = clock(); - secs = ((double) (endAt - startAt)) / ((double) CLOCKS_PER_SEC); + //secs = ((double) (endAt - startAt)) / ((double) CLOCKS_PER_SEC); if (_debug) fprintf(stderr, "term: %s of line: %i took: %ld\n", term, iline, endAt - startAt); //if ((endAt - startAt) > 10000000) Cudd_AutodynDisable(manager); if (bdd == NULL) { @@ -1513,7 +1513,7 @@ DdNode* OnlineGenerateBDD(DdManager *manager, namedvars *varmap) { DdNode* OnlineLineParser(DdManager *manager, namedvars *varmap, DdNode **inter, int maxinter, char *function, int iline) { int istart, iend, ilength, i, symbol, ivar, inegvar, inegoper, iconst; long startAt, endAt; - double secs; + //double secs; DdNode *bdd; char *term, curoper; bdd = HIGH(manager); @@ -1581,7 +1581,7 @@ DdNode* OnlineLineParser(DdManager *manager, namedvars *varmap, DdNode **inter, } else { switch(curoper) { case '+': - if (inegvar ^ inegoper) ; else { + if (!(inegvar ^ inegoper)) { bdd = HIGH(manager); Cudd_Ref(bdd); } @@ -1593,12 +1593,12 @@ DdNode* OnlineLineParser(DdManager *manager, namedvars *varmap, DdNode **inter, } break; case '#': - if (inegvar ^ inegoper) ; else bdd = NOT(bdd); + if (!(inegvar ^ inegoper)) bdd = NOT(bdd); break; } } endAt = clock(); - secs = ((double) (endAt - startAt)) / ((double) CLOCKS_PER_SEC); + //secs = ((double) (endAt - startAt)) / ((double) CLOCKS_PER_SEC); if (_debug) fprintf(stderr, "term: %s of line: %i took: %ld\n", term, iline, endAt - startAt); //if ((endAt - startAt) > 10000000) Cudd_AutodynDisable(manager); if (bdd == NULL) { @@ -1630,7 +1630,7 @@ DdNode* OnlineLineParser(DdManager *manager, namedvars *varmap, DdNode **inter, if (inegvar) bdd = BDD_Operator(manager, NOT(inter[ivar]), bdd, curoper, inegoper); else bdd = BDD_Operator(manager, inter[ivar], bdd, curoper, inegoper); endAt = clock(); - secs = ((double) (endAt - startAt)) / ((double) CLOCKS_PER_SEC); + //secs = ((double) (endAt - startAt)) / ((double) CLOCKS_PER_SEC); if (_debug) fprintf(stderr, "term: %s of line: %i took: %ld\n", term, iline, endAt - startAt); //if ((endAt - startAt) > 10000000) Cudd_AutodynDisable(manager); if (bdd == NULL) { diff --git a/packages/ProbLog/simplecudd_lfi/problogbdd_lfi.c b/packages/ProbLog/simplecudd_lfi/problogbdd_lfi.c index 68868d590..dfdae88e1 100644 --- a/packages/ProbLog/simplecudd_lfi/problogbdd_lfi.c +++ b/packages/ProbLog/simplecudd_lfi/problogbdd_lfi.c @@ -761,7 +761,7 @@ double CalcExpectedCounts(extmanager * MyManager, DdNode *Current, char *query_i // fprintf(stderr,"%%calcing down\n"); if (calcdown_needed != 0) { - double retd=CalcExpectedCountsDown(MyManager,Current, query_id); + // double retd=CalcExpectedCountsDown(MyManager,Current, query_id); } /* if(1 != retd){ */ /* fprintf(stderr,"down %e != up %e/%e\n",ret,retd,ret); */ @@ -807,7 +807,7 @@ double CalcExpectedCounts(extmanager * MyManager, DdNode *Current, char *query_i #define LOG_EXPECTED 0 - +static void PrintNodeQueue(Queue q , extmanager MyManager){ QueueIterator qiter = QueueIteratorNew(q, 1); @@ -824,6 +824,8 @@ void PrintNodeQueue(Queue q , extmanager MyManager){ /** also nesting in CalcExpected seems to not work (must be here nested only valid within function frame)*/ /* will be changed at later stage */ static extmanager * ineedtostorethatsomehow; + +static int comparator(void *av, void *bv){ int ret = 0; DdNode* a = (DdNode*)av; @@ -852,7 +854,11 @@ int comparator(void *av, void *bv){ return ret; } +static void +skip_nodes_cnt(extmanager * MyManager, double (*counts)[] , int skipcnt, DdNode* l,double dprob, char *query_id); + /** output information for skipped nodes **/ +static void skip_nodes(extmanager * MyManager, double (*counts)[] , DdNode* node, DdNode* l,double dprob, char *query_id){ int skipcnt; skipcnt = Cudd_ReadPerm(MyManager->manager,GetIndex(node))+1; @@ -866,9 +872,10 @@ skip_nodes(extmanager * MyManager, double (*counts)[] , DdNode* node, DdNode* l, Cudd_IsConstant(l) ); } - return skip_nodes_cnt( MyManager, counts, skipcnt, l, dprob, query_id); - + skip_nodes_cnt( MyManager, counts, skipcnt, l, dprob, query_id); } + +static void skip_nodes_cnt(extmanager * MyManager, double (*counts)[] , int skipcnt, DdNode* l,double dprob, char *query_id){ if(LOG_EXPECTED) fprintf(stderr,"====================\n"); double p; @@ -954,7 +961,7 @@ double CalcExpectedCountsDown(extmanager * MyManager, DdNode *Current, char *que if(LOG_EXPECTED){PrintNodeQueue(q,*MyManager);} node=QueueGet(q); curnode = GetNodeVarNameDisp(MyManager->manager, MyManager->varmap, node); - int level = Cudd_ReadPerm(MyManager->manager,GetIndex(node)); + // int level = Cudd_ReadPerm(MyManager->manager,GetIndex(node)); if(!Cudd_IsConstant(node)){ tvalue = MyManager->varmap.dvalue[GetIndex(node) - MyManager->varmap.varstart]; ivalue = MyManager->varmap.ivalue[GetIndex(node) - MyManager->varmap.varstart]; From 801c4cb36985c51eb6ad9d445f825636c18a5dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Sat, 15 Mar 2014 22:22:11 +0000 Subject: [PATCH 2/5] catch warnings --- os/SWI-Stream.h | 2 +- os/pl-file.c | 7 ++++--- os/pl-read.c | 2 +- os/pl-stream.c | 2 ++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/os/SWI-Stream.h b/os/SWI-Stream.h index 536d1a8be..c6bc44409 100755 --- a/os/SWI-Stream.h +++ b/os/SWI-Stream.h @@ -233,7 +233,7 @@ PL_EXPORT_DATA(IOSTREAM) S__iob[3]; /* Libs standard streams */ static inline void S__checkpasteeof(IOSTREAM *s, int c) { - if ( (c)==-1 && (s)->flags & (SIO_FEOF|SIO_FERR) ) + if ( (c)==-1 && ((s)->flags & (SIO_FEOF|SIO_FERR)) ) ((s)->flags |= SIO_FEOF2); } diff --git a/os/pl-file.c b/os/pl-file.c index fd07ad6db..53f8578ed 100755 --- a/os/pl-file.c +++ b/os/pl-file.c @@ -2008,7 +2008,7 @@ found: ref = PL_blob_data(sblob, NULL, &type); if ( type == &stream_blob ) /* got a stream handle */ { if ( ref->read && ref->write && /* stream pair */ - info->flags & SS_NOPAIR ) + (info->flags & SS_NOPAIR) ) return PL_error("set_stream", 2, NULL, ERR_PERMISSION, aname, ATOM_stream_pair, stream); @@ -3421,7 +3421,7 @@ pl_seen(void) pop_input_context(); - if ( s && s->flags & SIO_NOFEOF ) + if ( s && (s->flags & SIO_NOFEOF) ) return TRUE; if ( s ) @@ -3523,7 +3523,7 @@ PRED_IMPL("told", 0, told, 0) popOutputContext(); - if ( s && s->flags & SIO_NOFEOF ) + if ( s && (s->flags & SIO_NOFEOF) ) return TRUE; if ( s ) @@ -4272,6 +4272,7 @@ PRED_IMPL("stream_property", 2, stream_property, return FALSE; } } + return FALSE; } diff --git a/os/pl-read.c b/os/pl-read.c index 1e5a94c1a..648b0c123 100644 --- a/os/pl-read.c +++ b/os/pl-read.c @@ -968,7 +968,7 @@ static unsigned char * backSkipUTF8(unsigned const char *start, unsigned const char *end, int *chr) { const unsigned char *s; - for(s=end-1 ; s>start && *s&0x80; s--) + for(s=end-1 ; s>start && ( *s&0x80 ); s--) ; utf8_get_char((char*)s, chr); diff --git a/os/pl-stream.c b/os/pl-stream.c index c7e52592f..1f730f25d 100755 --- a/os/pl-stream.c +++ b/os/pl-stream.c @@ -1343,6 +1343,7 @@ ScheckBOM(IOSTREAM *s) return 0; /* empty stream */ s->bufp--; } + return 0; } @@ -2648,6 +2649,7 @@ Sread_file(void *handle, char *buf, size_t size) return bytes; } + return -1; } From 4bc537a37b8d0c209451a842a7c842c282b0e946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Sat, 15 Mar 2014 22:22:43 +0000 Subject: [PATCH 3/5] new commits --- packages/jpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jpl b/packages/jpl index 77759f849..e4ecf86fb 160000 --- a/packages/jpl +++ b/packages/jpl @@ -1 +1 @@ -Subproject commit 77759f84962a5f77a970d0cdcc9647fdc8e7bbfb +Subproject commit e4ecf86fb3422538b107a35372e1888e75ae1f8b From cd5423a8bf42bf18b98ac7352bc795874e4aae22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Sat, 15 Mar 2014 22:22:54 +0000 Subject: [PATCH 4/5] new commits --- packages/real | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/real b/packages/real index 6c1496cf1..a7302696d 160000 --- a/packages/real +++ b/packages/real @@ -1 +1 @@ -Subproject commit 6c1496cf14e6c842a705fda7d397f354efaa0915 +Subproject commit a7302696dcb0d137b7f20740c71df92bbd35137e From 9c008ac769208dea386044ea3457b1ccf77f1d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Sat, 15 Mar 2014 22:24:02 +0000 Subject: [PATCH 5/5] use TRUE for booleans --- packages/real | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/real b/packages/real index a7302696d..10fd754c6 160000 --- a/packages/real +++ b/packages/real @@ -1 +1 @@ -Subproject commit a7302696dcb0d137b7f20740c71df92bbd35137e +Subproject commit 10fd754c6561313835d4e1ff557d654b3225365e