diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 8bc7b7c34..139c5a0fe 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -226,7 +226,7 @@ namespace mbts.spark { // notional value Add(notional_value_column = new NotionalValueColumn( new DoubleMinMax( - ort => ort.order.order.notional_value(), nameof(OrderBookRowVM.notional_value)))); + ort => ort.notional_value, nameof(OrderBookRowVM.notional_value)))); // edit quantity column // not usually part of the main order book, but it's useful to add it // rather than debugging the popup window diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index d2986401c..77e81efe4 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -108,7 +108,7 @@ namespace mbts.spark { public double display_quantity => quantity.safe_divide(_display_qty_divisor); public string display_quantity_text => quantity_display_settings.to_tick_display_settings().format(display_quantity); - public double notional_value => order.notional_value(); + public double notional_value => order_tuple.notional_value; public string notional_value_text => _fmt_price(notional_value); public TickDisplaySettingsImmutable quantity_display_settings { get => _quantity_display_settings; diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs index 1308744bc..388e48784 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs @@ -1,165 +1,165 @@ -using bts.api; -using bts.api.orderman; -using bts.utils; - -using mbts; -using mbts.spark; -using mbts.spark.filters; -using mbts.ui; -using mbts.ui.utility; - -using ProtoBuf; - -using Spark.Api.Orders; - -using System; - -namespace bts.shell.orderbook { - [ProtoContract] - class FilterStates : IEquatable { - [ProtoMember(1)] - public SecurityCriteria security_criteria; - [ProtoMember(2)] - public string order_key_regex; - [ProtoMember(3)] - public TimeFilterTuple time_created; - [ProtoMember(4)] - public string[] users; - [ProtoMember(5)] - public string[] accounts; - [ProtoMember(6)] - public Venue[] exchanges; - [ProtoMember(7)] - public TimeInForce[] tifs; - //[ProtoMember(8)] - //public CustomOrderDefinition.CustomOneofCase[] order_types; - [ProtoMember(23)] - public AlgoID[] order_types; - [ProtoMember(24)] - public AlgoID[] root_algo_types; - [ProtoMember(9)] - public Side[] sides; - [ProtoMember(10)] - public DoubleMinMaxState qty; - [ProtoMember(26)] - public DoubleMinMaxState notional_value; - [ProtoMember(11)] - public DoubleMinMaxState price; - [ProtoMember(12)] - public DoubleMinMaxState qty_filled; - [ProtoMember(13)] - public DoubleMinMaxState avg_price; - [ProtoMember(14)] - public DoubleMinMaxState last_price; - [ProtoMember(15)] - public OrderStatus[] statuses; - [ProtoMember(16)] - public string exchange_message_regex; - [ProtoMember(17)] - public TimeFilterTuple last_change; - //[ProtoMember(18)] - //public string security_regex; - [ProtoMember(19)] - public api.orderman.OrderSubType[] order_sub_types; - [ProtoMember(20)] - public string[] symbols; - [ProtoMember(21)] - public string parent_key_regex; - [ProtoMember(22)] - public string attached_target_order_key_regex; - [ProtoMember(25)] - public UIntMinMaxState piq; - - public bool Equals(FilterStates other) => - other != null && - security_criteria.safe_equals(other.security_criteria) && - order_key_regex == other.order_key_regex && - parent_key_regex == other.parent_key_regex && - attached_target_order_key_regex == other.attached_target_order_key_regex && - time_created.Equals(other.time_created) && - EqualityComparer.safe_sequence_equals(users, other.users) && - EqualityComparer.safe_sequence_equals(accounts, other.accounts) && - EqualityComparer.safe_sequence_equals(exchanges, other.exchanges) && - EqualityComparer.safe_sequence_equals(tifs, other.tifs) && - EqualityComparer.safe_sequence_equals(order_types, other.order_types) && - EqualityComparer.safe_sequence_equals(root_algo_types, other.root_algo_types) && - EqualityComparer.safe_sequence_equals(sides, other.sides) && - qty.safe_equals(other.qty) && - notional_value.safe_equals(other.notional_value) && - price.safe_equals(other.price) && - qty_filled.safe_equals(other.qty_filled) && - avg_price.safe_equals(other.avg_price) && - last_price.safe_equals(other.last_price) && - EqualityComparer.safe_sequence_equals(statuses, other.statuses) && - exchange_message_regex == other.exchange_message_regex && - last_change.Equals(other.last_change) && - EqualityComparer.safe_sequence_equals(order_sub_types, other.order_sub_types) && - EqualityComparer.safe_sequence_equals(symbols, other.symbols) && - piq.safe_equals(other.piq); - - public override bool Equals(object obj) => Equals(obj as FilterStates); - - public override int GetHashCode() => - EqualityComparer.aggregate_hash( - security_criteria?.GetHashCode() ?? 0, - order_key_regex?.GetHashCode() ?? 0, - parent_key_regex?.GetHashCode() ?? 0, - attached_target_order_key_regex?.GetHashCode() ?? 0, - time_created.GetHashCode(), - EqualityComparer.safe_aggregate_hash(users), - EqualityComparer.safe_aggregate_hash(accounts), - EqualityComparer.safe_aggregate_hash(exchanges), - EqualityComparer.safe_aggregate_hash(tifs), - EqualityComparer.safe_aggregate_hash(order_types), - EqualityComparer.safe_aggregate_hash(root_algo_types), - EqualityComparer.safe_aggregate_hash(sides), - qty?.GetHashCode() ?? 0, - notional_value?.GetHashCode() ?? 0, - price?.GetHashCode() ?? 0, - qty_filled?.GetHashCode() ?? 0, - avg_price?.GetHashCode() ?? 0, - last_price?.GetHashCode() ?? 0, - EqualityComparer.safe_aggregate_hash(statuses), - exchange_message_regex?.GetHashCode() ?? 0, - last_change.GetHashCode(), - EqualityComparer.safe_aggregate_hash(order_sub_types), - EqualityComparer.safe_aggregate_hash(symbols), - piq?.GetHashCode() ?? 0); - } - - static class FilterStatesExtensions { - public static Func build_predicate(this FilterStates fs) { - var pb = new ColumnPredicateBuilder(); - // security - pb.add_security_criteria(fs.security_criteria, o => o.order.security); - // regex - pb.add_regex(fs.order_key_regex, o => o.order.order.Key.ToString()); - pb.add_regex(fs.exchange_message_regex, o => o.order.order.State.LastMsg); - pb.add_regex(fs.attached_target_order_key_regex, o => o.order.order.attached_target_order_key().ToString()); - pb.add_regex(fs.parent_key_regex, o => o.order.order.ParentKey.ToString()); - // time - pb.add_time_filter(fs.time_created, o => o.order.order.created()); - pb.add_time_filter(fs.last_change, o => o.order.order.last_change()); - // discrete values - pb.add_discrete_values(fs.users, o => o.order.order.user()); - pb.add_discrete_values(fs.accounts, o => o.order.order.account()); - pb.add_discrete_values(fs.exchanges, o => o.order.security?.Exchange ?? Venue.Unset); - pb.add_discrete_values(fs.tifs, o => o.order.order.time_in_force()); - pb.add_discrete_values(fs.order_types, o => AlgoID.from_custom_def(o.order.order.Def.CustomDef)); - pb.add_discrete_values(fs.root_algo_types, o => AlgoID.from_algo_key(o.root.algo?.key ?? default)); - pb.add_discrete_values(fs.order_sub_types, o => o.order.order.sub_type()); - pb.add_discrete_values(fs.sides, o => o.order.order.side()); - pb.add_discrete_values(fs.statuses, o => o.order.order.status()); - pb.add_discrete_values(fs.symbols, o => o.order.security?.Symbol); - // numeric - pb.add_numeric(fs.qty, o => o.order.order.quantity()); - pb.add_numeric(fs.notional_value, o => o.order.order.notional_value()); - pb.add_price(fs.price, o => o.order.order.ui_price(), o => o.order.security); - pb.add_numeric(fs.qty_filled, o => o.order.order.filled_quantity()); - pb.add_numeric(fs.avg_price, o => o.order.order.avg_price()); - pb.add_numeric(fs.last_price, o => o.order.order.last_price()); - pb.add_numeric(fs.piq, o => o.order.piq ?? uint.MaxValue); - return pb.to_predicate(); - } - } -} +using bts.api; +using bts.api.orderman; +using bts.utils; + +using mbts; +using mbts.spark; +using mbts.spark.filters; +using mbts.ui; +using mbts.ui.utility; + +using ProtoBuf; + +using Spark.Api.Orders; + +using System; + +namespace bts.shell.orderbook { + [ProtoContract] + class FilterStates : IEquatable { + [ProtoMember(1)] + public SecurityCriteria security_criteria; + [ProtoMember(2)] + public string order_key_regex; + [ProtoMember(3)] + public TimeFilterTuple time_created; + [ProtoMember(4)] + public string[] users; + [ProtoMember(5)] + public string[] accounts; + [ProtoMember(6)] + public Venue[] exchanges; + [ProtoMember(7)] + public TimeInForce[] tifs; + //[ProtoMember(8)] + //public CustomOrderDefinition.CustomOneofCase[] order_types; + [ProtoMember(23)] + public AlgoID[] order_types; + [ProtoMember(24)] + public AlgoID[] root_algo_types; + [ProtoMember(9)] + public Side[] sides; + [ProtoMember(10)] + public DoubleMinMaxState qty; + [ProtoMember(26)] + public DoubleMinMaxState notional_value; + [ProtoMember(11)] + public DoubleMinMaxState price; + [ProtoMember(12)] + public DoubleMinMaxState qty_filled; + [ProtoMember(13)] + public DoubleMinMaxState avg_price; + [ProtoMember(14)] + public DoubleMinMaxState last_price; + [ProtoMember(15)] + public OrderStatus[] statuses; + [ProtoMember(16)] + public string exchange_message_regex; + [ProtoMember(17)] + public TimeFilterTuple last_change; + //[ProtoMember(18)] + //public string security_regex; + [ProtoMember(19)] + public api.orderman.OrderSubType[] order_sub_types; + [ProtoMember(20)] + public string[] symbols; + [ProtoMember(21)] + public string parent_key_regex; + [ProtoMember(22)] + public string attached_target_order_key_regex; + [ProtoMember(25)] + public UIntMinMaxState piq; + + public bool Equals(FilterStates other) => + other != null && + security_criteria.safe_equals(other.security_criteria) && + order_key_regex == other.order_key_regex && + parent_key_regex == other.parent_key_regex && + attached_target_order_key_regex == other.attached_target_order_key_regex && + time_created.Equals(other.time_created) && + EqualityComparer.safe_sequence_equals(users, other.users) && + EqualityComparer.safe_sequence_equals(accounts, other.accounts) && + EqualityComparer.safe_sequence_equals(exchanges, other.exchanges) && + EqualityComparer.safe_sequence_equals(tifs, other.tifs) && + EqualityComparer.safe_sequence_equals(order_types, other.order_types) && + EqualityComparer.safe_sequence_equals(root_algo_types, other.root_algo_types) && + EqualityComparer.safe_sequence_equals(sides, other.sides) && + qty.safe_equals(other.qty) && + notional_value.safe_equals(other.notional_value) && + price.safe_equals(other.price) && + qty_filled.safe_equals(other.qty_filled) && + avg_price.safe_equals(other.avg_price) && + last_price.safe_equals(other.last_price) && + EqualityComparer.safe_sequence_equals(statuses, other.statuses) && + exchange_message_regex == other.exchange_message_regex && + last_change.Equals(other.last_change) && + EqualityComparer.safe_sequence_equals(order_sub_types, other.order_sub_types) && + EqualityComparer.safe_sequence_equals(symbols, other.symbols) && + piq.safe_equals(other.piq); + + public override bool Equals(object obj) => Equals(obj as FilterStates); + + public override int GetHashCode() => + EqualityComparer.aggregate_hash( + security_criteria?.GetHashCode() ?? 0, + order_key_regex?.GetHashCode() ?? 0, + parent_key_regex?.GetHashCode() ?? 0, + attached_target_order_key_regex?.GetHashCode() ?? 0, + time_created.GetHashCode(), + EqualityComparer.safe_aggregate_hash(users), + EqualityComparer.safe_aggregate_hash(accounts), + EqualityComparer.safe_aggregate_hash(exchanges), + EqualityComparer.safe_aggregate_hash(tifs), + EqualityComparer.safe_aggregate_hash(order_types), + EqualityComparer.safe_aggregate_hash(root_algo_types), + EqualityComparer.safe_aggregate_hash(sides), + qty?.GetHashCode() ?? 0, + notional_value?.GetHashCode() ?? 0, + price?.GetHashCode() ?? 0, + qty_filled?.GetHashCode() ?? 0, + avg_price?.GetHashCode() ?? 0, + last_price?.GetHashCode() ?? 0, + EqualityComparer.safe_aggregate_hash(statuses), + exchange_message_regex?.GetHashCode() ?? 0, + last_change.GetHashCode(), + EqualityComparer.safe_aggregate_hash(order_sub_types), + EqualityComparer.safe_aggregate_hash(symbols), + piq?.GetHashCode() ?? 0); + } + + static class FilterStatesExtensions { + public static Func build_predicate(this FilterStates fs) { + var pb = new ColumnPredicateBuilder(); + // security + pb.add_security_criteria(fs.security_criteria, o => o.order.security); + // regex + pb.add_regex(fs.order_key_regex, o => o.order.order.Key.ToString()); + pb.add_regex(fs.exchange_message_regex, o => o.order.order.State.LastMsg); + pb.add_regex(fs.attached_target_order_key_regex, o => o.order.order.attached_target_order_key().ToString()); + pb.add_regex(fs.parent_key_regex, o => o.order.order.ParentKey.ToString()); + // time + pb.add_time_filter(fs.time_created, o => o.order.order.created()); + pb.add_time_filter(fs.last_change, o => o.order.order.last_change()); + // discrete values + pb.add_discrete_values(fs.users, o => o.order.order.user()); + pb.add_discrete_values(fs.accounts, o => o.order.order.account()); + pb.add_discrete_values(fs.exchanges, o => o.order.security?.Exchange ?? Venue.Unset); + pb.add_discrete_values(fs.tifs, o => o.order.order.time_in_force()); + pb.add_discrete_values(fs.order_types, o => AlgoID.from_custom_def(o.order.order.Def.CustomDef)); + pb.add_discrete_values(fs.root_algo_types, o => AlgoID.from_algo_key(o.root.algo?.key ?? default)); + pb.add_discrete_values(fs.order_sub_types, o => o.order.order.sub_type()); + pb.add_discrete_values(fs.sides, o => o.order.order.side()); + pb.add_discrete_values(fs.statuses, o => o.order.order.status()); + pb.add_discrete_values(fs.symbols, o => o.order.security?.Symbol); + // numeric + pb.add_numeric(fs.qty, o => o.order.order.quantity()); + pb.add_numeric(fs.notional_value, o => o.notional_value); + pb.add_price(fs.price, o => o.order.order.ui_price(), o => o.order.security); + pb.add_numeric(fs.qty_filled, o => o.order.order.filled_quantity()); + pb.add_numeric(fs.avg_price, o => o.order.order.avg_price()); + pb.add_numeric(fs.last_price, o => o.order.order.last_price()); + pb.add_numeric(fs.piq, o => o.order.piq ?? uint.MaxValue); + return pb.to_predicate(); + } + } +} diff --git a/src/client/spark_api/Orders/OrderRecordTuple.cs b/src/client/spark_api/Orders/OrderRecordTuple.cs index 17942f0c7..51538c022 100644 --- a/src/client/spark_api/Orders/OrderRecordTuple.cs +++ b/src/client/spark_api/Orders/OrderRecordTuple.cs @@ -69,6 +69,12 @@ namespace Spark.Api.Orders { public uint security_id => order.security_id; public SecurityImmutable? security => order.security; + // TODO: remove assumption that synthetic quantities are already notional values + public double notional_value => + (security?.HasSynthetic ?? false) + ? order.order.quantity() + : order.order.notional_value(); + public bool Equals(OrderRecordTupleWithRoot other) => order.Equals(other.order) && EqualityComparer.nullable_equals(_root, other._root);