Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ratapi/utils/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from os import PathLike
from pathlib import Path

from numpy import array, empty
from numpy import array, empty, ndarray
from scipy.io.matlab import MatlabOpaque, loadmat

from ratapi import Project, wrappers
Expand Down Expand Up @@ -227,6 +227,12 @@ def fix_invalid_constraints(name: str, constrs: tuple[float, float], value: floa
if isinstance(mat_project["resolNames"], str):
mat_project["resolNames"] = [mat_project["resolNames"]]

if isinstance(mat_project["contrastNames"], (ndarray, list)) and len(
dict.fromkeys(mat_project["contrastNames"])
) != len(mat_project["contrastNames"]):
# contrast names are not unique so create unique ones
mat_project["contrastNames"] = [f"Contrast {i + 1}" for i in range(len(mat_project["contrastNames"]))]

contrasts = ClassList(
[
Contrast(
Expand Down
7 changes: 7 additions & 0 deletions tests/test_convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ def test_r1_to_project(file, project, path_type, request):
assert getattr(output_project, class_list) == getattr(expected_project, class_list)


def test_r1_with_non_unique_contrast_names():
"""Test that R1 to Project class conversion returns the expected Project."""
output_project = r1_to_project(pathlib.Path(TEST_DIR_PATH, "nonUniqueContrast.mat"))
assert output_project.contrasts[0].name == "Contrast 1"
assert output_project.contrasts[1].name == "Contrast 2"


@pytest.mark.parametrize(
"project",
[
Expand Down
Binary file added tests/test_data/nonUniqueContrast.mat
Binary file not shown.
Loading