Skip to content

Make CoefficientCombineRule::combine public #1007

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

Open
Jondolf wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −5
Open

Make CoefficientCombineRule::combine public #1007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions src/dynamics/coefficient_combine_rule.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,20 @@ pub enum CoefficientCombineRule {
}

impl CoefficientCombineRule {
#[allow(dead_code)]
pub(crate) fn combine(
/// Combines two coefficients according to the given combine rules.
///
/// If the two combine rules differ, the one with the higher discriminant wins:
///
/// ```text
/// GeometricMean > ClampedSum > Max > Multiply > Min > Average
/// ```
pub fn combine(
coeff1: Real,
coeff2: Real,
rule_value1: CoefficientCombineRule,
rule_value2: CoefficientCombineRule,
rule1: CoefficientCombineRule,
rule2: CoefficientCombineRule,
) -> Real {
let effective_rule = rule_value1.max(rule_value2);
let effective_rule = rule1.max(rule2);

match effective_rule {
CoefficientCombineRule::Average => (coeff1 + coeff2) / 2.0,
Expand Down