removed dependency on array_t
This commit is contained in:
@@ -10,9 +10,7 @@ for the relative license.
|
||||
|
||||
#include "util.h"
|
||||
#include "cuddInt.h"
|
||||
#include "array.h"
|
||||
#include "mtr.h"
|
||||
#include "avl.h"
|
||||
#include "YapInterface.h"
|
||||
#include <glib.h>
|
||||
|
||||
@@ -21,16 +19,35 @@ typedef struct
|
||||
int var,value;
|
||||
} factor;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int nFact;
|
||||
factor * factors;
|
||||
} term;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int nTerms;
|
||||
term * terms;
|
||||
} expr;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int nVal,nBit;
|
||||
array_t * probabilities;
|
||||
array_t * booleanVars;
|
||||
double * probabilities;
|
||||
DdNode * * booleanVars;
|
||||
} variable;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int nVar;
|
||||
int nBVar;
|
||||
variable * varar;
|
||||
int * bVar2mVar;
|
||||
} variables;
|
||||
|
||||
void createVars(array_t * vars, YAP_Term t,DdManager * mgr, array_t * bVar2mVar,int create_dot, char inames[1000][20]);
|
||||
void createExpression(array_t * expression, YAP_Term t);
|
||||
variables createVars(YAP_Term t,DdManager * mgr, int create_dot, char inames[1000][20]);
|
||||
expr createExpression(YAP_Term t);
|
||||
void init_my_predicates(void);
|
||||
int compare(char *a, char *b);
|
||||
gint my_equal(gconstpointer v,gconstpointer v2);
|
||||
@@ -39,11 +56,11 @@ void dealloc(gpointer key,gpointer value,gpointer user_data);
|
||||
|
||||
|
||||
|
||||
DdNode * retFunction(DdManager * mgr, array_t * expression,array_t * v);
|
||||
DdNode * retTerm(DdManager * mgr,array_t *factors,array_t * v);
|
||||
DdNode * retFactor(DdManager * mgr, factor f, array_t * v);
|
||||
DdNode * retFunction(DdManager * mgr, expr expression,variables v);
|
||||
DdNode * retTerm(DdManager * mgr,term t,variables v);
|
||||
DdNode * retFactor(DdManager * mgr, factor f, variables v);
|
||||
|
||||
double Prob(DdNode *node, array_t * vars,array_t * bVar2mVar, GHashTable * nodes);
|
||||
double Prob(DdNode *node, variables vars,GHashTable * nodes);
|
||||
|
||||
double ProbBool(DdNode *node, int bits, int nBit,int posBVar,variable v,
|
||||
array_t * vars,array_t * bVar2mVar, GHashTable * nodes);
|
||||
variables vars,GHashTable * nodes);
|
||||
|
Reference in New Issue
Block a user