From 1089023c9485e362c273fc4a65d25efe15c2f545 Mon Sep 17 00:00:00 2001 From: Andi Gerken <andi.gerken@gmail.com> Date: Mon, 21 Feb 2022 13:40:16 +0100 Subject: [PATCH] Improved individual_iid individual speed performance --- src/robofish/evaluate/evaluate.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/robofish/evaluate/evaluate.py b/src/robofish/evaluate/evaluate.py index 02d4af1..da534c2 100644 --- a/src/robofish/evaluate/evaluate.py +++ b/src/robofish/evaluate/evaluate.py @@ -599,7 +599,7 @@ def evaluate_tracks_distance( paths: Iterable[Union[str, Path]], labels: Iterable[str] = None, predicate=None, - max_timesteps=1000, + max_timesteps=4000, ): """Evaluate the distances of two or more fish on the track. @@ -623,7 +623,7 @@ def evaluate_tracks( file_settings=None, lw_distances=False, seed=42, - max_timesteps=1000, + max_timesteps=4000, ): """Evaluate the track. @@ -676,14 +676,16 @@ def evaluate_tracks( return fig -def evaluate_individual_speed(**kwargs): +def evaluate_individual_speed(speeds_turns_from_paths, **kwargs): """Evaluate the average speeds per individual""" - return evaluate_individuals(mode="speed", **kwargs) + return evaluate_individuals( + speeds_turns_from_paths=speeds_turns_from_paths, mode="speed", **kwargs + ) -def evaluate_individual_iid(**kwargs): +def evaluate_individual_iid(poses_from_paths, **kwargs): """Evaluate the average iid per file""" - return evaluate_individuals(mode="iid", **kwargs) + return evaluate_individuals(poses_from_paths=poses_from_paths, mode="iid", **kwargs) def evaluate_individuals( -- GitLab