diff --git a/src/client/spark/Predicates/IPredicate.cs b/src/client/spark/Predicates/IPredicate.cs index 81579f979..11edf88d6 100644 --- a/src/client/spark/Predicates/IPredicate.cs +++ b/src/client/spark/Predicates/IPredicate.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.Linq; namespace mbts { interface IPredicate { @@ -97,7 +98,7 @@ namespace mbts { } #region Implementation - class EqualsTrigger : IPredicate { + class EqualsTrigger : IPredicate, IEquatable> { readonly T _value; readonly IEqualityComparer _eq_comparer; @@ -106,12 +107,26 @@ namespace mbts { _eq_comparer = eq_comparer; } - public bool trigger(T value) => _eq_comparer.Equals(value, _value); + public bool trigger(T value) => + _eq_comparer.Equals(value, _value); - public override string ToString() => $"EqualsTrigger ({typeof(T)})"; + public override string ToString() => + $"EqualsTrigger ({typeof(T)})"; + + public bool Equals(EqualsTrigger other) => + other != null && + // check equality with both IEqualityComparers + _eq_comparer.Equals(_value, other._value) && + other._eq_comparer.Equals(_value, other._value); + + public override bool Equals(object obj) => + Equals(obj as EqualsTrigger); + + public override int GetHashCode() => + _eq_comparer.GetHashCode(_value); } - class AndTrigger : IPredicate { + class AndTrigger : IPredicate, IEquatable> { readonly IPredicate _first, _second; public AndTrigger(IPredicate first, IPredicate second) { @@ -119,18 +134,28 @@ namespace mbts { _second = second; } - public bool trigger(T value) => _first.trigger(value) && _second.trigger(value); + public bool trigger(T value) => + _first.trigger(value) && + _second.trigger(value); - public override string ToString() => $"AndTrigger ({_first}, {_second})"; + public bool Equals(AndTrigger other) => + other != null && + _first.Equals(other._first) && + _second.Equals(other._second); + + public override string ToString() => + $"AndTrigger ({_first}, {_second})"; public override bool Equals(object obj) => - obj is AndTrigger t && _first.Equals(t._first) && _second.Equals(t._second); + Equals(obj as AndTrigger); public override int GetHashCode() => - EqualityComparer.aggregate_hash(_first.GetHashCode(), _second.GetHashCode()); + EqualityComparer.aggregate_hash( + _first.GetHashCode(), + _second.GetHashCode()); } - class AndTrigger : IPredicate<(T1, T2)> { + class AndTrigger : IPredicate<(T1, T2)>, IEquatable> { readonly IPredicate _first; readonly IPredicate _second; @@ -139,18 +164,28 @@ namespace mbts { _second = second; } - public bool trigger((T1, T2) value) => _first.trigger(value.Item1) && _second.trigger(value.Item2); + public bool trigger((T1, T2) value) => + _first.trigger(value.Item1) && + _second.trigger(value.Item2); + + public bool Equals(AndTrigger other) => + other != null && + _first.Equals(other._first) && + _second.Equals(other._second); public override bool Equals(object obj) => - obj is AndTrigger t && _first.Equals(t._first) && _second.Equals(t._second); + Equals(obj as AndTrigger); public override int GetHashCode() => - EqualityComparer.aggregate_hash(_first.GetHashCode(), _second.GetHashCode()); + EqualityComparer.aggregate_hash( + _first.GetHashCode(), + _second.GetHashCode()); - public override string ToString() => $"AndTrigger ({_first}, {_second})"; + public override string ToString() => + $"AndTrigger ({_first}, {_second})"; } - class OrTrigger : IPredicate { + class OrTrigger : IPredicate, IEquatable> { readonly IPredicate _first, _second; public OrTrigger(IPredicate first, IPredicate second) { @@ -160,16 +195,24 @@ namespace mbts { public bool trigger(T value) => _first.trigger(value) || _second.trigger(value); + public bool Equals(OrTrigger other) => + other != null && + _first.Equals(other._first) && + _second.Equals(other._second); + public override bool Equals(object obj) => - obj is OrTrigger t && _first.Equals(t._first) && _second.Equals(t._second); + Equals(obj is OrTrigger); public override int GetHashCode() => - EqualityComparer.aggregate_hash(_first.GetHashCode(), _second.GetHashCode()); + EqualityComparer.aggregate_hash( + _first.GetHashCode(), + _second.GetHashCode()); - public override string ToString() => $"OrTrigger ({_first}, {_second})"; + public override string ToString() => + $"OrTrigger ({_first}, {_second})"; } - class OrTrigger : IPredicate<(T1, T2)> { + class OrTrigger : IPredicate<(T1, T2)>, IEquatable> { readonly IPredicate _first; readonly IPredicate _second; @@ -178,15 +221,25 @@ namespace mbts { _second = second; } - public bool trigger((T1, T2) value) => _first.trigger(value.Item1) || _second.trigger(value.Item2); + public bool trigger((T1, T2) value) => + _first.trigger(value.Item1) || + _second.trigger(value.Item2); + + public bool Equals(OrTrigger other) => + other != null && + _first.Equals(other._first) && + _second.Equals(other._second); public override bool Equals(object obj) => - obj is OrTrigger t && _first.Equals(t._first) && _second.Equals(t._second); + Equals(obj as OrTrigger); public override int GetHashCode() => - EqualityComparer.aggregate_hash(_first.GetHashCode(), _second.GetHashCode()); + EqualityComparer.aggregate_hash( + _first.GetHashCode(), + _second.GetHashCode()); - public override string ToString() => $"OrTrigger ({_first}, {_second})"; + public override string ToString() => + $"OrTrigger ({_first}, {_second})"; } class GreaterThanTrigger : IPredicate { @@ -198,29 +251,66 @@ namespace mbts { _comparer = comparer; } - public bool trigger(T value) => _comparer.Compare(value, _value) > 0; + public bool trigger(T value) => + _comparer.Compare(value, _value) > 0; - public override string ToString() => $"GreaterThanTrigger ({_value})"; + public override string ToString() => + $"GreaterThanTrigger ({_value})"; } - class InSetTrigger: IPredicate { + class GreaterThanOrEqualToTrigger : IPredicate, IEquatable> { + readonly T _value; + readonly IComparer _comparer; + + public GreaterThanOrEqualToTrigger(T value, IComparer comparer) { + _value = value; + _comparer = comparer; + } + + public bool trigger(T value) => + _comparer.Compare(value, _value) >= 0; + + public bool Equals(GreaterThanOrEqualToTrigger other) => + other != null && + _comparer.Equals(other._comparer) && + _comparer.Compare(_value, other._value) == 0; + + public override bool Equals(object obj) => + Equals(obj as GreaterThanOrEqualToTrigger); + + public override int GetHashCode() => + _value.GetHashCode(); + + public override string ToString() => + $"GreaterThanTrigger ({_value})"; + } + + class InSetTrigger : IPredicate, IEquatable> { readonly ISet _set; public InSetTrigger(ISet set) => _set = set; - public bool trigger(T value) => _set.Contains(value); + public bool trigger(T value) => + _set.Contains(value); + + public bool Equals(InSetTrigger other) => + other != null && + // check SetEquals with both sets (IEqualityComparers may differ) + _set.SetEquals(other._set) && + other._set.SetEquals(_set); public override bool Equals(object obj) => obj is InSetTrigger t && _set.SetEquals(t._set); public override int GetHashCode() => - _set.GetHashCode(); + EqualityComparer.auto_phase(_set.Take(8)); - public override string ToString() => $"InSetTrigger (Count: {_set.Count}, type: {typeof(T)})"; + public override string ToString() => + $"InSetTrigger (Count: {_set.Count}, type: {typeof(T)})"; } - class WrapperTrigger : IPredicate { + class WrapperTrigger : IPredicate, IEquatable> { readonly IPredicate _inner_trigger; readonly Func _selector; @@ -229,26 +319,41 @@ namespace mbts { _selector = selector; } - public bool trigger(TOuter value) => _inner_trigger.trigger(_selector(value)); + public bool trigger(TOuter value) => + _inner_trigger.trigger(_selector(value)); + + public bool Equals(WrapperTrigger other) => + other != null && + _selector.Equals(other._selector) && + _inner_trigger.Equals(other._inner_trigger); public override bool Equals(object obj) => - obj is WrapperTrigger t && _inner_trigger.Equals(t._inner_trigger) && _selector.Equals(t._selector); + Equals(obj as WrapperTrigger); public override int GetHashCode() => - EqualityComparer.aggregate_hash(_inner_trigger.GetHashCode(), _selector.GetHashCode()); + EqualityComparer.aggregate_hash( + _inner_trigger.GetHashCode(), + _selector.GetHashCode()); - public override string ToString() => $"WrapperTrigger (outer-type {typeof(TOuter)}, inner-trigger: {_inner_trigger})"; + public override string ToString() => + $"WrapperTrigger (outer-type {typeof(TOuter)}, inner-trigger: {_inner_trigger})"; } - class NegateTrigger : IPredicate { + class NegateTrigger : IPredicate, IEquatable> { readonly IPredicate _trigger; + public NegateTrigger(IPredicate trigger) => _trigger = trigger; - public bool trigger(T value) => !_trigger.trigger(value); + public bool trigger(T value) => + !_trigger.trigger(value); + + public bool Equals(NegateTrigger other) => + other != null && + _trigger.Equals(other._trigger); public override bool Equals(object obj) => - obj is NegateTrigger t && _trigger.Equals(t._trigger); + Equals(obj as NegateTrigger); public override int GetHashCode() => -_trigger.GetHashCode(); @@ -256,16 +361,22 @@ namespace mbts { public override string ToString() => $"NegateTrigger ({_trigger})"; } - class AnonymousTrigger : IPredicate { + class AnonymousTrigger : IPredicate, IEquatable> { readonly Func _trigger; public AnonymousTrigger(Func trigger) => _trigger = trigger; - public bool trigger(T value) => _trigger(value); + public bool Equals(AnonymousTrigger other) => + other != null && + _trigger.Equals(other._trigger); - public override string ToString() => $"AnonymousTrigger ({typeof(T)})"; + public bool trigger(T value) => + _trigger(value); + + public override string ToString() => + $"AnonymousTrigger ({typeof(T)})"; } #endregion } -} \ No newline at end of file +}