Skip to content

Common association implementation for different SAFT models #239

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
prehner merged 7 commits into from
Apr 19, 2024
Merged

Common association implementation for different SAFT models #239

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
70cc640
Common association implementation for different SAFT models
prehner Apr 17, 2024
a3a51eb
more generic association implementation
prehner Apr 17, 2024
7ef046f
major refactor
prehner Apr 17, 2024
f9cda7e
Require kappa_ab and epsilon_k_ab
prehner Apr 18, 2024
d6a9229
fix epcsaft
prehner Apr 19, 2024
c4c7057
fix wheels
prehner Apr 19, 2024
7f4b58a
fix docs and remove mu an q from epcsaft
prehner Apr 19, 2024
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
major refactor
  • Loading branch information
@prehner
prehner committed Apr 19, 2024
commit 7ef046f53d1c72021e925f7c87e067550487868f
4 changes: 2 additions & 2 deletions src/association/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use num_dual::*;
use num_traits::Zero;
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::fmt::{self, Display};
use std::fmt;
use std::sync::Arc;

#[cfg(feature = "dft")]
Expand Down Expand Up @@ -63,7 +63,7 @@ impl<A> AssociationRecord<A> {
}
}

impl<A: Display> fmt::Display for AssociationRecord<A> {
impl<A: fmt::Display> fmt::Display for AssociationRecord<A> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "AssociationRecord(parameters={}", self.parameters)?;
if self.na > 0.0 {
Expand Down