Skip to content

Remove unused calendar options from period_helper #19534

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 2 commits into from
Feb 5, 2018
Merged

Remove unused calendar options from period_helper #19534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a67996
remove unused calendar options from period_helper
jbrockmendel Feb 4, 2018
896bcc0
Merge branch 'master' of https://github.com/pandas-dev/pandas into ph…
jbrockmendel Feb 4, 2018
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
119 changes: 43 additions & 76 deletions pandas/_libs/src/period_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,10 @@ static int days_in_month[2][12] = {
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
{31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}};

/* Return 1/0 iff year points to a leap year in calendar. */
static int dInfoCalc_Leapyear(npy_int64 year, int calendar) {
if (calendar == GREGORIAN_CALENDAR) {
return (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0));
} else {
return (year % 4 == 0);
}
/* Return 1/0 iff year points to a leap year.
* Assumes GREGORIAN_CALENDAR */
static int dInfoCalc_Leapyear(npy_int64 year) {
return (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0));
}

/* Return the day of the week for the given absolute date. */
Expand All @@ -71,40 +68,33 @@ static int dInfoCalc_DayOfWeek(npy_int64 absdate) {
static int monthToQuarter(int month) { return ((month - 1) / 3) + 1; }

/* Return the year offset, that is the absolute date of the day
31.12.(year-1) in the given calendar.
31.12.(year-1)

Assumes GREGORIAN_CALENDAR

This is equivalent to:

(datetime(year, 1, 1) - datetime(1970, 1, 1)).days

Note:
For the Julian calendar we shift the absdate (which is measured
using the Gregorian Epoch) value by two days because the Epoch
(0001-01-01) in the Julian calendar lies 2 days before the Epoch in
the Gregorian calendar. */
static int dInfoCalc_YearOffset(npy_int64 year, int calendar) {
static int dInfoCalc_YearOffset(npy_int64 year) {
year--;
if (calendar == GREGORIAN_CALENDAR) {
if (year >= 0 || -1 / 4 == -1)
return year * 365 + year / 4 - year / 100 + year / 400;
else
return year * 365 + (year - 3) / 4 - (year - 99) / 100 +
if (year >= 0 || -1 / 4 == -1)
return year * 365 + year / 4 - year / 100 + year / 400;
else
return year * 365 + (year - 3) / 4 - (year - 99) / 100 +
(year - 399) / 400;
} else if (calendar == JULIAN_CALENDAR) {
if (year >= 0 || -1 / 4 == -1)
return year * 365 + year / 4 - 2;
else
return year * 365 + (year - 3) / 4 - 2;
}
Py_Error(PyExc_ValueError, "unknown calendar");
onError:
return INT_ERR_CODE;
}

/* Set the instance's value using the given date and time. calendar may be set
* to the flags: GREGORIAN_CALENDAR, JULIAN_CALENDAR to indicate the calendar
* to be used. */

/* Set the instance's value using the given date and time.
* Assumes GREGORIAN_CALENDAR */
static int dInfoCalc_SetFromDateAndTime(struct date_info *dinfo, int year,
int month, int day, int hour,
int minute, double second,
int calendar) {
int minute, double second) {
/* Calculate the absolute date */
{
int leap;
Expand All @@ -116,7 +106,7 @@ static int dInfoCalc_SetFromDateAndTime(struct date_info *dinfo, int year,
PyExc_ValueError, "year out of range: %i", year);

/* Is it a leap year ? */
leap = dInfoCalc_Leapyear(year, calendar);
leap = dInfoCalc_Leapyear(year);

/* Negative month values indicate months relative to the years end */
if (month < 0) month += 13;
Expand All @@ -128,7 +118,7 @@ static int dInfoCalc_SetFromDateAndTime(struct date_info *dinfo, int year,
Py_AssertWithArg(day >= 1 && day <= days_in_month[leap][month - 1],
PyExc_ValueError, "day out of range: %i", day);

yearoffset = dInfoCalc_YearOffset(year, calendar);
yearoffset = dInfoCalc_YearOffset(year);
if (yearoffset == INT_ERR_CODE) goto onError;

absdate = day + month_offset[leap][month - 1] + yearoffset;
Expand All @@ -142,8 +132,6 @@ static int dInfoCalc_SetFromDateAndTime(struct date_info *dinfo, int year,

dinfo->day_of_week = dInfoCalc_DayOfWeek(absdate);
dinfo->day_of_year = (short)(absdate - yearoffset);

dinfo->calendar = calendar;
}

/* Calculate the absolute time */
Expand Down Expand Up @@ -171,33 +159,27 @@ static int dInfoCalc_SetFromDateAndTime(struct date_info *dinfo, int year,
return INT_ERR_CODE;
}

/* Sets the date part of the date_info struct using the indicated
calendar.
/* Sets the date part of the date_info struct
Assumes GREGORIAN_CALENDAR

XXX This could also be done using some integer arithmetics rather
than with this iterative approach... */
static int dInfoCalc_SetFromAbsDate(register struct date_info *dinfo,
npy_int64 absdate, int calendar) {
npy_int64 absdate) {
register npy_int64 year;
npy_int64 yearoffset;
int leap, dayoffset;
int *monthoffset;

/* Approximate year */
if (calendar == GREGORIAN_CALENDAR) {
year = (npy_int64)(((double)absdate) / 365.2425);
} else if (calendar == JULIAN_CALENDAR) {
year = (npy_int64)(((double)absdate) / 365.25);
} else {
Py_Error(PyExc_ValueError, "unknown calendar");
}
year = (npy_int64)(((double)absdate) / 365.2425);

if (absdate > 0) year++;

/* Apply corrections to reach the correct year */
while (1) {
/* Calculate the year offset */
yearoffset = dInfoCalc_YearOffset(year, calendar);
yearoffset = dInfoCalc_YearOffset(year);
if (yearoffset == INT_ERR_CODE) goto onError;

/* Backward correction: absdate must be greater than the
Expand All @@ -208,7 +190,7 @@ static int dInfoCalc_SetFromAbsDate(register struct date_info *dinfo,
}

dayoffset = absdate - yearoffset;
leap = dInfoCalc_Leapyear(year, calendar);
leap = dInfoCalc_Leapyear(year);

/* Forward correction: non leap years only have 365 days */
if (dayoffset > 365 && !leap) {
Expand All @@ -219,7 +201,6 @@ static int dInfoCalc_SetFromAbsDate(register struct date_info *dinfo,
}

dinfo->year = year;
dinfo->calendar = calendar;

/* Now iterate to find the month */
monthoffset = month_offset[leap];
Expand Down Expand Up @@ -410,8 +391,7 @@ static npy_int64 DtoB_WeekendToFriday(npy_int64 absdate, int day_of_week) {

static npy_int64 absdate_from_ymd(int y, int m, int d) {
struct date_info tempDate;
if (dInfoCalc_SetFromDateAndTime(&tempDate, y, m, d, 0, 0, 0,
GREGORIAN_CALENDAR)) {
if (dInfoCalc_SetFromDateAndTime(&tempDate, y, m, d, 0, 0, 0)) {
return INT_ERR_CODE;
}
return tempDate.absdate;
Expand All @@ -423,8 +403,7 @@ static npy_int64 asfreq_DTtoA(npy_int64 ordinal, char relation,
asfreq_info *af_info) {
struct date_info dinfo;
ordinal = downsample_daytime(ordinal, af_info, 0);
if (dInfoCalc_SetFromAbsDate(&dinfo, ordinal + ORD_OFFSET,
GREGORIAN_CALENDAR))
if (dInfoCalc_SetFromAbsDate(&dinfo, ordinal + ORD_OFFSET))
return INT_ERR_CODE;
if (dinfo.month > af_info->to_a_year_end) {
return (npy_int64)(dinfo.year + 1 - BASE_YEAR);
Expand All @@ -436,8 +415,7 @@ static npy_int64 asfreq_DTtoA(npy_int64 ordinal, char relation,
static npy_int64 DtoQ_yq(npy_int64 ordinal, asfreq_info *af_info, int *year,
int *quarter) {
struct date_info dinfo;
if (dInfoCalc_SetFromAbsDate(&dinfo, ordinal + ORD_OFFSET,
GREGORIAN_CALENDAR))
if (dInfoCalc_SetFromAbsDate(&dinfo, ordinal + ORD_OFFSET))
return INT_ERR_CODE;
if (af_info->to_q_year_end != 12) {
dinfo.month -= af_info->to_q_year_end;
Expand Down Expand Up @@ -474,8 +452,7 @@ static npy_int64 asfreq_DTtoM(npy_int64 ordinal, char relation,

ordinal = downsample_daytime(ordinal, af_info, 0);

if (dInfoCalc_SetFromAbsDate(&dinfo, ordinal + ORD_OFFSET,
GREGORIAN_CALENDAR))
if (dInfoCalc_SetFromAbsDate(&dinfo, ordinal + ORD_OFFSET))
return INT_ERR_CODE;
return (npy_int64)((dinfo.year - BASE_YEAR) * 12 + dinfo.month - 1);
}
Expand All @@ -493,8 +470,7 @@ static npy_int64 asfreq_DTtoB(npy_int64 ordinal, char relation,

ordinal = downsample_daytime(ordinal, af_info, 0);

if (dInfoCalc_SetFromAbsDate(&dinfo, ordinal + ORD_OFFSET,
GREGORIAN_CALENDAR))
if (dInfoCalc_SetFromAbsDate(&dinfo, ordinal + ORD_OFFSET))
return INT_ERR_CODE;

if (relation == 'S') {
Expand Down Expand Up @@ -595,8 +571,7 @@ static npy_int64 asfreq_WtoB(npy_int64 ordinal, char relation,
asfreq_info *af_info) {
struct date_info dinfo;
if (dInfoCalc_SetFromAbsDate(
&dinfo, asfreq_WtoDT(ordinal, relation, af_info) + ORD_OFFSET,
GREGORIAN_CALENDAR))
&dinfo, asfreq_WtoDT(ordinal, relation, af_info) + ORD_OFFSET))
return INT_ERR_CODE;

if (relation == 'S') {
Expand Down Expand Up @@ -655,8 +630,7 @@ static npy_int64 asfreq_MtoB(npy_int64 ordinal, char relation,
struct date_info dinfo;

if (dInfoCalc_SetFromAbsDate(
&dinfo, asfreq_MtoDT(ordinal, relation, af_info) + ORD_OFFSET,
GREGORIAN_CALENDAR))
&dinfo, asfreq_MtoDT(ordinal, relation, af_info) + ORD_OFFSET))
return INT_ERR_CODE;

if (relation == 'S') {
Expand Down Expand Up @@ -731,8 +705,7 @@ static npy_int64 asfreq_QtoB(npy_int64 ordinal, char relation,
asfreq_info *af_info) {
struct date_info dinfo;
if (dInfoCalc_SetFromAbsDate(
&dinfo, asfreq_QtoDT(ordinal, relation, af_info) + ORD_OFFSET,
GREGORIAN_CALENDAR))
&dinfo, asfreq_QtoDT(ordinal, relation, af_info) + ORD_OFFSET))
return INT_ERR_CODE;

if (relation == 'S') {
Expand Down Expand Up @@ -803,8 +776,7 @@ static npy_int64 asfreq_AtoB(npy_int64 ordinal, char relation,
asfreq_info *af_info) {
struct date_info dinfo;
if (dInfoCalc_SetFromAbsDate(
&dinfo, asfreq_AtoDT(ordinal, relation, af_info) + ORD_OFFSET,
GREGORIAN_CALENDAR))
&dinfo, asfreq_AtoDT(ordinal, relation, af_info) + ORD_OFFSET))
return INT_ERR_CODE;

if (relation == 'S') {
Expand Down Expand Up @@ -1096,19 +1068,17 @@ static int dInfoCalc_SetFromAbsTime(struct date_info *dinfo, double abstime) {
return 0;
}

/* Set the instance's value using the given date and time. calendar
may be set to the flags: GREGORIAN_CALENDAR, JULIAN_CALENDAR to
indicate the calendar to be used. */
/* Set the instance's value using the given date and time.
Assumes GREGORIAN_CALENDAR. */
static int dInfoCalc_SetFromAbsDateTime(struct date_info *dinfo,
npy_int64 absdate, double abstime,
int calendar) {
npy_int64 absdate, double abstime) {
/* Bounds check */
Py_AssertWithArg(abstime >= 0.0 && abstime <= SECONDS_PER_DAY,
PyExc_ValueError,
"abstime out of range (0.0 - 86400.0): %f", abstime);

/* Calculate the date */
if (dInfoCalc_SetFromAbsDate(dinfo, absdate, calendar)) goto onError;
if (dInfoCalc_SetFromAbsDate(dinfo, absdate)) goto onError;

/* Calculate the time */
if (dInfoCalc_SetFromAbsTime(dinfo, abstime)) goto onError;
Expand Down Expand Up @@ -1356,8 +1326,7 @@ static int _ISOWeek(struct date_info *dinfo) {
/* Verify */
if (week < 0) {
/* The day lies in last week of the previous year */
if ((week > -2) || (week == -2 && dInfoCalc_Leapyear(dinfo->year - 1,
dinfo->calendar)))
if ((week > -2) || (week == -2 && dInfoCalc_Leapyear(dinfo->year - 1)))
week = 53;
else
week = 52;
Expand All @@ -1384,8 +1353,7 @@ int get_date_info(npy_int64 ordinal, int freq, struct date_info *dinfo) {
absdate += 1;
}

if (dInfoCalc_SetFromAbsDateTime(dinfo, absdate, abstime,
GREGORIAN_CALENDAR))
if (dInfoCalc_SetFromAbsDateTime(dinfo, absdate, abstime))
return INT_ERR_CODE;

return 0;
Expand Down Expand Up @@ -1480,7 +1448,6 @@ int pdays_in_month(npy_int64 ordinal, int freq) {
if (get_date_info(ordinal, freq, &dinfo) == INT_ERR_CODE)
return INT_ERR_CODE;

days = days_in_month[dInfoCalc_Leapyear(dinfo.year, dinfo.calendar)]
[dinfo.month - 1];
days = days_in_month[dInfoCalc_Leapyear(dinfo.year)][dinfo.month - 1];
return days;
}
4 changes: 0 additions & 4 deletions pandas/_libs/src/period_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ frequency conversion routines.
* declarations from period here
*/

#define GREGORIAN_CALENDAR 0
#define JULIAN_CALENDAR 1

#define SECONDS_PER_DAY ((double)86400.0)

#define Py_AssertWithArg(x, errortype, errorstr, a1) \
Expand Down Expand Up @@ -138,7 +135,6 @@ typedef struct date_info {
int year;
int day_of_week;
int day_of_year;
int calendar;
} date_info;

typedef npy_int64 (*freq_conv_func)(npy_int64, char, asfreq_info *);
Expand Down
1 change: 0 additions & 1 deletion pandas/_libs/tslibs/period.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ cdef extern from "period_helper.h":
int year
int day_of_week
int day_of_year
int calendar

ctypedef struct asfreq_info:
int from_week_end
Expand Down