eyeprolog 0.5.13 → 0.5.14

package/examples/auroracare.pl

@@ -45,6 +45,32 @@
 %% goal: checkC10Text(X0, X1)
 
 
+:- discontiguous(policyUid/2).
+:- discontiguous(purposeAllowed/2).
+:- discontiguous(requireEnvironment/2).
+:- discontiguous(allowAnyCategory/2).
+:- discontiguous(duty/2).
+:- discontiguous(scenario/1).
+:- discontiguous(outputKey/2).
+:- discontiguous(scenario_label/2).
+:- discontiguous(scenario_description/2).
+:- discontiguous(requester/2).
+:- discontiguous(requesterRole/2).
+:- discontiguous(subject/2).
+:- discontiguous(purpose/2).
+:- discontiguous(environment/2).
+:- discontiguous(category/2).
+:- discontiguous(checkC1/2).
+:- discontiguous(checkC2/2).
+:- discontiguous(checkC3/2).
+:- discontiguous(checkC4/2).
+:- discontiguous(checkC5/2).
+:- discontiguous(checkC6/2).
+:- discontiguous(checkC7/2).
+:- discontiguous(checkC8/2).
+:- discontiguous(checkC9/2).
+:- discontiguous(checkC10Text/2).
+
 % Program structure: facts set up the scenario, and rules derive the queried conclusions.
 caseName(case, "auroracare").
 question(case, "For each AuroraCare scenario, should the PDP permit or deny the requested use of health data, and why?").

package/examples/bmi.pl

@@ -71,6 +71,15 @@
 %% goal: checkPassed(X0, X1)
 
 
+:- discontiguous(weightKg/2).
+:- discontiguous(heightM/2).
+:- discontiguous(units/2).
+:- discontiguous(bmi/2).
+:- discontiguous(category/2).
+:- discontiguous(healthyMinKg/2).
+:- discontiguous(healthyMaxKg/2).
+:- discontiguous(heightCm/2).
+
 % Program structure: facts set up the scenario, and rules derive the queried conclusions.
 unitSystem(input, metric).
 weight(input, 72.0).
@@ -260,4 +269,14 @@ heightCm(report, Height) :-
   heightCm(answer, Height).
 
 checkPassed(report, Check) :-
-  statement(check, Check, _message).
+  statement(check, Check, _Message).
+
+statement(check, c1, Message) :- c1(check, Message).
+statement(check, c2, Message) :- c2(check, Message).
+statement(check, c3, Message) :- c3(check, Message).
+statement(check, c4, Message) :- c4(check, Message).
+statement(check, c5, Message) :- c5(check, Message).
+statement(check, c6, Message) :- c6(check, Message).
+statement(check, c7, Message) :- c7(check, Message).
+statement(check, c8, Message) :- c8(check, Message).
+statement(check, c9, Message) :- c9(check, Message).

package/examples/cdcl-sat-solver.pl

@@ -17,9 +17,9 @@
 %% goal: cdclAnswer(X0, X1)
 
 
-clause(c1, [neg(a), pos(c)]).
-clause(c2, [neg(c)]).
-clause(c3, [pos(a), pos(b)]).
+sat_clause(c1, [neg(a), pos(c)]).
+sat_clause(c2, [neg(c)]).
+sat_clause(c3, [pos(a), pos(b)]).
 
 % Initial trail before conflict analysis.
 initial_value(a, true, decision(level1)).
@@ -38,7 +38,7 @@ call_value(final, Var, Value, Reason) :- final_value(Var, Value, Reason).
 
 % A clause is conflicting when all of its literals are false under a trail.
 conflict(Trail, Clause) :-
-  clause(Clause, Literals),
+  sat_clause(Clause, Literals),
   \+ nonfalse_literal(Trail, Literals).
 nonfalse_literal(Trail, Literals) :-
   member(Literal, Literals),
@@ -56,13 +56,13 @@ final_value(c, false, unit(c2)).
 final_value(b, true, unit(c3)).
 
 model_satisfies_clause(Trail, Clause) :-
-  clause(Clause, Literals),
+  sat_clause(Clause, Literals),
   member(Literal, Literals),
   lit_true(Literal, Trail).
 
 final_model_ok(ok) :- \+ unsatisfied_final_clause.
 unsatisfied_final_clause :-
-  clause(Name, _),
+  sat_clause(Name, _),
   \+ model_satisfies_clause(final, Name).
 
 cdclAnswer(conflict_clause, Clause) :- conflict(initial, Clause).

package/examples/composition-of-injective-functions-is-injective.pl

@@ -8,6 +8,9 @@
 %% goal: sameInputByCompositeInjectivity(X0, X1, X2)
 
 
+:- discontiguous(app/3).
+:- discontiguous(sameTerm/2).
+
 % Program structure: facts set up the scenario, and rules derive the queried conclusions.
 inX(a).
 inX(b).
@@ -19,7 +22,7 @@ inZ(e).
 sameTerm(X, X) :- inX(X).
 sameTerm(X, X) :- inY(X).
 sameTerm(X, X) :- inZ(X).
-sameTerm(Y, X) :- sameTerm(X, Y).
+sameTerm(Y, X) :- Y @< X, sameTerm(X, Y).
 
 app(f, a, c).
 app(f, b, d).

package/examples/deep-taxonomy-10.pl

@@ -19,6 +19,8 @@
 %% goal: arc(X0, X1)
 
 
+:- discontiguous(a/2).
+
 % Program structure: facts set up the scenario, and rules derive the queried conclusions.
 % fact
 

package/examples/deep-taxonomy-100.pl

@@ -19,6 +19,8 @@
 %% goal: arc(X0, X1)
 
 
+:- discontiguous(a/2).
+
 % Program structure: facts set up the scenario, and rules derive the queried conclusions.
 % fact
 

package/examples/deep-taxonomy-1000.pl

@@ -19,6 +19,8 @@
 %% goal: arc(X0, X1)
 
 
+:- discontiguous(a/2).
+
 % Program structure: facts set up the scenario, and rules derive the queried conclusions.
 % fact
 

package/examples/deep-taxonomy-10000.pl

@@ -19,6 +19,8 @@
 %% goal: arc(X0, X1)
 
 
+:- discontiguous(a/2).
+
 % Program structure: facts set up the scenario, and rules derive the queried conclusions.
 % fact
 

package/examples/exoplanet-validation-worlds.pl

@@ -18,6 +18,9 @@
 %% goal: reason(X0, X1)
 
 
+:- discontiguous(confirms_in_world/2).
+:- discontiguous(rejects_in_world/2).
+
 % candidate/4 stores occurrence rate, sensitivity, and specificity.  world/2
 % names the alternative validation policies applied to the same signals.
 candidate(rare_wide_orbit, 0.001, 0.99, 0.99).

package/examples/family-cousins.pl

@@ -8,6 +8,8 @@
 %% goal: cousin(X0, X1)
 
 
+:- discontiguous(branch/2).
+
 % The family tree is scoped inside family_graph/2.  family_statement/3 projects
 % only the parent and seedBranch facts that the cousin rules need.
 

package/examples/fastpow.pl

@@ -20,20 +20,20 @@
 
 % Base case and parity split for exponentiation by squaring.  Even exponents
 % square the half-power; odd exponents peel off one base factor.
-(1 is _base ** 0).
+fast_power(_Base, 0, 1).
 % Recursive even/odd clauses reduce the exponent quickly rather than counting
 % down one multiplication at a time.
-(Value is Base ** Exp) :-
+fast_power(Base, Exp, Value) :-
   (Exp > 0),
   (0 is Exp mod 2),
   (Half is Exp // 2),
-  (Halfvalue is Base ** Half),
+  fast_power(Base, Half, Halfvalue),
   (Value is Halfvalue * Halfvalue).
-(Value is Base ** Exp) :-
+fast_power(Base, Exp, Value) :-
   (Exp > 0),
   (1 is Exp mod 2),
   (Evenexp is Exp - 1),
-  (Evenvalue is Base ** Evenexp),
+  fast_power(Base, Evenexp, Evenvalue),
   (Value is Base * Evenvalue).
 
 % pow_mod/4 applies the modulus at each multiplication to keep values small.
@@ -58,7 +58,7 @@ pow_mod(Base, Exp, Mod, Value) :-
 tower(2, 4, 65536).
 tower_mod(2, 5, 1000000, 156736).
 
-pow([2, 10], Value) :- (Value is 2 ** 10).
+pow([2, 10], Value) :- fast_power(2, 10, Power), (Value is Power + 0.0).
 powSlow([2, 10], Value) :- (Value is 2 ** 10).
 powMod1e6([2, 10000], Value) :- pow_mod(2, 10000, 1000000, Value).
 powMod1e6([3, 10000], Value) :- pow_mod(3, 10000, 1000000, Value).

package/examples/flandor.pl

@@ -81,6 +81,20 @@
 %% goal: lowestCostEligiblePackageChosen(X0, X1)
 
 
+:- discontiguous(industrialCluster/1).
+:- discontiguous(clusterName/2).
+:- discontiguous(exportOrdersIndex/2).
+:- discontiguous(energyIntensity/2).
+:- discontiguous(policyPackage/1).
+:- discontiguous(packageId/2).
+:- discontiguous(packageName/2).
+:- discontiguous(costMEUR/2).
+:- discontiguous(worker_coverage/2).
+:- discontiguous(grid_relief_mw/2).
+:- discontiguous(coversExportWeakness/2).
+:- discontiguous(coversSkillsStrain/2).
+:- discontiguous(coversGridStress/2).
+
 % Program structure: facts set up the scenario, and rules derive the queried conclusions.
 % Case metadata describes the request, audit window, and expected file writes.
 case_name(case, "flandor").

package/examples/gd-step-certified.pl

@@ -24,6 +24,9 @@
 %% goal: widthContractsAt(X0, X1)
 
 
+:- discontiguous(x_bounds/3).
+:- discontiguous(width/2).
+
 % Program structure: facts set up the scenario, and rules derive the queried conclusions.
 
 % Adapted from Eyeling's gd-step-certified.n3.

package/examples/group-inverse-uniqueness.pl

@@ -14,21 +14,21 @@ element(x).
 element(i).
 element(j).
 
-% leftInverse/2 and rightInverse/2 are proved from op/3.  sameInverse/3
+% leftInverse/2 and rightInverse/2 are proved from group_op/3. sameInverse/3
 % then derives uniqueness by combining both inverse directions with sameTerm/2.
-op(e, X, X) :- element(X).
-op(X, e, X) :- element(X).
-op(i, x, e).
-op(x, j, e).
-op(j, x, e).
-op(x, i, e).
+group_op(e, X, X) :- element(X).
+group_op(X, e, X) :- element(X).
+group_op(i, x, e).
+group_op(x, j, e).
+group_op(j, x, e).
+group_op(x, i, e).
 
 sameTerm(X, X) :- element(X).
 sameTerm(i, j).
 sameTerm(j, i).
 
-leftInverse(A, B) :- op(B, A, e).
-rightInverse(A, B) :- op(A, B, e).
+leftInverse(A, B) :- group_op(B, A, e).
+rightInverse(A, B) :- group_op(A, B, e).
 
 sameInverse(A, B, C) :-
   leftInverse(A, B),

package/examples/illegitimate-reasoning.pl

@@ -23,6 +23,12 @@
 %% goal: omittedAlternative(X0, X1)
 
 
+:- discontiguous(argument/1).
+:- discontiguous(implication/3).
+:- discontiguous(observed/2).
+:- discontiguous(concludes/2).
+:- discontiguous(reason/2).
+
 % Program structure: facts set up the scenario, and rules derive the queried conclusions.
 argument(arg_affirming_consequent).
 implication(arg_affirming_consequent, rain, street_wet).

package/examples/input/odrl-dpv-fpv-trust-flow-rules.pl

@@ -65,16 +65,10 @@ rdf_number(Subject, Predicate, Number) :-
   iri_term(Subject, SubjectIri),
   iri_term(Predicate, PredicateIri),
   rdf(iri(SubjectIri), iri(PredicateIri), literal(Text, datatype(_Datatype)), default_graph),
-  number_string(Number, Text).
+  atom_chars(Text, Chars),
+  number_chars(Number, Chars).
 
 iri_term(ex(Name), Iri) :- namespace_iri('https://example.org/', Name, Iri).
 iri_term(odrl(Name), Iri) :- namespace_iri('http://www.w3.org/ns/odrl/2/', Name, Iri).
 
-namespace_iri(Prefix, Name, Iri) :-
-  atom(Name),
-  !,
-  atom_string(Name, Local),
-  string_concat(Prefix, Local, Iri).
-namespace_iri(Prefix, Name, Iri) :-
-  string_concat(Prefix, Local, Iri),
-  atom_string(Name, Local).
+namespace_iri(Prefix, Name, Iri) :- atom_concat(Prefix, Name, Iri).

package/examples/list-collection.pl

@@ -2,11 +2,11 @@
 % Demonstrates list literals, member/2, length/2, append/3, and [Head|Tail].
 % Each queried relation demonstrates one list operation.
 % Output declarations: host-supplied goals select the relations written to this example's golden output.
-%% goal: length(X0, X1)
+%% goal: collectionLength(X0, X1)
 
-%% goal: member(X0, X1)
+%% goal: collectionMember(X0, X1)
 
-%% goal: append(X0, X1)
+%% goal: collectionAppend(X0, X1)
 
 %% goal: head(X0, X1)
 
@@ -21,15 +21,15 @@ collection(letters, [a, b]).
 
 % The derived predicates show list length, membership, append, and pattern
 % matching with [Head|Tail] in the smallest possible setting.
-length(numbers, N) :-
+collectionLength(numbers, N) :-
   collection(numbers, List),
   length(List, N).
 
-member(numbers, X) :-
+collectionMember(numbers, X) :-
   collection(numbers, List),
   member(X, List).
 
-append(letters, Extended) :-
+collectionAppend(letters, Extended) :-
   collection(letters, List),
   append(List, [c], Extended).
 

package/examples/lldm.pl

@@ -18,6 +18,8 @@
 %% goal: lld_reason(X0, X1)
 
 
+:- discontiguous(val/3).
+
 % val/3 stores raw landmark coordinates, derived deltas, line coefficients,
 % projected landmarks, lengths, and alarm values in one measurement namespace.
 measurement(meas47).

package/examples/odrl-dpv-fpv-trust-flow.pl

@@ -100,16 +100,10 @@ rdf_number(Subject, Predicate, Number) :-
   iri_term(Subject, SubjectIri),
   iri_term(Predicate, PredicateIri),
   rdf(iri(SubjectIri), iri(PredicateIri), literal(Text, datatype(_Datatype)), default_graph),
-  number_string(Number, Text).
+  atom_chars(Text, Chars),
+  number_chars(Number, Chars).
 
 iri_term(ex(Name), Iri) :- namespace_iri('https://example.org/', Name, Iri).
 iri_term(odrl(Name), Iri) :- namespace_iri('http://www.w3.org/ns/odrl/2/', Name, Iri).
 
-namespace_iri(Prefix, Name, Iri) :-
-  atom(Name),
-  !,
-  atom_string(Name, Local),
-  string_concat(Prefix, Local, Iri).
-namespace_iri(Prefix, Name, Iri) :-
-  string_concat(Prefix, Local, Iri),
-  atom_string(Name, Local).
+namespace_iri(Prefix, Name, Iri) :- atom_concat(Prefix, Name, Iri).

package/examples/output/bmi.pl

@@ -30,3 +30,12 @@ c8(check, "OK - classification behavior is monotonic across representative BMI v
 c9(check, "OK - the healthy-weight band was reconstructed from BMI 18.5 to 24.9 at the same height.").
 result(report, bmi(22.72, "Normal")).
 healthyWeightRangeKg(report, range(58.6, 78.9)).
+checkPassed(report, c1).
+checkPassed(report, c2).
+checkPassed(report, c3).
+checkPassed(report, c4).
+checkPassed(report, c5).
+checkPassed(report, c6).
+checkPassed(report, c7).
+checkPassed(report, c8).
+checkPassed(report, c9).

package/examples/output/list-collection.pl

@@ -1,7 +1,7 @@
-length(numbers, 3).
-member(numbers, 1).
-member(numbers, 2).
-member(numbers, 3).
-append(letters, [a, b, c]).
+collectionLength(numbers, 3).
+collectionMember(numbers, 1).
+collectionMember(numbers, 2).
+collectionMember(numbers, 3).
+collectionAppend(letters, [a, b, c]).
 head(letters, a).
 tail(letters, [b]).

package/examples/pointer-analysis.pl

@@ -15,6 +15,9 @@
 
 
 
+:- discontiguous(assign/2).
+:- discontiguous(points_to/2).
+
 % Source-program statements:
 %   x = &object_a
 %   z = &object_b