From 767f98eaa369874991d54efc9408c34c41f978b7 Mon Sep 17 00:00:00 2001 From: Mark Thom Date: Sun, 24 Feb 2019 03:45:41 -0700 Subject: [PATCH] begin work on between library --- src/prolog/lib/between.pl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/prolog/lib/between.pl b/src/prolog/lib/between.pl index c6e203f0..e7167ca7 100644 --- a/src/prolog/lib/between.pl +++ b/src/prolog/lib/between.pl @@ -82,11 +82,12 @@ diag_ints(M, N) :- diag_ints(M0, N0, M, N). gen_ints(L, U) :- - integer(L), !, gen_int(U), L =< U. -gen_ints(L, U) :- - integer(U), !, gen_int(L), L =< U. -gen_ints(L, U) :- - diag_ints(L, U), L =< U. + ( integer(L), integer(U), ! + ; integer(L) -> gen_int(U) + ; integer(U) -> gen_int(L) + ; diag_ints(L, U) + ), + L =< U. numlist(Lower, Upper, List) :- gen_ints(Lower, Upper), findall(X, between(Lower, Upper, X), List). -- 2.54.0