Skip to content

Fix type hinting and simplify implementation of combine_distributions #3445

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
paulromano merged 16 commits into from
Jan 21, 2026
Merged

Fix type hinting and simplify implementation of combine_distributions #3445

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5f5a437
added merge to openmc.stats.Normal
GuySten Jun 15, 2025
890ac5b
Added merge to Mixture distributions
GuySten Jun 15, 2025
6a50756
Update univariate.py
GuySten Jun 15, 2025
db18ccf
Bugfix
GuySten Jun 15, 2025
c0b416c
Update univariate.py
GuySten Jun 16, 2025
8f70340
Update test_stats.py
GuySten Jun 16, 2025
e34a33f
Update docs
GuySten Jun 16, 2025
a0da5e5
Merge branch 'openmc-dev:develop' into combine
GuySten Jul 10, 2025
9a4cbca
rerun ci
GuySten Jul 13, 2025
72daec4
Merge branch 'openmc-dev:develop' into combine
GuySten Aug 27, 2025
1d3eaf8
Merge branch 'openmc-dev:develop' into combine
GuySten Aug 28, 2025
7546a13
Merge branch 'openmc-dev:develop' into combine
GuySten Sep 19, 2025
d78adaf
Merge branch 'develop' into combine
GuySten Jan 16, 2026
b2ba863
simplify further
GuySten Jan 16, 2026
2440d92
fix typo
GuySten Jan 16, 2026
a962139
Handle single Tabular case in combine_distributions
paulromano Jan 21, 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
Prev Previous commit
Next Next commit
Bugfix
  • Loading branch information
@GuySten
GuySten committed Jun 26, 2025
commit db18ccf65aebb372e4d29c1f7255b45eb514a839
4 changes: 2 additions & 2 deletions openmc/stats/univariate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,10 +1396,10 @@ def merge(
else:
others[0].append(dist)
others[1].append(p*prob)
if discrete:
if discrete[0]:
others[0].append(Discrete.merge(*discrete))
others[1].append(1.0)
if normal:
if normal[0]:
others[0].append(Normal.merge(*normal))
others[1].append(1.0)
if others[1]==[1.0]:
Expand Down