Changeset 38128 in project
 Timestamp:
 01/17/20 02:04:29 (5 weeks ago)
 Location:
 release/5/srfi19/trunk
 Files:

 1 deleted
 2 edited
Legend:
 Unmodified
 Added
 Removed

release/5/srfi19/trunk/srfi19period.scm
r38112 r38128 7 7 ;; 8 8 ;;  Use a halfclosed interval  [begin end)? Currently [B E]! 9 10 (include "chickenprimitiveobjectinlines")11 9 12 10 (module srfi19period … … 181 179 182 180 (define (tm:timeperiodcontains/period? loc per1 per2) 183 (let ((tper 184 (if (tm:timeperiodtype=? per1 per2) 185 per2 186 (%maketimeperiod 187 (tm:ensurecompatibletimeperiodbegin loc per1 per2) 188 (tm:ensurecompatibletimeperiodend loc per1 per2)) ) ) ) 181 (let ( 182 (tper 183 (if (tm:timeperiodtype=? per1 per2) 184 per2 185 (%maketimeperiod 186 (tm:ensurecompatibletimeperiodbegin loc per1 per2) 187 (tm:ensurecompatibletimeperiodend loc per1 per2)) ) ) ) 189 188 (tm:timepointwithin? 190 189 (%timeperiodbegin per1) (%timeperiodend per1) … … 224 223 225 224 (define (maketimeperiod beg end . args) 226 (letoptionals args ((tt (defaultdateclocktype))) 225 (letoptionals args ( 226 (tt (defaultdateclocktype)) ) 227 227 (checkclocktype 'maketimeperiod tt) 228 228 ; … … 359 359 (checktimeperiod 'timeperiodintersection per1) 360 360 (checktimeperiod 'timeperiodintersection per2) 361 (let ((b1 (%timeperiodbegin per1)) 362 (e1 (%timeperiodend per1))) 363 (let ((b2 (tm:ensurecompatibletime 'timeperiodintersection 364 b1 (%timeperiodbegin per2))) 365 (e2 (tm:ensurecompatibletime 'timeperiodintersection 366 e1 (%timeperiodend per2)))) 367 (receive (bi ei) (tm:timepointintersection b1 e1 b2 e2) 368 (and (tm:time<=? bi ei) 369 (%maketimeperiod bi ei)) ) ) ) ) 361 (let* ( 362 (b1 363 (%timeperiodbegin per1)) 364 (e1 365 (%timeperiodend per1)) 366 (b2 367 (tm:ensurecompatibletime 'timeperiodintersection 368 b1 (%timeperiodbegin per2))) 369 (e2 370 (tm:ensurecompatibletime 'timeperiodintersection 371 e1 (%timeperiodend per2))) ) 372 (receive (bi ei) (tm:timepointintersection b1 e1 b2 e2) 373 (and 374 (tm:time<=? bi ei) 375 (%maketimeperiod bi ei)) ) ) ) 370 376 371 377 ;#f when no overlap … … 373 379 (checktimeperiod 'timeperiodunion per1) 374 380 (checktimeperiod 'timeperiodunion per2) 375 (let ((b1 (%timeperiodbegin per1)) 376 (e1 (%timeperiodend per1))) 377 (let ((b2 (tm:ensurecompatibletime 'timeperiodunion b1 (timeperiodbegin per2))) 378 (e2 (tm:ensurecompatibletime 'timeperiodunion e1 (timeperiodend per2)))) 379 (receive (bi ei) (tm:timepointintersection b1 e1 b2 e2) 380 (and (tm:time<=? bi ei) 381 (receive (bu eu) (tm:timepointunion b1 e1 b2 e2) 382 (%maketimeperiod bu eu) ) ) ) ) ) ) 381 (let* ( 382 (b1 (%timeperiodbegin per1)) 383 (e1 (%timeperiodend per1)) 384 (b2 (tm:ensurecompatibletime 'timeperiodunion b1 (timeperiodbegin per2))) 385 (e2 (tm:ensurecompatibletime 'timeperiodunion e1 (timeperiodend per2))) ) 386 (receive (bi ei) (tm:timepointintersection b1 e1 b2 e2) 387 (and 388 (tm:time<=? bi ei) 389 (receive (bu eu) (tm:timepointunion b1 e1 b2 e2) 390 (%maketimeperiod bu eu) ) ) ) ) ) 383 391 384 392 (define (timeperiodspan per1 per2) 385 393 (checktimeperiod 'timeperiodspan per1) 386 394 (checktimeperiod 'timeperiodspan per2) 387 (let ((b1 (%timeperiodbegin per1)) 388 (e1 (%timeperiodend per1))) 389 (let ((b2 (tm:ensurecompatibletime 'timeperiodspan b1 (%timeperiodbegin per2))) 390 (e2 (tm:ensurecompatibletime 'timeperiodspan e1 (%timeperiodend per2)))) 395 (let* ( 396 (b1 (%timeperiodbegin per1)) 397 (e1 (%timeperiodend per1)) 398 (b2 (tm:ensurecompatibletime 'timeperiodspan b1 (%timeperiodbegin per2))) 399 (e2 (tm:ensurecompatibletime 'timeperiodspan e1 (%timeperiodend per2)))) 391 400 (receive (bu eu) (tm:timepointunion b1 e1 b2 e2) 392 (%maketimeperiod bu eu) ) ) ) )401 (%maketimeperiod bu eu) ) ) ) 393 402 394 403 (define (timeperiodshift per dur) 
release/5/srfi19/trunk/taiutc.dat
r38082 r38128 39 39 2012 JUL 1 =JD 2456109.5 TAIUTC= 35.0 S + (MJD  41317.) X 0.0 S 40 40 2015 JUL 1 =JD 2457204.5 TAIUTC= 36.0 S + (MJD  41317.) X 0.0 S 41 2017 JAN 1 =JD 2457754.5 TAIUTC= 37.0 S + (MJD  41317.) X 0.0 S
Note: See TracChangeset
for help on using the changeset viewer.