OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-ure commits / c9109ac

Explicitly require eager evaluation.
c9109acea4ba22cf64e9fb7db61e111a5ecedfac
by Linas Vepstas <linasvepstas@gmail.com> · 2022-07-27T04:35:13.000Z

Changed files (20) +81 -81

tests/ure/RuleUTest.cxxtest +16 -16
……@@ -205,13 +205,13 @@ void RuleUTest::test_unify_target_deduction_1()
205205 VA = al(INHERITANCE_LINK, V, A),
206206 XA = al(INHERITANCE_LINK, X, A),
207207 XnotA = al(NOT_LINK, al(IDENTICAL_LINK, X, A)),
208 true_enough = an(GROUNDED_PREDICATE_NODE, "scm: true-enough"),
208 true_enough = an(GROUNDED_PREDICATE_NODE, "scm-eager: true-enough"),
209209 true_enough_XV = al(EVALUATION_LINK, true_enough, XV),
210210 true_enough_VA = al(EVALUATION_LINK, true_enough, VA),
211211 body = al(AND_LINK,
212212 al(PRESENT_LINK, XV, VA),
213213 XnotA, true_enough_XV, true_enough_VA),
214 schema = an(GROUNDED_SCHEMA_NODE, "scm: bc-deduction"),
214 schema = an(GROUNDED_SCHEMA_NODE, "scm-eager: bc-deduction"),
215215 rewrite = al(EXECUTION_OUTPUT_LINK,
216216 schema,
217217 al(LIST_LINK, XA, XV, VA)),
……@@ -245,13 +245,13 @@ void RuleUTest::test_unify_target_deduction_2()
245245 VA = al(INHERITANCE_LINK, V, A),
246246 XA = al(INHERITANCE_LINK, X, A),
247247 XnotA = al(NOT_LINK, al(IDENTICAL_LINK, X, A)),
248 true_enough = an(GROUNDED_PREDICATE_NODE, "scm: true-enough"),
248 true_enough = an(GROUNDED_PREDICATE_NODE, "scm-eager: true-enough"),
249249 true_enough_XV = al(EVALUATION_LINK, true_enough, XV),
250250 true_enough_VA = al(EVALUATION_LINK, true_enough, VA),
251251 body = al(AND_LINK,
252252 al(PRESENT_LINK, XV, VA),
253253 XnotA, true_enough_XV, true_enough_VA),
254 schema = an(GROUNDED_SCHEMA_NODE, "scm: bc-deduction"),
254 schema = an(GROUNDED_SCHEMA_NODE, "scm-eager: bc-deduction"),
255255 rewrite = al(EXECUTION_OUTPUT_LINK,
256256 schema,
257257 al(LIST_LINK, XA, XV, VA)),
……@@ -314,7 +314,7 @@ void RuleUTest::test_unify_target_deduction_3()
314314 " (VariableNode \"$B-6c74a409\"))"
315315 " (AndLink"
316316 " (EvaluationLink"
317 " (GroundedPredicateNode \"scm: true-enough\")"
317 " (GroundedPredicateNode \"scm-eager: true-enough\")"
318318 " (ImplicationLink"
319319 " (VariableNode \"$B-6c74a409\")"
320320 " (QuoteLink"
……@@ -341,7 +341,7 @@ void RuleUTest::test_unify_target_deduction_3()
341341 " (UnquoteLink"
342342 " (VariableNode \"$P-25868310\"))))))"
343343 " (EvaluationLink"
344 " (GroundedPredicateNode \"scm: true-enough\")"
344 " (GroundedPredicateNode \"scm-eager: true-enough\")"
345345 " (ImplicationLink"
346346 " (LambdaLink"
347347 " (TypedVariableLink"
……@@ -374,7 +374,7 @@ void RuleUTest::test_unify_target_deduction_3()
374374 " (ConceptNode \"treatment-1\"))))"
375375 " (VariableNode \"$B-6c74a409\"))))"
376376 " (ExecutionOutputLink"
377 " (GroundedSchemaNode \"scm: crisp-deduction\")"
377 " (GroundedSchemaNode \"scm-eager: crisp-deduction\")"
378378 " (ListLink"
379379 " (ImplicationLink"
380380 " (LambdaLink"
……@@ -437,7 +437,7 @@ void RuleUTest::test_unify_target_implication_scope_to_implication_1()
437437 // Expected up to an alpha conversion
438438 body = al(IMPLICATION_SCOPE_LINK, Typed_X, Eval_P, Eval_Q),
439439 schema = an(GROUNDED_SCHEMA_NODE,
440 "scm: implication-scope-to-implication"),
440 "scm-eager: implication-scope-to-implication"),
441441 rewrite = al(EXECUTION_OUTPUT_LINK,
442442 schema,
443443 al(LIST_LINK, target, body)),
……@@ -468,7 +468,7 @@ void RuleUTest::test_unify_target_implication_scope_to_implication_2()
468468 // Expected up to an alpha conversion
469469 body = al(IMPLICATION_SCOPE_LINK, Typed_X, P_body_var, Eval_Q),
470470 schema = an(GROUNDED_SCHEMA_NODE,
471 "scm: implication-scope-to-implication"),
471 "scm-eager: implication-scope-to-implication"),
472472 rewrite = al(EXECUTION_OUTPUT_LINK,
473473 schema,
474474 al(LIST_LINK, target, body)),
……@@ -566,7 +566,7 @@ void RuleUTest::test_unify_target_implication_scope_to_implication_4()
566566 " (Unquote (VariableNode \"$P-6266d6f2\"))"
567567 " (Unquote (VariableNode \"$Q-7005b724\")))))"
568568 " (ExecutionOutputLink"
569 " (GroundedSchemaNode \"scm: implication-scope-to-implication\")"
569 " (GroundedSchemaNode \"scm-eager: implication-scope-to-implication\")"
570570 " (ListLink"
571571 " (ImplicationLink"
572572 " (Quote (LambdaLink"
……@@ -684,7 +684,7 @@ void RuleUTest::test_unify_target_implication_and_lambda_factorization()
684684 " )"
685685 " )"
686686 " (ExecutionOutputLink"
687 " (GroundedSchemaNode \"scm: implication-and-lambda-factorization\")"
687 " (GroundedSchemaNode \"scm-eager: implication-and-lambda-factorization\")"
688688 " (ImplicationLink"
689689 " (AndLink"
690690 " (LambdaLink"
……@@ -773,7 +773,7 @@ void RuleUTest::test_unify_target_closed_lambda_introduction_1()
773773 " )"
774774 " (AndLink"
775775 " (EvaluationLink"
776 " (GroundedPredicateNode \"scm: closed-lambda-introduction-precondition\")"
776 " (GroundedPredicateNode \"scm-eager: closed-lambda-introduction-precondition\")"
777777 " (EvaluationLink"
778778 " (PredicateNode \"contain\")"
779779 " (ListLink"
……@@ -797,7 +797,7 @@ void RuleUTest::test_unify_target_closed_lambda_introduction_1()
797797 " )"
798798 " )"
799799 " (ExecutionOutputLink"
800 " (GroundedSchemaNode \"scm: closed-lambda-introduction\")"
800 " (GroundedSchemaNode \"scm-eager: closed-lambda-introduction\")"
801801 " (ListLink"
802802 " (LambdaLink"
803803 " (TypedVariableLink"
……@@ -855,7 +855,7 @@ void RuleUTest::test_unify_target_closed_lambda_introduction_2()
855855 " (VariableSet)"
856856 " (AndLink"
857857 " (EvaluationLink"
858 " (GroundedPredicateNode \"scm: closed-lambda-introduction-precondition\")"
858 " (GroundedPredicateNode \"scm-eager: closed-lambda-introduction-precondition\")"
859859 " (EvaluationLink"
860860 " (PredicateNode \"take\")"
861861 " (ListLink"
……@@ -879,7 +879,7 @@ void RuleUTest::test_unify_target_closed_lambda_introduction_2()
879879 " )"
880880 " )"
881881 " (ExecutionOutputLink"
882 " (GroundedSchemaNode \"scm: closed-lambda-introduction\")"
882 " (GroundedSchemaNode \"scm-eager: closed-lambda-introduction\")"
883883 " (ListLink"
884884 " (LambdaLink"
885885 " (TypedVariableLink"
……@@ -967,7 +967,7 @@ void RuleUTest::test_unify_target_intensional_inheritance_direct_introduction()
967967 " )"
968968 " )"
969969 " (ExecutionOutputLink"
970 " (GroundedSchemaNode \"scm: intensional-inheritance-direct-introduction\")"
970 " (GroundedSchemaNode \"scm-eager: intensional-inheritance-direct-introduction\")"
971971 " (ListLink"
972972 " (IntensionalInheritanceLink"
973973 " (VariableNode \"$X\")"
tests/ure/backwardchainer/BITUTest.cxxtest +15 -15
……@@ -227,7 +227,7 @@ void BITUTest::test_expand_1()
227227 " )"
228228 " )"
229229 " (EvaluationLink"
230 " (GroundedPredicateNode \"scm: closed-lambda-introduction-precondition\")"
230 " (GroundedPredicateNode \"scm-eager: closed-lambda-introduction-precondition\")"
231231 " (EvaluationLink (stv 1.000000 1.000000)"
232232 " (PredicateNode \"contain\")"
233233 " (ListLink"
……@@ -268,7 +268,7 @@ void BITUTest::test_expand_1()
268268 " )"
269269 " )"
270270 " (ExecutionOutputLink"
271 " (GroundedSchemaNode \"scm: deduction\")"
271 " (GroundedSchemaNode \"scm-eager: deduction\")"
272272 " (ListLink"
273273 " (ImplicationLink"
274274 " (LambdaLink"
……@@ -296,7 +296,7 @@ void BITUTest::test_expand_1()
296296 " (VariableNode \"$X\")"
297297 " (ConceptNode \"treatment-1\"))))))"
298298 " (ExecutionOutputLink"
299 " (GroundedSchemaNode \"scm: implication-implicant-distribution\")"
299 " (GroundedSchemaNode \"scm-eager: implication-implicant-distribution\")"
300300 " (ListLink"
301301 " (ImplicationLink"
302302 " (LambdaLink"
……@@ -328,7 +328,7 @@ void BITUTest::test_expand_1()
328328 " (ConceptNode \"treatment-1\")"
329329 " (ConceptNode \"compound-A\"))))))"
330330 " (ExecutionOutputLink"
331 " (GroundedSchemaNode \"scm: implication-introduction\")"
331 " (GroundedSchemaNode \"scm-eager: implication-introduction\")"
332332 " (ListLink"
333333 " (ImplicationLink"
334334 " (LambdaLink"
……@@ -359,7 +359,7 @@ void BITUTest::test_expand_1()
359359 " (VariableNode \"$X\")"
360360 " (ConceptNode \"treatment-1\"))))"
361361 " (ExecutionOutputLink"
362 " (GroundedSchemaNode \"scm: closed-lambda-introduction\")"
362 " (GroundedSchemaNode \"scm-eager: closed-lambda-introduction\")"
363363 " (ListLink"
364364 " (LambdaLink"
365365 " (TypedVariableLink"
……@@ -376,7 +376,7 @@ void BITUTest::test_expand_1()
376376 " (ConceptNode \"treatment-1\")"
377377 " (ConceptNode \"compound-A\")))))))))"
378378 " (ExecutionOutputLink"
379 " (GroundedSchemaNode \"scm: implication-and-lambda-factorization\")"
379 " (GroundedSchemaNode \"scm-eager: implication-and-lambda-factorization\")"
380380 " (ImplicationLink"
381381 " (AndLink"
382382 " (LambdaLink"
……@@ -674,7 +674,7 @@ void BITUTest::test_expand_2()
674674 " )"
675675 " )"
676676 " (ExecutionOutputLink"
677 " (GroundedSchemaNode \"scm: deduction\")"
677 " (GroundedSchemaNode \"scm-eager: deduction\")"
678678 " (ListLink"
679679 " (ImplicationLink"
680680 " (LambdaLink"
……@@ -705,7 +705,7 @@ void BITUTest::test_expand_2()
705705 " )"
706706 " )"
707707 " (ExecutionOutputLink"
708 " (GroundedSchemaNode \"scm: deduction\")"
708 " (GroundedSchemaNode \"scm-eager: deduction\")"
709709 " (ListLink"
710710 " (ImplicationLink"
711711 " (LambdaLink"
……@@ -724,7 +724,7 @@ void BITUTest::test_expand_2()
724724 " (VariableNode \"$B-732fec2a\")"
725725 " )"
726726 " (ExecutionOutputLink"
727 " (GroundedSchemaNode \"scm: deduction\")"
727 " (GroundedSchemaNode \"scm-eager: deduction\")"
728728 " (ListLink"
729729 " (ImplicationLink"
730730 " (LambdaLink"
……@@ -792,7 +792,7 @@ void BITUTest::test_expand_2()
792792 " )"
793793 " )"
794794 " (ExecutionOutputLink"
795 " (GroundedSchemaNode \"scm: implication-and-lambda-factorization\")"
795 " (GroundedSchemaNode \"scm-eager: implication-and-lambda-factorization\")"
796796 " (ImplicationLink"
797797 " (AndLink"
798798 " (QuoteLink"
……@@ -938,7 +938,7 @@ void BITUTest::test_expand_3()
938938 " (VariableNode \"$f-72fe9f60\"))"
939939 " (VariableNode \"$f-53364b8c\")"
940940 " (EvaluationLink"
941 " (GroundedPredicateNode \"scm: has-arity\")"
941 " (GroundedPredicateNode \"scm-eager: has-arity\")"
942942 " (ListLink"
943943 " (VariableNode \"$g-6566b25f\")"
944944 " (NumberNode \"1.000000\")"
……@@ -953,7 +953,7 @@ void BITUTest::test_expand_3()
953953 " )"
954954 " )"
955955 " (EvaluationLink"
956 " (GroundedPredicateNode \"scm: absolutely-true\")"
956 " (GroundedPredicateNode \"scm-eager: absolutely-true\")"
957957 " (EvaluationLink"
958958 " (PredicateNode \"minsup\")"
959959 " (ListLink"
……@@ -964,7 +964,7 @@ void BITUTest::test_expand_3()
964964 " )"
965965 " )"
966966 " (EvaluationLink"
967 " (GroundedPredicateNode \"scm: has-arity\")"
967 " (GroundedPredicateNode \"scm-eager: has-arity\")"
968968 " (ListLink"
969969 " (QuoteLink"
970970 " (PutLink"
……@@ -981,7 +981,7 @@ void BITUTest::test_expand_3()
981981 " )"
982982 " )"
983983 " (ExecutionOutputLink"
984 " (GroundedSchemaNode \"scm: specialization\")"
984 " (GroundedSchemaNode \"scm-eager: specialization\")"
985985 " (ListLink"
986986 " (EvaluationLink"
987987 " (PredicateNode \"minsup\")"
……@@ -1009,7 +1009,7 @@ void BITUTest::test_expand_3()
10091009 " )"
10101010 " )"
10111011 " (ExecutionOutputLink"
1012 " (GroundedSchemaNode \"scm: specialization\")"
1012 " (GroundedSchemaNode \"scm-eager: specialization\")"
10131013 " (ListLink"
10141014 " (EvaluationLink"
10151015 " (PredicateNode \"minsup\")"
tests/ure/backwardchainer/scm/bit.scm +20 -20
……@@ -73,7 +73,7 @@
7373 )
7474 )
7575 (EvaluationLink
76 (GroundedPredicateNode "scm: implication-introduction-precondition")
76 (GroundedPredicateNode "scm-eager: implication-introduction-precondition")
7777 (ListLink
7878 (LambdaLink
7979 (TypedVariableLink
……@@ -105,7 +105,7 @@
105105 )
106106 )
107107 (ExecutionOutputLink
108 (GroundedSchemaNode "scm: deduction")
108 (GroundedSchemaNode "scm-eager: deduction")
109109 (ListLink
110110 (ImplicationLink
111111 (LambdaLink
……@@ -145,7 +145,7 @@
145145 )
146146 )
147147 (ExecutionOutputLink
148 (GroundedSchemaNode "scm: implication-implicant-distribution")
148 (GroundedSchemaNode "scm-eager: implication-implicant-distribution")
149149 (ListLink
150150 (ImplicationLink
151151 (LambdaLink
……@@ -191,7 +191,7 @@
191191 )
192192 )
193193 (ExecutionOutputLink
194 (GroundedSchemaNode "scm: implication-introduction")
194 (GroundedSchemaNode "scm-eager: implication-introduction")
195195 (ListLink
196196 (ImplicationLink
197197 (LambdaLink
……@@ -252,7 +252,7 @@
252252 )
253253 )
254254 (ExecutionOutputLink
255 (GroundedSchemaNode "scm: implication-and-lambda-factorization")
255 (GroundedSchemaNode "scm-eager: implication-and-lambda-factorization")
256256 (ImplicationLink
257257 (AndLink
258258 (LambdaLink
……@@ -361,7 +361,7 @@
361361 (VariableNode "$X")
362362 (ConceptNode "treatment-1"))))))
363363 (EvaluationLink
364 (GroundedPredicateNode "scm: implication-introduction-precondition")
364 (GroundedPredicateNode "scm-eager: implication-introduction-precondition")
365365 (ListLink
366366 (LambdaLink
367367 (TypedVariableLink
……@@ -383,7 +383,7 @@
383383 (ConceptNode "treatment-1")
384384 (ConceptNode "compound-A")))))))
385385 (ExecutionOutputLink
386 (GroundedSchemaNode "scm: deduction")
386 (GroundedSchemaNode "scm-eager: deduction")
387387 (ListLink
388388 (ImplicationLink
389389 (LambdaLink
……@@ -411,7 +411,7 @@
411411 (VariableNode "$X")
412412 (ConceptNode "treatment-1"))))))
413413 (ExecutionOutputLink
414 (GroundedSchemaNode "scm: implication-implicant-distribution")
414 (GroundedSchemaNode "scm-eager: implication-implicant-distribution")
415415 (ListLink
416416 (ImplicationLink
417417 (LambdaLink
……@@ -443,7 +443,7 @@
443443 (VariableNode "$X")
444444 (ConceptNode "treatment-1"))))))
445445 (ExecutionOutputLink
446 (GroundedSchemaNode "scm: implication-introduction")
446 (GroundedSchemaNode "scm-eager: implication-introduction")
447447 (ListLink
448448 (ImplicationLink
449449 (LambdaLink
……@@ -483,7 +483,7 @@
483483 (ConceptNode "treatment-1")
484484 (ConceptNode "compound-A"))))))))
485485 (ExecutionOutputLink
486 (GroundedSchemaNode "scm: implication-and-lambda-factorization")
486 (GroundedSchemaNode "scm-eager: implication-and-lambda-factorization")
487487 (ImplicationLink
488488 (AndLink
489489 (LambdaLink
……@@ -664,7 +664,7 @@
664664 )
665665 )
666666 (ExecutionOutputLink
667 (GroundedSchemaNode "scm: deduction")
667 (GroundedSchemaNode "scm-eager: deduction")
668668 (ListLink
669669 (ImplicationLink
670670 (LambdaLink
……@@ -695,7 +695,7 @@
695695 )
696696 )
697697 (ExecutionOutputLink
698 (GroundedSchemaNode "scm: deduction")
698 (GroundedSchemaNode "scm-eager: deduction")
699699 (ListLink
700700 (ImplicationLink
701701 (LambdaLink
……@@ -714,7 +714,7 @@
714714 (VariableNode "$B-732fec2a")
715715 )
716716 (ExecutionOutputLink
717 (GroundedSchemaNode "scm: deduction")
717 (GroundedSchemaNode "scm-eager: deduction")
718718 (ListLink
719719 (ImplicationLink
720720 (LambdaLink
……@@ -856,7 +856,7 @@
856856 )
857857 )
858858 (EvaluationLink
859 (GroundedPredicateNode "scm: gt-zero-confidence")
859 (GroundedPredicateNode "scm-eager: gt-zero-confidence")
860860 (AndLink
861861 (EvaluationLink
862862 (PredicateNode "contraryAttribute")
……@@ -883,7 +883,7 @@
883883 )
884884 )
885885 (ExecutionOutputLink
886 (GroundedSchemaNode "scm: conditional-full-instantiation-scope")
886 (GroundedSchemaNode "scm-eager: conditional-full-instantiation-scope")
887887 (ListLink
888888 (EvaluationLink
889889 (PredicateNode "property")
……@@ -893,7 +893,7 @@
893893 )
894894 )
895895 (ExecutionOutputLink
896 (GroundedSchemaNode "scm: fuzzy-conjunction-introduction")
896 (GroundedSchemaNode "scm-eager: fuzzy-conjunction-introduction")
897897 (ListLink
898898 (AndLink
899899 (EvaluationLink
……@@ -934,7 +934,7 @@
934934 )
935935 )
936936 (ExecutionOutputLink
937 (GroundedSchemaNode "scm: conditional-full-instantiation-scope")
937 (GroundedSchemaNode "scm-eager: conditional-full-instantiation-scope")
938938 (ListLink
939939 (EvaluationLink
940940 (PredicateNode "property")
……@@ -1121,14 +1121,14 @@
11211121 )
11221122 )
11231123 (EvaluationLink
1124 (GroundedPredicateNode "scm: has-arity")
1124 (GroundedPredicateNode "scm-eager: has-arity")
11251125 (ListLink
11261126 (VariableNode "$g-2101505b")
11271127 (NumberNode "2.000000")
11281128 )
11291129 )
11301130 (EvaluationLink
1131 (GroundedPredicateNode "scm: absolutely-true")
1131 (GroundedPredicateNode "scm-eager: absolutely-true")
11321132 (EvaluationLink
11331133 (PredicateNode "minsup")
11341134 (ListLink
……@@ -1140,7 +1140,7 @@
11401140 )
11411141 )
11421142 (ExecutionOutputLink
1143 (GroundedSchemaNode "scm: specialization")
1143 (GroundedSchemaNode "scm-eager: specialization")
11441144 (ListLink
11451145 (EvaluationLink
11461146 (PredicateNode "minsup")
tests/ure/meta-rules/conditional-full-instantiation-meta-rule.scm +3 -3
……@@ -44,7 +44,7 @@
4444 (Unquote (Variable "$P"))
4545 (Unquote (Variable "$Q")))))
4646 (precondition (Evaluation
47 (GroundedPredicate "scm: true-enough")
47 (GroundedPredicate "scm-eager: true-enough")
4848 implication)))
4949 (And
5050 implication
……@@ -66,9 +66,9 @@
6666 (Unquote TyVs)
6767 (And
6868 (Unquote (LocalQuote (LocalQuote P)))
69 (Evaluation (GroundedPredicate "scm: true-enough") (Unquote P)))
69 (Evaluation (GroundedPredicate "scm-eager: true-enough") (Unquote P)))
7070 (ExecutionOutput
71 (GroundedSchema "scm: conditional-full-instantiation")
71 (GroundedSchema "scm-eager: conditional-full-instantiation")
7272 (Unquote
7373 (ListLink
7474 Q
tests/ure/meta-rules/conditional-partial-instantiation-meta-rule.scm +2 -2
……@@ -64,7 +64,7 @@
6464 (Unquote Q))))
6565 ;; Meta rule precondition
6666 (meta-precondition (Evaluation
67 (GroundedPredicate "scm: gt-zero-confidence")
67 (GroundedPredicate "scm-eager: gt-zero-confidence")
6868 implication))
6969 ;; Meta rule pattern
7070 (meta-pattern (And implication meta-precondition))
……@@ -78,7 +78,7 @@
7878 ;; Produced rule rewrite. Apply formula to calculate the TV
7979 ;; over the partially substituted ImplicationScope.
8080 (produced-rewrite (ExecutionOutput
81 (GroundedSchema "scm: conditional-partial-instantiation")
81 (GroundedSchema "scm-eager: conditional-partial-instantiation")
8282 (Unquote
8383 (List
8484 ;; Conclusion
tests/ure/rules/bc-deduction-rule.scm +3 -3
……@@ -19,12 +19,12 @@
1919 (TypedVariable A Concept)
2020 (TypedVariable B Concept)
2121 (TypedVariable C Concept)))
22 (precon1 (Evaluation (GroundedPredicate "scm: true-enough") AB))
23 (precon2 (Evaluation (GroundedPredicate "scm: true-enough") BC))
22 (precon1 (Evaluation (GroundedPredicate "scm-eager: true-enough") AB))
23 (precon2 (Evaluation (GroundedPredicate "scm-eager: true-enough") BC))
2424 (precon3 (Not (Identical A C)))
2525 (pattern (And (Present AB BC) precon1 precon2 precon3))
2626 (rewrite (ExecutionOutput
27 (GroundedSchema "scm: bc-deduction")
27 (GroundedSchema "scm-eager: bc-deduction")
2828 (List AC AB BC))))
2929 (Bind
3030 vardecl
tests/ure/rules/closed-lambda-introduction-rule.scm +2 -2
……@@ -30,12 +30,12 @@
3030 (VariableNode "$V")
3131 (VariableNode "$B"))
3232 (EvaluationLink
33 (GroundedPredicateNode "scm: closed-lambda-introduction-precondition")
33 (GroundedPredicateNode "scm-eager: closed-lambda-introduction-precondition")
3434 (VariableNode "$B"))))
3535
3636(define closed-lambda-introduction-rewrite
3737 (ExecutionOutputLink
38 (GroundedSchemaNode "scm: closed-lambda-introduction")
38 (GroundedSchemaNode "scm-eager: closed-lambda-introduction")
3939 (ListLink
4040 (QuoteLink (LambdaLink
4141 (UnquoteLink (VariableNode "$V"))
tests/ure/rules/conditional-direct-evaluation.scm +1 -1
……@@ -29,7 +29,7 @@
2929 (Present
3030 (Variable "$I"))
3131 (ExecutionOutput
32 (GroundedSchema "scm: conditional-direct-evaluation-implication-scope")
32 (GroundedSchema "scm-eager: conditional-direct-evaluation-implication-scope")
3333 (Variable "$I"))))
3434
3535(define (conditional-direct-evaluation-implication-scope I)
tests/ure/rules/crisp-deduction-rule.scm +3 -3
……@@ -21,12 +21,12 @@
2121 (BC (link-type B C))
2222 (AC (link-type A C))
2323 (vardecl (VariableSet A B C))
24 (precon1 (Evaluation (GroundedPredicate "scm: true-enough") AB))
25 (precon2 (Evaluation (GroundedPredicate "scm: true-enough") BC))
24 (precon1 (Evaluation (GroundedPredicate "scm-eager: true-enough") AB))
25 (precon2 (Evaluation (GroundedPredicate "scm-eager: true-enough") BC))
2626 (precon3 (Not (Identical A C)))
2727 (pattern (And (Present AB BC) precon1 precon2 precon3))
2828 (rewrite (ExecutionOutput
29 (GroundedSchema "scm: crisp-deduction")
29 (GroundedSchema "scm-eager: crisp-deduction")
3030 (List AC AB BC))))
3131 (Bind
3232 vardecl
tests/ure/rules/crisp-modus-ponens-rule.scm +3 -3
……@@ -18,14 +18,14 @@
1818 (vardecl (VariableSet
1919 (TypedVariable A (TypeChoice LambdaT PredicateT))
2020 (TypedVariable B (TypeChoice LambdaT PredicateT))))
21 (precon1 (Evaluation (GroundedPredicate "scm: true-enough") A))
22 (precon2 (Evaluation (GroundedPredicate "scm: true-enough") AB))
21 (precon1 (Evaluation (GroundedPredicate "scm-eager: true-enough") A))
22 (precon2 (Evaluation (GroundedPredicate "scm-eager: true-enough") AB))
2323 (pattern (And
2424 ;; No need to include A as it is already in AB
2525 (Present AB)
2626 precon1 precon2))
2727 (rewrite (ExecutionOutput
28 (GroundedSchema "scm: crisp-modus-ponens")
28 (GroundedSchema "scm-eager: crisp-modus-ponens")
2929 (List B A AB))))
3030 (BindLink
3131 vardecl
tests/ure/rules/fc-deduction-rule.scm +1 -1
……@@ -41,7 +41,7 @@
4141 )
4242 )
4343 (ExecutionOutputLink
44 (GroundedSchemaNode "scm: fc-deduction")
44 (GroundedSchemaNode "scm-eager: fc-deduction")
4545 (ListLink
4646 (InheritanceLink
4747 (VariableNode "$A")
tests/ure/rules/fuzzy-conjunction-introduction-rule.scm +1 -1
……@@ -39,7 +39,7 @@
3939 (vardecl (VariableSet (map gen-typed-variable variables)))
4040 (pattern (Present variables))
4141 (rewrite (ExecutionOutput
42 (GroundedSchema "scm: fuzzy-conjunction-introduction")
42 (GroundedSchema "scm-eager: fuzzy-conjunction-introduction")
4343 ;; We wrap the variables in Set because the order
4444 ;; doesn't matter and that way alpha-conversion
4545 ;; works better.
tests/ure/rules/implication-and-lambda-factorization-rule.scm +1 -1
……@@ -74,7 +74,7 @@
7474
7575(define implication-and-lambda-factorization-rewrite
7676 (ExecutionOutputLink
77 (GroundedSchemaNode "scm: implication-and-lambda-factorization")
77 (GroundedSchemaNode "scm-eager: implication-and-lambda-factorization")
7878 (ImplicationLink
7979 (AndLink
8080 (QuoteLink (LambdaLink
tests/ure/rules/implication-instantiation-rule.scm +2 -2
……@@ -53,7 +53,7 @@
5353
5454(define implication-full-instantiation-rewrite
5555 (ExecutionOutputLink
56 (GroundedSchemaNode "scm: implication-full-instantiation")
56 (GroundedSchemaNode "scm-eager: implication-full-instantiation")
5757 (ListLink
5858 implication-instantiation-body)))
5959
……@@ -115,7 +115,7 @@
115115
116116(define implication-partial-instantiation-rewrite
117117 (ExecutionOutputLink
118 (GroundedSchemaNode "scm: implication-partial-instantiation")
118 (GroundedSchemaNode "scm-eager: implication-partial-instantiation")
119119 (ListLink
120120 implication-instantiation-body)))
121121
tests/ure/rules/implication-introduction-rule.scm +1 -1
……@@ -42,7 +42,7 @@
4242
4343(define implication-introduction-rewrite
4444 (ExecutionOutputLink
45 (GroundedSchemaNode "scm: implication-introduction")
45 (GroundedSchemaNode "scm-eager: implication-introduction")
4646 (ListLink
4747 (VariableNode "$P")
4848 (VariableNode "$Q"))))
tests/ure/rules/implication-scope-direct-evaluation-rule.scm +1 -1
……@@ -83,7 +83,7 @@
8383
8484(define implication-scope-direct-evaluation-rewrite
8585 (ExecutionOutput
86 (GroundedSchema "scm: implication-scope-direct-evaluation")
86 (GroundedSchema "scm-eager: implication-scope-direct-evaluation")
8787 (List
8888 (Variable "$P")
8989 (Variable "$Q"))))
tests/ure/rules/implication-scope-to-implication-rule.scm +1 -1
……@@ -37,7 +37,7 @@
3737
3838(define implication-scope-to-implication-rewrite
3939 (ExecutionOutputLink
40 (GroundedSchemaNode "scm: implication-scope-to-implication")
40 (GroundedSchemaNode "scm-eager: implication-scope-to-implication")
4141 (ListLink
4242 (Implication
4343 (Quote (Lambda
tests/ure/rules/intensional-inheritance-direct-introduction.scm +1 -1
……@@ -94,7 +94,7 @@
9494 ;; A and B are different
9595 (Not (Equal A B)))
9696 (ExecutionOutput
97 (GroundedSchema "scm: intensional-inheritance-direct-introduction")
97 (GroundedSchema "scm-eager: intensional-inheritance-direct-introduction")
9898 (List
9999 ;; Conclusion
100100 (IntensionalInheritance A B)
tests/ure/rules/pln-implication-and-lambda-factorization-rule.scm +1 -1
……@@ -75,7 +75,7 @@
7575
7676(define implication-and-lambda-factorization-rewrite
7777 (ExecutionOutputLink
78 (GroundedSchemaNode "scm: implication-and-lambda-factorization")
78 (GroundedSchemaNode "scm-eager: implication-and-lambda-factorization")
7979 (ListLink
8080 (VariableNode "$TyVs-one")
8181 (VariableNode "$TyVs-two")
tests/ure/rules/unary-specialization-rule.scm +3 -3
……@@ -20,7 +20,7 @@
2020 (AndLink
2121 (Present (VariableNode "$f"))
2222 (EvaluationLink
23 (GroundedPredicateNode "scm: has-arity")
23 (GroundedPredicateNode "scm-eager: has-arity")
2424 (ListLink
2525 (VariableNode "$g")
2626 (NumberNode "1.000000")))
……@@ -31,7 +31,7 @@
3131 (VariableNode "$texts")
3232 (VariableNode "$ms")))
3333 (EvaluationLink
34 (GroundedPredicateNode "scm: absolutely-true")
34 (GroundedPredicateNode "scm-eager: absolutely-true")
3535 (EvaluationLink
3636 (PredicateNode "minsup")
3737 (ListLink
……@@ -39,7 +39,7 @@
3939 (VariableNode "$texts")
4040 (VariableNode "$ms")))))
4141 (ExecutionOutputLink
42 (GroundedSchemaNode "scm: specialization")
42 (GroundedSchemaNode "scm-eager: specialization")
4343 (ListLink
4444 (EvaluationLink
4545 (PredicateNode "minsup")