eyeprolog 1.3.73 → 1.3.75

package/package.json

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

package/src/iso.js

@@ -2556,19 +2556,32 @@ function residueVariablesSince(snapshot, env) {
   return names;
 }
 
-function* callResidueVarsBuiltin({ solver, goal, env }) {
+function callResidueVarsBuiltin({ solver, goal, env }) {
   const invoked = callable(goal.args[0], env);
   if (invoked.module == null) invoked.module = goal.module ?? 'user';
   const snapshot = residueSnapshot(env);
   const child = solver.cloneForInnerGoal();
-  try {
-    for (const answerEnv of child.solve([invoked], env, 0)) {
-      const next = answerEnv.clone();
-      if (unify(goal.args[1], listFromItems(residueVariablesSince(snapshot, answerEnv)), next)) yield next;
+  let pending = true;
+  // The wrapper iterator is resumable even for a deterministic Goal. Expose
+  // the child's actual search state so the top level does not print a phantom
+  // choicepoint after the final answer.
+  const iterator = (function* residueSolutions() {
+    try {
+      for (const answerEnv of child.solve([invoked], env, 0)) {
+        pending = child.hasPendingAlternatives();
+        const next = answerEnv.clone();
+        if (unify(goal.args[1], listFromItems(residueVariablesSince(snapshot, answerEnv)), next)) {
+          yield next;
+          if (!pending) return;
+        }
+      }
+      pending = false;
+    } finally {
+      solver.absorbStatsFrom(child);
     }
-  } finally {
-    solver.absorbStatsFrom(child);
-  }
+  })();
+  iterator.hasPendingAlternatives = () => pending;
+  return iterator;
 }
 
 function* freezeBuiltin({ solver, goal, env }) {

package/src/lib/clpz.pl

@@ -2248,10 +2248,15 @@ all_different([X|Right], Left, Orig) -->
 all_distinct(Ls) :-
         fd_must_be_list(Ls, all_distinct(Ls)-1),
         maplist(fd_variable, Ls),
-        make_propagator(pdistinct(Ls), Prop),
-        new_queue(Q0),
-        phrase((distinct_attach(Ls, Prop, []),trigger_prop(Prop),do_queue), [Q0], _),
-        variables_same_queue(Ls).
+        % A ground list needs validation, but no attributed propagator.
+        (   ground(Ls) ->
+            sort(Ls, Distinct),
+            same_length(Ls, Distinct)
+        ;   make_propagator(pdistinct(Ls), Prop),
+            new_queue(Q0),
+            phrase((distinct_attach(Ls, Prop, []),trigger_prop(Prop),do_queue), [Q0], _),
+            variables_same_queue(Ls)
+        ).
 
 %% nvalue(?N, +Vars).
 %
@@ -6707,10 +6712,21 @@ serialize_upper_bound(I, D_I, J, D_J, MState) -->
 
 element(N, Is, V) :-
         must_be(list, Is),
-        length(Is, L),
-        N in 1..L,
-        element_(Is, 1, N, V),
-        propagator_init_trigger([N|Is], pelement(N,Is,V)).
+        % A constant table is one extensional relation; expanding it into
+        % reified implications and a second propagator is needlessly costly.
+        (   maplist(integer, Is) ->
+            element_relation(Is, 1, Relation),
+            tuples_in([[N,V]], Relation)
+        ;   length(Is, L),
+            N in 1..L,
+            element_(Is, 1, N, V),
+            propagator_init_trigger([N|Is], pelement(N,Is,V))
+        ).
+
+element_relation([], _, []).
+element_relation([V|Vs], N, [[N,V]|Relation]) :-
+        N1 is N + 1,
+        element_relation(Vs, N1, Relation).
 
 element_domain(V, VD) :-
         (   fd_get(V, VD, _) -> true
@@ -6799,8 +6815,15 @@ global_cardinality(Xs, Pairs, Options) :-
         ).
 
 keys_costs(Keys, X, Row, C) :-
-        element(N, Keys, X),
-        element(N, Row, C).
+        % Keys and matrix rows are integers here. Zip them once instead of
+        % connecting two element/3 constraints through an auxiliary index.
+        keys_cost_relation(Keys, Row, Relation),
+        tuples_in([[X,C]], Relation).
+
+keys_cost_relation([Key|Keys], [Cost|Costs], [[Key,Cost]|Relation]) :-
+        keys_cost_relation(Keys, Costs, Relation).
+keys_cost_relation([], _, []).
+keys_cost_relation([_|_], [], []).
 
 gcc_pair(Pair) :-
         (   Pair = Key-Val ->

package/test/run-regression.mjs

@@ -178,6 +178,16 @@ check :- call_residue_vars(X in 1..3, Vs), Vs = [X].
 `;
         assertIncludes(run(clpzResidue, { goal: 'check' }).stdout, 'check.', 'call_residue_vars/2 includes CLP(Z) attributed variables');
 
+        const deterministicProgram = Program.parse(':- use_module(library(atts)).');
+        const deterministicSolver = new Solver(deterministicProgram);
+        const deterministicGoal = parseGoalText('call_residue_vars(true, Xs)');
+        const deterministicSolutions = deterministicSolver.solve([deterministicGoal], new Env(), 0);
+        const deterministicAnswer = deterministicSolutions.next();
+        assertEqual(deterministicAnswer.done, false, 'call_residue_vars/2 deterministic answer');
+        assertEqual(deterministicSolver.hasPendingAlternatives(), false,
+          'call_residue_vars/2 deterministic success has no leftover choicepoint');
+        deterministicSolutions.return();
+
         const residualFile = path.join(tmp, `atts-residual-${++tmpCounter}.pl`);
         fs.writeFileSync(residualFile, `:- use_module(library(atts)).
 :- attribute required/1.