Skip to content
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.

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

FIX: Fix Residual protocol for MCMC for Python 3.11 #253

Merged
merged 2 commits into from
Jan 14, 2024
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fail-fast: false
max-parallel: 100
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.8", "3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -52,7 +52,7 @@ jobs:
fail-fast: false
max-parallel: 100
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.8", "3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion espei/error_functions/activity_error.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def __init__(
symbols_to_fit: Optional[List[SymbolName]] = None,
weight: Optional[Dict[str, float]] = None,
):
super().__init__(database, datasets, phase_models, symbols_to_fit)
super().__init__(database, datasets, phase_models, symbols_to_fit, weight)

if weight is not None:
self.weight = weight.get("ACR", 1.0)
Expand Down
2 changes: 1 addition & 1 deletion espei/error_functions/equilibrium_thermochemical_error.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def __init__(
symbols_to_fit: Optional[List[SymbolName]] = None,
weight: Optional[Dict[str, float]] = None,
):
super().__init__(database, datasets, phase_models, symbols_to_fit)
super().__init__(database, datasets, phase_models, symbols_to_fit, weight)

if weight is not None:
self.weight = weight
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ def __init__(
symbols_to_fit: Optional[List[SymbolName]] = None,
weight: Optional[Dict[str, float]] = None,
):
super().__init__(database, datasets, phase_models, symbols_to_fit)
super().__init__(database, datasets, phase_models, symbols_to_fit, weight)

if weight is not None:
self.weight = weight
Expand Down
4 changes: 2 additions & 2 deletions espei/error_functions/residual_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def __init__(
database: Database,
datasets: PickleableTinyDB,
phase_models: PhaseModelSpecification,
symbols_to_fit: Optional[List[SymbolName]],
weight: Optional[Dict[str, float]],
symbols_to_fit: Optional[List[SymbolName]] = None,
weight: Optional[Dict[str, float]] = None,
):
...

Expand Down
2 changes: 1 addition & 1 deletion espei/error_functions/zpf_error.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ def __init__(
symbols_to_fit: Optional[List[SymbolName]] = None,
weight: Optional[Dict[str, float]] = None,
):
super().__init__(database, datasets, phase_models, symbols_to_fit)
super().__init__(database, datasets, phase_models, symbols_to_fit, weight)
if weight is not None:
self.weight = weight.get("ZPF", 1.0)
else:
Expand Down
Loading