Merge branch 'master' of yap.dcc.fc.up.pt:yap-6
This commit is contained in:
commit
9f97085640
@ -2284,15 +2284,6 @@ extend(_G,[],[],CompSub,CompSub):-!.
|
|||||||
extend(G,Cand,Not,CS,CSOut):-
|
extend(G,Cand,Not,CS,CSOut):-
|
||||||
extend_cycle(G,Cand,Not,CS,CSOut).
|
extend_cycle(G,Cand,Not,CS,CSOut).
|
||||||
|
|
||||||
intersection([],_Y,[]).
|
|
||||||
|
|
||||||
intersection([H|T],Y,[H|Z]):-
|
|
||||||
member(H,Y),!,
|
|
||||||
intersection(T,Y,Z).
|
|
||||||
|
|
||||||
intersection([_H|T],Y,Z):-
|
|
||||||
intersection(T,Y,Z).
|
|
||||||
|
|
||||||
/* set(Par,Value) can be used to set the value of a parameter */
|
/* set(Par,Value) can be used to set the value of a parameter */
|
||||||
set(Parameter,Value):-
|
set(Parameter,Value):-
|
||||||
retract(setting(Parameter,_)),
|
retract(setting(Parameter,_)),
|
||||||
|
@ -283,7 +283,7 @@ get_prob(GL,AV,AVL,CVL,P):-
|
|||||||
{G=goal with p([f,t],Table, Parents)},
|
{G=goal with p([f,t],Table, Parents)},
|
||||||
append(AVL,CVL,Vars),
|
append(AVL,CVL,Vars),
|
||||||
append(Vars,[G],Vars1),
|
append(Vars,[G],Vars1),
|
||||||
clpbn:call_solver([G], Vars1),
|
clpbn:clpbn_run_solver([G], Vars1,_State),
|
||||||
clpbn_display:get_atts(G, [posterior(Vs,Vals,[_P0,P],AllDiffs)]).
|
clpbn_display:get_atts(G, [posterior(Vs,Vals,[_P0,P],AllDiffs)]).
|
||||||
|
|
||||||
lookup_gvars([],_AV,[],S,S).
|
lookup_gvars([],_AV,[],S,S).
|
||||||
@ -1166,15 +1166,6 @@ extend(_G,[],[],CompSub,CompSub):-!.
|
|||||||
extend(G,Cand,Not,CS,CSOut):-
|
extend(G,Cand,Not,CS,CSOut):-
|
||||||
extend_cycle(G,Cand,Not,CS,CSOut).
|
extend_cycle(G,Cand,Not,CS,CSOut).
|
||||||
|
|
||||||
intersection([],_Y,[]).
|
|
||||||
|
|
||||||
intersection([H|T],Y,[H|Z]):-
|
|
||||||
member(H,Y),!,
|
|
||||||
intersection(T,Y,Z).
|
|
||||||
|
|
||||||
intersection([_H|T],Y,Z):-
|
|
||||||
intersection(T,Y,Z).
|
|
||||||
|
|
||||||
/* set(Par,Value) can be used to set the value of a parameter */
|
/* set(Par,Value) can be used to set the value of a parameter */
|
||||||
set(Parameter,Value):-
|
set(Parameter,Value):-
|
||||||
retract(setting(Parameter,_)),
|
retract(setting(Parameter,_)),
|
||||||
|
@ -1465,15 +1465,6 @@ extend(_G,[],[],CompSub,CompSub):-!.
|
|||||||
extend(G,Cand,Not,CS,CSOut):-
|
extend(G,Cand,Not,CS,CSOut):-
|
||||||
extend_cycle(G,Cand,Not,CS,CSOut).
|
extend_cycle(G,Cand,Not,CS,CSOut).
|
||||||
|
|
||||||
intersection([],_Y,[]).
|
|
||||||
|
|
||||||
intersection([H|T],Y,[H|Z]):-
|
|
||||||
member(H,Y),!,
|
|
||||||
intersection(T,Y,Z).
|
|
||||||
|
|
||||||
intersection([_H|T],Y,Z):-
|
|
||||||
intersection(T,Y,Z).
|
|
||||||
|
|
||||||
/* set(Par,Value) can be used to set the value of a parameter */
|
/* set(Par,Value) can be used to set the value of a parameter */
|
||||||
set(Parameter,Value):-
|
set(Parameter,Value):-
|
||||||
retract(setting(Parameter,_)),
|
retract(setting(Parameter,_)),
|
||||||
|
@ -1521,15 +1521,6 @@ extend(_G,[],[],CompSub,CompSub):-!.
|
|||||||
extend(G,Cand,Not,CS,CSOut):-
|
extend(G,Cand,Not,CS,CSOut):-
|
||||||
extend_cycle(G,Cand,Not,CS,CSOut).
|
extend_cycle(G,Cand,Not,CS,CSOut).
|
||||||
|
|
||||||
intersection([],_Y,[]).
|
|
||||||
|
|
||||||
intersection([H|T],Y,[H|Z]):-
|
|
||||||
member(H,Y),!,
|
|
||||||
intersection(T,Y,Z).
|
|
||||||
|
|
||||||
intersection([_H|T],Y,Z):-
|
|
||||||
intersection(T,Y,Z).
|
|
||||||
|
|
||||||
/* set(Par,Value) can be used to set the value of a parameter */
|
/* set(Par,Value) can be used to set the value of a parameter */
|
||||||
set(Parameter,Value):-
|
set(Parameter,Value):-
|
||||||
retract(setting(Parameter,_)),
|
retract(setting(Parameter,_)),
|
||||||
|
@ -683,15 +683,6 @@ extend(_G,[],[],CompSub,CompSub):-!.
|
|||||||
extend(G,Cand,Not,CS,CSOut):-
|
extend(G,Cand,Not,CS,CSOut):-
|
||||||
extend_cycle(G,Cand,Not,CS,CSOut).
|
extend_cycle(G,Cand,Not,CS,CSOut).
|
||||||
|
|
||||||
intersection([],_Y,[]).
|
|
||||||
|
|
||||||
intersection([H|T],Y,[H|Z]):-
|
|
||||||
member(H,Y),!,
|
|
||||||
intersection(T,Y,Z).
|
|
||||||
|
|
||||||
intersection([_H|T],Y,Z):-
|
|
||||||
intersection(T,Y,Z).
|
|
||||||
|
|
||||||
convert_body((~ A & B),[\+ A|B1]):-!,
|
convert_body((~ A & B),[\+ A|B1]):-!,
|
||||||
convert_body(B,B1).
|
convert_body(B,B1).
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user