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

Jump to bottom

Features Improvement #1

Closed
wants to merge 4 commits into from
Closed

Features Improvement #1

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee92c3c
Remove radarpipeline submodulke
thepushkarp Sep 8, 2022
9e992d7
Sort imports
thepushkarp Sep 8, 2022
d415e55
Fix features codebase
thepushkarp Sep 15, 2022
dcb9a75
Remove duplicate index drop line
thepushkarp Sep 15, 2022
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
Prev Previous commit
Next Next commit
Fix features codebase
  • Loading branch information
@thepushkarp
thepushkarp committed Sep 15, 2022
commit d415e55897ebc96085bae77814ca183b9941a9b6
28 changes: 12 additions & 16 deletions mockfeatures/features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import pandas as pd

from radarpipeline.datalib import RadarData
from radarpipeline.features import Feature, FeatureGroup

Expand Down Expand Up @@ -34,8 +33,7 @@ def calculate(self, data: RadarData) -> float:
df_phone_battery_level = data.get_combined_data_by_variable(
"android_phone_battery_level"
)
print(df_phone_battery_level)
df_phone_battery_level["value.time"] = pd.to_datetime(
df_phone_battery_level["time"] = pd.to_datetime(
df_phone_battery_level["value.time"], unit="s"
)
df_phone_battery_level["date"] = df_phone_battery_level["time"].dt.date
Expand All @@ -47,17 +45,18 @@ def calculate(self, data: RadarData) -> float:
df_phone_battery_level["value.statusTime"] = (
df_phone_battery_level.groupby("key.userId")["value.time"].diff().shift(-1)
)
df_phone_battery_level = df_phone_battery_level[
df_phone_battery_level["value.status"] == "CHARGING"
]
df_phone_battery_level = (
df_phone_battery_level.groupby(["key.userId", "date", "value.status"])
.agg({"value.statusTime": "sum"})
.reset_index()["value.statusTime"]
.dt.total_seconds()
/ 60
.reset_index(drop=True)
)
df_phone_battery_level["value.statusTime"] = (
df_phone_battery_level["value.statusTime"].dt.total_seconds() / 60
)
df_phone_battery_level = df_phone_battery_level.reset_index()
df_phone_battery_level = df_phone_battery_level[
df_phone_battery_level["value.status"] == "charging"
]
df_phone_battery_level = df_phone_battery_level.reset_index(drop=True)
df_phone_battery_level = df_phone_battery_level.reset_index(drop=True)
return df_phone_battery_level

Expand All @@ -70,17 +69,14 @@ def __init__(self):

def calculate(self, data: RadarData) -> float:
df_step_count = data.get_combined_data_by_variable("android_phone_step_count")
print(df_step_count)
df_step_count["value.time"] = pd.to_datetime(
df_step_count["value.time"], unit="s"
)
df_step_count["time"] = pd.to_datetime(df_step_count["value.time"], unit="s")
df_step_count["date"] = df_step_count["time"].dt.date
df_step_count = df_step_count[
~df_step_count[["key.userId", "value.time", "value.stepCount"]].duplicated()
~df_step_count[["key.userId", "value.time", "value.steps"]].duplicated()
]
df_step_count = df_step_count.reset_index(drop=True)
df_total_step_count = df_step_count.groupby(["key.userId", "date"]).agg(
{"value.stepCount": "sum"}
{"value.steps": "sum"}
)
df_total_step_count = df_total_step_count.reset_index(drop=True)
return df_total_step_count