eyeprolog 0.5.18 → 0.6.0

package/README.md

@@ -29,8 +29,8 @@ proper list of one-character atoms (`chars`), matching Trealla and Scryer.
 
 ## Portable library
 
-EyeProlog adds 50 public library predicates to its 115-predicate ISO profile.
-**All 50 are ordinary Prolog clauses** across `src/eyeprolog-library.pl` and
+EyeProlog adds 44 public library predicates to its 127-entry ISO core registry.
+**All 44 are ordinary Prolog clauses** across `src/eyeprolog-library.pl` and
 `src/eyeprolog-common-library.pl`; both are autoloaded in Node and the
 browser. None requires host support. Other Prolog systems should load only
 `eyeprolog-library.pl`, which avoids redefining their common list predicates.

package/conformance-report.md

@@ -11,7 +11,7 @@ This report summarizes the file-based conformance corpus under `test/conformance
 | builtins | 11 | 0 | 0 | 0 | 11 |
 | context | 11 | 0 | 0 | 0 | 11 |
 | control | 15 | 0 | 0 | 0 | 15 |
-| iso | 121 | 159 | 0 | 0 | 280 |
+| iso | 130 | 174 | 0 | 0 | 304 |
 | lists | 52 | 3 | 0 | 0 | 55 |
 | negation | 8 | 0 | 19 | 0 | 27 |
 | proofs | 0 | 0 | 0 | 21 | 21 |
@@ -22,4 +22,4 @@ This report summarizes the file-based conformance corpus under `test/conformance
 | terms | 26 | 3 | 0 | 0 | 29 |
 | unification | 18 | 0 | 0 | 0 | 18 |
 | variables | 16 | 9 | 0 | 0 | 25 |
-| **Total** | **434** | **212** | **19** | **21** | **686** |
+| **Total** | **443** | **227** | **19** | **21** | **710** |

package/examples/blocks-world-planning.pl

@@ -48,7 +48,7 @@ move(State, move(Block, From, To), Newstate) :-
   (Block \= To),
   (From \= To),
   select(on(Block, From), State, Rest),
-  sort_unique([on(Block, To)|Rest], Newstate).
+  sort([on(Block, To)|Rest], Newstate).
 
 plan(State, Goal, 0, _visited, [], State) :-
   (State = Goal).
@@ -63,8 +63,8 @@ plan(State, Goal, Depth, Visited, [Move|Moves], Final) :-
 five_move_plan(Moves, Final) :-
   initial(Start),
   goal(Goal),
-  sort_unique(Start, Sortedstart),
-  sort_unique(Goal, Sortedgoal),
+  sort(Start, Sortedstart),
+  sort(Goal, Sortedgoal),
   plan(Sortedstart, Sortedgoal, 5, [Sortedstart], Moves, Final).
 
 status(blocks_world, planned) :-

package/examples/combinatorics-findall-sort.pl

@@ -1,7 +1,7 @@
-% Eyelet-inspired combinations example using findall/3 and sort_unique/2.
+% Eyelet-inspired combinations example using findall/3 and sort/2.
 %
 % combination/3 generates the same subset in several selection orders.  findall/3
-% collects those candidates, and sort_unique/2 canonicalizes the list so each unordered
+% collects those candidates, and sort/2 canonicalizes the list so each unordered
 % 3-combination of five items is reported once.
 %% goal: combinations(X0, X1)
 
@@ -24,12 +24,12 @@ combination(I, Items, Combination) :-
   select(Item, Items, Remaining),
   (J is I - 1),
   combination(J, Remaining, Partial),
-  sort_unique([Item | Partial], Combination).
+  sort([Item | Partial], Combination).
 
 % findall collects all generation orders; sort canonicalizes and deduplicates.
 unique_combinations(K, Items, Unique) :-
   findall(C, combination(K, Items, C), All),
-  sort_unique(All, Unique).
+  sort(All, Unique).
 
 combinations(combinations_5_choose_3, Unique) :-
   unique_combinations(3, [1, 2, 3, 4, 5], Unique).

package/examples/complex.pl

@@ -50,7 +50,7 @@ complex_asin([A, B], [C, D]) :-
   (E is Z10 / 2),
   (Z11 is Z5 + Z9),
   (F is Z11 / 2),
-  asin(E, C),
+  (C is asin(E)),
   (Z12 is F ** 2),
   (Z13 is Z12 - 1),
   (Z14 is Z13 ** 0.5),
@@ -71,7 +71,7 @@ complex_acos([A, B], [C, D]) :-
   (E is Z10 / 2),
   (Z11 is Z5 + Z9),
   (F is Z11 / 2),
-  acos(E, C),
+  (C is acos(E)),
   (Z12 is F ** 2),
   (Z13 is Z12 - 1),
   (Z14 is Z13 ** 0.5),
@@ -86,7 +86,7 @@ complex_polar([X, Y], [R, Tp]) :-
   (R is Z3 ** 0.5),
   (Z4 is abs(X)),
   (Z5 is Z4 / R),
-  acos(Z5, T),
+  (T is acos(Z5)),
   complex_dial(X, Y, T, Tp).
 
 complex_dial(X, Y, T, Tp) :-

package/examples/d3-group.pl

@@ -1,4 +1,4 @@
-% Eyelet-inspired D3 group example using findall/3 and sort_unique/2.
+% Eyelet-inspired D3 group example using findall/3 and sort/2.
 % The six facts are the symmetries of an equilateral triangle, with compose/3 as
 % the Cayley table and inverse/2 as the inverse relation.  Candidate subsets are
 % generated as subsequences, then filtered for subgroup closure.
@@ -72,7 +72,7 @@ subsequence([_head | Tail], Rest) :-
 
 all_symmetries(Symmetries) :-
   findall(X, symmetry(X), Raw),
-  sort_unique(Raw, Symmetries).
+  sort(Raw, Symmetries).
 
 % A valid subgroup is closed under both composition and inverse.
 closed_under_composition(Group) :-
@@ -90,7 +90,7 @@ valid_group(Group) :-
 
 all_subgroups(Groups) :-
   findall(G, valid_group(G), Raw),
-  sort_unique(Raw, Groups).
+  sort(Raw, Groups).
 
 subgroups(d3_group, Groups) :-
   all_subgroups(Groups).

package/examples/dijkstra-findall-sort.pl

@@ -1,7 +1,7 @@
-% Eyelet-inspired Dijkstra example using findall/3 and sort_unique/2.
+% Eyelet-inspired Dijkstra example using findall/3 and sort/2.
 % The priority queue is represented as sorted list entries [Cost, Node | Path].
 % Each expansion collects unvisited neighbors with findall/3, appends them to
-% the frontier, and uses sort_unique/2 so the cheapest frontier entry is processed next.
+% the frontier, and uses sort/2 so the cheapest frontier entry is processed next.
 
 %% goal: shortestPath(X0, X1)
 
@@ -34,7 +34,7 @@ dijkstra_queue([[Cost, Node | Path] | Queue], Goal, Visited, Resultpath, Resultc
     (edge(Node, Neighbor, Weight), \+ member(Neighbor, Visited), (Newcost is Cost + Weight)),
     Neighbors),
   append(Queue, Neighbors, Newqueue),
-  sort_unique(Newqueue, Sortedqueue),
+  sort(Newqueue, Sortedqueue),
   dijkstra_queue(Sortedqueue, Goal, [Node | Visited], Resultpath, Resultcost).
 
 shortestPath(dijkstra_findall_sort, Path) :-

package/examples/enigma1225.pl

@@ -89,7 +89,7 @@ eval_matrix(Matrix, FreqSorted) :-
     setof(E, member(E, Entries), Set),
     maplist(count_var(Entries), Set, Multiplicities),
     zip(Multiplicities, Set, Frequencies),
-    sort_unique(Frequencies, FreqSorted),
+    sort(Frequencies, FreqSorted),
     maplist(snd, FreqSorted, VarsSorted),
     length(VarsSorted, NVars),
     from_to(1, NVars, VarsSorted).

package/examples/eulerian-path.pl

@@ -1,4 +1,4 @@
-% Eyelet-inspired Eulerian path example using findall/3 and sort_unique/2.
+% Eyelet-inspired Eulerian path example using findall/3 and sort/2.
 %
 % The graph is undirected; edges have identifiers so the trail consumes each
 % physical edge exactly once even when vertices are revisited.  The remaining
@@ -49,15 +49,15 @@ odd_degree(V) :-
 
 odd_vertices(Odds) :-
   findall(V, odd_degree(V), Raw),
-  sort_unique(Raw, Odds).
+  sort(Raw, Odds).
 
 all_edges(Edges) :-
   findall(E, edge(E, _a, _b), Raw),
-  sort_unique(Raw, Edges).
+  sort(Raw, Edges).
 
 vertices(Vertices) :-
   findall(V, vertex(V), Raw),
-  sort_unique(Raw, Vertices).
+  sort(Raw, Vertices).
 
 eulerian_start(Start) :-
   odd_vertices([Start, _end]).

package/examples/four-color-map.pl

@@ -102,13 +102,13 @@ border_count(36).
 
 all_countries_coloured(map_eu) :-
   findall(Country, valid_assignment(Country), Countries),
-  sort_unique(Countries, Uniquecountries),
+  sort(Countries, Uniquecountries),
   length(Uniquecountries, Count),
   country_count(Count).
 
 all_borders_checked(map_eu) :-
   findall([A, B], border_colours_differ(A, B), Borders),
-  sort_unique(Borders, Uniqueborders),
+  sort(Borders, Uniqueborders),
   length(Uniqueborders, Count),
   border_count(Count).
 

package/examples/input/odrl-dpv-healthcare-risk-ranked-rules.pl

@@ -15,7 +15,7 @@ healthcare_risk_report(Ranked) :-
     ),
     Unsorted
   ),
-  sort_unique(Unsorted, Sorted),
+  sort(Unsorted, Sorted),
   ranked_values(Sorted, 1, Ranked).
 
 risk_report(Risk, Score, Level, Clause, Mitigation) :-

package/examples/input/odrl-dpv-risk-ranked-rules.pl

@@ -15,7 +15,7 @@ consumer_risk_report(Ranked) :-
     ),
     Unsorted
   ),
-  sort_unique(Unsorted, Sorted),
+  sort(Unsorted, Sorted),
   ranked_values(Sorted, 1, Ranked).
 
 risk_report(Risk, Score, Level, Clause, Mitigation) :-

package/examples/input/rdf12-annotated-claims-rules.pl

@@ -25,7 +25,7 @@ ranked_claims(Claims) :-
     ),
     Unsorted
   ),
-  sort_unique(Unsorted, Sorted),
+  sort(Unsorted, Sorted),
   pair_values(Sorted, Claims).
 
 annotated_status_claim(Status, Source, Score) :-

package/examples/odrl-dpv-healthcare-risk-ranked.pl

@@ -56,7 +56,7 @@ healthcare_risk_report(Ranked) :-
     ),
     Unsorted
   ),
-  sort_unique(Unsorted, Sorted),
+  sort(Unsorted, Sorted),
   ranked_values(Sorted, 1, Ranked).
 
 risk_report(Risk, Score, Level, Clause, Mitigation) :-

package/examples/odrl-dpv-risk-ranked.pl

@@ -68,7 +68,7 @@ consumer_risk_report(Ranked) :-
     ),
     Unsorted
   ),
-  sort_unique(Unsorted, Sorted),
+  sort(Unsorted, Sorted),
   ranked_values(Sorted, 1, Ranked).
 
 risk_report(Risk, Score, Level, Clause, Mitigation) :-

package/examples/output/complex.pl

@@ -1 +1,6 @@
+complex_power(sqrt_minus_one, [-1, 0], [0.5, 0], [6.123233995736766e-17, 1.0]).
+complex_power(e_to_i_pi, [2.718281828459045, 0], [0, 3.141592653589793], [-1.0, 1.2246467991473532e-16]).
 complex_power(i_to_i, [0, 1], [0, 1], [0.20787957635076193, 0.0]).
+complex_power(e_to_minus_pi_over_two, [2.718281828459045, 0], [-1.57079632679, 0], [0.20787957635177984, 0.0]).
+complex_function(asin, two, [2, 0], [1.5707963267948966, 1.3169578969248166]).
+complex_function(acos, two, [2, 0], [0.0, -1.3169578969248166]).

package/examples/output/enigma1225.pl

@@ -1 +1 @@
-enigma1225(8, [[2, 1, 4, 3, 6, 5, 8, 7], [[16, 16, 1, 2, 3, 4, 5, 6], [16, 16, 2, 1, 4, 3, 6, 5], [2, 1, 7, 7, 8, 9, 10, 11], [1, 2, 7, 7, 9, 8, 11, 10], [4, 3, 9, 8, 12, 12, 13, 14], [3, 4, 8, 9, 12, 12, 14, 13], [6, 5, 11, 10, 14, 13, 15, 15], [5, 6, 10, 11, 13, 14, 15, 15]], 544]).
+enigma1225(8, [[2, 1, 4, 3, 6, 5, 8, 7], [[1, 1, 2, 3, 4, 5, 6, 7], [1, 1, 3, 2, 5, 4, 7, 6], [3, 2, 8, 8, 9, 10, 11, 12], [2, 3, 8, 8, 10, 9, 12, 11], [5, 4, 10, 9, 13, 13, 14, 15], [4, 5, 9, 10, 13, 13, 15, 14], [7, 6, 12, 11, 15, 14, 16, 16], [6, 7, 11, 12, 14, 15, 16, 16]], 544]).

package/examples/output/iso-integer-arithmetic.pl

@@ -1,4 +1,4 @@
-report(div_mod, quotient_remainder(-2, 2)).
+report(div_mod, quotient_remainder(-3, 2)).
 report(quotient_rem, quotient_remainder(-2, -1)).
 report(bit_mask, 4).
 report(bit_union, 11).

package/examples/proof/d3-group.pl

@@ -16,8 +16,8 @@ why(
             by(builtin(findall, 3))
           ),
           proof(
-            goal(sort_unique([], [])),
-            by(library(sort_unique, 2))
+            goal(sort([], [])),
+            by(builtin(sort, 2))
           )
         ])
       )
@@ -43,8 +43,8 @@ why(
             by(builtin(findall, 3))
           ),
           proof(
-            goal(sort_unique([], [])),
-            by(library(sort_unique, 2))
+            goal(sort([], [])),
+            by(builtin(sort, 2))
           )
         ])
       ),

package/examples/proof/iso-dynamic-database.pl

@@ -12,7 +12,7 @@ why(
         uses([
           proof(
             goal(task(check_power, urgent)),
-            by(fact("<input>", clause(303)))
+            by(fact("<input>", clause(278)))
           )
         ])
       )

package/examples/quine-mccluskey.pl

@@ -75,7 +75,7 @@ check(4, 'Canonical Tie-Breaking (Lexicographical First)', Status) :-
         find_combination(Size, Primes, C),
         covers_all(C, Minterms)
     ), Alternatives),
-    sort_unique(Alternatives, [Best|_]),
+    sort(Alternatives, [Best|_]),
     equality_status(Cover, Best, Status).
 
 check(5, 'Consistency (Solution is subset of Primes)', Status) :-
@@ -166,9 +166,9 @@ compute_primes(Primes) :-
     findall(B, (minterm(M), int_to_bits(M, B)), Mts),
     findall(B, (dont_care(D), int_to_bits(D, B)), Dcs),
     append(Mts, Dcs, All),
-    sort_unique(All, Init),
+    sort(All, Init),
     generate_loop(Init, [], RawPrimes),
-    sort_unique(RawPrimes, Primes).
+    sort(RawPrimes, Primes).
 
 generate_loop(Group, Acc, Final) :-
     findall(Nx-[P1,P2], (
@@ -176,8 +176,8 @@ generate_loop(Group, Acc, Final) :-
     ), Pairs),
     findall(N, member(N-_, Pairs), NextRaw),
     findall(P, (member(_-Pars, Pairs), member(P, Pars)), UsedRaw),
-    sort_unique(NextRaw, NextGen),
-    sort_unique(UsedRaw, Used),
+    sort(NextRaw, NextGen),
+    sort(UsedRaw, Used),
     findall(P, (member(P, Group), \+ member(P, Used)), New),
     append(Acc, New, AccUpd),
     (NextGen = [] -> Final = AccUpd ; generate_loop(NextGen, AccUpd, Final)).
@@ -187,13 +187,13 @@ solve_minimal_cover(Primes, MinimalCover) :-
     % 1. Essentials
     findall(M-Ps, (member(M, Minterms), findall(P, (member(P, Primes), covers_int(P, M)), Ps)), Chart),
     findall(P, member(_-[P], Chart), EssRaw),
-    sort_unique(EssRaw, Essentials),
+    sort(EssRaw, Essentials),
     % 2. Remaining
     remaining_minterms(Minterms, Essentials, RemMts),
     subtract_list(Primes, Essentials, NonEss),
     (RemMts = [] -> BestRest = [] ; find_smallest_subset(NonEss, RemMts, BestRest)),
     append(Essentials, BestRest, Total),
-    sort_unique(Total, MinimalCover).
+    sort(Total, MinimalCover).
 
 remaining_minterms([], _, []).
 remaining_minterms([M|Ms], Essentials, Rest) :-

package/examples/rdf12-annotated-claims.pl

@@ -41,7 +41,7 @@ ranked_claims(Claims) :-
     ),
     Unsorted
   ),
-  sort_unique(Unsorted, Sorted),
+  sort(Unsorted, Sorted),
   pair_values(Sorted, Claims).
 
 annotated_status_claim(Status, Source, Score) :-

package/examples/sudoku.pl

@@ -46,7 +46,7 @@ best_choice(Grid, Row, Column, Candidates) :-
     ),
     Choices
   ),
-  sort_unique(Choices, [choice(_Count, Row, Column, Candidates)|_]).
+  sort(Choices, [choice(_Count, Row, Column, Candidates)|_]).
 
 empty_cell(Grid, Row, Column) :-
   between(0, 8, Row),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.5.18",
+  "version": "0.6.0",
   "description": "EyeProlog turns facts and rules into answers and proofs.",
   "type": "module",
   "main": "./index.js",

package/playground.html

@@ -654,7 +654,6 @@
             "aggregate_max",
             "aggregate_min",
             "append",
-            "apply",
             "arg",
             "asin",
             "atan2",
@@ -707,7 +706,6 @@
             "sin",
             "slice",
             "smallest_divisor_from",
-            "sort_unique",
             "split",
             "sqrt",
             "string_concat",

package/src/eyeprolog-autoload.js

@@ -8,12 +8,7 @@ export const eyePrologNativeLibraryIndicators = Object.freeze([]);
 export const eyePrologPortableLibraryIndicators = Object.freeze([
   'uuid/3',
   'difference/3',
-  'apply/3',
   'maplist/3',
-  'tan/2',
-  'asin/2',
-  'acos/2',
-  'atan2/3',
   'lt/2',
   'gt/2',
   'le/2',
@@ -51,7 +46,6 @@ export const eyePrologPortableLibraryIndicators = Object.freeze([
   'min_list/2',
   'max_list/2',
   'list_to_set/2',
-  'sort_unique/2',
   'countall/2',
   'sumall/3',
   'aggregate_min/5',
@@ -70,7 +64,7 @@ const libraryFiles = [
 ];
 const libraryCacheKey = isNode
   ? null
-  : (new URL(import.meta.url).searchParams.get('playground') ?? '20260807b');
+  : (new URL(import.meta.url).searchParams.get('playground') ?? '20260808a');
 const librarySources = await Promise.all(libraryFiles.map(async (filename) => ({
   filename,
   source: await loadLibrarySource(libraryFileUrl(filename)),

package/src/eyeprolog-common-library.pl

@@ -7,7 +7,7 @@
 
 maplist(_, [], []).
 maplist(Closure, [A|As], [B|Bs]) :-
-    apply(Closure, A, B),
+    call(Closure, A, B),
     maplist(Closure, As, Bs).
 
 append([], Ys, Ys).

package/src/eyeprolog-library.pl

@@ -35,7 +35,7 @@ eyeprolog__atomic_chars(Value, Chars) :-
     eyeprolog__char_list(Value),
     Value = Chars.
 
-% ---------- core/meta ----------
+% ---------- core helpers ----------
 
 eyeprolog__append([], Ys, Ys).
 eyeprolog__append([X|Xs], Ys, [X|Zs]) :- eyeprolog__append(Xs, Ys, Zs).
@@ -43,29 +43,8 @@ eyeprolog__append([X|Xs], Ys, [X|Zs]) :- eyeprolog__append(Xs, Ys, Zs).
 eyeprolog__member(X, [X|_]).
 eyeprolog__member(X, [_|Xs]) :- eyeprolog__member(X, Xs).
 
-apply(Closure, A, B) :-
-    Closure =.. Parts,
-    eyeprolog__append(Parts, [A, B], CallParts),
-    Goal =.. CallParts,
-    call(Goal).
-
 % ---------- arithmetic helpers ----------
 
-tan(X, Y) :- Y is sin(X) / cos(X).
-
-asin(1, Y) :- Y is pi / 2.
-asin(-1, Y) :- Y is -pi / 2.
-asin(X, Y) :- X > -1, X < 1, Y is atan(X / sqrt(1 - X * X)).
-
-acos(X, Y) :- asin(X, A), Y is pi / 2 - A.
-
-atan2(Y, X, A) :- X > 0, A is atan(Y / X).
-atan2(Y, X, A) :- X < 0, Y >= 0, A is atan(Y / X) + pi.
-atan2(Y, X, A) :- X < 0, Y < 0, A is atan(Y / X) - pi.
-atan2(Y, 0, A) :- Y > 0, A is pi / 2.
-atan2(Y, 0, A) :- Y < 0, A is -pi / 2.
-atan2(0, 0, 0).
-
 eyeprolog__atom_number(Text, Number) :-
     eyeprolog__text_chars(Text, Chars),
     catch(number_chars(Number, Chars), _, fail).
@@ -724,17 +703,6 @@ eyeprolog__list_to_set([X|Xs], Seen, [X|Set]) :-
 eyeprolog__identical_member(X, [Y|_]) :- X == Y.
 eyeprolog__identical_member(X, [_|Ys]) :- eyeprolog__identical_member(X, Ys).
 
-sort_unique(List, Sorted) :- eyeprolog__sort(List, [], Sorted).
-eyeprolog__sort([], Sorted, Sorted).
-eyeprolog__sort([X|Xs], Acc, Sorted) :-
-    eyeprolog__insert_sorted(X, Acc, Next),
-    eyeprolog__sort(Xs, Next, Sorted).
-
-eyeprolog__insert_sorted(X, [], [X]).
-eyeprolog__insert_sorted(X, [Y|Ys], [Y|Ys]) :- X == Y.
-eyeprolog__insert_sorted(X, [Y|Ys], [X,Y|Ys]) :- X @< Y.
-eyeprolog__insert_sorted(X, [Y|Ys], [Y|Zs]) :- X @> Y, eyeprolog__insert_sorted(X, Ys, Zs).
-
 % ---------- aggregation ----------
 
 sumall(Expression, Goal, Sum) :-
@@ -742,29 +710,14 @@ sumall(Expression, Goal, Sum) :-
     eyeprolog__sum_list(Values, 0, Sum).
 
 aggregate_min(Key, Value, Goal, BestKey, BestValue) :-
-    findall(pair(Key, Value), Goal, Pairs),
-    eyeprolog__aggregate_min(Pairs, BestKey, BestValue).
-
-eyeprolog__aggregate_min([pair(K,V)|Pairs], BestKey, BestValue) :-
-    eyeprolog__aggregate_min_rest(Pairs, K, V, BestKey, BestValue).
-eyeprolog__aggregate_min_rest([], K, V, K, V).
-eyeprolog__aggregate_min_rest([pair(K,V)|Pairs], CK, _, BK, BV) :-
-    K @< CK,
-    eyeprolog__aggregate_min_rest(Pairs, K, V, BK, BV).
-eyeprolog__aggregate_min_rest([pair(K,_)|Pairs], CK, CV, BK, BV) :-
-    K @>= CK,
-    eyeprolog__aggregate_min_rest(Pairs, CK, CV, BK, BV).
+    findall(Key-Value, Goal, Pairs),
+    keysort(Pairs, [BestKey-BestValue|_]).
 
 aggregate_max(Key, Value, Goal, BestKey, BestValue) :-
-    findall(pair(Key, Value), Goal, Pairs),
-    eyeprolog__aggregate_max(Pairs, BestKey, BestValue).
-
-eyeprolog__aggregate_max([pair(K,V)|Pairs], BestKey, BestValue) :-
-    eyeprolog__aggregate_max_rest(Pairs, K, V, BestKey, BestValue).
-eyeprolog__aggregate_max_rest([], K, V, K, V).
-eyeprolog__aggregate_max_rest([pair(K,V)|Pairs], CK, _, BK, BV) :-
-    K @> CK,
-    eyeprolog__aggregate_max_rest(Pairs, K, V, BK, BV).
-eyeprolog__aggregate_max_rest([pair(K,_)|Pairs], CK, CV, BK, BV) :-
-    K @=< CK,
-    eyeprolog__aggregate_max_rest(Pairs, CK, CV, BK, BV).
+    findall(Key-Value, Goal, Pairs),
+    eyeprolog__reverse(Pairs, [], ReversePairs),
+    keysort(ReversePairs, Sorted),
+    eyeprolog__last_pair(Sorted, BestKey-BestValue).
+
+eyeprolog__last_pair([Pair], Pair).
+eyeprolog__last_pair([_|Pairs], Pair) :- eyeprolog__last_pair(Pairs, Pair).