bug fices

packages/bdd/CMakeLists.txt

@@ -35,12 +35,12 @@ IF (CUDD_FOUND)
     ${CUDD_INCLUDE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     )
- 
+
   check_include_files( util.h HAVE_UTIL_H )
   check_include_files( cudd/util.h HAVE_CUDD_UTIL_H )
   check_include_files( cudd.h HAVE_CUDD_H )
   check_include_files( "stdio.h;cudd/cudd.h" HAVE_CUDD_CUDD_H )
-  check_include_files( cuddInt.h HAVE_CUDDINT_H )  
+  check_include_files( cuddInt.h HAVE_CUDDINT_H )
   check_include_files( "stdio.h;cudd/cudd.h;cudd/cuddInt.h" HAVE_CUDD_CUDDINT_H )
 
   configure_file ("${PROJECT_SOURCE_DIR}/cudd_config.h.cmake"
@@ -63,6 +63,7 @@ IF (CUDD_FOUND)
 
   add_subdirectory(simplecudd)
   add_subdirectory(simplecudd_lfi)
+  set(YAP_SYSTEM_OPTIONS "cudd " ${YAP_SYSTEM_OPTIONS} PARENT_SCOPE)
 
   install(TARGETS  cudd
     LIBRARY DESTINATION ${dlls}
@@ -72,7 +73,7 @@ IF (CUDD_FOUND)
   INSTALL(FILES ddnnf.yap DESTINATION ${libpl})
   INSTALL(FILES simpbool.yap DESTINATION ${libpl})
   INSTALL(FILES trie_sp.yap DESTINATION ${libpl})
-  
+
 ENDIF (CUDD_FOUND)
 
 SET (CUDD_FOUND_EXPORT ${CUDD_FOUND} PARENT_SCOPE)

packages/bdd/cudd_config.h

@@ -2,7 +2,7 @@
 
 /* Define to 1 if you have the <cuddInt.h> header file. */
 #ifndef HAVE_CUDDINT_H
-#define HAVE_CUDDINT_H 
+/* #undef HAVE_CUDDINT_H */
 #endif
 
 /* Define to 1 if you have the <cudd/cuddInt.h> header file. */
@@ -15,9 +15,9 @@
 #define HAVE_CUDD_CUDD_H 1
 #endif
 
-/* Define to 1 if you have the <cudd.h> header file. */
+/*Define to 1 if you have the <cudd.h> header file. */
 #ifndef HAVE_CUDD_H
-#define HAVE_CUDD_H 
+/* #undef HAVE_CUDD_H */
 #endif
 
 /* Define to 1 if you have the <cudd/util.h> header file. */

packages/bdd/simplecudd_lfi/general.c

@@ -254,7 +254,7 @@ int CharIn(const char c, const char *in) {
 
 /* string handling */
 
-int patternmatch(char *pattern, char *thestr) {
+int patternmatch(const char *pattern, const char *thestr) {
   int i, j = -1, pl = strlen(pattern), sl = strlen(thestr);
   for(i = 0; i < pl; i++) {
     if (pattern[i] == '*') {

packages/bdd/simplecudd_lfi/general.h

@@ -200,5 +200,5 @@ int IsRealNumber(char *c);
 int IsNumber(const char *c);
 char * freadstr(FILE *fd, const char *separators);
 int CharIn(const char c, const char *in);
-int patternmatch(char *pattern, char *thestr);
+int patternmatch(const char *pattern, const char *thestr);
 

packages/bdd/simplecudd_lfi/problogbdd_lfi.c

@@ -241,7 +241,7 @@ double CalcExpectedCountsUp(extmanager * MyManager, DdNode *Current, char *query
 double CalcExpectedCountsDown(extmanager * MyManager, DdNode *Current, char *query_id);
 double CalcExpectedCounts(extmanager * MyManager, DdNode *Current, char *query_id, int calcdown_needed);
 int patterncalculated(char *pattern, extmanager MyManager, int loc);
-char * extractpattern(char *thestr);
+char * extractpattern(const char *thestr);
 
 int main(int argc, char **arg) {
   extmanager MyManager;
@@ -476,7 +476,7 @@ int main(int argc, char **arg) {
       free(MyManager.varmap.dynvalue);
     }
     for (i = 0; i < MyManager.varmap.varcnt; i++)
-      free(MyManager.varmap.vars[i]);
+      free((const char *)MyManager.varmap.vars[i]);
     free(MyManager.varmap.vars);
   }
   if (params.error != NULL) free(params.error);
@@ -1168,7 +1168,7 @@ gradientpair CalcGradient(extmanager MyManager, DdNode *Current, int TargetVar,
   return tvalue;
 }
 
-char * extractpattern(char *thestr) {
+char * extractpattern(const char *thestr) {
   char *p;
   int i = 0, sl = strlen(thestr);
   while((thestr[i] != '_') && (i < sl)) i++;

packages/bdd/simplecudd_lfi/simplecudd.c

@@ -370,7 +370,7 @@ int CheckFileVersion(const char *version) {
   return -1;
 }
 
-int simpleBDDtoDot(DdManager *manager, DdNode *bdd, char *filename) {
+int simpleBDDtoDot(DdManager *manager, DdNode *bdd, const char *filename) {
   DdNode *f[1];
   int ret;
   FILE *fd;
@@ -385,8 +385,8 @@ int simpleBDDtoDot(DdManager *manager, DdNode *bdd, char *filename) {
   return ret;
 }
 
-int simpleNamedBDDtoDot(DdManager *manager, const namedvars varmap, DdNode *bdd,
-                        char *filename) {
+int simpleNamedBDDtoDot(DdManager *manager, namedvars varmap, DdNode *bdd,
+                        const char *filename) {
   DdNode *f[1];
   int ret;
   FILE *fd;
@@ -435,7 +435,7 @@ void SaveExpand(DdManager *manager, namedvars varmap, hisqueue *Nodes,
                 DdNode *Current, FILE *outputfile) {
   DdNode *h, *l;
   hisnode *Found;
-  char *curnode;
+  const char *curnode;
   int inode;
   if (Current != HIGH(manager) && Current != LOW(manager)) {
     if ((Found = GetNode(Nodes, varmap.varstart, Current)) == NULL) {
@@ -917,7 +917,7 @@ namedvars InitNamedVars(int varcnt, int varstart) {
   int i;
   temp.varcnt = varcnt;
   temp.varstart = varstart;
-  temp.vars = (char **)malloc(sizeof(char *) * varcnt);
+  temp.vars = (const char **)malloc(sizeof(char *) * varcnt);
   temp.loaded = (int *)malloc(sizeof(int) * varcnt);
   temp.dvalue = (double *)malloc(sizeof(double) * varcnt);
   temp.ivalue = (int *)malloc(sizeof(int) * varcnt);
@@ -934,7 +934,7 @@ namedvars InitNamedVars(int varcnt, int varstart) {
 
 void EnlargeNamedVars(namedvars *varmap, int newvarcnt) {
   int i;
-  varmap->vars = (char **)realloc(varmap->vars, sizeof(char *) * newvarcnt);
+  varmap->vars = (const char **)realloc(varmap->vars, sizeof(const char *) * newvarcnt);
   varmap->loaded = (int *)realloc(varmap->loaded, sizeof(int) * newvarcnt);
   varmap->dvalue =
       (double *)realloc(varmap->dvalue, sizeof(double) * newvarcnt);
@@ -954,7 +954,7 @@ void EnlargeNamedVars(namedvars *varmap, int newvarcnt) {
 int AddNamedVarAt(namedvars varmap, const char *varname, int index) {
   if (varmap.varcnt > index) {
     varmap.vars[index] = (char *)malloc(sizeof(char) * (strlen(varname) + 1));
-    strcpy(varmap.vars[index], varname);
+    strcpy(varmap.vars[index], (char *)varname);
     return index;
   }
   return -1;
@@ -1010,7 +1010,7 @@ int GetNamedVarIndex(const namedvars varmap, const char *varname) {
   return -1 * varmap.varcnt;
 }
 
-char *GetNodeVarName(DdManager *manager, namedvars varmap, DdNode *node) {
+const char *GetNodeVarName(DdManager *manager, namedvars varmap, DdNode *node) {
   if (node == NULL)
     return NULL;
   if (node == HIGH(manager))
@@ -1020,7 +1020,7 @@ char *GetNodeVarName(DdManager *manager, namedvars varmap, DdNode *node) {
   return varmap.vars[GetIndex(node) - varmap.varstart];
 }
 
-char *GetNodeVarNameDisp(DdManager *manager, namedvars varmap, DdNode *node) {
+const char *GetNodeVarNameDisp(DdManager *manager, namedvars varmap, DdNode *node) {
   if (HIGH(manager) == node)
     return "TRUE";
   if (LOW(manager) == node)

packages/bdd/simplecudd_lfi/simplecudd.h

@@ -249,7 +249,7 @@ typedef struct _bddfileheader {
 typedef struct _namedvars {
   int varcnt;
   int varstart;
-  char **vars;
+  const char ** vars;
   int *loaded;
   double *dvalue;
   int *ivalue;
@@ -317,8 +317,8 @@ void SetNamedVarValuesAt(namedvars varmap, int index, double dvalue, int ivalue,
 int SetNamedVarValues(namedvars varmap, const char *varname, double dvalue, int ivalue, void *dynvalue);
 int GetNamedVarIndex(const namedvars varmap, const char *varname);
 int RepairVarcnt(namedvars *varmap);
-char* GetNodeVarName(DdManager *manager, namedvars varmap, DdNode *node);
-char* GetNodeVarNameDisp(DdManager *manager, namedvars varmap, DdNode *node);
+const char* GetNodeVarName(DdManager *manager, namedvars varmap, DdNode *node);
+const char* GetNodeVarNameDisp(DdManager *manager, namedvars varmap, DdNode *node);
 int all_loaded(namedvars varmap, int disp);
 int all_loaded_for_deterministic_variables(namedvars varmap, int disp);
 
@@ -351,6 +351,6 @@ void ExpandNodes(hisqueue *Nodes, int index, int nodenum);
 
 /* Export */
 
-int simpleBDDtoDot(DdManager *manager, DdNode *bdd, char *filename);
-int simpleNamedBDDtoDot(DdManager *manager, namedvars varmap, DdNode *bdd, char *filename);
+int simpleBDDtoDot(DdManager *manager, DdNode *bdd, const char *filename);
+int simpleNamedBDDtoDot(DdManager *manager, namedvars varmap, DdNode *bdd, const char *filename);