sforman
/
Thun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanup.

This commit is contained in:
Simon Forman 2019-07-21 18:48:11 -07:00
parent 66d8a3be47
commit df94c8feed
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
thun/TLA.pl
View File

@ -36,15 +36,15 @@ next(PC, I) :- PC \= done, relly(PC, I, PCnext, Inext), next(PCnext, Inext).
% Inext in 1..1001. % Inext in 1..1001.
type_ok(Small, Big) :- Small in 0..3, Big in 0..5. type_ok(Small, Big) :- Small in 0..3, Big in 0..5.
next_dh(Small, Big, S, B, Mi, Mo) :- next_dh(Moves) :- next_dh(0, 0, Moves).
B #\= 4, type_ok(Small, Big),
next_dh(Small, Big, [[Move, Si, Bi]|Moves]) :-
type_ok(Small, Big),
die_hard(Move, Small, Big, Si, Bi), die_hard(Move, Small, Big, Si, Bi),
State = [Move, Si, Bi], (Bi = 4 -> Moves=[] ; next_dh(Si, Bi, Moves)).
(Bi = 4 -> Mo=[State|Mi] ; next_dh(Si, Bi, S, B, [State|Mi], Mo)).
% die_hard(Small, Big, S, B). % die_hard(Small, Big, S, B).
@ -66,7 +66,7 @@ big_to_small(Small, Big, S, 0) :-
Small + Big #=< 3, Small + Big #=< 3,
S is Small + Big. S is Small + Big.
big_to_small(Small, Big, 3, B) :- % big_to_small(Small, Big, 3, B) :-
Small + Big #> 3, Small + Big #> 3,
B is Big - (3 - Small). B is Big - (3 - Small).
@ -80,10 +80,18 @@ small_to_big(Small, Big, S, 5) :-
/* /*
With some manual reflow of the list for presentation...
call_with_depth_limit(next_dh(0, 0, S, B, Mi, Mo), 12, REsult). ?- call_with_depth_limit(next_dh(Moves), 11, _).
Moves = [
[fill_big, 0, 5],
[big_to_small, 3, 2],
[empty_small, 0, 2],
[big_to_small, 2, 0],
[fill_big, 2, 5],
[big_to_small, 3, 4]
] ;
true.

1
thun/thun.pl
View File

@ -220,7 +220,6 @@ combo(branch, [T, F, Expr|S], S, Ei, Eo) :-
(append(T, Ei, Eo) ; append(F, Ei, Eo)) (append(T, Ei, Eo) ; append(F, Ei, Eo))
). ).
combo(loop, [_, false|S], S, E, E ). combo(loop, [_, false|S], S, E, E ).
combo(loop, [B, true|S], S, Ei, Eo) :- append(B, [B, loop|Ei], Eo). combo(loop, [B, true|S], S, Ei, Eo) :- append(B, [B, loop|Ei], Eo).