aboutsummaryrefslogtreecommitdiff
path: root/src/dynamics/coefficient_combine_rule.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/dynamics/coefficient_combine_rule.rs')
-rw-r--r--src/dynamics/coefficient_combine_rule.rs14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/dynamics/coefficient_combine_rule.rs b/src/dynamics/coefficient_combine_rule.rs
index 9b3b9ee..1016d09 100644
--- a/src/dynamics/coefficient_combine_rule.rs
+++ b/src/dynamics/coefficient_combine_rule.rs
@@ -20,17 +20,13 @@ pub enum CoefficientCombineRule {
Max,
}
-impl CoefficientCombineRule {
- pub(crate) fn from_value(val: u8) -> Self {
- match val {
- 0 => CoefficientCombineRule::Average,
- 1 => CoefficientCombineRule::Min,
- 2 => CoefficientCombineRule::Multiply,
- 3 => CoefficientCombineRule::Max,
- _ => panic!("Invalid coefficient combine rule."),
- }
+impl Default for CoefficientCombineRule {
+ fn default() -> Self {
+ CoefficientCombineRule::Average
}
+}
+impl CoefficientCombineRule {
pub(crate) fn combine(coeff1: Real, coeff2: Real, rule_value1: u8, rule_value2: u8) -> Real {
let effective_rule = rule_value1.max(rule_value2);