aboutsummaryrefslogtreecommitdiff
path: root/module/datetime
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2020-05-24 22:28:13 +0200
committerHugo Hörnquist <hugo@lysator.liu.se>2020-05-24 22:28:13 +0200
commitac374b555accaf7a83424c241f38f997dc6a2068 (patch)
treed598692548f1daf186623bed8db62b7f77312673 /module/datetime
parentMinor change. (diff)
downloadcalp-ac374b555accaf7a83424c241f38f997dc6a2068.tar.gz
calp-ac374b555accaf7a83424c241f38f997dc6a2068.tar.xz
Timespan-overlaps? single moment and tests.
Diffstat (limited to 'module/datetime')
-rw-r--r--module/datetime/util.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/module/datetime/util.scm b/module/datetime/util.scm
index 1bbde87d..6b0a8411 100644
--- a/module/datetime/util.scm
+++ b/module/datetime/util.scm
@@ -211,6 +211,9 @@
;; | ||s2| : |s1|| | : | || | : | || | : | || | :
;; | | : | | : | || | : | || | : | || | : |s2|
;; | | : | | : | | : | | : : | |
+;;
+;; Infinitely short ---+|s2| : |s1|+--- : two instants don't overlap
+;; events, overlap s1 : s2 :
;; @end verbatim
;;
;; E is covered by both case A and B.
@@ -226,11 +229,11 @@
(date/-time<? s2-begin s1-end))
;; C
- (and (date/-time<? s1-begin s2-begin)
+ (and (date/-time<=? s1-begin s2-begin)
(date/-time<? s2-end s1-end))
;; D
- (and (date/-time<? s2-begin s1-begin)
+ (and (date/-time<=? s2-begin s1-begin)
(date/-time<? s1-end s2-end))))
(define-public (add-day d)