From fad58ca8c221def75093463e917f66fc006f3df5 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@gnu.org>
Date: Mon, 26 Mar 2018 16:39:13 +0200
Subject: job-specifier: Preserve '%find-best-next' arguments exactness
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The behavior of the 'min' procedure which converts its parameters to
inexact numbers when at least one of them is inexact was causing
'%find-best-next' to always return real numbers.
* src/mcron/job-specifier.scm (%find-best-next): Preserve the exactness
of numbers in NEXT-LIST.
* tests/job-specifier.scm ("%find-best-next: exact"): New test.
Reported-by: Ludovic Courtès <ludo@gnu.org>
---
src/mcron/job-specifier.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/mcron/job-specifier.scm b/src/mcron/job-specifier.scm
index 5c8e171..e3b3391 100644
--- a/src/mcron/job-specifier.scm
+++ b/src/mcron/job-specifier.scm
@@ -60,12 +60,16 @@ go into the list. For example, (range 1 6 2) returns '(1 3 5)."
;; consisting of the smallest element of the NEXT-LIST, and the smallest
;; element larger than the CURRENT value. If an example of the latter
;; cannot be found, +INF.0 will be returned.
+ (define (exact-min a b)
+ ;; An implement of 'min' which preserves the exactness its arguments.
+ (if (< a b) a b))
+
(let loop ((smallest (inf)) (closest+ (inf)) (lst next-list))
(match lst
(() (cons smallest closest+))
((time . rest)
- (loop (min time smallest)
- (if (> time current) (min time closest+) closest+)
+ (loop (exact-min time smallest)
+ (if (> time current) (exact-min time closest+) closest+)
rest)))))
(define (bump-time time value-list component higher-component
--
cgit v1.2.3