Skip to content

Follow-up to #17770 #17873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2017
Merged

Follow-up to #17770 #17873

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 77 additions & 27 deletions pandas/_libs/tslibs/fields.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
if field == 'is_month_start':
if is_business:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -172,7 +174,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
return out.view(bool)
else:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -185,7 +189,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
elif field == 'is_month_end':
if is_business:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -202,7 +208,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
return out.view(bool)
else:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -219,7 +227,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
elif field == 'is_quarter_start':
if is_business:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -232,7 +242,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
return out.view(bool)
else:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -245,7 +257,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
elif field == 'is_quarter_end':
if is_business:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -263,7 +277,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
return out.view(bool)
else:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -280,7 +296,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
elif field == 'is_year_start':
if is_business:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -293,7 +311,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
return out.view(bool)
else:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -306,7 +326,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
elif field == 'is_year_end':
if is_business:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -324,7 +346,9 @@ def get_start_end_field(ndarray[int64_t] dtindex, object field,
return out.view(bool)
else:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = 0; continue
if dtindex[i] == NPY_NAT:
out[i] = 0
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand Down Expand Up @@ -367,7 +391,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
if field == 'Y':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -377,7 +403,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 'M':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -387,7 +415,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 'D':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -397,7 +427,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 'h':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -407,7 +439,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 'm':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -417,7 +451,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 's':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -427,7 +463,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 'us':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -437,7 +475,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 'ns':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -446,7 +486,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 'doy':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -457,7 +499,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 'dow':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -467,7 +511,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 'woy':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -477,7 +523,7 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
doy = mo_off + dts.day
dow = dayofweek(dts.year, dts.month, dts.day)

#estimate
# estimate
woy = (doy - 1) - dow + 3
if woy >= 0:
woy = woy / 7 + 1
Expand All @@ -498,7 +544,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 'q':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -509,7 +557,9 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
elif field == 'dim':
with nogil:
for i in range(count):
if dtindex[i] == NPY_NAT: out[i] = -1; continue
if dtindex[i] == NPY_NAT:
out[i] = -1
continue

pandas_datetime_to_datetimestruct(
dtindex[i], PANDAS_FR_ns, &dts)
Expand All @@ -522,7 +572,7 @@ def get_date_field(ndarray[int64_t] dtindex, object field):


cdef inline int days_in_month(pandas_datetimestruct dts) nogil:
return days_per_month_table[is_leapyear(dts.year)][dts.month -1]
return days_per_month_table[is_leapyear(dts.year)][dts.month - 1]


cpdef isleapyear_arr(ndarray years):
Expand Down