Skip to content

Commit

Permalink
fixing log:repeat to not have literal as subject
Browse files Browse the repository at this point in the history
  • Loading branch information
josd committed Mar 13, 2024
1 parent ae79217 commit fd1f1a1
Show file tree
Hide file tree
Showing 8 changed files with 386 additions and 784 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.2
0.3.0
70 changes: 70 additions & 0 deletions lingua/easter.trig
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# ----------
# Easter day
# ----------
#
# See https://en.wikipedia.org/wiki/Date_of_Easter

@prefix math: <http://www.w3.org/2000/10/swap/math#>.
@prefix log: <http://www.w3.org/2000/10/swap/log#>.
@prefix lingua: <http://www.w3.org/2000/10/swap/lingua#>.
@prefix var: <http://www.w3.org/2000/10/swap/var#>.
@prefix : <#>.

# calculate easter day
:easter_rule lingua:head _:easter_rule_head;
lingua:body _:easter_rule_body.

_:easter_rule_head {
(var:x0) :easter (var:x34 var:x32).
}

_:easter_rule_body {
(var:x0 19) math:remainder var:x1.
(var:x0 100) math:integerQuotient var:x2.
(var:x0 100) math:remainder var:x3.
(var:x2 4) math:integerQuotient var:x4.
(var:x2 4) math:remainder var:x5.
(var:x2 8) math:sum var:x6.
(var:x6 25) math:integerQuotient var:x7.
(var:x2 var:x7) math:difference var:x8.
(var:x8 1) math:sum var:x9.
(var:x9 3) math:integerQuotient var:x10.
(19 var:x1) math:product var:x11.
(var:x11 var:x2) math:sum var:x12.
(var:x12 var:x4) math:difference var:x13.
(var:x13 var:x10) math:difference var:x14.
(var:x14 15) math:sum var:x15.
(var:x15 30) math:remainder var:x16.
(var:x3 4) math:integerQuotient var:x17.
(var:x3 4) math:remainder var:x18.
(2 var:x5) math:product var:x19.
(2 var:x17) math:product var:x20.
var:x16 math:negation var:x21.
var:x18 math:negation var:x22.
(32 var:x19 var:x20 var:x21 var:x22) math:sum var:x23.
(var:x23 7) math:remainder var:x24.
(11 var:x16) math:product var:x25.
(22 var:x24) math:product var:x26.
(var:x1 var:x25 var:x26) math:sum var:x27.
(var:x27 451) math:integerQuotient var:x28.
(7 var:x28) math:product var:x29.
var:x29 math:negation var:x30.
(var:x16 var:x24 var:x30 114) math:sum var:x31.
(var:x31 31) math:integerQuotient var:x32.
(var:x31 31) math:remainder var:x33.
(var:x33 1) math:sum var:x34.
}

# query
:easter_query lingua:question _:easter_question;
lingua:answer _:easter_answer.

_:easter_question {
(27) log:repeat var:x0.
(2024 var:x0) math:sum var:x1.
(var:x1) :easter (var:x2 var:x3).
}

_:easter_answer {
var:x1 :easter (var:x2 var:x3).
}
11 changes: 8 additions & 3 deletions lingua/peano.trig
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,15 @@ _:peano_fac_rule2_body {
}

# query
:peano_query lingua:question _:peano_question.
:peano_query lingua:question _:peano_question;
lingua:answer _:peano_answer.

_:peano_question {
((:s 0) (:s (:s 0))) :add var:A.
(var:A (:s (:s 0))) :multiply var:B.
((:s 0) (:s (:s 0))) :multiply var:A.
(var:A (:s (:s (:s 0)))) :add var:B.
var:B :factorial var:C.
}

_:peano_answer {
var:B :factorial var:C.
}
138 changes: 138 additions & 0 deletions lingua/proof/easter.trig

Large diffs are not rendered by default.

943 changes: 166 additions & 777 deletions lingua/proof/peano.trig

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lingua/test
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ done
end=$(($(date +%s)))
echo ""

echo -e "lingua tests: ${YELLOW}`expr $end - $begin` sec${NORMAL} ${GREEN}${OK} OK${NORMAL} ${RED}${FAILED} FAILED${NORMAL}"
echo -e "`expr ${OK} + ${FAILED}` tests ${YELLOW}`expr $end - $begin` sec${NORMAL} ${GREEN}${OK} OK${NORMAL} ${RED}${FAILED} FAILED${NORMAL}"
if [[ ${FAILED} -eq 0 ]]; then
exit 0
else
Expand Down
4 changes: 2 additions & 2 deletions see.pl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
:- use_module(library(semweb/turtle)).
:- catch(use_module(library(http/http_open)), _, true).

version_info('SEE v0.2.2 (2024-03-13)').
version_info('SEE v0.3.0 (2024-03-13)').

help_info('Usage: see <options>* <data>*
see
Expand Down Expand Up @@ -1923,7 +1923,7 @@
raw_type(A, C),
C = B.

'<http://www.w3.org/2000/10/swap/log#repeat>'(A, B) :-
'<http://www.w3.org/2000/10/swap/log#repeat>'([A], B) :-
C is A-1,
between(0, C, B).

Expand Down
Binary file modified see.pvm
Binary file not shown.

0 comments on commit fd1f1a1

Please sign in to comment.