indenting; warning; exceptions; small fixes

This commit is contained in:
Vítor Santos Costa
2016-03-29 02:02:43 +01:00
parent 6bc4acec15
commit f3e8b8b3da
51 changed files with 2220 additions and 2221 deletions

View File

@@ -27,6 +27,6 @@
/* Define to 1 if you have the <util.h> header file. */
#ifndef HAVE_UTIL_H
/* #undef HAVE_UTIL_H */
#define HAVE_UTIL_H 1
#endif

Binary file not shown.

View File

@@ -807,7 +807,7 @@ void termhandler(int num) { exit(3); }
void myexpand(extmanager MyManager, DdNode *Current) {
DdNode *h, *l;
hisnode *Found;
char *curnode;
const char *curnode;
curnode = GetNodeVarNameDisp(MyManager.manager, MyManager.varmap, Current);
printf("%s\n", curnode);
if ((Current != MyManager.t) && (Current != MyManager.f) &&
@@ -828,7 +828,7 @@ void myexpand(extmanager MyManager, DdNode *Current) {
double CalcProbability(extmanager MyManager, DdNode *Current) {
DdNode *h, *l;
hisnode *Found = NULL;
char *curnode; //, *dynvalue;
const char *curnode; //, *dynvalue;
double lvalue, hvalue, tvalue;
// density_integral dynvalue_parsed;
@@ -1062,7 +1062,7 @@ double CalcExpectedCountsDown(extmanager *MyManager, DdNode *Current,
Queue q = QueueNew();
// fprintf(stderr", =====> queue is: %p \n",q);
int i;
char *curnode, *curh, *curl, *dynvalue;
const char *curnode, *curh, *curl, *dynvalue;
DdNode *h, *l, *node;
ComparisonFunction fun;
hisnode *Found = NULL, *lfound, *hfound;
@@ -1230,7 +1230,7 @@ double CalcExpectedCountsUp(extmanager *MyManager, DdNode *Current,
DdNode *h, *l;
hisnode *Found;
char *curnode = NULL;
const char *curnode = NULL;
double lvalue, hvalue, tvalue;
// tvalue=0.0;
int ivalue;
@@ -1293,7 +1293,7 @@ gradientpair CalcGradient(extmanager MyManager, DdNode *Current, int TargetVar,
char *TargetPattern, int type) {
DdNode *h, *l;
hisnode *Found;
char *curnode = NULL, *dynvalue;
const char *curnode = NULL, *dynvalue;
gradientpair lowvalue, highvalue, tvalue;
double this_probability;
double *gradient;

View File

@@ -208,7 +208,7 @@ double cumulative_normal_dsigma(double low, double high,double mu,double sigma)
// this function parses two strings "$a;$b" and "???_???l$ch$d" where $a-$d are (real) numbers
// it is used to parse in the parameters of continues variables from the input file
density_integral parse_density_integral_string(char *input, char *variablename) {
density_integral parse_density_integral_string(char *input, const char *variablename) {
density_integral result;
int i;
char garbage[64], s1[64],s2[64],s3[64],s4[64];

View File

@@ -166,4 +166,4 @@ double Phi(double x);
double cumulative_normal(double low, double high, double sigma, double mu);
double cumulative_normal_dmu(double low, double high,double mu,double sigma);
double cumulative_normal_dsigma(double low, double high,double mu,double sigma);
density_integral parse_density_integral_string(char *input, char *variablename);
density_integral parse_density_integral_string(char *input, const char *variablename);

View File

@@ -249,7 +249,7 @@ typedef struct _bddfileheader {
typedef struct _namedvars {
int varcnt;
int varstart;
const char ** vars;
char ** vars;
int *loaded;
double *dvalue;
int *ivalue;