From 5c1965f53435ec9f20e27523ea6d3fdc38b8370b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 11 Jul 2019 14:07:31 -0400 Subject: [PATCH 1/5] fix crash when acct names are > 12 chars --- src/server/sparkd/position/MarginServiceServer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 2b3c790b0..2354eb09f 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -43,6 +43,9 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _last_report(), _first_time(true) { + if(!config::get().enabled()) + return; + LOG(Gen, Info, "MarginServiceServer: service started"); // _admin_service.get_admin_data(api::VoidMessage(), From a91c2d9bc6f28be4636c9d31a0d30c5ce205e684 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 16 Jul 2019 11:20:15 -0400 Subject: [PATCH 2/5] SP-146 (Limiter will not accept unresolved fills) --- src/server/sparkd/position/PositionServiceServer.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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(); From 554614ab72c3d1a640b03a213df8091ea8e4b7c9 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 16 Jul 2019 15:50:44 -0500 Subject: [PATCH 3/5] add means to perform price comparsion based on tick equality --- .../DIYGrid/Columns/ColumnPredicateBuilder.cs | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs index 03ee224f3..45fd6849a 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs @@ -37,6 +37,53 @@ 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) { + var price_comparer = Comparer.Create((x, y) => si.Value.ContractSpec.tick_equals(x, y) ? 0 : x.CompareTo(y)); + return price_comparer.Compare(min, v) <= 0 && price_comparer.Compare(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) { + var price_comparer = Comparer.Create((x, y) => si.Value.ContractSpec.tick_equals(x, y) ? 0 : x.CompareTo(y)); + return price_comparer.Compare(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) { + var price_comparer = Comparer.Create((x, y) => si.Value.ContractSpec.tick_equals(x, y) ? 0 : x.CompareTo(y)); + return price_comparer.Compare(max, selector(o)) >= 0; + } + return max.CompareTo(selector(o)) >= 0; + } + } } public void add_regex(string str, Func selector) { From 534474621f4e8c8f183948ac0ba51fc25697456f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 16 Jul 2019 15:51:27 -0500 Subject: [PATCH 4/5] price filter should use new add_price tick-based method --- .../Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()); From 6b2708b1608bdf87ea3b526a49b53873170eda15 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 16 Jul 2019 16:34:59 -0500 Subject: [PATCH 5/5] PR suggestions --- .../Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs | 10 ++++------ src/client/spark/view/Spark/Core/TickUtils.cs | 3 +++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs index 45fd6849a..7d8833c00 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs @@ -56,8 +56,8 @@ namespace mbts.spark.filters { var v = selector(o); var si = si_selector(o); if (si.HasValue) { - var price_comparer = Comparer.Create((x, y) => si.Value.ContractSpec.tick_equals(x, y) ? 0 : x.CompareTo(y)); - return price_comparer.Compare(min, v) <= 0 && price_comparer.Compare(max, v) >= 0; + 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; } @@ -66,8 +66,7 @@ namespace mbts.spark.filters { bool impl(TRow o) { var si = si_selector(o); if (si.HasValue) { - var price_comparer = Comparer.Create((x, y) => si.Value.ContractSpec.tick_equals(x, y) ? 0 : x.CompareTo(y)); - return price_comparer.Compare(min, selector(o)) <= 0; + return si.Value.ContractSpec.compare_tick_fallback_to_double(min, selector(o)) <= 0; } return min.CompareTo(selector(o)) <= 0; } @@ -78,8 +77,7 @@ namespace mbts.spark.filters { bool impl(TRow o) { var si = si_selector(o); if (si.HasValue) { - var price_comparer = Comparer.Create((x, y) => si.Value.ContractSpec.tick_equals(x, y) ? 0 : x.CompareTo(y)); - return price_comparer.Compare(max, selector(o)) >= 0; + return si.Value.ContractSpec.compare_tick_fallback_to_double(max, selector(o)) >= 0; } return max.CompareTo(selector(o)) >= 0; } 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;