Skip to content

Fix missing return in v1v2_observable_df noise distribution merge #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dweindl merged 2 commits into from
Jul 9, 2026
Merged

Fix missing return in v1v2_observable_df noise distribution merge #502

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52e51d5
Fix missing return in v1v2_observable_df noise distribution merge
dweindl Jul 9, 2026
0e0eee3
..
dweindl Jul 9, 2026
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
2 changes: 2 additions & 0 deletions petab/v2/petab1to2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,8 @@ def update_noise_dist(row):
f" is not supported in PEtab v2."
)

return new_dist

df[v2.C.NOISE_DISTRIBUTION] = df.apply(update_noise_dist, axis=1)
df.drop(columns=[v1.C.OBSERVABLE_TRANSFORMATION], inplace=True)

Expand Down
26 changes: 25 additions & 1 deletion tests/v2/test_conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,33 @@
import logging

import pandas as pd
import pytest

import petab.v1 as v1
import petab.v2 as v2
from petab.v2 import Problem
from petab.v2.petab1to2 import petab1to2
from petab.v2.petab1to2 import petab1to2, v1v2_observable_df


def test_v1v2_observable_df_noise_distribution():
"""Test that noiseDistribution is correctly merged with
observableTransformation."""
observable_df = pd.DataFrame(
data={
v1.C.OBSERVABLE_ID: ["obs1", "obs2"],
v1.C.OBSERVABLE_FORMULA: ["a", "b"],
v1.C.NOISE_FORMULA: ["1", "1"],
v1.C.OBSERVABLE_TRANSFORMATION: [v1.C.LIN, v1.C.LOG],
v1.C.NOISE_DISTRIBUTION: [v1.C.NORMAL, v1.C.NORMAL],
}
).set_index(v1.C.OBSERVABLE_ID)

new_df = v1v2_observable_df(observable_df)

assert list(new_df[v2.C.NOISE_DISTRIBUTION]) == [
v2.C.NORMAL,
v2.C.LOG_NORMAL,
]


def test_petab1to2_remote():
Expand Down
Loading