Optimized evaluation performance heavily.

Bugfix in relative orientation evaluation.

src/robofish/evaluate/app.py

@@ -22,13 +22,13 @@ def function_dict():
         "turn": base.evaluate_turn,
         "orientation": base.evaluate_orientation,
         "relative_orientation": base.evaluate_relative_orientation,
-        "distance_to_wall": base.evaluate_distanceToWall,
-        "tank_positions": base.evaluate_tankpositions,
+        "distance_to_wall": base.evaluate_distance_to_wall,
+        "tank_position": base.evaluate_tank_position,
         "tracks": base.evaluate_tracks,
         "tracks_distance": base.evaluate_tracks_distance,
-        "socialVec": base.evaluate_socialVec,
+        "social_vector": base.evaluate_social_vector,
         "follow_iid": base.evaluate_follow_iid,
-        "individual_speeds": base.evaluate_individual_speeds,
+        "individual_speed": base.evaluate_individual_speed,
         "individual_iid": base.evaluate_individual_iid,
         "all": base.evaluate_all,
     }

src/robofish/io/app.py

@@ -37,12 +37,11 @@ def print_file(args=None):
     if args is None:
         args = parser.parse_args()
 
-    sf = robofish.io.File(path=args.path, strict_validate=False)
-
-    print(sf.to_string(args.output_format))
-    print()
-    valid = sf.validate(strict_validate=False)[0]
-    print("Valid file" if valid else "Invalid file")
+    with robofish.io.File(path=args.path, strict_validate=False) as f:
+        print(f.to_string(args.output_format))
+        print()
+        valid = f.validate(strict_validate=False)[0]
+        print("Valid file" if valid else "Invalid file")
     return not valid
 
 
@@ -95,6 +94,7 @@ def validate(args=None):
     error_code = 0
     for file, sf in sf_dict.items():
         filled_file = (str)(file).ljust(max_filename_width + 3)
+        file.close()
         validity, validity_message = sf.validate(strict_validate=False)
         if not validity:
             error_code = 1

src/robofish/io/io.py

@@ -7,6 +7,7 @@ import logging
 import numpy as np
 import pandas
 import random
+import deprecation
 
 
 def now_iso8061() -> str:
@@ -20,6 +21,11 @@ def now_iso8061() -> str:
     )
 
 
+@deprecation.deprecated(
+    deprecated_in="0.2.10",
+    removed_in="0.3",
+    details="Loading all files first and then handling them is slow, memory intensive and inconvenient. Don't use this method.",
+)
 def read_multiple_files(
     paths: Union[Path, str, Iterable[Path], Iterable[str]],
     strict_validate: bool = False,

tests/robofish/evaluate/test_evaluate.py

@@ -6,8 +6,7 @@ import numpy as np
 
 def test_get_all_poses_from_paths():
     valid_file_path = utils.full_path(__file__, "../../resources/valid_1.hdf5")
-    poses, frequency = robofish.evaluate.get_all_poses_from_paths([valid_file_path])
+    poses, file_settings = robofish.evaluate.get_all_poses_from_paths([valid_file_path])
 
     # (1 input array, 1 file, 2 fishes, 100 timesteps, 4 poses)
     assert np.array(poses).shape == (1, 1, 2, 100, 4)
-    assert frequency == 25