accusleepy 0.4.5__py3-none-any.whl → 0.5.0__py3-none-any.whl

accusleepy/bouts.py

@@ -0,0 +1,142 @@
+import re
+from dataclasses import dataclass
+from operator import attrgetter
+
+import numpy as np
+
+
+@dataclass
+class Bout:
+    """Stores information about a brain state bout"""
+
+    length: int  # length, in number of epochs
+    start_index: int  # index where bout starts
+    end_index: int  # index where bout ends
+    surrounding_state: int  # brain state on both sides of the bout
+
+
+def find_last_adjacent_bout(sorted_bouts: list[Bout], bout_index: int) -> int:
+    """Find index of last consecutive same-length bout
+
+     When running the post-processing step that enforces a minimum duration
+     for brain state bouts, there is a special case when bouts below the
+     duration threshold occur consecutively. This function performs a
+     recursive search for the index of a bout at the end of such a sequence.
+     When initially called, bout_index will always be 0. If, for example, the
+     first three bouts in the list are consecutive, the function will return 2.
+
+    :param sorted_bouts: list of brain state bouts, sorted by start time
+    :param bout_index: index of the bout in question
+    :return: index of the last consecutive same-length bout
+    """
+    # if we're at the end of the bout list, stop
+    if bout_index == len(sorted_bouts) - 1:
+        return bout_index
+
+    # if there is an adjacent bout
+    if sorted_bouts[bout_index].end_index == sorted_bouts[bout_index + 1].start_index:
+        # look for more adjacent bouts using that one as a starting point
+        return find_last_adjacent_bout(sorted_bouts, bout_index + 1)
+    else:
+        return bout_index
+
+
+def enforce_min_bout_length(
+    labels: np.array, epoch_length: int | float, min_bout_length: int | float
+) -> np.array:
+    """Ensure brain state bouts meet the min length requirement
+
+    As a post-processing step for sleep scoring, we can require that any
+    bout (continuous period) of a brain state have a minimum duration.
+    This function sets any bout shorter than the minimum duration to the
+    surrounding brain state (if the states on the left and right sides
+    are the same). In the case where there are consecutive short bouts,
+    it either creates a transition at the midpoint or removes all short
+    bouts, depending on whether the number is even or odd. For example:
+    ...AAABABAAA...  -> ...AAAAAAAAA...
+    ...AAABABABBB... -> ...AAAAABBBBB...
+
+    :param labels: brain state labels (digits in the 0-9 range)
+    :param epoch_length: epoch length, in seconds
+    :param min_bout_length: minimum bout length, in seconds
+    :return: updated brain state labels
+    """
+    # if recording is very short, don't change anything
+    if labels.size < 3:
+        return labels
+
+    if epoch_length == min_bout_length:
+        return labels
+
+    # get minimum number of epochs in a bout
+    min_epochs = int(np.ceil(min_bout_length / epoch_length))
+    # get set of states in the labels
+    brain_states = set(labels.tolist())
+
+    while True:  # so true
+        # convert labels to a string for regex search
+        # There is probably a regex that can find all patterns like ab+a
+        # without consuming each "a" but I haven't found it :(
+        label_string = "".join(labels.astype(str))
+
+        bouts = list()
+
+        for state in brain_states:
+            for other_state in brain_states:
+                if state == other_state:
+                    continue
+                # get start and end indices of each bout
+                expression = (
+                    f"(?<={other_state}){state}{{1,{min_epochs - 1}}}(?={other_state})"
+                )
+                matches = re.finditer(expression, label_string)
+                spans = [match.span() for match in matches]
+
+                # if some bouts were found
+                for span in spans:
+                    bouts.append(
+                        Bout(
+                            length=span[1] - span[0],
+                            start_index=span[0],
+                            end_index=span[1],
+                            surrounding_state=other_state,
+                        )
+                    )
+
+        if len(bouts) == 0:
+            break
+
+        # only keep the shortest bouts
+        min_length_in_list = np.min([bout.length for bout in bouts])
+        bouts = [i for i in bouts if i.length == min_length_in_list]
+        # sort by start index
+        sorted_bouts = sorted(bouts, key=attrgetter("start_index"))
+
+        while len(sorted_bouts) > 0:
+            # get row index of latest adjacent bout (of same length)
+            last_adjacent_bout_index = find_last_adjacent_bout(sorted_bouts, 0)
+            # if there's an even number of adjacent bouts
+            if (last_adjacent_bout_index + 1) % 2 == 0:
+                midpoint = sorted_bouts[
+                    round((last_adjacent_bout_index + 1) / 2)
+                ].start_index
+                labels[sorted_bouts[0].start_index : midpoint] = sorted_bouts[
+                    0
+                ].surrounding_state
+                labels[midpoint : sorted_bouts[last_adjacent_bout_index].end_index] = (
+                    sorted_bouts[last_adjacent_bout_index].surrounding_state
+                )
+            else:
+                labels[
+                    sorted_bouts[0].start_index : sorted_bouts[
+                        last_adjacent_bout_index
+                    ].end_index
+                ] = sorted_bouts[0].surrounding_state
+
+            # delete the bouts we just fixed
+            if last_adjacent_bout_index == len(sorted_bouts) - 1:
+                sorted_bouts = []
+            else:
+                sorted_bouts = sorted_bouts[(last_adjacent_bout_index + 1) :]
+
+    return labels

accusleepy/classification.py

@@ -61,13 +61,13 @@ def get_device():
     )
 
 
-def train_model(
+def train_ssann(
     annotations_file: str,
     img_dir: str,
     mixture_weights: np.array,
     n_classes: int,
 ) -> SSANN:
-    """Train a classification model for sleep scoring
+    """Train a SSANN classification model for sleep scoring
 
     :param annotations_file: file with information on each training image
     :param img_dir: training image location

accusleepy/constants.py

@@ -37,3 +37,5 @@ RECORDING_LIST_NAME = "recording_list"
 RECORDING_LIST_FILE_TYPE = ".json"
 # key for default epoch length in config
 DEFAULT_EPOCH_LENGTH_KEY = "default_epoch_length"
+# filename used to store info about training image datasets
+ANNOTATIONS_FILENAME = "annotations.csv"

accusleepy/fileio.py

@@ -4,7 +4,6 @@ from dataclasses import dataclass
 
 import numpy as np
 import pandas as pd
-import torch
 from PySide6.QtWidgets import QListWidgetItem
 
 from accusleepy.brain_state_set import BRAIN_STATES_KEY, BrainState, BrainStateSet
@@ -19,7 +18,6 @@ from accusleepy.constants import (
     RECORDING_LIST_NAME,
     UNDEFINED_LABEL,
 )
-from accusleepy.models import SSANN
 
 
 @dataclass
@@ -46,57 +44,6 @@ def load_calibration_file(filename: str) -> (np.array, np.array):
     return mixture_means, mixture_sds
 
 
-def save_model(
-    model: SSANN,
-    filename: str,
-    epoch_length: int | float,
-    epochs_per_img: int,
-    model_type: str,
-    brain_state_set: BrainStateSet,
-) -> None:
-    """Save classification model and its metadata
-
-    :param model: classification model
-    :param epoch_length: epoch length used when training the model
-    :param epochs_per_img: number of epochs in each model input
-    :param model_type: default or real-time
-    :param brain_state_set: set of brain state options
-    :param filename: filename
-    """
-    state_dict = model.state_dict()
-    state_dict.update({"epoch_length": epoch_length})
-    state_dict.update({"epochs_per_img": epochs_per_img})
-    state_dict.update({"model_type": model_type})
-    state_dict.update(
-        {BRAIN_STATES_KEY: brain_state_set.to_output_dict()[BRAIN_STATES_KEY]}
-    )
-
-    torch.save(state_dict, filename)
-
-
-def load_model(filename: str) -> tuple[SSANN, int | float, int, str, dict]:
-    """Load classification model and its metadata
-
-    :param filename: filename
-    :return: model, epoch length used when training the model,
-        number of epochs in each model input, model type
-        (default or real-time), set of brain state options
-        used when training the model
-    """
-    state_dict = torch.load(
-        filename, weights_only=True, map_location=torch.device("cpu")
-    )
-    epoch_length = state_dict.pop("epoch_length")
-    epochs_per_img = state_dict.pop("epochs_per_img")
-    model_type = state_dict.pop("model_type")
-    brain_states = state_dict.pop(BRAIN_STATES_KEY)
-    n_classes = len([b for b in brain_states if b["is_scored"]])
-
-    model = SSANN(n_classes=n_classes)
-    model.load_state_dict(state_dict)
-    return model, epoch_length, epochs_per_img, model_type, brain_states
-
-
 def load_csv_or_parquet(filename: str) -> pd.DataFrame:
     """Load a csv or parquet file as a dataframe
 

accusleepy/gui/main.py

@@ -5,20 +5,37 @@ import datetime
 import os
 import shutil
 import sys
-import toml
 from dataclasses import dataclass
 from functools import partial
 
 import numpy as np
-from PySide6 import QtCore, QtGui, QtWidgets
+import toml
+from PySide6.QtCore import (
+    QEvent,
+    QKeyCombination,
+    QObject,
+    QRect,
+    Qt,
+    QUrl,
+)
+from PySide6.QtGui import QKeySequence, QShortcut
+from PySide6.QtWidgets import (
+    QApplication,
+    QCheckBox,
+    QDoubleSpinBox,
+    QFileDialog,
+    QLabel,
+    QListWidgetItem,
+    QMainWindow,
+    QTextBrowser,
+    QVBoxLayout,
+    QWidget,
+)
 
+from accusleepy.bouts import enforce_min_bout_length
 from accusleepy.brain_state_set import BRAIN_STATES_KEY, BrainState, BrainStateSet
-from accusleepy.classification import (
-    create_calibration_file,
-    score_recording,
-    train_model,
-)
 from accusleepy.constants import (
+    ANNOTATIONS_FILENAME,
     CALIBRATION_FILE_TYPE,
     DEFAULT_MODEL_TYPE,
     LABEL_FILE_TYPE,
@@ -33,23 +50,21 @@ from accusleepy.fileio import (
     load_calibration_file,
     load_config,
     load_labels,
-    load_model,
     load_recording,
     load_recording_list,
     save_config,
     save_labels,
-    save_model,
     save_recording_list,
 )
 from accusleepy.gui.manual_scoring import ManualScoringWindow
 from accusleepy.gui.primary_window import Ui_PrimaryWindow
 from accusleepy.signal_processing import (
-    ANNOTATIONS_FILENAME,
     create_training_images,
-    enforce_min_bout_length,
     resample_and_standardize,
 )
 
+# note: functions using torch or scipy are lazily imported
+
 # max number of messages to display
 MESSAGE_BOX_MAX_DEPTH = 200
 LABEL_LENGTH_ERROR = "label file length does not match recording length"
@@ -63,13 +78,13 @@ class StateSettings:
     """Widgets for config settings for a brain state"""
 
     digit: int
-    enabled_widget: QtWidgets.QCheckBox
-    name_widget: QtWidgets.QLabel
-    is_scored_widget: QtWidgets.QCheckBox
-    frequency_widget: QtWidgets.QDoubleSpinBox
+    enabled_widget: QCheckBox
+    name_widget: QLabel
+    is_scored_widget: QCheckBox
+    frequency_widget: QDoubleSpinBox
 
 
-class AccuSleepWindow(QtWidgets.QMainWindow):
+class AccuSleepWindow(QMainWindow):
     """AccuSleePy primary window"""
 
     def __init__(self):
@@ -103,9 +118,7 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
 
         # set up the list of recordings
         first_recording = Recording(
-            widget=QtWidgets.QListWidgetItem(
-                "Recording 1", self.ui.recording_list_widget
-            ),
+            widget=QListWidgetItem("Recording 1", self.ui.recording_list_widget),
         )
         self.ui.recording_list_widget.addItem(first_recording.widget)
         self.ui.recording_list_widget.setCurrentRow(0)
@@ -132,10 +145,8 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
         self.ui.version_label.setText(f"v{version}")
 
         # user input: keyboard shortcuts
-        keypress_quit = QtGui.QShortcut(
-            QtGui.QKeySequence(
-                QtCore.QKeyCombination(QtCore.Qt.Modifier.CTRL, QtCore.Qt.Key.Key_W)
-            ),
+        keypress_quit = QShortcut(
+            QKeySequence(QKeyCombination(Qt.Modifier.CTRL, Qt.Key.Key_W)),
             self,
         )
         keypress_quit.activated.connect(self.close)
@@ -187,7 +198,7 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
     def export_recording_list(self) -> None:
         """Save current list of recordings to file"""
         # get the name for the recording list file
-        filename, _ = QtWidgets.QFileDialog.getSaveFileName(
+        filename, _ = QFileDialog.getSaveFileName(
             self,
             caption="Save list of recordings as",
             filter="*" + RECORDING_LIST_FILE_TYPE,
@@ -200,10 +211,10 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
 
     def import_recording_list(self):
         """Load list of recordings from file, overwriting current list"""
-        file_dialog = QtWidgets.QFileDialog(self)
+        file_dialog = QFileDialog(self)
         file_dialog.setWindowTitle("Select list of recordings")
-        file_dialog.setFileMode(QtWidgets.QFileDialog.FileMode.ExistingFile)
-        file_dialog.setViewMode(QtWidgets.QFileDialog.ViewMode.Detail)
+        file_dialog.setFileMode(QFileDialog.FileMode.ExistingFile)
+        file_dialog.setViewMode(QFileDialog.ViewMode.Detail)
         file_dialog.setNameFilter("*" + RECORDING_LIST_FILE_TYPE)
 
         if file_dialog.exec():
@@ -219,7 +230,7 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
         self.recordings = load_recording_list(filename)
 
         for recording in self.recordings:
-            recording.widget = QtWidgets.QListWidgetItem(
+            recording.widget = QListWidgetItem(
                 f"Recording {recording.name}", self.ui.recording_list_widget
             )
             self.ui.recording_list_widget.addItem(self.recordings[-1].widget)
@@ -228,7 +239,7 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
         self.ui.recording_list_widget.setCurrentRow(0)
         self.show_message(f"Loaded list of recordings from {filename}")
 
-    def eventFilter(self, obj: QtCore.QObject, event: QtCore.QEvent) -> bool:
+    def eventFilter(self, obj: QObject, event: QEvent) -> bool:
         """Filter mouse events to detect when user drags/drops a file
 
         :param obj: UI object receiving the event
@@ -243,7 +254,7 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
             self.ui.model_label,
         ]:
             event.accept()
-            if event.type() == QtCore.QEvent.Drop:
+            if event.type() == QEvent.Drop:
                 urls = event.mimeData().urls()
                 if len(urls) == 1:
                     filename = os.path.normpath(urls[0].toLocalFile())
@@ -299,7 +310,7 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
                 return
 
         # get filename for the new model
-        model_filename, _ = QtWidgets.QFileDialog.getSaveFileName(
+        model_filename, _ = QFileDialog.getSaveFileName(
             self,
             caption="Save classification model file as",
             filter="*" + MODEL_FILE_TYPE,
@@ -322,11 +333,10 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
         os.makedirs(temp_image_dir, exist_ok=True)
 
         # create training images
-        self.show_message(
-            (f"Creating training images in {temp_image_dir}, please wait...")
-        )
+        self.show_message("Training, please wait. See console for progress updates.")
+        self.show_message((f"Creating training images in {temp_image_dir}"))
         self.ui.message_area.repaint()
-        QtWidgets.QApplication.processEvents()
+        QApplication.processEvents()
         print("Creating training images")
         failed_recordings = create_training_images(
             recordings=self.recordings,
@@ -349,11 +359,14 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
                 )
 
         # train model
-        self.show_message("Training model, please wait...")
+        self.show_message("Training model")
         self.ui.message_area.repaint()
-        QtWidgets.QApplication.processEvents()
+        QApplication.processEvents()
         print("Training model")
-        model = train_model(
+        from accusleepy.classification import train_ssann
+        from accusleepy.models import save_model
+
+        model = train_ssann(
             annotations_file=os.path.join(temp_image_dir, ANNOTATIONS_FILENAME),
             img_dir=temp_image_dir,
             mixture_weights=self.brain_state_set.mixture_weights,
@@ -374,11 +387,12 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
         if self.delete_training_images:
             shutil.rmtree(temp_image_dir)
 
-        self.show_message(f"Training complete, saved model to {model_filename}")
+        self.show_message(f"Training complete. Saved model to {model_filename}")
+        print("Training complete.")
 
     def set_training_folder(self) -> None:
         """Select location in which to create a folder for training images"""
-        training_folder_parent = QtWidgets.QFileDialog.getExistingDirectory(
+        training_folder_parent = QFileDialog.getExistingDirectory(
             self, "Select directory for training images"
         )
         if training_folder_parent:
@@ -421,7 +435,9 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
 
         self.ui.score_all_status.setText("running...")
         self.ui.score_all_status.repaint()
-        QtWidgets.QApplication.processEvents()
+        QApplication.processEvents()
+
+        from accusleepy.classification import score_recording
 
         # check some inputs for each recording
         for recording_index in range(len(self.recordings)):
@@ -570,11 +586,13 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
 
         :param filename: model filename, if it's known
         """
+        from accusleepy.models import load_model
+
         if filename is None:
-            file_dialog = QtWidgets.QFileDialog(self)
+            file_dialog = QFileDialog(self)
             file_dialog.setWindowTitle("Select classification model")
-            file_dialog.setFileMode(QtWidgets.QFileDialog.FileMode.ExistingFile)
-            file_dialog.setViewMode(QtWidgets.QFileDialog.ViewMode.Detail)
+            file_dialog.setFileMode(QFileDialog.FileMode.ExistingFile)
+            file_dialog.setViewMode(QFileDialog.ViewMode.Detail)
             file_dialog.setNameFilter("*" + MODEL_FILE_TYPE)
 
             if file_dialog.exec():
@@ -634,7 +652,7 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
         self.ui.model_label.setText(filename)
 
     def load_single_recording(
-        self, status_widget: QtWidgets.QLabel
+        self, status_widget: QLabel
     ) -> (np.array, np.array, int | float, bool):
         """Load and preprocess one recording
 
@@ -721,7 +739,7 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
             return
 
         # get the name for the calibration file
-        filename, _ = QtWidgets.QFileDialog.getSaveFileName(
+        filename, _ = QFileDialog.getSaveFileName(
             self,
             caption="Save calibration file as",
             filter="*" + CALIBRATION_FILE_TYPE,
@@ -730,6 +748,8 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
             return
         filename = os.path.normpath(filename)
 
+        from accusleepy.classification import create_calibration_file
+
         create_calibration_file(
             filename=filename,
             eeg=eeg,
@@ -799,7 +819,7 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
         # immediately display a status message
         self.ui.manual_scoring_status.setText("loading...")
         self.ui.manual_scoring_status.repaint()
-        QtWidgets.QApplication.processEvents()
+        QApplication.processEvents()
 
         # load the recording
         eeg, emg, sampling_rate, success = self.load_single_recording(
@@ -889,7 +909,7 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
 
     def create_label_file(self) -> None:
         """Set the filename for a new label file"""
-        filename, _ = QtWidgets.QFileDialog.getSaveFileName(
+        filename, _ = QFileDialog.getSaveFileName(
             self,
             caption="Set filename for label file (nothing will be overwritten yet)",
             filter="*" + LABEL_FILE_TYPE,
@@ -901,10 +921,10 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
 
     def select_label_file(self) -> None:
         """User can select an existing label file"""
-        file_dialog = QtWidgets.QFileDialog(self)
+        file_dialog = QFileDialog(self)
         file_dialog.setWindowTitle("Select label file")
-        file_dialog.setFileMode(QtWidgets.QFileDialog.FileMode.ExistingFile)
-        file_dialog.setViewMode(QtWidgets.QFileDialog.ViewMode.Detail)
+        file_dialog.setFileMode(QFileDialog.FileMode.ExistingFile)
+        file_dialog.setViewMode(QFileDialog.ViewMode.Detail)
         file_dialog.setNameFilter("*" + LABEL_FILE_TYPE)
 
         if file_dialog.exec():
@@ -916,10 +936,10 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
 
     def select_calibration_file(self) -> None:
         """User can select a calibration file"""
-        file_dialog = QtWidgets.QFileDialog(self)
+        file_dialog = QFileDialog(self)
         file_dialog.setWindowTitle("Select calibration file")
-        file_dialog.setFileMode(QtWidgets.QFileDialog.FileMode.ExistingFile)
-        file_dialog.setViewMode(QtWidgets.QFileDialog.ViewMode.Detail)
+        file_dialog.setFileMode(QFileDialog.FileMode.ExistingFile)
+        file_dialog.setViewMode(QFileDialog.ViewMode.Detail)
         file_dialog.setNameFilter("*" + CALIBRATION_FILE_TYPE)
 
         if file_dialog.exec():
@@ -931,10 +951,10 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
 
     def select_recording_file(self) -> None:
         """User can select a recording file"""
-        file_dialog = QtWidgets.QFileDialog(self)
+        file_dialog = QFileDialog(self)
         file_dialog.setWindowTitle("Select recording file")
-        file_dialog.setFileMode(QtWidgets.QFileDialog.FileMode.ExistingFile)
-        file_dialog.setViewMode(QtWidgets.QFileDialog.ViewMode.Detail)
+        file_dialog.setFileMode(QFileDialog.FileMode.ExistingFile)
+        file_dialog.setViewMode(QFileDialog.ViewMode.Detail)
         file_dialog.setNameFilter(f"(*{' *'.join(RECORDING_FILE_TYPES)})")
 
         if file_dialog.exec():
@@ -1009,7 +1029,7 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
             Recording(
                 name=new_name,
                 sampling_rate=self.recordings[self.recording_index].sampling_rate,
-                widget=QtWidgets.QListWidgetItem(
+                widget=QListWidgetItem(
                     f"Recording {new_name}", self.ui.recording_list_widget
                 ),
             )
@@ -1033,16 +1053,16 @@ class AccuSleepWindow(QtWidgets.QMainWindow):
 
     def show_user_manual(self) -> None:
         """Show a popup window with the user manual"""
-        self.popup = QtWidgets.QWidget()
-        self.popup_vlayout = QtWidgets.QVBoxLayout(self.popup)
-        self.guide_textbox = QtWidgets.QTextBrowser(self.popup)
+        self.popup = QWidget()
+        self.popup_vlayout = QVBoxLayout(self.popup)
+        self.guide_textbox = QTextBrowser(self.popup)
         self.popup_vlayout.addWidget(self.guide_textbox)
 
-        url = QtCore.QUrl.fromLocalFile(MAIN_GUIDE_FILE)
+        url = QUrl.fromLocalFile(MAIN_GUIDE_FILE)
         self.guide_textbox.setSource(url)
         self.guide_textbox.setOpenLinks(False)
 
-        self.popup.setGeometry(QtCore.QRect(100, 100, 600, 600))
+        self.popup.setGeometry(QRect(100, 100, 600, 600))
         self.popup.show()
 
     def initialize_settings_tab(self):
@@ -1389,7 +1409,7 @@ def check_config_consistency(
 
 
 def run_primary_window() -> None:
-    app = QtWidgets.QApplication(sys.argv)
+    app = QApplication(sys.argv)
     AccuSleepWindow()
     sys.exit(app.exec())
 

accusleepy/gui/manual_scoring.py

@@ -12,7 +12,24 @@ from types import SimpleNamespace
 
 import matplotlib.pyplot as plt
 import numpy as np
-from PySide6 import QtCore, QtGui, QtWidgets
+from PySide6.QtCore import (
+    QKeyCombination,
+    QRect,
+    Qt,
+    QUrl,
+)
+from PySide6.QtGui import (
+    QCloseEvent,
+    QKeySequence,
+    QShortcut,
+)
+from PySide6.QtWidgets import (
+    QDialog,
+    QMessageBox,
+    QTextBrowser,
+    QVBoxLayout,
+    QWidget,
+)
 
 from accusleepy.constants import UNDEFINED_LABEL
 from accusleepy.fileio import load_config, save_labels
@@ -73,7 +90,7 @@ class StateChange:
     epoch: int  # first epoch affected
 
 
-class ManualScoringWindow(QtWidgets.QDialog):
+class ManualScoringWindow(QDialog):
     """AccuSleePy manual scoring GUI"""
 
     def __init__(
@@ -191,33 +208,25 @@ class ManualScoringWindow(QtWidgets.QDialog):
         self.update_lower_figure()
 
         # user input: keyboard shortcuts
-        keypress_right = QtGui.QShortcut(
-            QtGui.QKeySequence(QtCore.Qt.Key.Key_Right), self
-        )
+        keypress_right = QShortcut(QKeySequence(Qt.Key.Key_Right), self)
         keypress_right.activated.connect(partial(self.shift_epoch, DIRECTION_RIGHT))
 
-        keypress_left = QtGui.QShortcut(
-            QtGui.QKeySequence(QtCore.Qt.Key.Key_Left), self
-        )
+        keypress_left = QShortcut(QKeySequence(Qt.Key.Key_Left), self)
         keypress_left.activated.connect(partial(self.shift_epoch, DIRECTION_LEFT))
 
         keypress_zoom_in_x = list()
-        for zoom_key in [QtCore.Qt.Key.Key_Plus, QtCore.Qt.Key.Key_Equal]:
-            keypress_zoom_in_x.append(
-                QtGui.QShortcut(QtGui.QKeySequence(zoom_key), self)
-            )
+        for zoom_key in [Qt.Key.Key_Plus, Qt.Key.Key_Equal]:
+            keypress_zoom_in_x.append(QShortcut(QKeySequence(zoom_key), self))
             keypress_zoom_in_x[-1].activated.connect(partial(self.zoom_x, ZOOM_IN))
 
-        keypress_zoom_out_x = QtGui.QShortcut(
-            QtGui.QKeySequence(QtCore.Qt.Key.Key_Minus), self
-        )
+        keypress_zoom_out_x = QShortcut(QKeySequence(Qt.Key.Key_Minus), self)
         keypress_zoom_out_x.activated.connect(partial(self.zoom_x, ZOOM_OUT))
 
         keypress_modify_label = list()
         for brain_state in self.brain_state_set.brain_states:
             keypress_modify_label.append(
-                QtGui.QShortcut(
-                    QtGui.QKeySequence(QtCore.Qt.Key[f"Key_{brain_state.digit}"]),
+                QShortcut(
+                    QKeySequence(Qt.Key[f"Key_{brain_state.digit}"]),
                     self,
                 )
             )
@@ -225,25 +234,19 @@ class ManualScoringWindow(QtWidgets.QDialog):
                 partial(self.modify_current_epoch_label, brain_state.digit)
             )
 
-        keypress_delete_label = QtGui.QShortcut(
-            QtGui.QKeySequence(QtCore.Qt.Key.Key_Backspace), self
-        )
+        keypress_delete_label = QShortcut(QKeySequence(Qt.Key.Key_Backspace), self)
         keypress_delete_label.activated.connect(
             partial(self.modify_current_epoch_label, UNDEFINED_LABEL)
         )
 
-        keypress_quit = QtGui.QShortcut(
-            QtGui.QKeySequence(
-                QtCore.QKeyCombination(QtCore.Qt.Modifier.CTRL, QtCore.Qt.Key.Key_W)
-            ),
+        keypress_quit = QShortcut(
+            QKeySequence(QKeyCombination(Qt.Modifier.CTRL, Qt.Key.Key_W)),
             self,
         )
         keypress_quit.activated.connect(self.close)
 
-        keypress_save = QtGui.QShortcut(
-            QtGui.QKeySequence(
-                QtCore.QKeyCombination(QtCore.Qt.Modifier.CTRL, QtCore.Qt.Key.Key_S)
-            ),
+        keypress_save = QShortcut(
+            QKeySequence(QKeyCombination(Qt.Modifier.CTRL, Qt.Key.Key_S)),
             self,
         )
         keypress_save.activated.connect(self.save)
@@ -251,11 +254,11 @@ class ManualScoringWindow(QtWidgets.QDialog):
         keypress_roi = list()
         for brain_state in self.brain_state_set.brain_states:
             keypress_roi.append(
-                QtGui.QShortcut(
-                    QtGui.QKeySequence(
-                        QtCore.QKeyCombination(
-                            QtCore.Qt.Modifier.SHIFT,
-                            QtCore.Qt.Key[f"Key_{brain_state.digit}"],
+                QShortcut(
+                    QKeySequence(
+                        QKeyCombination(
+                            Qt.Modifier.SHIFT,
+                            Qt.Key[f"Key_{brain_state.digit}"],
                         )
                     ),
                     self,
@@ -265,11 +268,11 @@ class ManualScoringWindow(QtWidgets.QDialog):
                 partial(self.enter_label_roi_mode, brain_state.digit)
             )
         keypress_roi.append(
-            QtGui.QShortcut(
-                QtGui.QKeySequence(
-                    QtCore.QKeyCombination(
-                        QtCore.Qt.Modifier.SHIFT,
-                        QtCore.Qt.Key.Key_Backspace,
+            QShortcut(
+                QKeySequence(
+                    QKeyCombination(
+                        Qt.Modifier.SHIFT,
+                        Qt.Key.Key_Backspace,
                     )
                 ),
                 self,
@@ -279,22 +282,18 @@ class ManualScoringWindow(QtWidgets.QDialog):
             partial(self.enter_label_roi_mode, UNDEFINED_LABEL)
         )
 
-        keypress_esc = QtGui.QShortcut(
-            QtGui.QKeySequence(QtCore.Qt.Key.Key_Escape), self
-        )
+        keypress_esc = QShortcut(QKeySequence(Qt.Key.Key_Escape), self)
         keypress_esc.activated.connect(self.exit_label_roi_mode)
 
-        keypress_space = QtGui.QShortcut(
-            QtGui.QKeySequence(QtCore.Qt.Key.Key_Space), self
-        )
+        keypress_space = QShortcut(QKeySequence(Qt.Key.Key_Space), self)
         keypress_space.activated.connect(
             partial(self.jump_to_next_state, DIRECTION_RIGHT, DIFFERENT_STATE)
         )
-        keypress_shift_right = QtGui.QShortcut(
-            QtGui.QKeySequence(
-                QtCore.QKeyCombination(
-                    QtCore.Qt.Modifier.SHIFT,
-                    QtCore.Qt.Key.Key_Right,
+        keypress_shift_right = QShortcut(
+            QKeySequence(
+                QKeyCombination(
+                    Qt.Modifier.SHIFT,
+                    Qt.Key.Key_Right,
                 )
             ),
             self,
@@ -302,11 +301,11 @@ class ManualScoringWindow(QtWidgets.QDialog):
         keypress_shift_right.activated.connect(
             partial(self.jump_to_next_state, DIRECTION_RIGHT, DIFFERENT_STATE)
         )
-        keypress_shift_left = QtGui.QShortcut(
-            QtGui.QKeySequence(
-                QtCore.QKeyCombination(
-                    QtCore.Qt.Modifier.SHIFT,
-                    QtCore.Qt.Key.Key_Left,
+        keypress_shift_left = QShortcut(
+            QKeySequence(
+                QKeyCombination(
+                    Qt.Modifier.SHIFT,
+                    Qt.Key.Key_Left,
                 )
             ),
             self,
@@ -314,11 +313,11 @@ class ManualScoringWindow(QtWidgets.QDialog):
         keypress_shift_left.activated.connect(
             partial(self.jump_to_next_state, DIRECTION_LEFT, DIFFERENT_STATE)
         )
-        keypress_ctrl_right = QtGui.QShortcut(
-            QtGui.QKeySequence(
-                QtCore.QKeyCombination(
-                    QtCore.Qt.Modifier.CTRL,
-                    QtCore.Qt.Key.Key_Right,
+        keypress_ctrl_right = QShortcut(
+            QKeySequence(
+                QKeyCombination(
+                    Qt.Modifier.CTRL,
+                    Qt.Key.Key_Right,
                 )
             ),
             self,
@@ -326,11 +325,11 @@ class ManualScoringWindow(QtWidgets.QDialog):
         keypress_ctrl_right.activated.connect(
             partial(self.jump_to_next_state, DIRECTION_RIGHT, UNDEFINED_STATE)
         )
-        keypress_ctrl_left = QtGui.QShortcut(
-            QtGui.QKeySequence(
-                QtCore.QKeyCombination(
-                    QtCore.Qt.Modifier.CTRL,
-                    QtCore.Qt.Key.Key_Left,
+        keypress_ctrl_left = QShortcut(
+            QKeySequence(
+                QKeyCombination(
+                    Qt.Modifier.CTRL,
+                    Qt.Key.Key_Left,
                 )
             ),
             self,
@@ -339,17 +338,13 @@ class ManualScoringWindow(QtWidgets.QDialog):
             partial(self.jump_to_next_state, DIRECTION_LEFT, UNDEFINED_STATE)
         )
 
-        keypress_undo = QtGui.QShortcut(
-            QtGui.QKeySequence(
-                QtCore.QKeyCombination(QtCore.Qt.Modifier.CTRL, QtCore.Qt.Key.Key_Z)
-            ),
+        keypress_undo = QShortcut(
+            QKeySequence(QKeyCombination(Qt.Modifier.CTRL, Qt.Key.Key_Z)),
             self,
         )
         keypress_undo.activated.connect(self.undo)
-        keypress_redo = QtGui.QShortcut(
-            QtGui.QKeySequence(
-                QtCore.QKeyCombination(QtCore.Qt.Modifier.CTRL, QtCore.Qt.Key.Key_Y)
-            ),
+        keypress_redo = QShortcut(
+            QKeySequence(QKeyCombination(Qt.Modifier.CTRL, Qt.Key.Key_Y)),
             self,
         )
         keypress_redo.activated.connect(self.redo)
@@ -483,34 +478,34 @@ class ManualScoringWindow(QtWidgets.QDialog):
         )
         self.click_to_jump(simulated_click)
 
-    def closeEvent(self, event: QtGui.QCloseEvent) -> None:
+    def closeEvent(self, event: QCloseEvent) -> None:
         """Check if there are unsaved changes before closing"""
         if not all(self.labels == self.last_saved_labels):
-            result = QtWidgets.QMessageBox.question(
+            result = QMessageBox.question(
                 self,
                 "Unsaved changes",
                 "You have unsaved changes. Really quit?",
-                QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No,
+                QMessageBox.Yes | QMessageBox.No,
             )
-            if result == QtWidgets.QMessageBox.Yes:
+            if result == QMessageBox.Yes:
                 event.accept()
             else:
                 event.ignore()
 
     def show_user_manual(self) -> None:
         """Show a popup window with the user manual"""
-        self.popup = QtWidgets.QWidget()
-        self.popup_vlayout = QtWidgets.QVBoxLayout(self.popup)
-        self.guide_textbox = QtWidgets.QTextBrowser(self.popup)
+        self.popup = QWidget()
+        self.popup_vlayout = QVBoxLayout(self.popup)
+        self.guide_textbox = QTextBrowser(self.popup)
         self.popup_vlayout.addWidget(self.guide_textbox)
 
-        url = QtCore.QUrl.fromLocalFile(
+        url = QUrl.fromLocalFile(
             os.path.join(os.path.dirname(os.path.abspath(__file__)), USER_MANUAL_FILE)
         )
         self.guide_textbox.setSource(url)
         self.guide_textbox.setOpenLinks(False)
 
-        self.popup.setGeometry(QtCore.QRect(100, 100, 830, 600))
+        self.popup.setGeometry(QRect(100, 100, 830, 600))
         self.popup.show()
 
     def jump_to_next_state(self, direction: str, target: str) -> None:

accusleepy/gui/mplwidget.py

@@ -339,18 +339,23 @@ def resample_x_ticks(x_ticks: np.array) -> np.array:
     """Choose a subset of x_ticks to display
 
     The x-axis can get crowded if there are too many timestamps shown.
-    This function resamples the x-axis ticks by a factor of either
-    MAX_LOWER_X_TICK_N or MAX_LOWER_X_TICK_N - 2, whichever is closer
-    to being a factor of the number of ticks.
+    This function finds a subset of evenly spaced x-axis ticks that
+    includes the one at the beginning of the central epoch.
 
     :param x_ticks: full set of x_ticks
     :return: smaller subset of x_ticks
     """
-    # add one since the tick at the rightmost edge isn't shown
-    n_ticks = len(x_ticks) + 1
-    if n_ticks < MAX_LOWER_X_TICK_N:
+    if len(x_ticks) <= MAX_LOWER_X_TICK_N:
         return x_ticks
-    elif n_ticks % MAX_LOWER_X_TICK_N < n_ticks % (MAX_LOWER_X_TICK_N - 2):
-        return x_ticks[:: int(n_ticks / MAX_LOWER_X_TICK_N)]
-    else:
-        return x_ticks[:: int(n_ticks / (MAX_LOWER_X_TICK_N - 2))]
+
+    # number of ticks to the left of the central epoch
+    # this will always be an integer
+    nl = round((len(x_ticks) - 1) / 2)
+
+    # search for even tick spacings that include the central epoch
+    # if necessary, skip the leftmost tick
+    for offset in [0, 1]:
+        if (nl - offset) % 3 == 0:
+            return x_ticks[offset :: round((nl - offset) / 3)]
+        elif (nl - offset) % 2 == 0:
+            return x_ticks[offset :: round((nl - offset) / 2)]

accusleepy/gui/primary_window.py

@@ -30,6 +30,7 @@ from PySide6.QtWidgets import (
     QVBoxLayout,
     QWidget,
 )
+
 import accusleepy.gui.resources_rc  # noqa F401
 
 

accusleepy/models.py

@@ -1,8 +1,9 @@
 import numpy as np
-import torch
-import torch.nn.functional as F
-from torch import nn
+from torch import device, flatten, nn
+from torch import load as torch_load
+from torch import save as torch_save
 
+from accusleepy.brain_state_set import BRAIN_STATES_KEY, BrainStateSet
 from accusleepy.constants import (
     DOWNSAMPLING_START_FREQ,
     EMG_COPIES,
@@ -41,8 +42,57 @@ class SSANN(nn.Module):
 
     def forward(self, x):
         x = x.float()
-        x = self.pool(F.relu(self.conv1_bn(self.conv1(x))))
-        x = self.pool(F.relu(self.conv2_bn(self.conv2(x))))
-        x = self.pool(F.relu(self.conv3_bn(self.conv3(x))))
-        x = torch.flatten(x, 1)  # flatten all dimensions except batch
+        x = self.pool(nn.functional.relu(self.conv1_bn(self.conv1(x))))
+        x = self.pool(nn.functional.relu(self.conv2_bn(self.conv2(x))))
+        x = self.pool(nn.functional.relu(self.conv3_bn(self.conv3(x))))
+        x = flatten(x, 1)  # flatten all dimensions except batch
         return self.fc1(x)
+
+
+def save_model(
+    model: SSANN,
+    filename: str,
+    epoch_length: int | float,
+    epochs_per_img: int,
+    model_type: str,
+    brain_state_set: BrainStateSet,
+) -> None:
+    """Save classification model and its metadata
+
+    :param model: classification model
+    :param epoch_length: epoch length used when training the model
+    :param epochs_per_img: number of epochs in each model input
+    :param model_type: default or real-time
+    :param brain_state_set: set of brain state options
+    :param filename: filename
+    """
+    state_dict = model.state_dict()
+    state_dict.update({"epoch_length": epoch_length})
+    state_dict.update({"epochs_per_img": epochs_per_img})
+    state_dict.update({"model_type": model_type})
+    state_dict.update(
+        {BRAIN_STATES_KEY: brain_state_set.to_output_dict()[BRAIN_STATES_KEY]}
+    )
+
+    torch_save(state_dict, filename)
+
+
+def load_model(filename: str) -> tuple[SSANN, int | float, int, str, dict]:
+    """Load classification model and its metadata
+
+    :param filename: filename
+    :return: model, epoch length used when training the model,
+        number of epochs in each model input, model type
+        (default or real-time), set of brain state options
+        used when training the model
+    """
+    state_dict = torch_load(filename, weights_only=True, map_location=device("cpu"))
+    epoch_length = state_dict.pop("epoch_length")
+    epochs_per_img = state_dict.pop("epochs_per_img")
+    model_type = state_dict.pop("model_type")
+    brain_states = state_dict.pop(BRAIN_STATES_KEY)
+    n_classes = len([b for b in brain_states if b["is_scored"]])
+
+    model = SSANN(n_classes=n_classes)
+    model.load_state_dict(state_dict)
+    return model, epoch_length, epochs_per_img, model_type, brain_states

accusleepy/multitaper.py

@@ -15,8 +15,9 @@ import warnings
 
 import numpy as np
 from joblib import Parallel, cpu_count, delayed
-from scipy.signal import detrend
-from scipy.signal.windows import dpss
+
+# from scipy.signal import detrend # unused by AccuSleePy
+# from scipy.signal.windows import dpss # lazily loaded later
 
 
 # MULTITAPER SPECTROGRAM #
@@ -28,14 +29,14 @@ def spectrogram(
     num_tapers=None,
     window_params=None,
     min_nfft=0,
-    detrend_opt="linear",
+    detrend_opt="off",  # this functionality is disabled
     multiprocess=False,
     n_jobs=None,
     weighting="unity",
     plot_on=False,
     return_fig=False,
     clim_scale=True,
-    verbose=True,
+    verbose=False,
     xyflip=False,
     ax=None,
 ):
@@ -121,6 +122,7 @@ def spectrogram(
 
     __________________________________________________________________________________________________________________
     """
+    from scipy.signal.windows import dpss
 
     #  Process user input
     [
@@ -618,9 +620,9 @@ def calc_mts_segment(
         ret.fill(np.nan)
         return ret
 
-    # Option to detrend data to remove low frequency DC component
-    if detrend_opt != "off":
-        data_segment = detrend(data_segment, type=detrend_opt)
+    # # Option to detrend data to remove low frequency DC component
+    # if detrend_opt != "off":
+    #     data_segment = detrend(data_segment, type=detrend_opt)
 
     # Multiply data by dpss tapers (STEP 2)
     tapered_data = np.multiply(np.asmatrix(data_segment).T, np.asmatrix(dpss_tapers.T))

accusleepy/signal_processing.py

@@ -1,17 +1,14 @@
 import os
-import re
 import warnings
-from dataclasses import dataclass
-from operator import attrgetter
 
 import numpy as np
 import pandas as pd
 from PIL import Image
-from scipy.signal import butter, filtfilt
 from tqdm import trange
 
 from accusleepy.brain_state_set import BrainStateSet
 from accusleepy.constants import (
+    ANNOTATIONS_FILENAME,
     DEFAULT_MODEL_TYPE,
     DOWNSAMPLING_START_FREQ,
     EMG_COPIES,
@@ -23,13 +20,13 @@ from accusleepy.constants import (
 from accusleepy.fileio import Recording, load_labels, load_recording
 from accusleepy.multitaper import spectrogram
 
+# note: scipy is lazily imported
+
 # clip mixture z-scores above and below this level
 # in the matlab implementation, I used 4.5
 ABS_MAX_Z_SCORE = 3.5
 # upper frequency limit when generating EEG spectrograms
 SPECTROGRAM_UPPER_FREQ = 64
-# filename used to store info about training image datasets
-ANNOTATIONS_FILENAME = "annotations.csv"
 
 
 def resample(
@@ -186,6 +183,8 @@ def get_emg_power(
     :param epoch_length: epoch length, in seconds
     :return: EMG "power" for each epoch
     """
+    from scipy.signal import butter, filtfilt
+
     # filter parameters
     order = 8
     bp_lower = 20
@@ -450,140 +449,3 @@ def create_training_images(
     )
 
     return failed_recordings
-
-
-@dataclass
-class Bout:
-    """Stores information about a brain state bout"""
-
-    length: int  # length, in number of epochs
-    start_index: int  # index where bout starts
-    end_index: int  # index where bout ends
-    surrounding_state: int  # brain state on both sides of the bout
-
-
-def find_last_adjacent_bout(sorted_bouts: list[Bout], bout_index: int) -> int:
-    """Find index of last consecutive same-length bout
-
-     When running the post-processing step that enforces a minimum duration
-     for brain state bouts, there is a special case when bouts below the
-     duration threshold occur consecutively. This function performs a
-     recursive search for the index of a bout at the end of such a sequence.
-     When initially called, bout_index will always be 0. If, for example, the
-     first three bouts in the list are consecutive, the function will return 2.
-
-    :param sorted_bouts: list of brain state bouts, sorted by start time
-    :param bout_index: index of the bout in question
-    :return: index of the last consecutive same-length bout
-    """
-    # if we're at the end of the bout list, stop
-    if bout_index == len(sorted_bouts) - 1:
-        return bout_index
-
-    # if there is an adjacent bout
-    if sorted_bouts[bout_index].end_index == sorted_bouts[bout_index + 1].start_index:
-        # look for more adjacent bouts using that one as a starting point
-        return find_last_adjacent_bout(sorted_bouts, bout_index + 1)
-    else:
-        return bout_index
-
-
-def enforce_min_bout_length(
-    labels: np.array, epoch_length: int | float, min_bout_length: int | float
-) -> np.array:
-    """Ensure brain state bouts meet the min length requirement
-
-    As a post-processing step for sleep scoring, we can require that any
-    bout (continuous period) of a brain state have a minimum duration.
-    This function sets any bout shorter than the minimum duration to the
-    surrounding brain state (if the states on the left and right sides
-    are the same). In the case where there are consecutive short bouts,
-    it either creates a transition at the midpoint or removes all short
-    bouts, depending on whether the number is even or odd. For example:
-    ...AAABABAAA...  -> ...AAAAAAAAA...
-    ...AAABABABBB... -> ...AAAAABBBBB...
-
-    :param labels: brain state labels (digits in the 0-9 range)
-    :param epoch_length: epoch length, in seconds
-    :param min_bout_length: minimum bout length, in seconds
-    :return: updated brain state labels
-    """
-    # if recording is very short, don't change anything
-    if labels.size < 3:
-        return labels
-
-    if epoch_length == min_bout_length:
-        return labels
-
-    # get minimum number of epochs in a bout
-    min_epochs = int(np.ceil(min_bout_length / epoch_length))
-    # get set of states in the labels
-    brain_states = set(labels.tolist())
-
-    while True:  # so true
-        # convert labels to a string for regex search
-        # There is probably a regex that can find all patterns like ab+a
-        # without consuming each "a" but I haven't found it :(
-        label_string = "".join(labels.astype(str))
-
-        bouts = list()
-
-        for state in brain_states:
-            for other_state in brain_states:
-                if state == other_state:
-                    continue
-                # get start and end indices of each bout
-                expression = (
-                    f"(?<={other_state}){state}{{1,{min_epochs - 1}}}(?={other_state})"
-                )
-                matches = re.finditer(expression, label_string)
-                spans = [match.span() for match in matches]
-
-                # if some bouts were found
-                for span in spans:
-                    bouts.append(
-                        Bout(
-                            length=span[1] - span[0],
-                            start_index=span[0],
-                            end_index=span[1],
-                            surrounding_state=other_state,
-                        )
-                    )
-
-        if len(bouts) == 0:
-            break
-
-        # only keep the shortest bouts
-        min_length_in_list = np.min([bout.length for bout in bouts])
-        bouts = [i for i in bouts if i.length == min_length_in_list]
-        # sort by start index
-        sorted_bouts = sorted(bouts, key=attrgetter("start_index"))
-
-        while len(sorted_bouts) > 0:
-            # get row index of latest adjacent bout (of same length)
-            last_adjacent_bout_index = find_last_adjacent_bout(sorted_bouts, 0)
-            # if there's an even number of adjacent bouts
-            if (last_adjacent_bout_index + 1) % 2 == 0:
-                midpoint = sorted_bouts[
-                    round((last_adjacent_bout_index + 1) / 2)
-                ].start_index
-                labels[sorted_bouts[0].start_index : midpoint] = sorted_bouts[
-                    0
-                ].surrounding_state
-                labels[midpoint : sorted_bouts[last_adjacent_bout_index].end_index] = (
-                    sorted_bouts[last_adjacent_bout_index].surrounding_state
-                )
-            else:
-                labels[
-                    sorted_bouts[0].start_index : sorted_bouts[
-                        last_adjacent_bout_index
-                    ].end_index
-                ] = sorted_bouts[0].surrounding_state
-
-            # delete the bouts we just fixed
-            if last_adjacent_bout_index == len(sorted_bouts) - 1:
-                sorted_bouts = []
-            else:
-                sorted_bouts = sorted_bouts[(last_adjacent_bout_index + 1) :]
-
-    return labels

{accusleepy-0.4.5.dist-info → accusleepy-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: accusleepy
-Version: 0.4.5
+Version: 0.5.0
 Summary: Python implementation of AccuSleep
 License: GPL-3.0-only
 Author: Zeke Barger
@@ -75,6 +75,7 @@ to the [config file](accusleepy/config.json).
 
 ## Changelog
 
+- 0.5.0: Performance improvements
 - 0.4.5: Added support for python 3.13, **removed support for python 3.10.**
 - 0.4.4: Performance improvements
 - 0.4.3: Improved unit tests and user manuals

{accusleepy-0.4.5.dist-info → accusleepy-0.5.0.dist-info}/RECORD

@@ -1,10 +1,11 @@
 accusleepy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accusleepy/__main__.py,sha256=dKzl2N2Hg9lD264CWYNxThRyDKzWwyMwHRXmJxOmMis,104
+accusleepy/bouts.py,sha256=F_y6DxnpKFfImYb7vCZluZ2eD5I_33gZXmRM8mvebsg,5679
 accusleepy/brain_state_set.py,sha256=fRkrArHLIbEKimub804yt_mUXoyfsjJEfiJnTjeCMkY,3233
-accusleepy/classification.py,sha256=xrmPyMHlzYh0QfNCID1PRIYEIyNkWduOi7g1Bdb6xfg,8573
+accusleepy/classification.py,sha256=czRGcDYN28QK5Nsahy6y2C162OgbO1nhjJxWZT9AvWc,8579
 accusleepy/config.json,sha256=F76WRLarMEW38BBMPwFlQ_d7Dur-ptqYmW8BxqnQF4A,464
-accusleepy/constants.py,sha256=PnsPANggyIfMfd6OCR-kNztFOTybUEhMnPeibu5_eEU,1280
-accusleepy/fileio.py,sha256=S5pf_hE-btJPMbrTplKLaQTULSJQoOJ-56LBH79Uz3I,6383
+accusleepy/constants.py,sha256=mb6Tjzat-tWOHdz2I1mqW7NtDzDKcy3rVjeqSdOQ2qE,1381
+accusleepy/fileio.py,sha256=qJfnAnGou337z9_ngBpqsyhCawKazh2DpQdneFZMaMg,4547
 accusleepy/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accusleepy/gui/icons/brightness_down.png,sha256=PLT1fb83RHIhSRuU7MMMx0G7oJAY7o9wUcnqM8veZfM,12432
 accusleepy/gui/icons/brightness_up.png,sha256=64GnUqgPvN5xZ6Um3wOzwqvUmdAWYZT6eFmWpBsHyks,12989
@@ -17,13 +18,13 @@ accusleepy/gui/icons/save.png,sha256=J3EA8iU1BqLYRSsrq_OdoZlqrv2yfL7oV54DklTy_DI
 accusleepy/gui/icons/up_arrow.png,sha256=V9yF9t1WgjPaUu-mF1YGe_DfaRHg2dUpR_sUVVcvVvY,3329
 accusleepy/gui/icons/zoom_in.png,sha256=MFWnKZp7Rvh4bLPq4Cqo4sB_jQYedUUtT8-ZO8tNYyc,13589
 accusleepy/gui/icons/zoom_out.png,sha256=IB8Jecb3i0U4qjWRR46ridjLpvLCSe7PozBaLqQqYSw,13055
-accusleepy/gui/images/primary_window.png,sha256=x_ppmv0fKySxXAzbQHCv5JFLdM2ETTxJqUHyPVo5xck,596421
+accusleepy/gui/images/primary_window.png,sha256=-JHTb7bvRS-mUoSl9XRNmhBjQHHiwwuO80jwblp-IO8,598790
 accusleepy/gui/images/viewer_window.png,sha256=gKwIXkgsl1rTMfmMeMwNyjEAUL5I6FXk9-hpMR92qTI,970630
 accusleepy/gui/images/viewer_window_annotated.png,sha256=M5NmoWDHRLS334Rp8SsfOPUUXzPltH1p7aB0BrISgQU,261481
-accusleepy/gui/main.py,sha256=QLtxVvBz81CjDeBddJZNDCLd207j9WJga1n45nlsxWI,54384
-accusleepy/gui/manual_scoring.py,sha256=Sy4vwMmMLY_SreXUyxd0t-at2F-1pHkvvz1UGIbzVic,40496
-accusleepy/gui/mplwidget.py,sha256=f9O3u_96whQGUwpi3o_QGc7yjiETX5vE0oj3ePXTJWE,12279
-accusleepy/gui/primary_window.py,sha256=RXpDvcb7zy8Ea4Da1VhMG1T6GC54KW3vyGjqqQJN45k,104582
+accusleepy/gui/main.py,sha256=VW4dYk4a2NPA3zl9omBkxaVRJDAvECTLYHsE0uIlnyo,54502
+accusleepy/gui/manual_scoring.py,sha256=f4y_33kFzZ6krdtfkUDJqQ4LRhn7aC1Fwm6nwus4x1I,39853
+accusleepy/gui/mplwidget.py,sha256=Jy3hdkTayo8KzKx1AJ7jS0n_w-CCLlAYqUK7uSEzIBY,12389
+accusleepy/gui/primary_window.py,sha256=gk-IRcsjw4Sf7b1mQbf5RhZiPprv2BtvxGfYjAjrUmc,104583
 accusleepy/gui/primary_window.ui,sha256=09k4xFcjgOL9mlhFlg6mXCc_tgj4_FY9CZ3H03e3z3A,147074
 accusleepy/gui/resources.qrc,sha256=ByNEmJqr0YbKBqoZGvONZtjyNYr4ST4enO6TEdYSqWg,802
 accusleepy/gui/resources_rc.py,sha256=Z2e34h30U4snJjnYdZVV9B6yjATKxxfvgTRt5uXtQdo,329727
@@ -32,9 +33,9 @@ accusleepy/gui/text/main_guide.md,sha256=VS6A5_CzQOBwIotNgEA_X0KHKfMT4lEK43Ki_Dk
 accusleepy/gui/text/manual_scoring_guide.md,sha256=ow_RMSjFy05NupEDSCuJtu-V65-BPnIkrZqtssFoZCQ,999
 accusleepy/gui/viewer_window.py,sha256=5PkbuYMXUegH1CExCoqSGDZ9GeJqCCUz0-3WWkM8Vfc,24049
 accusleepy/gui/viewer_window.ui,sha256=D1LwUFR-kZ_GWGZFFtXvGJdFWghLrOWZTblQeLQt9kI,30525
-accusleepy/models.py,sha256=Muapsw088AUHqRIbW97Rkbv0oiwCtQvO9tEoBCC-MYg,1476
-accusleepy/multitaper.py,sha256=V6MJDk0OSWhg2MFhrnt9dvYrHiNsk2T7IxAA7paZVyE,25549
-accusleepy/signal_processing.py,sha256=-aXnywfp1LBsk3DcbIMmZlgv3f8j6sZ6js0bizZId0o,21718
-accusleepy-0.4.5.dist-info/METADATA,sha256=qKYYF4smvfZF2l92BjYNpDyT6mB6QTqg10kw4MAxtRU,3875
-accusleepy-0.4.5.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-accusleepy-0.4.5.dist-info/RECORD,,
+accusleepy/models.py,sha256=IJcMy102p8RndidqZ9HrL-eIGLOjQqc1hwebZHRvl5Q,3390
+accusleepy/multitaper.py,sha256=D5-iglwkFBRciL5tKSNcunMtcq0rM3zHwRHUVPgem1U,25679
+accusleepy/signal_processing.py,sha256=dxq0Nq9ae8ze5hX8vX7LXBqz1IJ3SoBsNQYmNSY5n2E,16023
+accusleepy-0.5.0.dist-info/METADATA,sha256=F1AZtdxlgo70PPCJucnVhYyUa922FXsjMzS942wfqSs,3909
+accusleepy-0.5.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+accusleepy-0.5.0.dist-info/RECORD,,