From 90041919d42d78fc5a87d63247215b99e29f1230 Mon Sep 17 00:00:00 2001 From: Theofrastos Mantadelis Date: Fri, 17 Dec 2010 12:23:03 +0100 Subject: [PATCH] fixed problogbdd compilation warnings --- packages/ProbLog/simplecudd/problogmath.c | 6 +++--- packages/ProbLog/simplecudd/problogmath.h | 6 ++++-- packages/ProbLog/simplecudd/simplecudd.c | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/ProbLog/simplecudd/problogmath.c b/packages/ProbLog/simplecudd/problogmath.c index d768fb790..bc06f5ba9 100644 --- a/packages/ProbLog/simplecudd/problogmath.c +++ b/packages/ProbLog/simplecudd/problogmath.c @@ -7,8 +7,8 @@ * * * Author: Bernd Gutmann * * File: problogmath.c * -* $Date:: 2010-10-06 13:20:59 +0200 (Wed, 06 Oct 2010) $ * -* $Revision:: 4880 $ * +* $Date:: 2010-12-17 12:21:58 +0100 (Fri, 17 Dec 2010) $ * +* $Revision:: 5159 $ * * * ******************************************************************************** * * @@ -187,7 +187,7 @@ \******************************************************************************/ #include "problogmath.h" - +#include "general.h" double sigmoid(double x, double slope) { return 1.0 / (1.0 + exp(-x * slope)); diff --git a/packages/ProbLog/simplecudd/problogmath.h b/packages/ProbLog/simplecudd/problogmath.h index 2df38c626..2b56d41a4 100644 --- a/packages/ProbLog/simplecudd/problogmath.h +++ b/packages/ProbLog/simplecudd/problogmath.h @@ -7,8 +7,8 @@ * * * Author: Bernd Gutmann * * File: problogmath.h * -* $Date:: 2010-10-06 13:20:59 +0200 (Wed, 06 Oct 2010) $ * -* $Revision:: 4880 $ * +* $Date:: 2010-12-17 12:21:58 +0100 (Fri, 17 Dec 2010) $ * +* $Revision:: 5159 $ * * * ******************************************************************************** * * @@ -212,4 +212,6 @@ double cumulative_normal_upper(double high, double mu, double sigma); double cumulative_normal_upper_dsigma(double high,double mu,double sigma); double cumulative_normal_upper_dmu(double high,double mu,double sigma); +double normal(double x, double mu,double sigma); + density_integral parse_density_integral_string(char *input, char *variablename); diff --git a/packages/ProbLog/simplecudd/simplecudd.c b/packages/ProbLog/simplecudd/simplecudd.c index 07698b2f8..56a76807c 100644 --- a/packages/ProbLog/simplecudd/simplecudd.c +++ b/packages/ProbLog/simplecudd/simplecudd.c @@ -7,8 +7,8 @@ * * * Author: Theofrastos Mantadelis * * File: simplecudd.c * -* $Date:: 2010-10-06 13:20:59 +0200 (Wed, 06 Oct 2010) $ * -* $Revision:: 4880 $ * +* $Date:: 2010-12-17 12:21:58 +0100 (Fri, 17 Dec 2010) $ * +* $Revision:: 5159 $ * * * ******************************************************************************** * * @@ -1688,7 +1688,7 @@ int GetParam(char *inputline, int iParam) { void onlinetraverse(DdManager *manager, namedvars varmap, hisqueue *HisQueue, DdNode *bdd) { char buf, *inputline; - int icur, maxlinesize, iline, index, iloop, iQsize, i, inQ, iRoot; //ivalue, + int icur, maxlinesize, iline, index, iloop, iQsize, i, iRoot; //ivalue,inQ, // double dvalue; DdNode **Q, **Q2, *h_node, *l_node, *curnode; hisqueue *his;