Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
This commit is contained in:
commit
dbd4c7f50f
@ -7,12 +7,15 @@
|
||||
:- use_module(library(rbtrees)).
|
||||
|
||||
trie_to_bdd(Trie, BDD, MapList) :-
|
||||
trie_to_list(Trie, Complex),
|
||||
rb_new(Map0),
|
||||
complex_to_andor(Complex,Map0,Map,Tree),
|
||||
rb_visit(Map, MapList),
|
||||
extract_vars(MapList, Vs),
|
||||
bdd_new(Tree, Vs, BDD).
|
||||
%trie_print(Trie),
|
||||
trie_to_list(Trie, Complex),
|
||||
%(numbervars(Complex,1,_), writeln(Complex), fail ; true ),
|
||||
rb_new(Map0),
|
||||
complex_to_andor(Complex,Map0,Map,Tree),
|
||||
%(numbervars(Tree,1,_), writeln(Tree), fail ; true ),
|
||||
rb_visit(Map, MapList),
|
||||
extract_vars(MapList, Vs),
|
||||
bdd_new(Tree, Vs, BDD).
|
||||
|
||||
tabled_trie_to_bdd(Trie, BDD, MapList) :-
|
||||
trie_to_list(Trie, Complex),
|
||||
@ -40,15 +43,28 @@ complex_to_andor([Els], Map0, MapF, V) :-
|
||||
complex_to_and(Els, Map0, MapF, V).
|
||||
|
||||
complex_to_and(int(A1,[endlist]), Map0, MapF, V) :- !,
|
||||
check(Map0, A1, V, MapF).
|
||||
check(Map0, A1, V, MapF).
|
||||
complex_to_and(functor(not,1,[int(A1,[endlist])]), Map0, MapF, not(V)) :- !,
|
||||
check(Map0, A1, V, MapF).
|
||||
complex_to_and(int(A1,Els), Map0, MapF, and(V,T2)) :-
|
||||
check(Map0, A1, V, MapI),
|
||||
complex_to_andor(Els, MapI, MapF, T2).
|
||||
complex_to_and(functor(not,1,[int(A1,Els)]), Map0, MapF, and(not(V),T2)) :-
|
||||
check(Map0, A1, V, MapI),
|
||||
complex_to_andor(Els, MapI, MapF, T2).
|
||||
check(Map0, A1, V, MapF).
|
||||
complex_to_and(int(A1,Els), Map0, MapF, and(V,T2)) :- !,
|
||||
check(Map0, A1, V, MapI),
|
||||
complex_to_andor(Els, MapI, MapF, T2).
|
||||
complex_to_and(functor(not,1,[int(A1,Els)]), Map0, MapF, and(not(V),T2)) :- !,
|
||||
check(Map0, A1, V, MapI),
|
||||
complex_to_andor(Els, MapI, MapF, T2).
|
||||
% HASH TABLE, it can be an OR or an AND.
|
||||
complex_to_and(functor(not,1,[int(A1,Els)|More]), Map0, MapF, or(NOTV1,O2)) :-
|
||||
check(Map0, A1, V, MapI),
|
||||
(Els == [endlist]
|
||||
->
|
||||
NOTV1 = not(V),
|
||||
MapI = MapI2
|
||||
;
|
||||
complex_to_andor(Els, MapI, MapI2, T2),
|
||||
NOTV1 = and(not(V), T2)
|
||||
),
|
||||
complex_to_and(functor(not,1,More), MapI2, MapF, O2).
|
||||
|
||||
|
||||
tabled_complex_to_andor(T, Map, Map, Tab, Tab, V) :-
|
||||
rb_lookup(T, V, Tab), !,
|
||||
|
Reference in New Issue
Block a user