diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs index 52c09c565..5545761d4 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs @@ -144,7 +144,7 @@ namespace bts.shell.orderbook { pb.add_discrete_values(fs.symbols, o => o.security?.Symbol); // numeric pb.add_numeric(fs.qty, o => o.order.quantity()); - pb.add_numeric(fs.price, o => o.order.price()); + pb.add_price(fs.price, o => o.order.price(), o => o.security); pb.add_numeric(fs.qty_filled, o => o.order.filled()); pb.add_numeric(fs.avg_price, o => o.order.avg_price()); pb.add_numeric(fs.last_price, o => o.order.last_price()); diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs index 03ee224f3..7d8833c00 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs @@ -37,6 +37,51 @@ namespace mbts.spark.filters { _predicates.Add(impl); bool impl(TRow o) => max.CompareTo(selector(o)) >= 0; } + } + + // this is a copy of add_numeric except we do a tick_equals comparsion + // if the ticks are not equals, then it falls back to a regular double comparison + // + // if the SecurityImmutable? doesn't have a value + // then we fallback to double comparison + public void add_price(DoubleMinMaxState value, Func selector, Func si_selector) { + if (value == null) + return; + if (value.minimum.active) { + var min = value.minimum.value.Value; + if (value.maximum.active) { + var max = value.maximum.value.Value; + _predicates.Add(impl); + bool impl(TRow o) { + var v = selector(o); + var si = si_selector(o); + if (si.HasValue) { + return si.Value.ContractSpec.compare_tick_fallback_to_double(min, v) <= 0 && + si.Value.ContractSpec.compare_tick_fallback_to_double(max, v) >= 0; + } + return min.CompareTo(v) <= 0 && max.CompareTo(v) >= 0; + } + } else { + _predicates.Add(impl); + bool impl(TRow o) { + var si = si_selector(o); + if (si.HasValue) { + return si.Value.ContractSpec.compare_tick_fallback_to_double(min, selector(o)) <= 0; + } + return min.CompareTo(selector(o)) <= 0; + } + } + } else if (value.maximum.active) { + var max = value.maximum.value.Value; + _predicates.Add(impl); + bool impl(TRow o) { + var si = si_selector(o); + if (si.HasValue) { + return si.Value.ContractSpec.compare_tick_fallback_to_double(max, selector(o)) >= 0; + } + return max.CompareTo(selector(o)) >= 0; + } + } } public void add_regex(string str, Func selector) { diff --git a/src/client/spark/view/Spark/Core/TickUtils.cs b/src/client/spark/view/Spark/Core/TickUtils.cs index 5a2a7d5e6..8144dd74a 100644 --- a/src/client/spark/view/Spark/Core/TickUtils.cs +++ b/src/client/spark/view/Spark/Core/TickUtils.cs @@ -128,6 +128,9 @@ namespace mbts.spark { public static IEqualityComparer tick_equality_comparer(this ContractSpecificationImmutable contract) => EqualityComparer.Create((double a, double b) => tick_equals(contract, a, b), x => MathUtils.RoundFractionalUnits(x, contract.LowTick)); + public static int compare_tick_fallback_to_double(this ContractSpecificationImmutable contract, double x, double y) => + tick_equals(contract, x, y) ? 0 : x.CompareTo(y); + public static double round_to_tick(this ContractSpecificationImmutable spec, double value) { double intpart = (long)value; double floatpart = value % 1; diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index f73a0178f..7c3fdf022 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -84,16 +84,12 @@ me(new PImpl(context, rxcpp::operators::subscribe( [this](auto const& update) { for (const auto& f : update.removed()) - if(_valid_account_id(*f)) - me->publisher.add_or_update(_on_fill(*f,false)); + me->publisher.add_or_update(_on_fill(*f,false)); for (const auto& f : update.added()) - if(_valid_account_id(*f)) - me->publisher.add_or_update(_on_fill(*f,true)); + me->publisher.add_or_update(_on_fill(*f,true)); for (const auto& f : update.changed()) { - if(_valid_account_id(*f.previous()) && _valid_account_id(*f.current())){ - me->publisher.add_or_update(_on_fill(*f.previous(),false)); - me->publisher.add_or_update(_on_fill(*f.current(),true)); - } + me->publisher.add_or_update(_on_fill(*f.previous(),false)); + me->publisher.add_or_update(_on_fill(*f.current(),true)); } me->publisher.flush(); _compute_pnl_and_publish();