boris-behav-obs 8.16.6__py3-none-any.whl → 9.7.2__py3-none-any.whl

boris/time_budget_functions.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2023 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,6 +24,9 @@ import statistics
 from decimal import Decimal as dec
 from typing import Tuple
 import tablib
+import logging
+import itertools
+import re
 
 from . import config as cfg
 from . import db_functions
@@ -32,14 +35,14 @@ from . import project_functions
 from . import observation_operations
 
 
-def default_value(ethogram: dict, behav: str, param):
+def default_value(ethogram: dict, behavior_code: str, param):
     """
     return value for duration in case of point event
     """
     default_value_ = 0.0
-    behav_type = project_functions.event_type(behav, ethogram)
+    behavior_type = project_functions.event_type(behavior_code, ethogram)
 
-    if behav_type == "POINT EVENT" and param in (
+    if behavior_type in cfg.POINT_EVENT_TYPES and param in (
         "duration",
         "duration mean",
         "duration stdev",
@@ -47,7 +50,7 @@ def default_value(ethogram: dict, behav: str, param):
     ):
         default_value_ = cfg.NA
 
-    if behav_type == "STATE EVENT" and param in (
+    if behavior_type in cfg.STATE_EVENT_TYPES and param in (
         "duration mean",
         "duration stdev",
     ):
@@ -64,7 +67,6 @@ def init_behav_modif(ethogram: dict, selected_subjects: list, distinct_behav_mod
     for subj in selected_subjects:
         behaviors[subj] = {}
         for behav_modif in distinct_behav_modif:
-
             behav, modif = behav_modif
             behav_modif_str = "|".join(behav_modif) if modif else behav
 
@@ -85,7 +87,6 @@ def init_behav_modif_bin(ethogram: dict, selected_subjects: list, distinct_behav
     for subj in selected_subjects:
         behaviors[subj] = {}
         for behav_modif in distinct_behav_modif:
-
             if behav_modif not in behaviors[subj]:
                 behaviors[subj][behav_modif] = {}
 
@@ -135,35 +136,24 @@ def synthetic_time_budget_bin(pj: dict, selected_observations: list, parameters_
     """
 
     def interval_len(interval):
-        if interval.empty:
-            return dec(0)
-        else:
-            return sum([x.upper - x.lower for x in interval])
+        return dec(0) if interval.empty else sum([x.upper - x.lower for x in interval])
 
     def interval_number(interval):
-        if interval.empty:
-            return dec(0)
-        else:
-            return len(interval)
+        return dec(0) if interval.empty else len(interval)
 
     def interval_mean(interval):
-        if interval.empty:
-            return dec(0)
-        else:
-            return sum([x.upper - x.lower for x in interval]) / len(interval)
+        return dec(0) if interval.empty else sum([x.upper - x.lower for x in interval]) / len(interval)
 
     def interval_std_dev(interval) -> str:
         if interval.empty:
-            return "NA"
+            return cfg.NA
         else:
             try:
                 return f"{statistics.stdev([x.upper - x.lower for x in interval]):.3f}"
             except Exception:
                 return cfg.NA
 
-    selected_subjects = parameters_obs[cfg.SELECTED_SUBJECTS]
     selected_behaviors = parameters_obs[cfg.SELECTED_BEHAVIORS]
-    include_modifiers = parameters_obs[cfg.INCLUDE_MODIFIERS]
     time_interval = parameters_obs["time"]
     start_time = parameters_obs[cfg.START_TIME]
     end_time = parameters_obs[cfg.END_TIME]
@@ -183,14 +173,26 @@ def synthetic_time_budget_bin(pj: dict, selected_observations: list, parameters_
     distinct_behav_modif = []
     for obs_id in selected_observations:
         for event in pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS]:
-            if include_modifiers:
-                if (
-                    event[cfg.EVENT_BEHAVIOR_FIELD_IDX],
-                    event[cfg.EVENT_MODIFIER_FIELD_IDX],
-                ) not in distinct_behav_modif:
-                    distinct_behav_modif.append(
-                        (event[cfg.EVENT_BEHAVIOR_FIELD_IDX], event[cfg.EVENT_MODIFIER_FIELD_IDX])
-                    )
+            if parameters_obs[cfg.INCLUDE_MODIFIERS]:
+                if parameters_obs[cfg.EXCLUDE_NON_CODED_MODIFIERS]:
+                    # get coded modifiers
+                    if (
+                        event[cfg.EVENT_BEHAVIOR_FIELD_IDX],
+                        event[cfg.EVENT_MODIFIER_FIELD_IDX],
+                    ) not in distinct_behav_modif:
+                        distinct_behav_modif.append((event[cfg.EVENT_BEHAVIOR_FIELD_IDX], event[cfg.EVENT_MODIFIER_FIELD_IDX]))
+                else:
+                    # get all modifiers combination
+                    ms: list = []
+                    modifiers_list = project_functions.get_modifiers_of_behavior(pj[cfg.ETHOGRAM], event[cfg.EVENT_BEHAVIOR_FIELD_IDX])
+                    if modifiers_list:
+                        for modif_set in modifiers_list[0]:
+                            modif_set.append("None")
+                            ms.append([re.sub(r" \(.*\)", "", x) for x in modif_set])
+                    distinct_modifiers = ["|".join(x) for x in itertools.product(*ms)]
+                    for modifier in distinct_modifiers:
+                        distinct_behav_modif.append((event[cfg.EVENT_BEHAVIOR_FIELD_IDX], modifier))
+
             else:
                 if (event[cfg.EVENT_BEHAVIOR_FIELD_IDX], "") not in distinct_behav_modif:
                     distinct_behav_modif.append((event[cfg.EVENT_BEHAVIOR_FIELD_IDX], ""))
@@ -212,7 +214,7 @@ def synthetic_time_budget_bin(pj: dict, selected_observations: list, parameters_
     behav_header[1] = "Behaviors:"
     modif_header[1] = "Modifiers:"
 
-    for subj in selected_subjects:
+    for subj in parameters_obs[cfg.SELECTED_SUBJECTS]:
         for behavior_modifiers in distinct_behav_modif:
             behavior, modifiers = behavior_modifiers
             behavior_modifiers_str = "|".join(behavior_modifiers) if modifiers else behavior
@@ -224,19 +226,16 @@ def synthetic_time_budget_bin(pj: dict, selected_observations: list, parameters_
 
     data_report.append(subj_header)
     data_report.append(behav_header)
-    if include_modifiers:
+    if parameters_obs[cfg.INCLUDE_MODIFIERS]:
         data_report.append(modif_header)
     data_report.append(param_header)
 
     state_events_list = [
-        pj[cfg.ETHOGRAM][x][cfg.BEHAVIOR_CODE]
-        for x in pj[cfg.ETHOGRAM]
-        if cfg.STATE in pj[cfg.ETHOGRAM][x][cfg.TYPE].upper()
+        pj[cfg.ETHOGRAM][x][cfg.BEHAVIOR_CODE] for x in pj[cfg.ETHOGRAM] if cfg.STATE in pj[cfg.ETHOGRAM][x][cfg.TYPE].upper()
     ]
     # select time interval
     for obs_id in selected_observations:
-
-        behaviors = init_behav_modif_bin(pj[cfg.ETHOGRAM], selected_subjects, distinct_behav_modif, parameters)
+        behaviors = init_behav_modif_bin(pj[cfg.ETHOGRAM], parameters_obs[cfg.SELECTED_SUBJECTS], distinct_behav_modif, parameters)
 
         obs_length = observation_operations.observation_total_length(pj[cfg.OBSERVATIONS][obs_id])
 
@@ -260,6 +259,13 @@ def synthetic_time_budget_bin(pj: dict, selected_observations: list, parameters_
             min_time = dec(start_time)
             max_time = dec(end_time)
 
+        if time_interval == cfg.TIME_OBS_INTERVAL:
+            obs_interval = pj[cfg.OBSERVATIONS][obs_id].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])
+            offset = pj[cfg.OBSERVATIONS][obs_id][cfg.TIME_OFFSET]
+            min_time = dec(obs_interval[0]) + offset
+            # Use max media duration for max time if no interval is defined (=0)
+            max_time = dec(obs_interval[1]) + offset if obs_interval[1] != 0 else dec(obs_length)
+
         events_interval = {}
         mem_events_interval = {}
 
@@ -269,13 +275,13 @@ def synthetic_time_budget_bin(pj: dict, selected_observations: list, parameters_
             else:
                 current_subject = event[cfg.EVENT_SUBJECT_FIELD_IDX]
 
-            if current_subject not in selected_subjects:
+            if current_subject not in parameters_obs[cfg.SELECTED_SUBJECTS]:
                 continue
             if current_subject not in events_interval:
                 events_interval[current_subject] = {}
                 mem_events_interval[current_subject] = {}
 
-            if include_modifiers:
+            if parameters_obs[cfg.INCLUDE_MODIFIERS]:
                 modif = event[cfg.EVENT_MODIFIER_FIELD_IDX]
             else:
                 modif = ""
@@ -287,9 +293,7 @@ def synthetic_time_budget_bin(pj: dict, selected_observations: list, parameters_
                 mem_events_interval[current_subject][(event[cfg.EVENT_BEHAVIOR_FIELD_IDX], modif)] = []
 
             if event[cfg.EVENT_BEHAVIOR_FIELD_IDX] in state_events_list:
-                mem_events_interval[current_subject][(event[cfg.EVENT_BEHAVIOR_FIELD_IDX], modif)].append(
-                    event[cfg.EVENT_TIME_FIELD_IDX]
-                )
+                mem_events_interval[current_subject][(event[cfg.EVENT_BEHAVIOR_FIELD_IDX], modif)].append(event[cfg.EVENT_TIME_FIELD_IDX])
                 if len(mem_events_interval[current_subject][(event[cfg.EVENT_BEHAVIOR_FIELD_IDX], modif)]) == 2:
                     events_interval[current_subject][(event[cfg.EVENT_BEHAVIOR_FIELD_IDX], modif)] |= I.closedopen(
                         mem_events_interval[current_subject][(event[cfg.EVENT_BEHAVIOR_FIELD_IDX], modif)][0],
@@ -311,9 +315,7 @@ def synthetic_time_budget_bin(pj: dict, selected_observations: list, parameters_
             time_bin_end = max_time
 
         while True:
-
             for subject in events_interval:
-
                 # check behavior to exclude from total time
                 time_to_subtract = 0
                 if cfg.EXCLUDED_BEHAVIORS in parameters_obs:
@@ -323,33 +325,32 @@ def synthetic_time_budget_bin(pj: dict, selected_observations: list, parameters_
                             time_to_subtract += interval_len(interval_intersec)
 
                 for behav in events_interval[subject]:
-
                     interval_intersec = events_interval[subject][behav] & I.closed(time_bin_start, time_bin_end)
 
                     nocc = interval_number(interval_intersec)
                     behaviors[subject][behav]["number"] = nocc
 
                     behav_type = project_functions.event_type(behav[0], pj[cfg.ETHOGRAM])
-                    if behav_type == "STATE EVENT":
+                    if behav_type in cfg.STATE_EVENT_TYPES:
                         dur = interval_len(interval_intersec)
                         behaviors[subject][behav]["duration"] = f"{dur:.3f}"
                         behaviors[subject][behav]["duration mean"] = f"{interval_mean(interval_intersec):.3f}"
                         behaviors[subject][behav]["duration stdev"] = interval_std_dev(interval_intersec)
 
                         if behav[0] in parameters_obs.get(cfg.EXCLUDED_BEHAVIORS, []):
-                            proportion = dur / ((time_bin_end - time_bin_start))
+                            proportion = dur / (time_bin_end - time_bin_start)
                         else:
                             proportion = dur / ((time_bin_end - time_bin_start) - time_to_subtract)
                         behaviors[subject][behav]["proportion of time"] = f"{proportion:.3f}"
 
-                    if behav_type == "POINT EVENT":
+                    if behav_type in cfg.POINT_EVENT_TYPES:
                         behaviors[subject][behav]["duration"] = cfg.NA
                         behaviors[subject][behav]["duration mean"] = cfg.NA
                         behaviors[subject][behav]["duration stdev"] = cfg.NA
                         behaviors[subject][behav]["proportion of time"] = cfg.NA
 
             columns = [obs_id, f"{max_time - min_time:.3f}", f"{time_bin_start:.3f}-{time_bin_end:.3f}"]
-            for subject in selected_subjects:
+            for subject in parameters_obs[cfg.SELECTED_SUBJECTS]:
                 for behavior_modifiers in distinct_behav_modif:
                     behavior, modifiers = behavior_modifiers
                     behavior_modifiers_str = behavior_modifiers
@@ -385,12 +386,9 @@ def synthetic_time_budget(pj: dict, selected_observations: list, parameters_obs:
         tablib.Dataset: dataset containing synthetic time budget data
     """
 
-    selected_subjects = parameters_obs[cfg.SELECTED_SUBJECTS]
-    selected_behaviors = parameters_obs[cfg.SELECTED_BEHAVIORS]
-    include_modifiers = parameters_obs[cfg.INCLUDE_MODIFIERS]
     interval = parameters_obs["time"]
-    start_time = parameters_obs["start time"]
-    end_time = parameters_obs["end time"]
+    start_time = parameters_obs[cfg.START_TIME]
+    end_time = parameters_obs[cfg.END_TIME]
 
     parameters = [
         ["duration", "Total duration"],
@@ -404,7 +402,7 @@ def synthetic_time_budget(pj: dict, selected_observations: list, parameters_obs:
     data_report.title = "Synthetic time budget"
 
     ok, msg, db_connector = db_functions.load_aggregated_events_in_db(
-        pj, selected_subjects, selected_observations, selected_behaviors
+        pj, parameters_obs[cfg.SELECTED_SUBJECTS], selected_observations, parameters_obs[cfg.SELECTED_BEHAVIORS]
     )
 
     if not ok:
@@ -413,20 +411,32 @@ def synthetic_time_budget(pj: dict, selected_observations: list, parameters_obs:
     db_connector.create_aggregate("stdev", 1, StdevFunc)
     cursor = db_connector.cursor()
 
-    # modifiers
-    if include_modifiers:
-        cursor.execute("SELECT distinct behavior, modifiers FROM aggregated_events")
-        distinct_behav_modif = [[rows["behavior"], rows["modifiers"]] for rows in cursor.fetchall()]
-    else:
-        cursor.execute("SELECT distinct behavior FROM aggregated_events")
-        distinct_behav_modif = [[rows["behavior"], ""] for rows in cursor.fetchall()]
-
     # add selected behaviors that are not observed
-    for behav in selected_behaviors:
-        if [x for x in distinct_behav_modif if x[0] == behav] == []:
-            distinct_behav_modif.append([behav, ""])
+    distinct_behav_modif: list = []
+    for behavior in parameters_obs[cfg.SELECTED_BEHAVIORS]:
+        # modifiers
+        if parameters_obs[cfg.INCLUDE_MODIFIERS]:
+            if parameters_obs[cfg.EXCLUDE_NON_CODED_MODIFIERS]:
+                # get coded modifiers
+                cursor.execute("SELECT DISTINCT modifiers FROM aggregated_events WHERE behavior = ?", (behavior,))
+                for row in cursor.fetchall():
+                    distinct_behav_modif.append((behavior, row["modifiers"]))
+            else:
+                # get all modifiers combination
+                ms: list = []
+                modifiers_list = project_functions.get_modifiers_of_behavior(pj[cfg.ETHOGRAM], behavior)
+                if modifiers_list:
+                    for modif_set in modifiers_list[0]:
+                        modif_set.append("None")
+                        ms.append([re.sub(r" \(.*\)", "", x) for x in modif_set])
+                distinct_modifiers = ["|".join(x) for x in itertools.product(*ms)]
+                for modifier in distinct_modifiers:
+                    distinct_behav_modif.append((behavior, modifier))
+
+        else:
+            distinct_behav_modif.append((behavior, ""))
 
-    """behaviors = init_behav_modif(pj[cfg.ETHOGRAM], selected_subjects, distinct_behav_modif, parameters)"""
+    # print(f"{distinct_behav_modif=}")
 
     param_header = ["Observations id", "Total length (s)"]
     subj_header, behav_header, modif_header = (
@@ -438,10 +448,10 @@ def synthetic_time_budget(pj: dict, selected_observations: list, parameters_obs:
     behav_header[1] = "Behaviors:"
     modif_header[1] = "Modifiers:"
 
-    for subj in selected_subjects:
-        for behavior_modifiers in distinct_behav_modif:
-            behavior, modifiers = behavior_modifiers
-            behavior_modifiers_str = "|".join(behavior_modifiers) if modifiers else behavior
+    for subj in parameters_obs[cfg.SELECTED_SUBJECTS]:
+        for behavior, modifiers in distinct_behav_modif:
+            """behavior, modifiers = behavior_modifiers"""
+            """behavior_modifiers_str = "|".join(behavior_modifiers) if modifiers else behavior"""
             for param in parameters:
                 subj_header.append(subj)
                 behav_header.append(behavior)
@@ -450,17 +460,16 @@ def synthetic_time_budget(pj: dict, selected_observations: list, parameters_obs:
 
     data_report.append(subj_header)
     data_report.append(behav_header)
-    if include_modifiers:
+    if parameters_obs[cfg.INCLUDE_MODIFIERS]:
         data_report.append(modif_header)
     data_report.append(param_header)
 
     # select time interval
     for obs_id in selected_observations:
-
-        behaviors = init_behav_modif(pj[cfg.ETHOGRAM], selected_subjects, distinct_behav_modif, parameters)
+        behaviors = init_behav_modif(pj[cfg.ETHOGRAM], parameters_obs[cfg.SELECTED_SUBJECTS], distinct_behav_modif, parameters)
 
         ok, msg, db_connector = db_functions.load_aggregated_events_in_db(
-            pj, selected_subjects, [obs_id], selected_behaviors
+            pj, parameters_obs[cfg.SELECTED_SUBJECTS], [obs_id], parameters_obs[cfg.SELECTED_BEHAVIORS]
         )
 
         if not ok:
@@ -469,7 +478,7 @@ def synthetic_time_budget(pj: dict, selected_observations: list, parameters_obs:
         db_connector.create_aggregate("stdev", 1, StdevFunc)
         cursor = db_connector.cursor()
         # if modifiers not to be included set modifiers to ""
-        if not include_modifiers:
+        if not parameters_obs[cfg.INCLUDE_MODIFIERS]:
             cursor.execute("UPDATE aggregated_events SET modifiers = ''")
 
         # time
@@ -544,19 +553,14 @@ def synthetic_time_budget(pj: dict, selected_observations: list, parameters_obs:
                 ),
             )
 
-        for subject in selected_subjects:
-
+        for subject in parameters_obs[cfg.SELECTED_SUBJECTS]:
             # check if behaviors are to exclude from total time
             time_to_subtract = 0
             if obs_length != dec(-2):  # obs not an images obs without time
                 if cfg.EXCLUDED_BEHAVIORS in parameters_obs:
                     for excluded_behav in parameters_obs[cfg.EXCLUDED_BEHAVIORS]:
                         cursor.execute(
-                            (
-                                "SELECT SUM(stop-start) "
-                                "FROM aggregated_events "
-                                "WHERE observation = ? AND subject = ? AND behavior = ? "
-                            ),
+                            ("SELECT SUM(stop-start) FROM aggregated_events WHERE observation = ? AND subject = ? AND behavior = ? "),
                             (
                                 obs_id,
                                 subject,
@@ -589,20 +593,15 @@ def synthetic_time_budget(pj: dict, selected_observations: list, parameters_obs:
                 )
 
                 for row in cursor.fetchall():
-
-                    behaviors[subject][behavior_modifiers_str]["number"] = (
-                        0 if row["n_occurences"] is None else row["n_occurences"]
-                    )
+                    behaviors[subject][behavior_modifiers_str]["number"] = 0 if row["n_occurences"] is None else row["n_occurences"]
 
                     if obs_length == dec(-2):  # images obs without time
-
                         behaviors[subject][behavior_modifiers_str]["duration"] = cfg.NA
                         behaviors[subject][behavior_modifiers_str]["duration mean"] = cfg.NA
                         behaviors[subject][behavior_modifiers_str]["duration stdev"] = cfg.NA
                         behaviors[subject][behavior_modifiers_str]["proportion of time"] = cfg.NA
 
                     else:
-
                         if row["type"] == cfg.POINT:
                             behaviors[subject][behavior_modifiers_str]["duration"] = cfg.NA
                             behaviors[subject][behavior_modifiers_str]["duration mean"] = cfg.NA
@@ -632,16 +631,14 @@ def synthetic_time_budget(pj: dict, selected_observations: list, parameters_obs:
                             else:
                                 # behavior subtracted
                                 behaviors[subject][behavior_modifiers_str]["proportion of time"] = (
-                                    cfg.NA
-                                    if row["duration"] is None
-                                    else f"{row['duration'] / (max_time - min_time):.3f}"
+                                    cfg.NA if row["duration"] is None else f"{row['duration'] / (max_time - min_time):.3f}"
                                 )
 
         if obs_length == dec(-2):
             columns = [obs_id, cfg.NA]
         else:
             columns = [obs_id, f"{max_time - min_time:0.3f}"]
-        for subj in selected_subjects:
+        for subj in parameters_obs[cfg.SELECTED_SUBJECTS]:
             for behavior_modifiers in distinct_behav_modif:
                 behavior, modifiers = behavior_modifiers
                 behavior_modifiers_str = "|".join(behavior_modifiers) if modifiers else behavior
@@ -666,39 +663,54 @@ def time_budget_analysis(
         cursor: cursor on temporary database
         selected_observations (list): selected observations
         parameters (dict): parameters for analysis
-        by_category (bool): True for grouping in category else False
+        by_category (bool): True for grouping in behavioral category else False
 
     Returns:
         list: results
         dict:
     """
 
+    logging.debug("time_budget_analysis function")
+
+    logging.debug(f"{selected_observations=}")
+    logging.debug(f"{parameters=}")
+
     categories: dict = {}
     out: list = []
     for subject in parameters[cfg.SELECTED_SUBJECTS]:
-        out_cat, categories[subject] = [], {}
+        logging.debug(f"{subject=}")
+
+        out_cat: list = []
+        categories[subject] = {}
 
         for behavior in parameters[cfg.SELECTED_BEHAVIORS]:
+            logging.debug(f"{behavior=}")
 
             if parameters[cfg.INCLUDE_MODIFIERS]:  # with modifiers
-
-                cursor.execute(
-                    "SELECT DISTINCT modifiers FROM events WHERE subject = ? AND code = ?", (subject, behavior)
-                )
-                distinct_modifiers = list(cursor.fetchall())
+                if parameters[cfg.EXCLUDE_NON_CODED_MODIFIERS]:
+                    # get coded modifiers
+                    cursor.execute("SELECT DISTINCT modifiers FROM events WHERE subject = ? AND code = ?", (subject, behavior))
+                    distinct_modifiers = [x[0] for x in cursor.fetchall()]
+                else:
+                    # get all modifiers combinations
+                    ms: list = []
+                    modifiers_list = project_functions.get_modifiers_of_behavior(ethogram, behavior)
+                    if modifiers_list:
+                        for modif_set in modifiers_list[0]:
+                            modif_set.append("None")
+                            ms.append([re.sub(r" \(.*\)", "", x) for x in modif_set])
+                    distinct_modifiers = ["|".join(x) for x in itertools.product(*ms)]
 
                 if not distinct_modifiers:
                     if not parameters[cfg.EXCLUDE_BEHAVIORS]:
-
-                        if cfg.STATE in project_functions.event_type(behavior, ethogram):
-
+                        if project_functions.event_type(behavior, ethogram) in cfg.STATE_EVENT_TYPES:
                             # check if observation from pictures
                             if parameters["start time"] == dec("0.000") and parameters["end time"] == dec("0.000"):
                                 duration = cfg.NA
                             else:
                                 duration = 0.000
 
-                            out.append(
+                            out_cat.append(
                                 {
                                     "subject": subject,
                                     "behavior": behavior,
@@ -712,7 +724,7 @@ def time_budget_analysis(
                                 }
                             )
                         else:  # point
-                            out.append(
+                            out_cat.append(
                                 {
                                     "subject": subject,
                                     "behavior": behavior,
@@ -727,8 +739,7 @@ def time_budget_analysis(
                             )
                     continue
 
-                if cfg.POINT in project_functions.event_type(behavior, ethogram):
-
+                if project_functions.event_type(behavior, ethogram) in cfg.POINT_EVENT_TYPES:
                     for modifier in distinct_modifiers:
                         cursor.execute(
                             (
@@ -738,26 +749,24 @@ def time_budget_analysis(
                                 "AND modifiers = ? "
                                 "ORDER BY observation, occurence"
                             ),
-                            (subject, behavior, modifier[0]),
+                            (subject, behavior, modifier),
                         )
 
                         rows = cursor.fetchall()
 
                         if len(selected_observations) == 1:
-                            new_rows = []
+                            new_rows: list = []
                             for occurence, observation in rows:
-                                if occurence is not None:
-                                    new_occurence = max(float(parameters["start time"]), occurence)
-                                    new_occurence = min(new_occurence, float(parameters["end time"]))
+                                if occurence is None:
+                                    new_rows.append([float("NaN"), observation])
                                 else:
-                                    new_occurence = float("NaN")
-                                new_rows.append([new_occurence, observation])
+                                    new_rows.append([occurence, observation])
                             rows = list(new_rows)
 
                         # include behaviors without events
                         if len(rows) == 0:
                             if not parameters[cfg.EXCLUDE_BEHAVIORS]:
-                                out.append(
+                                out_cat.append(
                                     {
                                         "subject": subject,
                                         "behavior": behavior,
@@ -792,7 +801,7 @@ def time_budget_analysis(
                             {
                                 "subject": subject,
                                 "behavior": behavior,
-                                "modifiers": modifier[0],
+                                "modifiers": modifier,
                                 "duration": cfg.NA,
                                 "duration_mean": cfg.NA,
                                 "duration_stdev": cfg.NA,
@@ -802,8 +811,7 @@ def time_budget_analysis(
                             }
                         )
 
-                if cfg.STATE in project_functions.event_type(behavior, ethogram):
-
+                if project_functions.event_type(behavior, ethogram) in cfg.STATE_EVENT_TYPES:
                     for modifier in distinct_modifiers:
                         cursor.execute(
                             (
@@ -813,24 +821,23 @@ def time_budget_analysis(
                                 "AND modifiers = ? "
                                 "ORDER BY observation, occurence"
                             ),
-                            (subject, behavior, modifier[0]),
+                            (subject, behavior, modifier),
                         )
 
                         rows = list(cursor.fetchall())
 
                         if len(rows) == 0:
-
                             if not parameters[cfg.EXCLUDE_BEHAVIORS]:  # include behaviors without events
                                 # check if observation from pictures
                                 if parameters["start time"] == dec("0.000") and parameters["end time"] == dec("0.000"):
                                     duration = cfg.NA
                                 else:
-                                    duration = 0.000
-                                out.append(
+                                    duration: float = 0.000
+                                out_cat.append(
                                     {
                                         "subject": subject,
                                         "behavior": behavior,
-                                        "modifiers": modifier[0],
+                                        "modifiers": modifier,
                                         "duration": duration,
                                         "duration_mean": cfg.NA,
                                         "duration_stdev": cfg.NA,
@@ -842,11 +849,11 @@ def time_budget_analysis(
                             continue
 
                         if len(rows) % 2:
-                            out.append(
+                            out_cat.append(
                                 {
                                     "subject": subject,
                                     "behavior": behavior,
-                                    "modifiers": modifier[0],
+                                    "modifiers": modifier,
                                     "duration": cfg.UNPAIRED,
                                     "duration_mean": cfg.UNPAIRED,
                                     "duration_stdev": cfg.UNPAIRED,
@@ -856,7 +863,8 @@ def time_budget_analysis(
                                 }
                             )
                         else:
-                            all_event_durations, all_event_interdurations = [], []
+                            all_event_durations: list = []
+                            all_event_interdurations: list = []
                             for idx, row in enumerate(rows):
                                 # event
                                 if idx % 2 == 0:
@@ -868,10 +876,11 @@ def time_budget_analysis(
 
                                 # inter event if same observation
                                 if idx % 2 and idx != len(rows) - 1 and row[1] == rows[idx + 1][1]:
-                                    if (row[0] is not None and rows[idx + 1][0] is not None) and (
-                                        parameters["start time"] <= row[0] <= parameters["end time"]
-                                        and parameters["start time"] <= rows[idx + 1][0] <= parameters["end time"]
-                                    ):
+                                    if row[0] is not None and rows[idx + 1][0] is not None:
+                                        # and (
+                                        # parameters["start time"] <= row[0] <= parameters["end time"]
+                                        # and parameters["start time"] <= rows[idx + 1][0] <= parameters["end time"]
+                                        # ):
                                         all_event_interdurations.append(float(rows[idx + 1][0]) - float(row[0]))
                                     else:
                                         all_event_interdurations.append(float("NaN"))
@@ -891,9 +900,7 @@ def time_budget_analysis(
                                 else:
                                     duration_stdev = cfg.NA
                             # interduration
-                            if [x for x in all_event_interdurations if math.isnan(x)] or len(
-                                all_event_interdurations
-                            ) == 0:
+                            if [x for x in all_event_interdurations if math.isnan(x)] or len(all_event_interdurations) == 0:
                                 inter_duration_mean = cfg.NA
                                 inter_duration_stdev = cfg.NA
                             else:
@@ -907,7 +914,7 @@ def time_budget_analysis(
                                 {
                                     "subject": subject,
                                     "behavior": behavior,
-                                    "modifiers": modifier[0],
+                                    "modifiers": modifier,
                                     "duration": total_duration,
                                     "duration_mean": duration_mean,
                                     "duration_stdev": duration_stdev,
@@ -918,34 +925,27 @@ def time_budget_analysis(
                             )
 
             else:  # no modifiers
-
-                if cfg.POINT in project_functions.event_type(behavior, ethogram):
-
+                if project_functions.event_type(behavior, ethogram) in cfg.POINT_EVENT_TYPES:
                     cursor.execute(
-                        (
-                            "SELECT occurence,observation FROM events "
-                            "WHERE subject = ? AND code = ? ORDER BY observation, occurence"
-                        ),
+                        ("SELECT occurence, observation FROM events WHERE subject = ? AND code = ? ORDER BY observation, occurence"),
                         (subject, behavior),
                     )
 
                     rows = list(cursor.fetchall())
 
                     if len(selected_observations) == 1:
-                        new_rows = []
+                        new_rows: list = []
                         for occurence, observation in rows:
-                            if occurence is not None:
-                                new_occurence = max(float(parameters["start time"]), occurence)
-                                new_occurence = min(new_occurence, float(parameters["end time"]))
+                            if occurence is None:
+                                new_rows.append([float("NaN"), observation])
                             else:
-                                new_occurence = float("NaN")
-                            new_rows.append([new_occurence, observation])
+                                new_rows.append([occurence, observation])
                         rows = list(new_rows)
 
                     # include behaviors without events
                     if len(rows) == 0:
                         if not parameters[cfg.EXCLUDE_BEHAVIORS]:
-                            out.append(
+                            out_cat.append(
                                 {
                                     "subject": subject,
                                     "behavior": behavior,
@@ -990,13 +990,9 @@ def time_budget_analysis(
                         }
                     )
 
-                if cfg.STATE in project_functions.event_type(behavior, ethogram):
-
+                if project_functions.event_type(behavior, ethogram) in cfg.STATE_EVENT_TYPES:
                     cursor.execute(
-                        (
-                            "SELECT occurence, observation FROM events "
-                            "WHERE subject = ? AND code = ? ORDER BY observation, occurence"
-                        ),
+                        ("SELECT occurence, observation FROM events WHERE subject = ? AND code = ? ORDER BY observation, occurence"),
                         (subject, behavior),
                     )
 
@@ -1009,7 +1005,7 @@ def time_budget_analysis(
                                 duration = cfg.NA
                             else:
                                 duration = 0.000
-                            out.append(
+                            out_cat.append(
                                 {
                                     "subject": subject,
                                     "behavior": behavior,
@@ -1024,8 +1020,8 @@ def time_budget_analysis(
                             )
                         continue
 
-                    if len(rows) % 2:
-                        out.append(
+                    if len(rows) % 2:  # unpaired events
+                        out_cat.append(
                             {
                                 "subject": subject,
                                 "behavior": behavior,
@@ -1039,7 +1035,8 @@ def time_budget_analysis(
                             }
                         )
                     else:
-                        all_event_durations, all_event_interdurations = [], []
+                        all_event_durations: list = []
+                        all_event_interdurations: list = []
                         for idx, row in enumerate(rows):
                             # event
                             if idx % 2 == 0:
@@ -1051,10 +1048,11 @@ def time_budget_analysis(
 
                             # inter event if same observation
                             if idx % 2 and idx != len(rows) - 1 and row[1] == rows[idx + 1][1]:
-                                if (row[0] is not None and rows[idx + 1][0] is not None) and (
-                                    parameters["start time"] <= row[0] <= parameters["end time"]
-                                    and parameters["start time"] <= rows[idx + 1][0] <= parameters["end time"]
-                                ):
+                                if row[0] is not None and rows[idx + 1][0] is not None:
+                                    # and (
+                                    # parameters["start time"] <= row[0] <= parameters["end time"]
+                                    # and parameters["start time"] <= rows[idx + 1][0] <= parameters["end time"]
+                                    # ):
                                     all_event_interdurations.append(float(rows[idx + 1][0]) - float(row[0]))
                                 else:
                                     all_event_interdurations.append(float("NaN"))
@@ -1101,9 +1099,7 @@ def time_budget_analysis(
         out += out_cat
 
         if by_category:  # and flagCategories:
-
             for behav in out_cat:
-
                 try:
                     category = [
                         ethogram[x][cfg.BEHAVIOR_CATEGORY]
@@ -1113,19 +1109,23 @@ def time_budget_analysis(
                 except Exception:
                     category = ""
 
-                if category in categories[subject]:
+                if category not in categories[subject]:
+                    categories[subject][category] = {"duration": 0, "number": 0}
+
+                if project_functions.event_type(behav["behavior"], ethogram) in cfg.STATE_EVENT_TYPES:
                     if behav["duration"] not in ("-", cfg.NA) and categories[subject][category]["duration"] not in (
                         "-",
                         cfg.NA,
                     ):
+                        # print(f"{categories[subject][category]["duration"]=}")
+                        # print(f"{behav["duration"]=}")
                         categories[subject][category]["duration"] += behav["duration"]
                     else:
                         categories[subject][category]["duration"] = cfg.NA
-                    categories[subject][category]["number"] += behav["number"]
-                else:
-                    categories[subject][category] = {"duration": behav["duration"], "number": behav["number"]}
 
-    out_sorted = []
+                categories[subject][category]["number"] += behav["number"]
+
+    out_sorted: list = []
     for subject in parameters[cfg.SELECTED_SUBJECTS]:
         for behavior in parameters[cfg.SELECTED_BEHAVIORS]:
             for row in out: