Skip to content
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

reshuffling code to solve #299 #318

Merged
merged 1 commit into from
Feb 6, 2023
Merged

reshuffling code to solve #299 #318

Show file tree
Hide file tree
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
18 changes: 9 additions & 9 deletions pyleoclim/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ def __repr__(self):

@property
def datetime_index(self):
datum, exponent, direction = tsutils.time_unit_to_datum_exp_dir(self.time_unit)
index = tsutils.time_to_datetime(self.time, datum, exponent, direction)
datum, exponent, direction = tsbase.time_unit_to_datum_exp_dir(self.time_unit)
index = tsbase.time_to_datetime(self.time, datum, exponent, direction)
return pd.DatetimeIndex(index, name='datetime')

@property
Expand All @@ -229,7 +229,7 @@ def metadata(self):
def from_pandas(cls, ser, metadata):
if isinstance(ser.index, pd.DatetimeIndex):
index = ser.index.as_unit('s') if ser.index.unit != 's' else ser.index
time = tsutils.convert_datetime_index_to_time(index, metadata['time_unit'], metadata['time_name'])
time = tsbase.convert_datetime_index_to_time(index, metadata['time_unit'], metadata['time_name'])
else:
raise ValueError('The provided index must be a proper DatetimeIndex object')

Expand All @@ -243,7 +243,7 @@ def from_pandas(cls, ser, metadata):

# Alternate formulation
# def from_pandas(ser, metadata):
# time = tsutils.convert_datetime_index_to_time(ser.index, metadata['time_unit'], metadata['time_name'])
# time = tsbase.convert_datetime_index_to_time(ser.index, metadata['time_unit'], metadata['time_name'])
# ts = Series(value=ser.values, time=time,
# time_name = metadata['time_name'] if metadata['time_name'] is not None else ser.index.name,
# time_unit = metadata['time_unit'],
Expand Down Expand Up @@ -553,7 +553,7 @@ def convert_time_unit(self, time_unit='ky BP', keep_log=False):
else:
return new_ts

new_time = tsutils.convert_datetime_index_to_time(self.datetime_index, time_unit_label, time_name)
new_time = tsbase.convert_datetime_index_to_time(self.datetime_index, time_unit_label, time_name)

dt = np.diff(new_time)
if any(dt<=0):
Expand Down Expand Up @@ -4015,13 +4015,13 @@ def resample(self, rule, **kwargs):
else:
multiplier = int(multiplier)
unit = search.group(2)
if unit.lower() in tsutils.MATCH_A:
if unit.lower() in tsbase.MATCH_A:
pass
elif unit.lower() in tsutils.MATCH_KA:
elif unit.lower() in tsbase.MATCH_KA:
multiplier *= 1_000
elif unit.lower() in tsutils.MATCH_MA:
elif unit.lower() in tsbase.MATCH_MA:
multiplier *= 1_000_000
elif unit.lower() in tsutils.MATCH_GA:
elif unit.lower() in tsbase.MATCH_GA:
multiplier *= 1_000_000_000
else:
raise ValueError(f'Invalid unit provided, got: {unit}')
Expand Down
Loading