boris-behav-obs 9.6__py2.py3-none-any.whl → 9.6.1__py2.py3-none-any.whl

boris/analysis_plugins/number_of_occurences_by_independent_variable.py

@@ -6,8 +6,8 @@ number of occurences of behaviors by independent_variable
 
 import pandas as pd
 
-__version__ = "0.3.0"
-__version_date__ = "2025-03-17"
+__version__ = "0.4.0"
+__version_date__ = "2025-07-17"
 __plugin_name__ = "Number of occurences of behaviors by subject by independent_variable"
 __author__ = "Olivier Friard - University of Torino - Italy"
 
@@ -19,16 +19,36 @@ def run(df: pd.DataFrame):
     This plugin returns a Pandas dataframe
     """
 
-    df_results: df.DataFrame = (
-        df.groupby(
-            [
-                "independent variable 'Weather'",
-                "Subject",
-                "Behavior",
-            ]
-        )["Behavior"]
-        .count()
-        .reset_index(name="number of occurences")
-    )
-
-    return df_results
+    df_results_list: list = []
+
+    flag_variable_found = False
+
+    for column in df.columns:
+        if isinstance(column, tuple) or (isinstance(column, str) and not column.startswith("independent variable '")):
+            continue
+
+        flag_variable_found = True
+        grouped_df: df.DataFrame = (
+            df.groupby(
+                [
+                    column,
+                    "Subject",
+                    "Behavior",
+                ]
+            )["Behavior"]
+            .count()
+            .reset_index(name="number of occurences")
+        )
+
+        grouped_df.rename(columns={column: "Value"}, inplace=True)
+
+        grouped_df.insert(0, "independent variable name", column)
+
+        df_results_list.append(grouped_df)
+
+    df_results = pd.concat(df_results_list, ignore_index=True) if df_results_list else pd.DataFrame([])
+
+    if not flag_variable_found:
+        return "No independent variable found"
+    else:
+        return df_results

boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "9.6"
-__version_date__ = "2025-07-15"
+__version__ = "9.6.1"
+__version_date__ = "2025-07-17"

{boris_behav_obs-9.6.dist-info → boris_behav_obs-9.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.6
+Version: 9.6.1
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License-Expression: GPL-3.0-only

{boris_behav_obs-9.6.dist-info → boris_behav_obs-9.6.1.dist-info}/RECORD

@@ -78,7 +78,7 @@ boris/time_budget_functions.py,sha256=y5He8crz0xsTxVfz0jATwFFQVnPAIrNHja_0sF6NtR
 boris/time_budget_widget.py,sha256=z-tyITBtIz-KH1H2OdMB5a8x9QQLK7Wu96-zkC6NVDA,43213
 boris/transitions.py,sha256=_aZJfJWv3EBrtmQ7qsdTCayQo6uWU7BXqtQQgflEhr4,12250
 boris/utilities.py,sha256=dD5HpojqlAGLVkr3YnOsaqfbCMHFYroe040ZchB5WnM,56662
-boris/version.py,sha256=ZEBnf_7vJi2eFStpheIWRPeqh70jKh34dnMHHdgbbzI,785
+boris/version.py,sha256=mDyPxZPO9ciCvBjRw2xZTdaF3TgIW_KL2omBeJ1TGTo,787
 boris/video_equalizer.py,sha256=FartoGghFK-T53zklP70rPKYqTuzL8qdvfGlsOF2wwc,5854
 boris/video_equalizer_ui.py,sha256=1CG3s79eM4JAbaCx3i1ILZXLceb41_gGXlOLNfpBgnw,10142
 boris/video_operations.py,sha256=rXKWndaALaF-yLEPIY_-Z99XRAncZRzRd1sLzwSpbjs,10768
@@ -89,7 +89,7 @@ boris/analysis_plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 boris/analysis_plugins/_latency.py,sha256=9kCdFDtb5Zdao1xFpioi_exm_IxyGm6RlY3Opn6GUFo,2030
 boris/analysis_plugins/list_of_dataframe_columns.py,sha256=VEiVhxADtyaIKN4JrfFV02TuTAfWhQ60bf1mHVQp27I,437
 boris/analysis_plugins/number_of_occurences.py,sha256=IDyDrdezqvSKT3BlD8QWpSYk8X9nnBBLI80OUnFJ3bY,509
-boris/analysis_plugins/number_of_occurences_by_independent_variable.py,sha256=t39bmmmZIDCSbcDvVeiKAhKNNP2SdpHp417JczHEnP4,793
+boris/analysis_plugins/number_of_occurences_by_independent_variable.py,sha256=_7HTKXsyxNfyO69tP8zkQEHzT0C7qHdL1sqBjnUfRQY,1459
 boris/analysis_plugins/time_budget.py,sha256=C1wNYwd5Jugr8h5z2aXRUBY8dF8pD4n953dPwNHY5VY,2244
 boris/portion/__init__.py,sha256=ZBUG4I7YWhRkeWdP-JEpxhxldJlUYQkeaJseTjdhtJE,602
 boris/portion/const.py,sha256=hEp26BKcEg1Js4DfZsBHmDtJJts83Tl1HWQ0CNJNwEc,1588
@@ -97,9 +97,9 @@ boris/portion/dict.py,sha256=SyHxc7PfDw2ufNLFQycwJtzmRfL48rDp4UrM2KN7IWc,11282
 boris/portion/func.py,sha256=3TkQtFKLfsqntwd27HSGHceFhnXHmT-EbNMqktElC5Q,2174
 boris/portion/interval.py,sha256=bAdUiJjGeUAPgsBAImwNeviiwfQq5odfhFZccAWzOTA,20299
 boris/portion/io.py,sha256=ppNeRpiLNrocF1yzGeuEUIhYMf2LfsR-cji3d0nmvUs,6371
-boris_behav_obs-9.6.dist-info/licenses/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-boris_behav_obs-9.6.dist-info/METADATA,sha256=9ttZPeStpc2xkd_zZxmh5FRrOs-SjWLGt63tYmT-Tc0,4600
-boris_behav_obs-9.6.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-boris_behav_obs-9.6.dist-info/entry_points.txt,sha256=k__8XvFi4vaA4QFvQehCZjYkKmZH34HSAJI2iYCWrMs,52
-boris_behav_obs-9.6.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
-boris_behav_obs-9.6.dist-info/RECORD,,
+boris_behav_obs-9.6.1.dist-info/licenses/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+boris_behav_obs-9.6.1.dist-info/METADATA,sha256=rOegvZFaLcobCRMuUmpNavzzhWQyX7wdWPrEs7ahGpY,4602
+boris_behav_obs-9.6.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+boris_behav_obs-9.6.1.dist-info/entry_points.txt,sha256=k__8XvFi4vaA4QFvQehCZjYkKmZH34HSAJI2iYCWrMs,52
+boris_behav_obs-9.6.1.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
+boris_behav_obs-9.6.1.dist-info/RECORD,,