bdd stuff
This commit is contained in:
parent
26b3cb5bb7
commit
252a2b7868
@ -72,7 +72,7 @@
|
|||||||
|
|
||||||
:- use_module( library(bdd) ).
|
:- use_module( library(bdd) ).
|
||||||
|
|
||||||
:- dynamic extension/4, init/2, frame/2.
|
:- dynamic extension/4, init/2, frame/2, exclusive/0.
|
||||||
|
|
||||||
user:term_expansion(Term,Clauses) :-
|
user:term_expansion(Term,Clauses) :-
|
||||||
Term = ( Spec :- Body),
|
Term = ( Spec :- Body),
|
||||||
@ -92,49 +92,65 @@ find_name( [_|UnsortedCurrentNames] , V, Name) :-
|
|||||||
expand( Skel, Names, GoalVars, Body, Tests, Out) :-
|
expand( Skel, Names, GoalVars, Body, Tests, Out) :-
|
||||||
Skel =.. [N|As], %
|
Skel =.. [N|As], %
|
||||||
%pick(Vs, As, Os),
|
%pick(Vs, As, Os),
|
||||||
trace,
|
|
||||||
append(As, GoalVars, Os),
|
append(As, GoalVars, Os),
|
||||||
Head =.. [N|Os],
|
Head =.. [N|Os],
|
||||||
maplist(original_name(GoalVars), Names, Ts),
|
maplist(original_name(GoalVars), Names, Ts),
|
||||||
LinkGoal =.. [access|Ts],
|
LinkGoal =.. [access|Ts],
|
||||||
|
trace,
|
||||||
formula( Tests, Fs, Dic),
|
formula( Tests, Fs, Dic),
|
||||||
bdd_new(Fs , BDD),
|
bdd_new(Fs , BDD),
|
||||||
bdd_print( BDD, '/Users/vsc/bdd.dot', Names), bdd_tree(BDD, Tree),
|
rb_visit(Dic, Map),
|
||||||
ptree(Tree, Names, Dic),
|
maplist( swap_f, Map, VNames),
|
||||||
|
% bdd_reorder(BDD, exact);
|
||||||
|
File = '/home/vsc/bdd0.dot',
|
||||||
|
bdd_print( BDD, File, VNames),
|
||||||
|
bdd_tree(BDD, Tree),
|
||||||
|
ptree(Tree, Names, '/home/vsc/bdd.dot', Dic),
|
||||||
% portray_clause((Head:-GExtBody)),
|
% portray_clause((Head:-GExtBody)),
|
||||||
unnumbervars((Head:- LinkGoal,Body), Out).
|
unnumbervars((Head:- LinkGoal,Body), Out).
|
||||||
|
|
||||||
ptree( bdd(_,L,_Vs) , Names, Dic) :-
|
swap_f(Key-V, Key=V).
|
||||||
% term_variables(L, LVs),
|
|
||||||
|
ptree( bdd(Root,L,_Vs) , Names, File, Dic) :-
|
||||||
|
% term_variables(L, LVs),
|
||||||
% Vs =.. [_|LVs],
|
% Vs =.. [_|LVs],
|
||||||
% trace,
|
maplist( bindv,Names),
|
||||||
maplist( bindv,Names),
|
|
||||||
rb_visit(Dic, Pairs),
|
rb_visit(Dic, Pairs),
|
||||||
maplist( bindv,Pairs),
|
maplist( bindv,Pairs),
|
||||||
open('bdd.dot', write, S) ,
|
absolute_file_name( File, [], AbsFile ),
|
||||||
|
open(AbsFile, write, S) ,
|
||||||
format(S,'digraph "DD" {
|
format(S,'digraph "DD" {
|
||||||
size = "7.5,10"
|
size = "7.5,10"
|
||||||
center = true;~n', []),
|
center = true;~n', []),
|
||||||
|
format(S,' "~w" [label = "~w"];~n', [1, Root]),
|
||||||
maplist( print_node(S), L),
|
maplist( print_node(S), L),
|
||||||
format(S, '}~n', []),
|
format(S, '}~n', []),
|
||||||
close(S),
|
close(S),
|
||||||
fail.
|
fail.
|
||||||
ptree(_, _, _).
|
ptree(_, _, _).
|
||||||
|
|
||||||
bindv( X = '$VAR'(X) ).
|
bindv( X = '$VAR'(X) ) :- !.
|
||||||
bindv( X - '$VAR'(X) ).
|
bindv( X - '$VAR'(X) ) :- !.
|
||||||
|
bindv(_).
|
||||||
|
|
||||||
print_node(S,pp( Val, Name, Left, Right )) :-
|
print_node(S,pp( Val, Name, Left, Right )) :-
|
||||||
|
%writeln(Name),
|
||||||
simplify(Name, N),
|
simplify(Name, N),
|
||||||
format(S,' "~w" [label = "~w"];~n', [Val, N]),
|
format(S,' "~w" [label = "~w"];~n', [Val, N]),
|
||||||
format(S,' "~w" -> "~w";~n', [Val, Right]),
|
format(S,' "~w" -> "~w" [arrowType="none" color="red"] ;~n', [Val, Left]),
|
||||||
format(S,' "~w" -> "~w" [style = dashed];~n', [Val, Left]).
|
format(S,' "~w" -> "~w" [style = dashed arrowType="none"];~n', [Val, Right]).
|
||||||
print_node(S,pn( Val, Name, Left, Right )) :-
|
print_node(S,pn( Val, Name, Left, Right )) :-
|
||||||
simplify(Name, N),
|
simplify(Name, N),
|
||||||
|
%writeln(Name),
|
||||||
format(S,' "~w" [label = "~w"];~n', [Val, N]),
|
format(S,' "~w" [label = "~w"];~n', [Val, N]),
|
||||||
format(S,' "~w" -> "~w";~n', [Val, Right]),
|
format(S,' "~w" -> "~w" [arrowType="none" color="red"];~n', [Val,Left]),
|
||||||
format(S,' "~w" -> "~w" [style = dashed];~n', [Val, Left]).
|
( Right == 1 ->
|
||||||
|
format(S,' "~w" -> "0" [dir=none style = dotted];~n', [Val])
|
||||||
|
;
|
||||||
|
format(S,' "~w" -> "~w" [style = dotted type="odot"];~n', [Val, Right])
|
||||||
|
).
|
||||||
|
|
||||||
|
simplify(V,V) :- var(V),!.
|
||||||
simplify('$VAR'(X),Y) :- !, simplify(X,Y).
|
simplify('$VAR'(X),Y) :- !, simplify(X,Y).
|
||||||
simplify(c^(X),Y) :- !, simplify(X,Y).
|
simplify(c^(X),Y) :- !, simplify(X,Y).
|
||||||
simplify(G, X:M) :- G=.. [X,N], !, simplify(N,M).
|
simplify(G, X:M) :- G=.. [X,N], !, simplify(N,M).
|
||||||
@ -144,7 +160,7 @@ simplify(X, X).
|
|||||||
/*
|
/*
|
||||||
pick([LastV,LastV1|More], As, OVs) :-
|
pick([LastV,LastV1|More], As, OVs) :-
|
||||||
nonvar(LastV),
|
nonvar(LastV),
|
||||||
LastV = (ID:_Name=V),
|
LastV = (ID:_Name=V),
|
||||||
nonvar(LastV1),
|
nonvar(LastV1),
|
||||||
LastV1 = (ID: _Name1=_V1), !,
|
LastV1 = (ID: _Name1=_V1), !,
|
||||||
(
|
(
|
||||||
@ -427,16 +443,16 @@ ensure((X in D)) :-
|
|||||||
|
|
||||||
formula( Axioms, FormulaE, Dic) :-
|
formula( Axioms, FormulaE, Dic) :-
|
||||||
rb_new( Dic0 ),
|
rb_new( Dic0 ),
|
||||||
partition( is_init, Axioms, _Inits, OGoals),
|
partition( is_frame, Axioms, _, Goals),
|
||||||
partition( is_frame, OGoals, _Frames, Goals),
|
|
||||||
foldl2( eq, Goals, Formula, Dic0, Dic, [], Extras),
|
foldl2( eq, Goals, Formula, Dic0, Dic, [], Extras),
|
||||||
append(Formula, Extras, FormulaL),
|
append(Formula, Extras, FormulaL),
|
||||||
maplist(writeln,FormulaL),
|
|
||||||
list2prod( FormulaL, FormulaE).
|
list2prod( FormulaL, FormulaE).
|
||||||
|
|
||||||
is_init( A ?= B ) :- assert(init(A, B)).
|
|
||||||
|
|
||||||
is_frame( A =:= B ) :- assert( frame(A, B)).
|
is_frame( A =:= B ) :- assert( frame(A, B)).
|
||||||
|
is_frame( level(N, [H|L]) ) :- !, maplist( assertn(level, N), [H|L] ).
|
||||||
|
is_frame( level(N, L ) ) :- assert( level( N, L) ).
|
||||||
|
|
||||||
|
assertn(level, N, L) :- assert( level( N, L) ).
|
||||||
|
|
||||||
list2prod( [], true).
|
list2prod( [], true).
|
||||||
list2prod( [F], F).
|
list2prod( [F], F).
|
||||||
@ -444,17 +460,20 @@ list2prod( [F1,F2|Fs], F1*NF) :-
|
|||||||
list2prod( [F2|Fs], NF).
|
list2prod( [F2|Fs], NF).
|
||||||
|
|
||||||
%eq(G,_,_,_,_,_) :- writeln(a:G), fail.
|
%eq(G,_,_,_,_,_) :- writeln(a:G), fail.
|
||||||
|
eq(1, 1, Dic, Dic, I, I) :- !.
|
||||||
|
eq(X, VX, Dic0, Dic, I0, I) :- var(X), !,
|
||||||
|
add(X, VX, Dic0, Dic, I0, I).
|
||||||
eq(X == Exp, (-TA + TY)*(-TY + TA), Dic0, Dic, I0, I) :- !,
|
eq(X == Exp, (-TA + TY)*(-TY + TA), Dic0, Dic, I0, I) :- !,
|
||||||
eq(X, TA, Dic0, Dic1, I0, I1),
|
eq(X, TA, Dic0, Dic1, I0, I1),
|
||||||
eq(Exp, TY, Dic1, Dic, I1, I).
|
eq(Exp, TY, Dic1, Dic, I1, I).
|
||||||
|
|
||||||
eq((X ==> Y), (-TX + TY), Dic0, Dic, I0, I) :- !,
|
eq((X ==> Y), (-TX + TY), Dic0, Dic, I0, I) :- !,
|
||||||
eq( X, TX, Dic0, Dic1, I0, I1),
|
eq( X, TX, Dic0, Dic1, I0, I1),
|
||||||
eq( Y, TY, Dic1, Dic, I1, I).
|
eq( Y, TY, Dic1, Dic, I1, I).
|
||||||
|
|
||||||
eq((X :- Y), (TX + -TY), Dic0, Dic, I0, I) :- !,
|
eq((X :- Y), (TX + -TY), Dic0, Dic, I0, I) :- !,
|
||||||
eq( X, TX, Dic0, Dic1, I0, I1),
|
eq( X, TX, Dic0, Dic1, I0, I1),
|
||||||
eq( Y, TY, Dic1, Dic, I1, I).
|
eq( Y, TY, Dic1, Dic, I1, I).
|
||||||
|
|
||||||
eq((X + Y), (TX + TY), Dic0, Dic, I0, I) :- !,
|
eq((X + Y), (TX + TY), Dic0, Dic, I0, I) :- !,
|
||||||
eq( X, TX, Dic0, Dic1, I0, I1),
|
eq( X, TX, Dic0, Dic1, I0, I1),
|
||||||
@ -471,22 +490,39 @@ eq((X xor Y), (TX xor TY), Dic0, Dic, I0, I) :- !,
|
|||||||
eq( X, TX, Dic0, Dic1, I0, I1),
|
eq( X, TX, Dic0, Dic1, I0, I1),
|
||||||
eq( Y, TY, Dic1, Dic, I1, I).
|
eq( Y, TY, Dic1, Dic, I1, I).
|
||||||
|
|
||||||
eq(X in D, TAX + (-TAX * (EDX+ (-EDX + Ds ))) , Dic0, Dic, I0, I) :- !,
|
eq((X in D), Disj , Dic0, Dic, I0, I) :- !,
|
||||||
eq( t_atom(X), TAX, Dic0, Dic1, I0, I1),
|
%trace,
|
||||||
add( err(dom(X,D)), EDX, Dic1, Dic2, I1, I2),
|
add(X, VX, Dic0, Dic1, I0, I1),
|
||||||
add(X, VX, Dic2, Dic3, I2, I3)
|
append( D, [err], _Domain),
|
||||||
t_domain( D, VX, Ds, Dic3, Dic, I3, I).
|
foldl2(add, D, DVs, Dic1, Dic, I1, I),
|
||||||
|
%foldl(add_xors(DVs), DVs, I2, I),
|
||||||
|
foldl(xor(VX, DVs), DVs, 0, Disj).
|
||||||
|
|
||||||
eq(G, NG, Dic0, Dic, I0, I) :-
|
eq(G, NG, Dic0, Dic, I0, I) :-
|
||||||
add( G, NG, Dic0, Dic, I0, I).
|
add( G, NG, Dic0, Dic, I0, I).
|
||||||
|
|
||||||
|
add_xors(L, V, I0, I) :-
|
||||||
|
foldl(add_xor(V), L, I0, I).
|
||||||
|
|
||||||
|
add_xor(V, V0, I, I) :- V == V0, !.
|
||||||
|
add_xor(V, V0, I, [(V-V0)|I]).
|
||||||
|
|
||||||
|
xor( VX, DV0s, DV , Disj0, Disj0+Conj) :- !,
|
||||||
|
foldl( add_all2(VX, DV), DV0s, 1,Conj).
|
||||||
|
|
||||||
|
add_all2(VX, G, GD, C, C*(VX=G)
|
||||||
|
) :- G == GD, ! .
|
||||||
|
add_all2(VX, _, G, C, C*(-(VX=G))).
|
||||||
|
|
||||||
|
list2prod(X, P, X *P).
|
||||||
|
list2sum(X, P, X +P).
|
||||||
|
|
||||||
|
t_domain0( [D], DX, Dic0, Dic, I0, I) :- !,
|
||||||
|
eq(D , DX , Dic0, Dic, I0, I).
|
||||||
|
t_domain0( [D1|D2s], (DX1+ (-DX1*D2Xs)), Dic0, Dic, I0, I) :-
|
||||||
|
eq(D1, DX1, Dic0, Dic1, I0, I1),
|
||||||
|
t_domain0(D2s, D2Xs, Dic1, Dic, I1, I).
|
||||||
|
|
||||||
t_domain( [D], VX, VD = VX, Dic0, Dic, I0, I) :- !,
|
|
||||||
add(D, VD, Dic0, Dic, I0, I).
|
|
||||||
t_domain( [D1|D2s], (VX==VX=D)* + D2S, _, Dic0, Dic, I0, I) :-
|
|
||||||
add( X=D1, VDX, Dic0, Dic1, I0, I1),
|
|
||||||
add( X, VX, Dic0, Dic1, I0, I1),
|
|
||||||
maplist(diff(XD1), D2s, Dic1, Dic, I1, I),
|
|
||||||
t_domain(D2S, X, ).
|
|
||||||
|
|
||||||
diff(XD, DO, Dic0, Dic, [-XD*VDO+ (XD * -VDO)|I0], I) :-
|
diff(XD, DO, Dic0, Dic, [-XD*VDO+ (XD * -VDO)|I0], I) :-
|
||||||
new(DO, VDO, Dic0, Dic, I0, I).
|
new(DO, VDO, Dic0, Dic, I0, I).
|
||||||
@ -500,6 +536,7 @@ add( AG, V, Dic0, Dic, I0, IF) :-
|
|||||||
add( AG, V, Dic0, Dic, I, I) :-
|
add( AG, V, Dic0, Dic, I, I) :-
|
||||||
rb_insert( Dic0, AG, V, Dic).
|
rb_insert( Dic0, AG, V, Dic).
|
||||||
|
|
||||||
|
simp_key(G , G) :- var(G), !.
|
||||||
simp_key(_^_:error(_^G) , G) :- !.
|
simp_key(_^_:error(_^G) , G) :- !.
|
||||||
simp_key(_^_:G , G) :- !.
|
simp_key(_^_:G , G) :- !.
|
||||||
simp_key('$VAR'(S):A, SAG) :-
|
simp_key('$VAR'(S):A, SAG) :-
|
||||||
|
@ -31,8 +31,9 @@ The following predicates construct a BDD:
|
|||||||
bdd_print/2,
|
bdd_print/2,
|
||||||
bdd_print/3,
|
bdd_print/3,
|
||||||
bdd_to_probability_sum_product/2,
|
bdd_to_probability_sum_product/2,
|
||||||
bdd_to_probability_sum_product/3,
|
bdd_to_probability_sum_product/3,
|
||||||
bdd_close/1,
|
bdd_reorder/2,
|
||||||
|
bdd_close/1,
|
||||||
mtbdd_close/1]).
|
mtbdd_close/1]).
|
||||||
|
|
||||||
:- use_module(library(lists)).
|
:- use_module(library(lists)).
|
||||||
@ -338,6 +339,14 @@ bdd_close(cudd(M,_,_Vars, _)) :-
|
|||||||
bdd_close(add(M,_,_Vars, _)) :-
|
bdd_close(add(M,_,_Vars, _)) :-
|
||||||
cudd_die(M).
|
cudd_die(M).
|
||||||
|
|
||||||
|
/** @pred bdd_close( _BDDHandle_)
|
||||||
|
|
||||||
|
close the BDD and release any resources it holds.
|
||||||
|
|
||||||
|
*/
|
||||||
|
bdd_reorder(cudd(M,Top,_Vars, _), How) :-
|
||||||
|
cudd_reorder(M, Top,How).
|
||||||
|
|
||||||
/** @pred bdd_size(+ _BDDHandle_, - _Size_)
|
/** @pred bdd_size(+ _BDDHandle_, - _Size_)
|
||||||
|
|
||||||
Unify _Size_ with the number of nodes in _BDDHandle_.
|
Unify _Size_ with the number of nodes in _BDDHandle_.
|
||||||
@ -356,19 +365,23 @@ Output bdd _BDDHandle_ as a dot file to _File_.
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
bdd_print(cudd(M,Top,_Vars, _), File) :-
|
bdd_print(cudd(M,Top,_Vars, _), File) :-
|
||||||
cudd_print(M, Top, File).
|
absolute_file_name(File, AFile, []),
|
||||||
|
cudd_print(M, Top, AFile).
|
||||||
bdd_print(add(M,Top,_Vars, _), File) :-
|
bdd_print(add(M,Top,_Vars, _), File) :-
|
||||||
cudd_print(M, Top, File).
|
absolute_file_name(File, AFile, []),
|
||||||
|
cudd_print(M, Top, AFile).
|
||||||
|
|
||||||
bdd_print(cudd(M,Top, Vars, _), File, Names) :-
|
bdd_print(cudd(M,Top, Vars, _), File, Names) :-
|
||||||
Vars =.. [_|LVars],
|
Vars =.. [_|LVars],
|
||||||
%trace,
|
%trace,
|
||||||
maplist( fetch_name(Names), LVars, Ss),
|
maplist( fetch_name(Names), LVars, Ss),
|
||||||
cudd_print(M, Top, File, Ss).
|
absolute_file_name(File, AFile, []),
|
||||||
|
cudd_print(M, Top, AFile, Ss).
|
||||||
bdd_print(add(M,Top, Vars, _), File, Names) :-
|
bdd_print(add(M,Top, Vars, _), File, Names) :-
|
||||||
Vars =.. [_|LVars],
|
Vars =.. [_|LVars],
|
||||||
maplist( fetch_name(Names), LVars, Ss),
|
maplist( fetch_name(Names), LVars, Ss),
|
||||||
cudd_print(M, Top, File, Ss).
|
absolute_file_name(File, AFile, []),
|
||||||
|
cudd_print(M, Top, AFile, Ss).
|
||||||
|
|
||||||
fetch_name([S=V1|_], V2, SN) :- V1 == V2, !,
|
fetch_name([S=V1|_], V2, SN) :- V1 == V2, !,
|
||||||
( atom(S) -> SN = S ; format(atom(SN), '~w', [S]) ).
|
( atom(S) -> SN = S ; format(atom(SN), '~w', [S]) ).
|
||||||
|
@ -633,6 +633,13 @@ get_vars(YAP_Term t3)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static YAP_Bool
|
static YAP_Bool
|
||||||
|
p_cudd_reorder(void)
|
||||||
|
{
|
||||||
|
DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1);
|
||||||
|
return Cudd_ReduceHeap( manager, CUDD_REORDER_EXACT, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static YAP_Bool
|
||||||
p_cudd_to_term(void)
|
p_cudd_to_term(void)
|
||||||
{
|
{
|
||||||
DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1);
|
DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1);
|
||||||
@ -870,10 +877,12 @@ p_cudd_print_with_names(void)
|
|||||||
DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1);
|
DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1);
|
||||||
DdNode *n0 = (DdNode *)YAP_IntOfTerm(YAP_ARG2);
|
DdNode *n0 = (DdNode *)YAP_IntOfTerm(YAP_ARG2);
|
||||||
const char *s = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG3));
|
const char *s = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG3));
|
||||||
const char **namesp;
|
char **namesp;
|
||||||
YAP_Term names = YAP_ARG4;
|
YAP_Term names = YAP_ARG4;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
YAP_Int len;
|
YAP_Int len;
|
||||||
|
YAP_Int i = 0;
|
||||||
|
|
||||||
if (!strcmp(s, "user_output")) f = stdout;
|
if (!strcmp(s, "user_output")) f = stdout;
|
||||||
else if (!strcmp(s, "user_error")) f = stderr;
|
else if (!strcmp(s, "user_error")) f = stderr;
|
||||||
else if (!strcmp(s, "user")) f = stdout;
|
else if (!strcmp(s, "user")) f = stdout;
|
||||||
@ -883,18 +892,34 @@ p_cudd_print_with_names(void)
|
|||||||
if ((namesp = malloc(sizeof(const char *)*len)) == NULL)
|
if ((namesp = malloc(sizeof(const char *)*len)) == NULL)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
while (YAP_IsPairTerm(names)) {
|
while (YAP_IsPairTerm(names)) {
|
||||||
YAP_Int i = 0;
|
|
||||||
YAP_Term hd = YAP_HeadOfTerm( names);
|
YAP_Term hd = YAP_HeadOfTerm( names);
|
||||||
char * s = YAP_AtomName(YAP_AtomOfTerm(hd));
|
const char *f;
|
||||||
const char *ns = malloc(strlen(s)+1);
|
|
||||||
strncpy(ns, s, strlen(s)+1);
|
if (YAP_IsAtomTerm(hd)) {
|
||||||
namesp[i++] = ns;
|
const char * s = YAP_AtomName(YAP_AtomOfTerm(hd));
|
||||||
|
char *ns = malloc(strlen(s)+1);
|
||||||
|
strncpy(ns, s, strlen(s)+1);
|
||||||
|
f = ns;
|
||||||
|
} else {
|
||||||
|
size_t sz =256;
|
||||||
|
char *s = malloc(sz+256);
|
||||||
|
while( !YAP_WriteBuffer(hd, s, sz-1, 0) ) {
|
||||||
|
sz+=1024;
|
||||||
|
s = realloc(s, sz);
|
||||||
|
}
|
||||||
|
f = s;
|
||||||
|
}
|
||||||
names = YAP_TailOfTerm( names);
|
names = YAP_TailOfTerm( names);
|
||||||
|
namesp[i++] = f;
|
||||||
}
|
}
|
||||||
Cudd_DumpDot(manager, 1, &n0, (char **)namesp, NULL, f);
|
Cudd_DumpDot(manager, 1, &n0, namesp, NULL, f);
|
||||||
free( namesp );
|
|
||||||
if (f != stdout && f != stderr)
|
if (f != stdout && f != stderr)
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
while (i > 0) {
|
||||||
|
i--;
|
||||||
|
free(namesp[i]);
|
||||||
|
}
|
||||||
|
free( namesp );
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -942,7 +967,8 @@ init_cudd(void)
|
|||||||
FunctorOutAdd = YAP_MkFunctor(YAP_LookupAtom("add"), 4);
|
FunctorOutAdd = YAP_MkFunctor(YAP_LookupAtom("add"), 4);
|
||||||
FunctorCudd = YAP_MkFunctor(YAP_LookupAtom("cudd"), 1);
|
FunctorCudd = YAP_MkFunctor(YAP_LookupAtom("cudd"), 1);
|
||||||
TermMinusOne = YAP_MkIntTerm(-1);
|
TermMinusOne = YAP_MkIntTerm(-1);
|
||||||
TermPlusOne = YAP_MkIntTerm(+1);
|
TermPlusOne = YAP_MkIntTerm(+1);
|
||||||
|
TermZero = YAP_MkIntTerm(0);
|
||||||
TermFalse = YAP_MkAtomTerm(YAP_LookupAtom("false"));
|
TermFalse = YAP_MkAtomTerm(YAP_LookupAtom("false"));
|
||||||
TermTrue = YAP_MkAtomTerm(YAP_LookupAtom("true"));
|
TermTrue = YAP_MkAtomTerm(YAP_LookupAtom("true"));
|
||||||
YAP_UserCPredicate("term_to_cudd", p_term_to_cudd, 3);
|
YAP_UserCPredicate("term_to_cudd", p_term_to_cudd, 3);
|
||||||
@ -953,7 +979,8 @@ init_cudd(void)
|
|||||||
YAP_UserCPredicate("add_to_term", p_add_to_term, 4);
|
YAP_UserCPredicate("add_to_term", p_add_to_term, 4);
|
||||||
YAP_UserCPredicate("cudd_to_probability_sum_product", p_cudd_to_p, 4);
|
YAP_UserCPredicate("cudd_to_probability_sum_product", p_cudd_to_p, 4);
|
||||||
YAP_UserCPredicate("cudd_size", p_cudd_size, 3);
|
YAP_UserCPredicate("cudd_size", p_cudd_size, 3);
|
||||||
YAP_UserCPredicate("cudd_die", p_cudd_die, 1);
|
YAP_UserCPredicate("cudd_die", p_cudd_die, 1);
|
||||||
|
YAP_UserCPredicate("cudd_reorder", p_cudd_reorder, 2);
|
||||||
YAP_UserCPredicate("cudd_release_node", p_cudd_release_node, 2);
|
YAP_UserCPredicate("cudd_release_node", p_cudd_release_node, 2);
|
||||||
YAP_UserCPredicate("cudd_print", p_cudd_print, 3);
|
YAP_UserCPredicate("cudd_print", p_cudd_print, 3);
|
||||||
YAP_UserCPredicate("cudd_print", p_cudd_print_with_names, 4);
|
YAP_UserCPredicate("cudd_print", p_cudd_print_with_names, 4);
|
||||||
|
@ -57,31 +57,36 @@ MYDDAS_SOURCES= \
|
|||||||
myddas_wkb2prolog.c
|
myddas_wkb2prolog.c
|
||||||
|
|
||||||
MYDDAS_PROLOG= \
|
MYDDAS_PROLOG= \
|
||||||
$(srcdir)/pl/myddas.ypp \
|
myddas.ypp \
|
||||||
$(srcdir)/pl/myddas_assert_predicates.ypp \
|
myddas_assert_predicates.ypp \
|
||||||
$(srcdir)/pl/myddas_mysql.ypp \
|
myddas_mysql.ypp \
|
||||||
$(srcdir)/pl/myddas_sqlite3.ypp \
|
myddas_sqlite3.ypp \
|
||||||
$(srcdir)/pl/myddas_top_level.ypp \
|
myddas_top_level.ypp \
|
||||||
$(srcdir)/pl/myddas_errors.ypp \
|
myddas_errors.ypp \
|
||||||
$(srcdir)/pl/myddas_postgres.ypp \
|
myddas_postgres.ypp \
|
||||||
$(srcdir)/pl/myddas_prolog2sql.ypp \
|
myddas_prolog2sql.ypp \
|
||||||
$(srcdir)/pl/myddas_util_predicates.ypp \
|
myddas_util_predicates.ypp \
|
||||||
$(srcdir)/pl/myddas_prolog2sql_optimizer.ypp
|
myddas_prolog2sql_optimizer.ypp
|
||||||
|
|
||||||
|
|
||||||
OBJS= $(MYDDAS_SOURCES:.c=.o)
|
OBJS= $(MYDDAS_SOURCES:.c=.o)
|
||||||
|
MYDDAS_YAP= $(MYDDAS_PROLOG:.ypp=.yap)
|
||||||
SOBJS= myddas.@SO@
|
SOBJS= myddas.@SO@
|
||||||
|
|
||||||
|
|
||||||
#in some systems we just create a single object, in others we need to
|
#in some systems we just create a single object, in others we need to
|
||||||
# create a libray
|
# create a libray
|
||||||
|
|
||||||
all: $(SOBJS)
|
all: $(SOBJS) $(MYDDAS_YAP)
|
||||||
|
|
||||||
.PRECIOUS: %.o
|
.PRECIOUS: %.o %.yap
|
||||||
|
|
||||||
%.o: $(srcdir)/%.c
|
%.o: $(srcdir)/%.c
|
||||||
$(CC) -c $(CFLAGS) $< -o $@
|
$(CC) -c $(CFLAGS) $< -o $@
|
||||||
|
|
||||||
|
%.yap: $(srcdir)/pl/%.ypp
|
||||||
|
cpp $(YAP_EXTRAS) -P -E -w $< -o $@
|
||||||
|
|
||||||
@DO_SECOND_LD@%.@SO@: $(OBJS)
|
@DO_SECOND_LD@%.@SO@: $(OBJS)
|
||||||
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ @MYDDAS_LIBS@
|
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ @MYDDAS_LIBS@
|
||||||
|
|
||||||
@ -97,7 +102,7 @@ install_myddas:
|
|||||||
mkdir -p $(DESTDIR)$(SHAREDIR); \
|
mkdir -p $(DESTDIR)$(SHAREDIR); \
|
||||||
for p in $(MYDDAS_PROLOG); \
|
for p in $(MYDDAS_PROLOG); \
|
||||||
do name=`basename $$p .ypp`; echo $$name;\
|
do name=`basename $$p .ypp`; echo $$name;\
|
||||||
cpp $(YAP_EXTRAS) -P -E -w $$p > $(DESTDIR)$(SHAREDIR)/$$name.yap; \
|
$(INSTALL_DATA) $$name.yap $(DESTDIR)$(SHAREDIR); \
|
||||||
done; \
|
done; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1 +1 @@
|
|||||||
Subproject commit b36fdac2281b7eef141095375d81456410dbcd2f
|
Subproject commit 36f99e3c3c978fef25f899dc4fab1ffee334d73c
|
Reference in New Issue
Block a user