From 8c5a68856630baf95d3410fdc4d0c69133de3244 Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Tue, 2 Mar 2021 19:58:20 +0100 Subject: [PATCH 1/2] remove group_pairs_by_key/2, which is now provided by library(pairs) --- src/lib/clpb.pl | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/lib/clpb.pl b/src/lib/clpb.pl index 0310e775..75a38282 100644 --- a/src/lib/clpb.pl +++ b/src/lib/clpb.pl @@ -49,17 +49,6 @@ Compatibility predicates. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -group_pairs_by_key([], []). -group_pairs_by_key([M-N|T0], [M-[N|TN]|T]) :- - same_key(M, T0, TN, T1), - group_pairs_by_key(T1, T). - -same_key(M0, [M-N|T0], [N|TN], T) :- - M0 == M, - !, - same_key(M, T0, TN, T). -same_key(_, L, [], L). - must_be(What, Term) :- must_be(What, unknown(Term)-1, Term). must_be(acyclic, Where, Term) :- !, From 5b60c8aa7ea690b8ecb34489145c5cf40999d68c Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Tue, 2 Mar 2021 19:59:57 +0100 Subject: [PATCH 2/2] remove min_/3 and max_/3 which are also defined elsewhere --- src/lib/clpz.pl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl index 3012af78..0c561b92 100644 --- a/src/lib/clpz.pl +++ b/src/lib/clpz.pl @@ -6985,10 +6985,6 @@ cumulative(Tasks, Options) :- resource_limit(Start, End, Tasks, Bss, L) ). -min_(E, M0, M) :- M is min(E,M0). - -max_(E, M0, M) :- M is max(E,M0). - /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Trivial lower and upper bounds, assuming no gaps and not necessarily retaining the rectangular shape of each task.