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

boris/portion/interval.py

@@ -2,7 +2,7 @@ from collections import namedtuple
 from .const import Bound, inf
 
 
-Atomic = namedtuple('Atomic', ['left', 'lower', 'upper', 'right'])
+Atomic = namedtuple("Atomic", ["left", "lower", "upper", "right"])
 
 
 def mergeable(a, b):
@@ -96,7 +96,7 @@ class Interval:
     one of the helpers provided in this module (open, closed, openclosed, etc.)
     """
 
-    __slots__ = ('_intervals',)
+    __slots__ = ("_intervals",)
 
     def __init__(self, *intervals):
         """
@@ -111,7 +111,7 @@ class Interval:
                 if not interval.empty:
                     self._intervals.extend(interval._intervals)
             else:
-                raise TypeError('Parameters must be Interval instances')
+                raise TypeError("Parameters must be Interval instances")
 
         if len(self._intervals) == 0:
             # So we have at least one (empty) interval
@@ -181,10 +181,7 @@ class Interval:
         """
         True if interval is empty, False otherwise.
         """
-        return (
-            self.lower > self.upper or
-            (self.lower == self.upper and (self.left == Bound.OPEN or self.right == Bound.OPEN))
-        )
+        return self.lower > self.upper or (self.lower == self.upper and (self.left == Bound.OPEN or self.right == Bound.OPEN))
 
     @property
     def atomic(self):
@@ -307,7 +304,7 @@ class Interval:
             elif isinstance(value, tuple):
                 intervals.append(Interval.from_atomic(*value))
             else:
-                raise TypeError('Unsupported return type {} for {}'.format(type(value), value))
+                raise TypeError("Unsupported return type {} for {}".format(type(value), value))
 
         return Interval(*intervals)
 
@@ -350,7 +347,7 @@ class Interval:
                     return True
             return False
         else:
-            raise TypeError('Unsupported type {} for {}'.format(type(other), other))
+            raise TypeError("Unsupported type {} for {}".format(type(other), other))
 
     def intersection(self, other):
         """
@@ -468,14 +465,8 @@ class Interval:
             if item.empty:
                 return True
             elif self.atomic:
-                left = item.lower > self.lower or (
-                    item.lower == self.lower and
-                    (item.left == self.left or self.left == Bound.CLOSED)
-                )
-                right = item.upper < self.upper or (
-                    item.upper == self.upper and
-                    (item.right == self.right or self.right == Bound.CLOSED)
-                )
+                left = item.lower > self.lower or (item.lower == self.lower and (item.left == self.left or self.left == Bound.CLOSED))
+                right = item.upper < self.upper or (item.upper == self.upper and (item.right == self.right or self.right == Bound.CLOSED))
                 return left and right
             else:
                 selfiter = iter(self)
@@ -504,13 +495,11 @@ class Interval:
     def __invert__(self):
         complements = [
             Interval.from_atomic(Bound.OPEN, -inf, self.lower, ~self.left),
-            Interval.from_atomic(~self.right, self.upper, inf, Bound.OPEN)
+            Interval.from_atomic(~self.right, self.upper, inf, Bound.OPEN),
         ]
 
         for i, j in zip(self._intervals[:-1], self._intervals[1:]):
-            complements.append(
-                Interval.from_atomic(~i.right, i.upper, j.lower, ~j.left)
-            )
+            complements.append(Interval.from_atomic(~i.right, i.upper, j.lower, ~j.left))
 
         return Interval(*complements)
 
@@ -526,12 +515,7 @@ class Interval:
                 return False
 
             for a, b in zip(self._intervals, other._intervals):
-                eq = (
-                    a.left == b.left and
-                    a.lower == b.lower and
-                    a.upper == b.upper and
-                    a.right == b.right
-                )
+                eq = a.left == b.left and a.lower == b.lower and a.upper == b.upper and a.right == b.right
                 if not eq:
                     return False
             return True
@@ -543,8 +527,7 @@ class Interval:
             if self.right == Bound.OPEN:
                 return self.upper <= other.lower
             else:
-                return self.upper < other.lower or \
-                    (self.upper == other.lower and other.left == Bound.OPEN)
+                return self.upper < other.lower or (self.upper == other.lower and other.left == Bound.OPEN)
         else:
             return self.upper < other or (self.right == Bound.OPEN and self.upper == other)
 
@@ -553,8 +536,7 @@ class Interval:
             if self.left == Bound.OPEN:
                 return self.lower >= other.upper
             else:
-                return self.lower > other.upper or \
-                    (self.lower == other.upper and other.right == Bound.OPEN)
+                return self.lower > other.upper or (self.lower == other.upper and other.right == Bound.OPEN)
         else:
             return self.lower > other or (self.left == Bound.OPEN and self.lower == other)
 
@@ -563,8 +545,7 @@ class Interval:
             if self.right == Bound.OPEN:
                 return self.upper <= other.upper
             else:
-                return self.upper < other.upper or \
-                    (self.upper == other.upper and other.right == Bound.CLOSED)
+                return self.upper < other.upper or (self.upper == other.upper and other.right == Bound.CLOSED)
         else:
             return self.lower < other or (self.left == Bound.CLOSED and self.lower == other)
 
@@ -573,8 +554,7 @@ class Interval:
             if self.left == Bound.OPEN:
                 return self.lower >= other.lower
             else:
-                return self.lower > other.lower or \
-                    (self.lower == other.lower and other.left == Bound.CLOSED)
+                return self.lower > other.lower or (self.lower == other.lower and other.left == Bound.CLOSED)
         else:
             return self.upper > other or (self.right == Bound.CLOSED and self.upper == other)
 
@@ -586,16 +566,16 @@ class Interval:
 
         for interval in self:
             if interval.empty:
-                intervals.append('()')
+                intervals.append("()")
             elif interval.lower == interval.upper:
-                intervals.append('[{}]'.format(repr(interval.lower)))
+                intervals.append("[{}]".format(repr(interval.lower)))
             else:
                 intervals.append(
-                    '{}{},{}{}'.format(
-                        '[' if interval.left == Bound.CLOSED else '(',
+                    "{}{},{}{}".format(
+                        "[" if interval.left == Bound.CLOSED else "(",
                         repr(interval.lower),
                         repr(interval.upper),
-                        ']' if interval.right == Bound.CLOSED else ')',
+                        "]" if interval.right == Bound.CLOSED else ")",
                     )
                 )
-        return ' | '.join(intervals)
+        return " | ".join(intervals)

boris/portion/io.py

@@ -4,9 +4,20 @@ from .const import Bound, inf
 from .interval import Interval
 
 
-def from_string(string, conv, *, bound=r'.+?', disj=r' ?\| ?', sep=r', ?',
-                left_open=r'\(', left_closed=r'\[', right_open=r'\)', right_closed=r'\]',
-                pinf=r'\+inf', ninf=r'-inf'):
+def from_string(
+    string,
+    conv,
+    *,
+    bound=r".+?",
+    disj=r" ?\| ?",
+    sep=r", ?",
+    left_open=r"\(",
+    left_closed=r"\[",
+    right_open=r"\)",
+    right_closed=r"\]",
+    pinf=r"\+inf",
+    ninf=r"-inf",
+):
     """
     Parse given string and create an Interval instance.
     A converter function has to be provided to convert a bound (as string) to a value.
@@ -25,11 +36,11 @@ def from_string(string, conv, *, bound=r'.+?', disj=r' ?\| ?', sep=r', ?',
     :return: an Interval instance.
     """
 
-    re_left_boundary = r'(?P<left>{}|{})'.format(left_open, left_closed)
-    re_right_boundary = r'(?P<right>{}|{})'.format(right_open, right_closed)
-    re_bounds = r'(?P<lower>{bound})({sep}(?P<upper>{bound}))?'.format(bound=bound, sep=sep)
-    re_interval = r'{}(|{}){}'.format(re_left_boundary, re_bounds, re_right_boundary)
-    re_intervals = r'{}(?P<disj>{})?'.format(re_interval, disj)
+    re_left_boundary = r"(?P<left>{}|{})".format(left_open, left_closed)
+    re_right_boundary = r"(?P<right>{}|{})".format(right_open, right_closed)
+    re_bounds = r"(?P<lower>{bound})({sep}(?P<upper>{bound}))?".format(bound=bound, sep=sep)
+    re_interval = r"{}(|{}){}".format(re_left_boundary, re_bounds, re_right_boundary)
+    re_intervals = r"{}(?P<disj>{})?".format(re_interval, disj)
 
     intervals = []
     has_more = True
@@ -49,22 +60,23 @@ def from_string(string, conv, *, bound=r'.+?', disj=r' ?\| ?', sep=r', ?',
         else:
             group = match.groupdict()
 
-            left = Bound.CLOSED if re.match(left_closed + '$', group['left']) else Bound.OPEN
-            right = Bound.CLOSED if re.match(right_closed + '$', group['right']) else Bound.OPEN
+            left = Bound.CLOSED if re.match(left_closed + "$", group["left"]) else Bound.OPEN
+            right = Bound.CLOSED if re.match(right_closed + "$", group["right"]) else Bound.OPEN
 
-            lower = group.get('lower', None)
-            upper = group.get('upper', None)
+            lower = group.get("lower", None)
+            upper = group.get("upper", None)
             lower = _convert(lower) if lower is not None else inf
             upper = _convert(upper) if upper is not None else lower
 
             intervals.append(Interval.from_atomic(left, lower, upper, right))
-            string = string[match.end():]
+            string = string[match.end() :]
 
     return Interval(*intervals)
 
 
-def to_string(interval, conv=repr, *, disj=' | ', sep=',', left_open='(',
-              left_closed='[', right_open=')', right_closed=']', pinf='+inf', ninf='-inf'):
+def to_string(
+    interval, conv=repr, *, disj=" | ", sep=",", left_open="(", left_closed="[", right_open=")", right_closed="]", pinf="+inf", ninf="-inf"
+):
     """
     Export given interval to string.
 
@@ -81,7 +93,7 @@ def to_string(interval, conv=repr, *, disj=' | ', sep=',', left_open='(',
     :return: a string representation for given interval.
     """
     if interval.empty:
-        return '{}{}'.format(left_open, right_open)
+        return "{}{}".format(left_open, right_open)
 
     def _convert(bound):
         if bound == inf:
@@ -100,14 +112,14 @@ def to_string(interval, conv=repr, *, disj=' | ', sep=',', left_open='(',
         upper = _convert(item.upper)
 
         if item.lower == item.upper:
-            exported_intervals.append('{}{}{}'.format(left, lower, right))
+            exported_intervals.append("{}{}{}".format(left, lower, right))
         else:
-            exported_intervals.append('{}{}{}{}{}'.format(left, lower, sep, upper, right))
+            exported_intervals.append("{}{}{}{}{}".format(left, lower, sep, upper, right))
 
     return disj.join(exported_intervals)
 
 
-def from_data(data, conv=None, *, pinf=float('inf'), ninf=float('-inf')):
+def from_data(data, conv=None, *, pinf=float("inf"), ninf=float("-inf")):
     """
     Import an interval from a piece of data.
 
@@ -130,16 +142,18 @@ def from_data(data, conv=None, *, pinf=float('inf'), ninf=float('-inf')):
 
     for item in data:
         left, lower, upper, right = item
-        intervals.append(Interval.from_atomic(
-            Bound(left),
-            _convert(lower),
-            _convert(upper),
-            Bound(right),
-        ))
+        intervals.append(
+            Interval.from_atomic(
+                Bound(left),
+                _convert(lower),
+                _convert(upper),
+                Bound(right),
+            )
+        )
     return Interval(*intervals)
 
 
-def to_data(interval, conv=None, *, pinf=float('inf'), ninf=float('-inf')):
+def to_data(interval, conv=None, *, pinf=float("inf"), ninf=float("-inf")):
     """
     Export given interval to a list of 4-uples (left, lower,
     upper, right).
@@ -163,10 +177,5 @@ def to_data(interval, conv=None, *, pinf=float('inf'), ninf=float('-inf')):
             return conv(bound)
 
     for item in interval:
-        data.append((
-            item.left.value,
-            _convert(item.lower),
-            _convert(item.upper),
-            item.right.value
-        ))
+        data.append((item.left.value, _convert(item.lower), _convert(item.upper), item.right.value))
     return data

boris/project_functions.py

@@ -1539,7 +1539,8 @@ def open_project_json(project_file_name: str) -> tuple:
     # sort events by time asc
     for obs_id in pj[cfg.OBSERVATIONS]:
         if pj[cfg.OBSERVATIONS][obs_id][cfg.TYPE] in (cfg.LIVE, cfg.MEDIA):
-            pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS].sort()
+            # sort events list using the first 3 items (time, subject, behavior)
+            pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS].sort(key=lambda x: x[:3])
 
     return project_file_name, projectChanged, pj, msg
 

boris/state_events.py

@@ -136,7 +136,7 @@ def fix_unpaired_events(self, silent_mode: bool = False):
 
             self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS].extend(events_to_add)
             self.project_changed()
-            self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS].sort()
+            self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS].sort(key=lambda x: x[:3])
             self.load_tw_events(self.observationId)
 
             index = self.tv_events.model().index(

boris/time_budget_functions.py

@@ -1021,15 +1021,6 @@ def time_budget_analysis(
                         continue
 
                     if len(rows) % 2:  # unpaired events
-                        """
-                        print()
-                        print(f"{subject=}")
-                        print(f"{behavior=}")
-                        print()
-                        for row in rows:
-                            print(f"{row['observation']=}  {row['occurence']=}")
-                        print()
-                        """
                         out_cat.append(
                             {
                                 "subject": subject,

boris/transitions.py

@@ -354,7 +354,7 @@ def transitions_flow_diagram():
             with open(tempfile.gettempdir() + os.sep + os.path.basename(file_name) + ".tmp.gv", "w") as f:
                 f.write(gv)
             result = subprocess.getoutput(
-                (f'dot -Tpng -o "{file_name}.png" ' f'"{tempfile.gettempdir() + os.sep + os.path.basename(file_name)}.tmp.gv"')
+                (f'dot -Tpng -o "{file_name}.png" "{tempfile.gettempdir() + os.sep + os.path.basename(file_name)}.tmp.gv"')
             )
             if not result:
                 out += f"<b>{file_name}.png</b> created<br>"

boris/version.py

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

boris/video_equalizer.py

@@ -60,8 +60,6 @@ class Video_equalizer(QDialog, Ui_Equalizer):
         if n_player not in self.equalizer:
             return
 
-        print(self.equalizer)
-
         self.hs_brightness.setValue(self.equalizer[n_player]["hs_brightness"])
         self.lb_brightness.setText(str(self.equalizer[n_player]["hs_brightness"]))
 

boris/view_df.py

@@ -49,8 +49,6 @@ class View_df(QWidget, Ui_Form):
         self.lb_plugin_info.setText(f"{plugin_name} v. {plugin_version}")
         self.setWindowTitle(f"{plugin_name} v. {plugin_version}")
 
-        # print(f"{self.df=}")
-
         self.pb_close.clicked.connect(self.close)
         self.pb_save.clicked.connect(self.save)
 

boris/write_event.py

@@ -68,8 +68,6 @@ def write_event(self, event: dict, mem_time: dec) -> int:
             )
             return 1
 
-        print(f"{mem_time=}")
-
         if mem_time < self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])[0]:
             _ = dialog.MessageDialog(
                 cfg.programName,
@@ -104,12 +102,6 @@ def write_event(self, event: dict, mem_time: dec) -> int:
 
                 # add media creation date/time
 
-                """
-                print(f"{media_file_name=}")
-                print(f"{mem_time=}")
-                """
-                print(f"{self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO]=}")
-
                 mem_time += dec(
                     self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO][cfg.MEDIA_CREATION_TIME][media_file_name_posix]
                 )
@@ -413,7 +405,6 @@ def write_event(self, event: dict, mem_time: dec) -> int:
                         r = modifiers_selector.exec_()
                         if r:
                             selected_modifiers = modifiers_selector.get_modifiers()
-                            # print(f"{selected_modifiers=}")
 
                             behavior_to_stop_modifier_str: str = ""
                             for idx in util.sorted_keys(selected_modifiers):
@@ -472,8 +463,8 @@ def write_event(self, event: dict, mem_time: dec) -> int:
                 comment,
                 frame_idx,
             ]
-            # order by image index ASC
-            self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS].sort()
+            # order events list using time, subject, behavior
+            self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS].sort(key=lambda x: x[:3])
 
         elif self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.LIVE:
             self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][event["row"]] = [
@@ -483,8 +474,8 @@ def write_event(self, event: dict, mem_time: dec) -> int:
                 modifier_str,
                 comment,
             ]
-            # order by image index ASC
-            self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS].sort()
+            # order events list using time, subject, behavior
+            self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS].sort(key=lambda x: x[:3])
 
         elif self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.IMAGES:
             self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][event["row"]] = [

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.6.1
+Version: 9.6.3
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License-Expression: GPL-3.0-only
@@ -19,7 +19,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.TXT
 Requires-Dist: exifread>=3.0.0
-Requires-Dist: numpy>=1.26.4
+Requires-Dist: numpy==2.3.2
 Requires-Dist: matplotlib>=3.3.3
 Requires-Dist: pandas>=2.2.2
 Requires-Dist: tablib[cli,html,ods,pandas,xls,xlsx]>=3
@@ -27,6 +27,7 @@ Requires-Dist: pyreadr
 Requires-Dist: pyside6==6.9
 Requires-Dist: hachoir>=3.3.0
 Requires-Dist: scipy>=1.15.3
+Requires-Dist: scikit-learn>=1.7.1
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -48,7 +49,7 @@ You can not longer run BORIS natively on MacOS (since v.8). Some alternatives to
 
 It provides also some analysis tools like time budget and some plotting functions.
 
-The BORIS paper has more than [![BORIS citations counter](http://penelope.unito.it/friard/boris_scopus_citations.png) citations](https://www.boris.unito.it/citations) in peer-reviewed scientific publications.
+The BORIS paper has more than [![BORIS citations counter](https://penelope.unito.it/friard/boris_scopus_citations.png) citations](https://www.boris.unito.it/citations) in peer-reviewed scientific publications.
 
 
 
@@ -58,13 +59,17 @@ See the official [BORIS web site](https://www.boris.unito.it).
 [![Python web site](https://img.shields.io/badge/Made%20with-Python-1f425f.svg)](https://www.python.org)
 ![Python versions](https://img.shields.io/pypi/pyversions/boris-behav-obs)
 ![BORIS license](https://img.shields.io/pypi/l/boris-behav-obs)
+[![PyPI version](https://img.shields.io/pypi/v/boris-behav-obs.svg)](https://pypi.org/project/boris-behav-obs/)
+
 [![Number of downloads](https://static.pepy.tech/personalized-badge/boris-behav-obs?period=total&units=international_system&left_color=black&right_color=orange&left_text=Downloads)](https://pepy.tech/project/boris-behav-obs)
 ![commit-activity](https://img.shields.io/github/commit-activity/m/olivierfriard/BORIS)
-[![PyPI version](https://img.shields.io/pypi/v/boris-behav-obs.svg)](https://pypi.org/project/boris-behav-obs/)
-![BORIS scopus citations badge](http://penelope.unito.it/friard/boris_scopus_citations.svg)
+![GitHub last commit](https://img.shields.io/github/last-commit/olivierfriard/BORIS)
 
+![BORIS scopus citations badge](https://penelope.unito.it/friard/boris_scopus_citations.svg)
 
 
+![GitHub Repo stars](https://img.shields.io/github/stars/olivierfriard/BORIS?style=flat&label=Stars)
+[![Please Star](https://img.shields.io/badge/⭐-Star%20this%20repo-blue?style=flat-square)](https://github.com/olivierfriard/BORIS/stargazers)
 
 # Documentation
 
@@ -81,8 +86,7 @@ Some [video tutorials](https://www.boris.unito.it/video_tutorials/) are availabl
 # Bug reports and feature requests
 
 
-To search for bugs, report them or request a feature, please use the github tracker:
-https://github.com/olivierfriard/BORIS/issues
+To search for bugs, report them or request a feature, please use the [GitHub issues tracker](https://github.com/olivierfriard/BORIS/issues)
 
 
 
@@ -128,7 +132,7 @@ GNU General Public License for more details.
 
 Distributed with a [GPL v.3 license](LICENSE.TXT).
 
-Copyright (C) 2012-2024 Olivier Friard
+Copyright (C) 2012-2025 Olivier Friard