rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove scratch comments from clpb.pl

Browse Source
This commit is contained in:
Mark Thom
2019-10-22 21:19:01 -06:00
parent 1b1879a6fa
commit e9c1556c32
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/prolog/lib/clpb.pl
View File

@@ -1244,8 +1244,7 @@ bdd_count(Node, VNum, Count) :-
bdd_count(High, VNum, HCount), bdd_count(High, VNum, HCount),
bdd_pow(Low, V, VNum, LPow), bdd_pow(Low, V, VNum, LPow),
bdd_pow(High, V, VNum, HPow), bdd_pow(High, V, VNum, HPow),
Count0 is LPow*LCount + HPow*HCount, Count is LPow*LCount + HPow*HCount
Count0 = Count
) )
). ).
@@ -1358,7 +1357,7 @@ weighted_maximum(Ws, Vars, Max) :-
pairs_values(IVs1, VarsIndexOrder), pairs_values(IVs1, VarsIndexOrder),
% Pairs is a list of Var-Weight terms, in index order of Vars % Pairs is a list of Var-Weight terms, in index order of Vars
pairs_keys_values(Pairs, VarsIndexOrder, WeightsIndexOrder), pairs_keys_values(Pairs, VarsIndexOrder, WeightsIndexOrder),
bdd_maximum(BDD, Pairs, Max), %% A,B are in BDD, but not C; A,B,C *are* in Pairs. bdd_maximum(BDD, Pairs, Max),
max_labeling(BDD, Pairs). max_labeling(BDD, Pairs).
max_labeling(1, Pairs) :- max_upto(Pairs, _, _). max_labeling(1, Pairs) :- max_upto(Pairs, _, _).