Skip to content

Commit 5293a53

Browse files
aarchibamaxnoe
authored andcommitted
Fix datetime accuracy
Fixes astropy#9579
1 parent bd7fe98 commit 5293a53

2 files changed

Lines changed: 24 additions & 10 deletions

File tree

‎astropy/time/formats.py‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,24 +1539,28 @@ def _check_val_type(self, val1, val2):
15391539

15401540
def set_jds(self, val1, val2):
15411541
self._check_scale(self._scale) # Validate scale.
1542-
iterator = np.nditer([val1, None],
1542+
iterator = np.nditer([val1, None, None],
15431543
flags=['refs_ok', 'zerosize_ok'],
1544-
op_dtypes=[None] + [np.double])
1544+
op_dtypes=[None, np.double, np.double])
15451545

1546-
for val, sec in iterator:
1547-
sec[...] = val.item().total_seconds()
1546+
day = datetime.timedelta(days=1)
1547+
for val, jd1, jd2 in iterator:
1548+
jd1[...], other = divmod(val.item(), day)
1549+
jd2[...] = other/day
15481550

1549-
self.jd1, self.jd2 = day_frac(iterator.operands[-1], 0.0,
1550-
divisor=erfa.DAYSEC)
1551+
self.jd1, self.jd2 = day_frac(iterator.operands[-2],
1552+
iterator.operands[-1])
15511553

15521554
@property
15531555
def value(self):
1554-
iterator = np.nditer([self.jd1 + self.jd2, None],
1556+
iterator = np.nditer([self.jd1, self.jd2, None],
15551557
flags=['refs_ok', 'zerosize_ok'],
1556-
op_dtypes=[None] + [object])
1558+
op_dtypes=[None, None, object])
15571559

1558-
for jd, out in iterator:
1559-
out[...] = datetime.timedelta(days=jd.item())
1560+
for jd1, jd2, out in iterator:
1561+
jd1_, jd2_ = day_frac(jd1.item(), jd2.item())
1562+
out[...] = datetime.timedelta(days=jd1_,
1563+
microseconds=jd2_*86400*1e6)
15601564

15611565
return self.mask_if_needed(iterator.operands[-1])
15621566

‎astropy/time/tests/test_precision.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import pytest
55
import numpy as np
66
from decimal import Decimal
7+
from datetime import datetime
78

89
import astropy.units as u
910
import astropy._erfa as erfa
@@ -198,3 +199,12 @@ def test_conversion_preserves_jd1_jd2_invariant_2():
198199
assert t2.jd1 % 1 == 0
199200
assert abs(t2.jd2) <= 0.5
200201
assert abs(t2.jd2) < 0.5 or t2.jd1 % 2 == 0
202+
203+
204+
def test_datetime_difference_agrees_with_timedelta_no_hypothesis():
205+
scale = "tai"
206+
dt1 = datetime(1235, 1, 1, 0, 0)
207+
dt2 = datetime(9950, 1, 1, 0, 0, 0, 890773)
208+
t1 = Time(dt1, scale=scale)
209+
t2 = Time(dt2, scale=scale)
210+
assert(abs((t2-t1) - TimeDelta(dt2-dt1, scale=scale)) < 25*u.us)

0 commit comments

Comments
 (0)