diff --git a/src/features/phone_applications_foreground/rapids/main.py b/src/features/phone_applications_foreground/rapids/main.py index 08522813..d709c5cc 100644 --- a/src/features/phone_applications_foreground/rapids/main.py +++ b/src/features/phone_applications_foreground/rapids/main.py @@ -24,9 +24,13 @@ def compute_features(filtered_data, apps_type, requested_features, apps_features apps_features["frequencyentropy" + apps_type] = np.nan else: apps_features["frequencyentropy" + apps_type] = apps_with_count.groupby("local_segment")["timestamp"].agg(entropy) - if "count" in requested_features: - apps_features["count" + apps_type] = filtered_data.groupby(["local_segment"]).count()["timestamp"] - apps_features.fillna(value={"count" + apps_type: 0}, inplace=True) + if "countevent" in requested_features: + apps_features["countevent" + apps_type] = filtered_data.groupby(["local_segment"]).count()["timestamp"] + apps_features.fillna(value={"countevent" + apps_type: 0}, inplace=True) + + if "countepisode" in requested_features: + apps_features["countepisode" + apps_type] = filtered_data.groupby(["local_segment"]).count()["start_timestamp"] + apps_features.fillna(value={"countepisode" + apps_type: 0}, inplace=True) if "minduration" in requested_features: grouped_data = filtered_data.groupby(by = ['local_segment'])['duration'].min() @@ -104,6 +108,9 @@ def process_app_features(data, requested_features, time_segment, provider, filte # own categories for owncategory_name, owncategory_content in custom_categories.items(): filtered_data = data[data["package_name"].isin(owncategory_content)] + print(filtered_data) + # print(requested_features) + # 1/0 features = compute_features(filtered_data, owncategory_name, requested_features, features, time_segment) # multiple categories for mcategory_name, mcategory_content in multiple_categories.items(): diff --git a/tests/settings/stz_frequency_config.yaml b/tests/settings/stz_frequency_config.yaml index 71169e48..cd532993 100644 --- a/tests/settings/stz_frequency_config.yaml +++ b/tests/settings/stz_frequency_config.yaml @@ -123,8 +123,8 @@ PHONE_APPLICATIONS_FOREGROUND: EXCLUDED_CATEGORIES: [] EXCLUDED_APPS: ["com.fitbit.FitbitMobile", "com.aware.plugin.upmc.cancer"] FEATURES: - APP_EVENTS: ["count", "timeoffirstuse", "timeoflastuse", "frequencyentropy"] - APP_EPISODES: ["minduration", "maxduration", "meanduration", "sumduration"] + APP_EVENTS: ["countevent", "timeoffirstuse", "timeoflastuse", "frequencyentropy"] + APP_EPISODES: ["countepisode","minduration", "maxduration", "meanduration", "sumduration"] IGNORE_EPISODES_SHORTER_THAN: 0 # in minutes, set to 0 to disable IGNORE_EPISODES_LONGER_THAN: 300 # in minutes, set to 0 to disable SRC_SCRIPT: src/features/phone_applications_foreground/rapids/main.py