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.

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

refactor: add 'Filename' column; rename 'time' column #114

Merged
merged 1 commit into from
May 8, 2024
Merged
Changes from all commits
Commits
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
34 changes: 26 additions & 8 deletions src/stepcount/stepcount.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,31 +165,43 @@ def main():
steps_summary['hourly'],
enmo_summary['hourly'],
], axis=1)
hourly.to_csv(f"{outdir}/{basename}-Hourly.csv.gz")
hourly.index.name = 'Time'
hourly.reset_index(inplace=True)
hourly.insert(0, 'Filename', info['Filename']) # add filename for reference
hourly.to_csv(f"{outdir}/{basename}-Hourly.csv.gz", index=False)
del hourly # free memory

# Save hourly data, adjusted
hourly_adj = pd.concat([
steps_summary_adj['hourly'],
enmo_summary_adj['hourly'],
], axis=1)
hourly_adj.to_csv(f"{outdir}/{basename}-HourlyAdjusted.csv.gz")
hourly_adj.index.name = 'Time'
hourly_adj.reset_index(inplace=True)
hourly_adj.insert(0, 'Filename', info['Filename']) # add filename for reference
hourly_adj.to_csv(f"{outdir}/{basename}-HourlyAdjusted.csv.gz", index=False)
del hourly_adj # free memory

# Save minutely data
minutely = pd.concat([
steps_summary['minutely'],
enmo_summary['minutely'],
], axis=1)
minutely.to_csv(f"{outdir}/{basename}-Minutely.csv.gz")
minutely.index.name = 'Time'
minutely.reset_index(inplace=True)
minutely.insert(0, 'Filename', info['Filename']) # add filename for reference
minutely.to_csv(f"{outdir}/{basename}-Minutely.csv.gz", index=False)
del minutely # free memory

# Save minutely data, adjusted
minutely_adj = pd.concat([
steps_summary_adj['minutely'],
enmo_summary_adj['minutely'],
], axis=1)
minutely_adj.to_csv(f"{outdir}/{basename}-MinutelyAdjusted.csv.gz")
minutely_adj.index.name = 'Time'
minutely_adj.reset_index(inplace=True)
minutely_adj.insert(0, 'Filename', info['Filename']) # add filename for reference
minutely_adj.to_csv(f"{outdir}/{basename}-MinutelyAdjusted.csv.gz", index=False)
del minutely_adj # free memory

# Save daily data
Expand All @@ -198,7 +210,10 @@ def main():
cadence_summary['daily'],
enmo_summary['daily'],
], axis=1)
daily.to_csv(f"{outdir}/{basename}-Daily.csv.gz")
daily.index.name = 'Date'
daily.reset_index(inplace=True)
daily.insert(0, 'Filename', info['Filename']) # add filename for reference
daily.to_csv(f"{outdir}/{basename}-Daily.csv.gz", index=False)
# del daily # still needed for printing

# Save daily data, adjusted
Expand All @@ -207,16 +222,19 @@ def main():
cadence_summary_adj['daily'],
enmo_summary_adj['daily'],
], axis=1)
daily_adj.to_csv(f"{outdir}/{basename}-DailyAdjusted.csv.gz")
daily_adj.index.name = 'Date'
daily_adj.reset_index(inplace=True)
daily_adj.insert(0, 'Filename', info['Filename']) # add filename for reference
daily_adj.to_csv(f"{outdir}/{basename}-DailyAdjusted.csv.gz", index=False)
# del daily_adj # still needed for printing

# Print
print("\nSummary\n-------")
print(json.dumps(info, indent=4, cls=NpEncoder))
print("\nEstimated Daily Stats\n---------------------")
print(daily)
print(daily.set_index('Date').drop(columns='Filename'))
print("\nEstimated Daily Stats (Adjusted)\n---------------------")
print(daily_adj)
print(daily_adj.set_index('Date').drop(columns='Filename'))
print("\nOutput files saved in:", outdir)

after = time.time()
Expand Down
Loading