Merge branch 'SP-221-sound-alerts' into prod
This commit is contained in:
commit
da95ece9fc
1 file changed
+13
-2
@@ -215,7 +215,7 @@ namespace mbts {
|
||||
_second.Equals(other._second);
|
||||
|
||||
public override bool Equals(object obj) =>
|
||||
Equals(obj is OrTrigger<T>);
|
||||
Equals(obj as OrTrigger<T>);
|
||||
|
||||
public override int GetHashCode() =>
|
||||
EqualityComparer.aggregate_hash(
|
||||
@@ -256,7 +256,7 @@ namespace mbts {
|
||||
$"OrTrigger ({_first}, {_second})";
|
||||
}
|
||||
|
||||
class GreaterThanTrigger<T> : IPredicate<T> {
|
||||
class GreaterThanTrigger<T> : IPredicate<T>, IEquatable<GreaterThanTrigger<T>> {
|
||||
readonly T _value;
|
||||
readonly IComparer<T> _comparer;
|
||||
|
||||
@@ -268,6 +268,17 @@ namespace mbts {
|
||||
public bool trigger(T value) =>
|
||||
_comparer.Compare(value, _value) > 0;
|
||||
|
||||
public bool Equals(GreaterThanTrigger<T> other) =>
|
||||
other != null &&
|
||||
_comparer.Equals(other._comparer) &&
|
||||
_comparer.Compare(_value, other._value) == 0;
|
||||
|
||||
public override bool Equals(object obj) =>
|
||||
Equals(obj as GreaterThanTrigger<T>);
|
||||
|
||||
public override int GetHashCode() =>
|
||||
_value.GetHashCode();
|
||||
|
||||
public override string ToString() =>
|
||||
$"GreaterThanTrigger ({_value})";
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user