diff --git a/packages/cplint/lpad.pl b/packages/cplint/lpad.pl index bcd0fec4e..a1f68844d 100644 --- a/packages/cplint/lpad.pl +++ b/packages/cplint/lpad.pl @@ -2284,15 +2284,6 @@ extend(_G,[],[],CompSub,CompSub):-!. extend(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(Parameter,Value):- retract(setting(Parameter,_)), diff --git a/packages/cplint/lpadclpbn.pl b/packages/cplint/lpadclpbn.pl index 180318415..42e15c5b5 100644 --- a/packages/cplint/lpadclpbn.pl +++ b/packages/cplint/lpadclpbn.pl @@ -283,7 +283,7 @@ get_prob(GL,AV,AVL,CVL,P):- {G=goal with p([f,t],Table, Parents)}, append(AVL,CVL,Vars), 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)]). lookup_gvars([],_AV,[],S,S). @@ -1166,15 +1166,6 @@ extend(_G,[],[],CompSub,CompSub):-!. extend(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(Parameter,Value):- retract(setting(Parameter,_)), diff --git a/packages/cplint/lpadsld.pl b/packages/cplint/lpadsld.pl index 6dca77f63..a4b511ac8 100644 --- a/packages/cplint/lpadsld.pl +++ b/packages/cplint/lpadsld.pl @@ -1465,15 +1465,6 @@ extend(_G,[],[],CompSub,CompSub):-!. extend(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(Parameter,Value):- retract(setting(Parameter,_)), diff --git a/packages/cplint/lpadvel.pl b/packages/cplint/lpadvel.pl index acde32d54..3745f8663 100644 --- a/packages/cplint/lpadvel.pl +++ b/packages/cplint/lpadvel.pl @@ -1521,15 +1521,6 @@ extend(_G,[],[],CompSub,CompSub):-!. extend(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(Parameter,Value):- retract(setting(Parameter,_)), diff --git a/packages/cplint/picl.pl b/packages/cplint/picl.pl index ee57d6605..5186608ae 100644 --- a/packages/cplint/picl.pl +++ b/packages/cplint/picl.pl @@ -683,15 +683,6 @@ extend(_G,[],[],CompSub,CompSub):-!. extend(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(B,B1).