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

weighted_maximum/3 now works

Browse Source
This commit is contained in:
Markus Triska
2019-10-16 19:17:03 +02:00
parent 567af2648c
commit 145fee0d36
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@
:- use_module(library(lists)). :- use_module(library(lists)).
:- use_module(library(non_iso)). :- use_module(library(non_iso)).
:- use_module(library(dcgs)). :- use_module(library(dcgs)).
%:- use_module(library(types)). :- use_module(library(error), []).
:- attribute :- attribute
clpb/1, clpb/1,
@@ -77,8 +77,8 @@ must_be(list(What), Where, Term) :- !,
must_be(ground, _, Term) :- !, must_be(ground, _, Term) :- !,
functor(Term, _, _). functor(Term, _, _).
must_be(Type, Goal-Arg, Term) :- must_be(Type, _, Term) :-
must_be(Term, Type, Goal, Arg). error:must_be(Type, Term).
clpz_list(Nil, _) :- Nil == []. clpz_list(Nil, _) :- Nil == [].
clpz_list(Ls, Where) :- clpz_list(Ls, Where) :-
@@ -87,7 +87,6 @@ clpz_list(Ls, Where) :-
; Ls = [_|Rest], ; Ls = [_|Rest],
clpz_list(Rest, Where) clpz_list(Rest, Where)
). ).
instantiation_error(Term) :- instantiation_error(Term, unknown(Term)-1). instantiation_error(Term) :- instantiation_error(Term, unknown(Term)-1).
@@ -139,7 +138,10 @@ partition(Pred, Ls0, As, Bs) :-
include(Pred, Ls0, As), include(Pred, Ls0, As),
exclude(Pred, Ls0, Bs). exclude(Pred, Ls0, Bs).
sum_list(Ls, S) :- sumlist(Ls, S). sum_list(Ls, S) :-
foldl(sum_, Ls, 0, S).
sum_(L, S0, S) :- S is S0 + L.
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Pairs. Pairs.