eyeprolog 1.1.16 → 1.1.17

package/README.md

@@ -91,12 +91,13 @@ noun --> [world] | [prolog].
 %% goal: phrase(sentence, Words)
 ```
 
-EyeProlog also adds 62 public library predicate indicators to its 129-entry ISO
+EyeProlog also adds 91 public library predicate indicators to its 129-entry ISO
 profile. **60 are implemented entirely as ordinary Prolog clauses** in focused
-modules under `src/lib/`; `call_nth/2` and `freeze/2` use private host adapters
-for their control behavior.
+modules under `src/lib/`; the control predicates and finite-domain
+`library(clpz)` kernel use backtrackable host support.
 They are ISO/IEC 13211-2 modules loaded explicitly by purpose, such as
-`library(lists)`, `library(strings)`, or `library(aggregate)`. Portable text
+`library(lists)`, `library(strings)`, `library(aggregate)`, or `library(clpz)`.
+Portable text
 predicates use ISO atoms or character lists. The old catch-all
 `library(eyeprolog)` module is no longer needed.
 

package/examples/clpz-factorial.pl

@@ -0,0 +1,14 @@
+:- use_module(library(clpz)).
+
+% Declarative integer constraints replace mode-sensitive is/2 arithmetic.
+% Each recursive step relates the predecessor and product; the constraint
+% kernel propagates the single unknown value without an explicit labeling step.
+
+%% goal: factorial(6, X0)
+
+factorial(0, 1).
+factorial(N, F) :-
+  N #> 0,
+  Previous #= N - 1,
+  factorial(Previous, PreviousFactorial),
+  F #= N * PreviousFactorial.

package/examples/clpz-n-queens.pl

@@ -0,0 +1,29 @@
+:- use_module(library(clpz)).
+:- use_module(library(lists), [length/2]).
+
+% The list position is a column and its value is a row. Domains, global
+% distinctness, and delayed diagonal constraints describe the puzzle before
+% labeling searches the remaining finite alternatives.
+
+%% goal: queens(X0, X1)
+
+queens(Size, Rows) :-
+  Size = 6,
+  length(Rows, Size),
+  Rows ins 1..Size,
+  all_distinct(Rows),
+  safe_diagonals(Rows),
+  labeling([ff], Rows).
+
+safe_diagonals([]).
+safe_diagonals([Row|Rows]) :-
+  safe_from(Row, Rows, 1),
+  safe_diagonals(Rows).
+
+safe_from(_, [], _).
+safe_from(Row, [Other|Rows], Distance) :-
+  Row #\= Other + Distance,
+  Row #\= Other - Distance,
+  NextDistance is Distance + 1,
+  safe_from(Row, Rows, NextDistance).
+

package/examples/clpz-resource-allocation.pl

@@ -0,0 +1,29 @@
+:- use_module(library(clpz)).
+
+% A small allocation model exercises element and chain constraints, a scalar
+% product, a sum with a derived total, reification, labeling options, and
+% domain reflection. Worker numbers select job-specific duration tables.
+
+%% goal: clpz_example(X0, X1)
+
+clpz_example(allocation, plan([A, B, C], durations([DA, DB, DC]), Total)) :-
+  [A, B, C] ins 1..3,
+  all_distinct([A, B, C]),
+  scalar_product([1, 2, 3], [A, B, C], #=, 11),
+  element(A, [5, 3, 4], DA),
+  element(B, [4, 6, 2], DB),
+  element(C, [7, 2, 5], DC),
+  chain(#>=, [DA, DB]),
+  sum([DA, DB, DC], #=, Total),
+  Fast in 0..1,
+  Fast #<==> Total #=< 12,
+  Fast #= 1,
+  labeling([ff, down], [A, B, C, Fast]).
+
+clpz_example(domain, domain(Infimum, Supremum, Size, Domain)) :-
+  X in 2..4 \/ 7,
+  fd_var(X),
+  fd_inf(X, Infimum),
+  fd_sup(X, Supremum),
+  fd_size(X, Size),
+  fd_dom(X, Domain).

package/examples/output/clpz-factorial.pl

@@ -0,0 +1 @@
+factorial(6, 720).

package/examples/output/clpz-n-queens.pl

@@ -0,0 +1,4 @@
+queens(6, [2, 4, 6, 1, 3, 5]).
+queens(6, [3, 6, 2, 5, 1, 4]).
+queens(6, [4, 1, 5, 2, 6, 3]).
+queens(6, [5, 3, 1, 6, 4, 2]).

package/examples/output/clpz-resource-allocation.pl

@@ -0,0 +1,3 @@
+clpz_example(allocation, plan([3, 1, 2], durations([4, 4, 2]), 10)).
+clpz_example(allocation, plan([2, 3, 1], durations([3, 2, 7]), 12)).
+clpz_example(domain, domain(2, 7, 4, 2..4 \/ 7)).

package/examples/output/fast-fourier-transform.pl

@@ -1 +1 @@
-fft([0, 1, 2, 3, 4, 5, 6, 7], [n(232, op('+', 216, 231)), n(231, op(*, 217, 230)), n(230, op('+', 222, 229)), n(229, op(*, 223, 228)), n(228, op('+', 224, 227)), n(227, op(*, 225, 226)), n(226, a(7)), n(225, ^(w, 4)), n(224, a(3)), n(223, ^(w, 6)), n(222, op('+', 218, 221)), n(221, op(*, 219, 220)), n(220, a(5)), n(219, ^(w, 4)), n(218, a(1)), n(217, ^(w, 7)), n(216, op('+', 208, 215)), n(215, op(*, 209, 214)), n(214, op('+', 210, 213)), n(213, op(*, 211, 212)), n(212, a(6)), n(211, ^(w, 4)), n(210, a(2)), n(209, ^(w, 6)), n(208, op('+', 204, 207)), n(207, op(*, 205, 206)), n(206, a(4)), n(205, ^(w, 4)), n(204, a(0)), n(203, op('+', 187, 202)), n(202, op(*, 188, 201)), n(201, op('+', 193, 200)), n(200, op(*, 194, 199)), n(199, op('+', 195, 198)), n(198, op(*, 196, 197)), n(197, a(7)), n(196, ^(w, 0)), n(195, a(3)), n(194, ^(w, 4)), n(193, op('+', 189, 192)), n(192, op(*, 190, 191)), n(191, a(5)), n(190, ^(w, 0)), n(189, a(1)), n(188, ^(w, 6)), n(187, op('+', 179, 186)), n(186, op(*, 180, 185)), n(185, op('+', 181, 184)), n(184, op(*, 182, 183)), n(183, a(6)), n(182, ^(w, 0)), n(181, a(2)), n(180, ^(w, 4)), n(179, op('+', 175, 178)), n(178, op(*, 176, 177)), n(177, a(4)), n(176, ^(w, 0)), n(175, a(0)), n(174, op('+', 158, 173)), n(173, op(*, 159, 172)), n(172, op('+', 164, 171)), n(171, op(*, 165, 170)), n(170, op('+', 166, 169)), n(169, op(*, 167, 168)), n(168, a(7)), n(167, ^(w, 4)), n(166, a(3)), n(165, ^(w, 2)), n(164, op('+', 160, 163)), n(163, op(*, 161, 162)), n(162, a(5)), n(161, ^(w, 4)), n(160, a(1)), n(159, ^(w, 5)), n(158, op('+', 150, 157)), n(157, op(*, 151, 156)), n(156, op('+', 152, 155)), n(155, op(*, 153, 154)), n(154, a(6)), n(153, ^(w, 4)), n(152, a(2)), n(151, ^(w, 2)), n(150, op('+', 146, 149)), n(149, op(*, 147, 148)), n(148, a(4)), n(147, ^(w, 4)), n(146, a(0)), n(145, op('+', 129, 144)), n(144, op(*, 130, 143)), n(143, op('+', 135, 142)), n(142, op(*, 136, 141)), n(141, op('+', 137, 140)), n(140, op(*, 138, 139)), n(139, a(7)), n(138, ^(w, 0)), n(137, a(3)), n(136, ^(w, 0)), n(135, op('+', 131, 134)), n(134, op(*, 132, 133)), n(133, a(5)), n(132, ^(w, 0)), n(131, a(1)), n(130, ^(w, 4)), n(129, op('+', 121, 128)), n(128, op(*, 122, 127)), n(127, op('+', 123, 126)), n(126, op(*, 124, 125)), n(125, a(6)), n(124, ^(w, 0)), n(123, a(2)), n(122, ^(w, 0)), n(121, op('+', 117, 120)), n(120, op(*, 118, 119)), n(119, a(4)), n(118, ^(w, 0)), n(117, a(0)), n(116, op('+', 100, 115)), n(115, op(*, 101, 114)), n(114, op('+', 106, 113)), n(113, op(*, 107, 112)), n(112, op('+', 108, 111)), n(111, op(*, 109, 110)), n(110, a(7)), n(109, ^(w, 4)), n(108, a(3)), n(107, ^(w, 6)), n(106, op('+', 102, 105)), n(105, op(*, 103, 104)), n(104, a(5)), n(103, ^(w, 4)), n(102, a(1)), n(101, ^(w, 3)), n(100, op('+', 92, 99)), n(99, op(*, 93, 98)), n(98, op('+', 94, 97)), n(97, op(*, 95, 96)), n(96, a(6)), n(95, ^(w, 4)), n(94, a(2)), n(93, ^(w, 6)), n(92, op('+', 88, 91)), n(91, op(*, 89, 90)), n(90, a(4)), n(89, ^(w, 4)), n(88, a(0)), n(87, op('+', 71, 86)), n(86, op(*, 72, 85)), n(85, op('+', 77, 84)), n(84, op(*, 78, 83)), n(83, op('+', 79, 82)), n(82, op(*, 80, 81)), n(81, a(7)), n(80, ^(w, 0)), n(79, a(3)), n(78, ^(w, 4)), n(77, op('+', 73, 76)), n(76, op(*, 74, 75)), n(75, a(5)), n(74, ^(w, 0)), n(73, a(1)), n(72, ^(w, 2)), n(71, op('+', 63, 70)), n(70, op(*, 64, 69)), n(69, op('+', 65, 68)), n(68, op(*, 66, 67)), n(67, a(6)), n(66, ^(w, 0)), n(65, a(2)), n(64, ^(w, 4)), n(63, op('+', 59, 62)), n(62, op(*, 60, 61)), n(61, a(4)), n(60, ^(w, 0)), n(59, a(0)), n(58, op('+', 42, 57)), n(57, op(*, 43, 56)), n(56, op('+', 48, 55)), n(55, op(*, 49, 54)), n(54, op('+', 50, 53)), n(53, op(*, 51, 52)), n(52, a(7)), n(51, ^(w, 4)), n(50, a(3)), n(49, ^(w, 2)), n(48, op('+', 44, 47)), n(47, op(*, 45, 46)), n(46, a(5)), n(45, ^(w, 4)), n(44, a(1)), n(43, ^(w, 1)), n(42, op('+', 34, 41)), n(41, op(*, 35, 40)), n(40, op('+', 36, 39)), n(39, op(*, 37, 38)), n(38, a(6)), n(37, ^(w, 4)), n(36, a(2)), n(35, ^(w, 2)), n(34, op('+', 30, 33)), n(33, op(*, 31, 32)), n(32, a(4)), n(31, ^(w, 4)), n(30, a(0)), n(29, op('+', 13, 28)), n(28, op(*, 14, 27)), n(27, op('+', 19, 26)), n(26, op(*, 20, 25)), n(25, op('+', 21, 24)), n(24, op(*, 22, 23)), n(23, a(7)), n(22, ^(w, 0)), n(21, a(3)), n(20, ^(w, 0)), n(19, op('+', 15, 18)), n(18, op(*, 16, 17)), n(17, a(5)), n(16, ^(w, 0)), n(15, a(1)), n(14, ^(w, 0)), n(13, op('+', 5, 12)), n(12, op(*, 6, 11)), n(11, op('+', 7, 10)), n(10, op(*, 8, 9)), n(9, a(6)), n(8, ^(w, 0)), n(7, a(2)), n(6, ^(w, 0)), n(5, op('+', 1, 4)), n(4, op(*, 2, 3)), n(3, a(4)), n(2, ^(w, 0)), n(1, a(0))]).
+fft([0, 1, 2, 3, 4, 5, 6, 7], [n(232, op('+', 216, 231)), n(231, op(*, 217, 230)), n(230, op('+', 222, 229)), n(229, op(*, 223, 228)), n(228, op('+', 224, 227)), n(227, op(*, 225, 226)), n(226, a(7)), n(225, w ^ 4), n(224, a(3)), n(223, w ^ 6), n(222, op('+', 218, 221)), n(221, op(*, 219, 220)), n(220, a(5)), n(219, w ^ 4), n(218, a(1)), n(217, w ^ 7), n(216, op('+', 208, 215)), n(215, op(*, 209, 214)), n(214, op('+', 210, 213)), n(213, op(*, 211, 212)), n(212, a(6)), n(211, w ^ 4), n(210, a(2)), n(209, w ^ 6), n(208, op('+', 204, 207)), n(207, op(*, 205, 206)), n(206, a(4)), n(205, w ^ 4), n(204, a(0)), n(203, op('+', 187, 202)), n(202, op(*, 188, 201)), n(201, op('+', 193, 200)), n(200, op(*, 194, 199)), n(199, op('+', 195, 198)), n(198, op(*, 196, 197)), n(197, a(7)), n(196, w ^ 0), n(195, a(3)), n(194, w ^ 4), n(193, op('+', 189, 192)), n(192, op(*, 190, 191)), n(191, a(5)), n(190, w ^ 0), n(189, a(1)), n(188, w ^ 6), n(187, op('+', 179, 186)), n(186, op(*, 180, 185)), n(185, op('+', 181, 184)), n(184, op(*, 182, 183)), n(183, a(6)), n(182, w ^ 0), n(181, a(2)), n(180, w ^ 4), n(179, op('+', 175, 178)), n(178, op(*, 176, 177)), n(177, a(4)), n(176, w ^ 0), n(175, a(0)), n(174, op('+', 158, 173)), n(173, op(*, 159, 172)), n(172, op('+', 164, 171)), n(171, op(*, 165, 170)), n(170, op('+', 166, 169)), n(169, op(*, 167, 168)), n(168, a(7)), n(167, w ^ 4), n(166, a(3)), n(165, w ^ 2), n(164, op('+', 160, 163)), n(163, op(*, 161, 162)), n(162, a(5)), n(161, w ^ 4), n(160, a(1)), n(159, w ^ 5), n(158, op('+', 150, 157)), n(157, op(*, 151, 156)), n(156, op('+', 152, 155)), n(155, op(*, 153, 154)), n(154, a(6)), n(153, w ^ 4), n(152, a(2)), n(151, w ^ 2), n(150, op('+', 146, 149)), n(149, op(*, 147, 148)), n(148, a(4)), n(147, w ^ 4), n(146, a(0)), n(145, op('+', 129, 144)), n(144, op(*, 130, 143)), n(143, op('+', 135, 142)), n(142, op(*, 136, 141)), n(141, op('+', 137, 140)), n(140, op(*, 138, 139)), n(139, a(7)), n(138, w ^ 0), n(137, a(3)), n(136, w ^ 0), n(135, op('+', 131, 134)), n(134, op(*, 132, 133)), n(133, a(5)), n(132, w ^ 0), n(131, a(1)), n(130, w ^ 4), n(129, op('+', 121, 128)), n(128, op(*, 122, 127)), n(127, op('+', 123, 126)), n(126, op(*, 124, 125)), n(125, a(6)), n(124, w ^ 0), n(123, a(2)), n(122, w ^ 0), n(121, op('+', 117, 120)), n(120, op(*, 118, 119)), n(119, a(4)), n(118, w ^ 0), n(117, a(0)), n(116, op('+', 100, 115)), n(115, op(*, 101, 114)), n(114, op('+', 106, 113)), n(113, op(*, 107, 112)), n(112, op('+', 108, 111)), n(111, op(*, 109, 110)), n(110, a(7)), n(109, w ^ 4), n(108, a(3)), n(107, w ^ 6), n(106, op('+', 102, 105)), n(105, op(*, 103, 104)), n(104, a(5)), n(103, w ^ 4), n(102, a(1)), n(101, w ^ 3), n(100, op('+', 92, 99)), n(99, op(*, 93, 98)), n(98, op('+', 94, 97)), n(97, op(*, 95, 96)), n(96, a(6)), n(95, w ^ 4), n(94, a(2)), n(93, w ^ 6), n(92, op('+', 88, 91)), n(91, op(*, 89, 90)), n(90, a(4)), n(89, w ^ 4), n(88, a(0)), n(87, op('+', 71, 86)), n(86, op(*, 72, 85)), n(85, op('+', 77, 84)), n(84, op(*, 78, 83)), n(83, op('+', 79, 82)), n(82, op(*, 80, 81)), n(81, a(7)), n(80, w ^ 0), n(79, a(3)), n(78, w ^ 4), n(77, op('+', 73, 76)), n(76, op(*, 74, 75)), n(75, a(5)), n(74, w ^ 0), n(73, a(1)), n(72, w ^ 2), n(71, op('+', 63, 70)), n(70, op(*, 64, 69)), n(69, op('+', 65, 68)), n(68, op(*, 66, 67)), n(67, a(6)), n(66, w ^ 0), n(65, a(2)), n(64, w ^ 4), n(63, op('+', 59, 62)), n(62, op(*, 60, 61)), n(61, a(4)), n(60, w ^ 0), n(59, a(0)), n(58, op('+', 42, 57)), n(57, op(*, 43, 56)), n(56, op('+', 48, 55)), n(55, op(*, 49, 54)), n(54, op('+', 50, 53)), n(53, op(*, 51, 52)), n(52, a(7)), n(51, w ^ 4), n(50, a(3)), n(49, w ^ 2), n(48, op('+', 44, 47)), n(47, op(*, 45, 46)), n(46, a(5)), n(45, w ^ 4), n(44, a(1)), n(43, w ^ 1), n(42, op('+', 34, 41)), n(41, op(*, 35, 40)), n(40, op('+', 36, 39)), n(39, op(*, 37, 38)), n(38, a(6)), n(37, w ^ 4), n(36, a(2)), n(35, w ^ 2), n(34, op('+', 30, 33)), n(33, op(*, 31, 32)), n(32, a(4)), n(31, w ^ 4), n(30, a(0)), n(29, op('+', 13, 28)), n(28, op(*, 14, 27)), n(27, op('+', 19, 26)), n(26, op(*, 20, 25)), n(25, op('+', 21, 24)), n(24, op(*, 22, 23)), n(23, a(7)), n(22, w ^ 0), n(21, a(3)), n(20, w ^ 0), n(19, op('+', 15, 18)), n(18, op(*, 16, 17)), n(17, a(5)), n(16, w ^ 0), n(15, a(1)), n(14, w ^ 0), n(13, op('+', 5, 12)), n(12, op(*, 6, 11)), n(11, op('+', 7, 10)), n(10, op(*, 8, 9)), n(9, a(6)), n(8, w ^ 0), n(7, a(2)), n(6, w ^ 0), n(5, op('+', 1, 4)), n(4, op(*, 2, 3)), n(3, a(4)), n(2, w ^ 0), n(1, a(0))]).

package/examples/output/iso-extensions.pl

@@ -1,5 +1,5 @@
 extension_example(all_colors_are_atoms, true).
-extension_example(successors, ['-'(1, 2), '-'(2, 3), '-'(3, 4)]).
+extension_example(successors, [1 - 2, 2 - 3, 3 - 4]).
 extension_example(collection_with_tail, [red, green, blue, done]).
 extension_example(repeated_variable_variant, true).
 extension_example(different_variable_shape, true).

package/examples/output/iso-operators.pl

@@ -1,3 +1,3 @@
 report(parsed_as, [reports, sensor_7, temperature]).
-report(observations, and(humidity, temperature)).
+report(observations, humidity and temperature).
 report(operator, operator(600, xfx)).

package/examples/proof/iso-operators.pl

@@ -14,7 +14,7 @@ why(
   )
 ).
 
-report(observations, and(humidity, temperature)).
+report(observations, humidity and temperature).
 why(
   report(observations, and(humidity, temperature)),
   proof(

package/package.json

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

package/playground.html

@@ -464,6 +464,9 @@
           "cdcl-sat-solver",
           "chart-parser",
           "clinical-trial-screening",
+          "clpz-factorial",
+          "clpz-n-queens",
+          "clpz-resource-allocation",
           "collatz-1000",
           "combinatorics-findall-sort",
           "competitive-enzyme-kinetics",

package/src/cli.js

@@ -173,6 +173,8 @@ async function runDefault(engine, program, options) {
   const queriedKeys = new Set(goals.map((goal) => `${goal.name}/${goal.arity}`));
   const writeOptions = {
     doubleQuotes: solver.prologFlags.get('double_quotes')?.value?.name ?? 'chars',
+    operators: [...program.operators.values()],
+    quoted: true,
   };
   const facts = program.sourceFactLines(queriedKeys, writeOptions);
   const lines = new Set();
@@ -186,8 +188,10 @@ async function runDefault(engine, program, options) {
 
         const currentWriteOptions = {
           doubleQuotes: solver.prologFlags.get('double_quotes')?.value?.name ?? 'chars',
+          operators: [...program.operators.values()],
+          quoted: true,
         };
-        const line = `${engine.termToString(goal, env, true, currentWriteOptions)}.\n`;
+        const line = `${engine.formatTermForWrite(goal, env, currentWriteOptions)}.\n`;
         if (facts.has(line) || lines.has(line)) continue;
 
         lines.add(line);