From 396ac023c44dd218627a6e8ac74124138b61c52e Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 15 Nov 2018 13:33:41 -0500 Subject: [PATCH 01/19] adding field to proto --- src/lib/api/services/AdminService.proto | 6 ++++++ src/web/ui/src/Access.fs | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 3e13152f1..a52585403 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -141,6 +141,12 @@ message BTSAccount{ AccountSecurityClipLimits security_clip_limits = 90; AccountExchangeConnections connections = 100; ExchangeAccountData exchange_account_data = 110; + // extra parameters for risk enforcement + RiskLimitEnforcement risk_limit_enforcement=120; +} + +message RiskLimitEnforcement{ + bool product_limit_in_net_terms = 10; } message AccountProductPositionLimitUnit{ diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 9d3ba6411..b795990a3 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -102,6 +102,9 @@ module Accounts = clearingAccount = "" } } + riskLimitEnforcement={ + productLimitInNetTerms=true + } } From 500e5d508a57466f30a8244f816b79ab7e9d0463 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Thu, 15 Nov 2018 14:51:09 -0500 Subject: [PATCH 02/19] SPARK-1879: riskLimitEnforcement radio buttons --- src/web/ui/src/Access.fs | 6 +++--- src/web/ui/src/Accounts/State.fs | 2 ++ src/web/ui/src/Accounts/Types.fs | 1 + src/web/ui/src/Accounts/View.fs | 8 ++++++-- src/web/ui/src/Controls/Fields.fs | 20 ++++++++++++++++++++ 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index b795990a3..4241744d2 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -102,9 +102,9 @@ module Accounts = clearingAccount = "" } } - riskLimitEnforcement={ - productLimitInNetTerms=true - } + riskLimitEnforcement = + { productLimitInNetTerms = true + } } diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index e1d11ae06..5a7580c37 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -269,6 +269,8 @@ let update msg (model:Model) : Model * Cmd = | DeleteProductLimit i -> let limits = erase model.scratch.productPositionLimits i { model with scratch = { model.scratch with productPositionLimits = limits } }, Cmd.Empty + | EnforceProductLimitInNetTerms value -> + {model with scratch = {model.scratch with riskLimitEnforcement = {productLimitInNetTerms = value}}}, Cmd.none | SecurityLimits limits -> { model with scratch = { model.scratch with securityPositionLimits = limits } }, Cmd.Empty | DeleteSecurityLimit i -> diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index 402f009e8..5e240f483 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -69,6 +69,7 @@ type Msg = | ProductLimits of AccountProductPositionLimitUnit * AccountProductPositionLimitUnit | AddProductLimit of AccountProductPositionLimitUnit | DeleteProductLimit of int + | EnforceProductLimitInNetTerms of bool | SecurityLimits of AccountSecurityPositionLimitUnit[] | DeleteSecurityLimit of int diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index ed74b8a34..5118a4b0f 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -512,6 +512,10 @@ let productLimits model dispatch = div [ ClassName "column is-size-7 has-text-grey-mid is-help-text" ] [str "This limits the net position for a product (i.e. accumulated position over all securities belonging to a product). This can be set for one product, or for all products within a security type by selecting \"All\" for symbol. (Note that \"All\" applies the same limits to each symbol, not the combiled position of all symbols)"] ] + div [][ + Fields.radioButton "Use Net Contracts" "" model.scratch.riskLimitEnforcement.productLimitInNetTerms [] (EnforceProductLimitInNetTerms >> dispatch) + Fields.radioButton "Use Absolute Contracts" "" (not model.scratch.riskLimitEnforcement.productLimitInNetTerms) [] (not >> EnforceProductLimitInNetTerms >> dispatch) + ] TableControl.createDataTable (Some headerRow) rws (Button.button "Add" "" "plus-circle" Button.Enabled addRow) br [] ] @@ -527,8 +531,8 @@ let securityLimitsView model dispatch = TableControl.Cell (str "Security Type") TableControl.Cell (str "Symbol") TableControl.Cell (str "Security") - TableControl.Cell (str "Max Net Long Position") - TableControl.Cell (str "Max Net Short Position") + TableControl.Cell (str "Max Long Position") + TableControl.Cell (str "Max Short Position") ] className = "" header = None diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index 91961a3f6..a81122410 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -173,6 +173,26 @@ let checkbox (lbl:string) (description:string) (dv:bool) (attrs:IHTMLProp list) ] ] +let radioButton (lbl:string) (description:string) (dv:bool) (attrs:IHTMLProp list) (onchange:bool->unit) = + div [ ClassName "field" ] + [ + div [ ClassName "control" ] + [ + label [ ] [ + input ([ + ClassName "checkbox" + Type "radio" + Checked dv + OnChange (fun ev -> !!ev.target?``checked`` |> onchange) + ] @ attrs) + str (" " + lbl) + ] + nbsp.element + span [ClassName "is-size-7 has-text-grey-mid"][ str description] + ] + ] + + let mapSelect (lbl:string) (options:Map) (defaultText:string option) (defaultValue:string option) (onchange:'a->unit) = let optList:ReactElement list = match defaultText with From 29fbfd447912f2e686ad2b5261823ed3f2e7cd63 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Thu, 15 Nov 2018 16:35:14 -0500 Subject: [PATCH 03/19] SPARK-1877: product not security --- src/web/ui/src/Accounts/View.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 5118a4b0f..f0dfc9368 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -346,8 +346,8 @@ let productLimits model dispatch = TableControl.Cell (str "Exchange") TableControl.Cell (str "Security Type") TableControl.Cell (str "Symbol") - TableControl.Cell (str "Max Net Long Position") - TableControl.Cell (str "Max Net Short Position") + TableControl.Cell (str "Max Long Position") + TableControl.Cell (str "Max Short Position") ] className = "" header = None From 4a292c80303ca9c5ff17e94612383f53a5c8f53a Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 15 Nov 2018 16:21:13 -0500 Subject: [PATCH 04/19] limit enforcing logic added --- src/lib/orderman/limiter/LimiterUtils.h | 81 ++++++++++++++++--- src/lib/orderman/limiter/ProductLimitNode.cpp | 9 ++- src/lib/orderman/limiter/ProductLimitNode.h | 73 +++++++++++++---- src/lib/orderman/limiter/ProductLimitTree.cpp | 8 +- src/lib/orderman/limiter/SecurityLimitNode.h | 12 +-- 5 files changed, 147 insertions(+), 36 deletions(-) diff --git a/src/lib/orderman/limiter/LimiterUtils.h b/src/lib/orderman/limiter/LimiterUtils.h index 2b29cb9f2..d6f6b7068 100644 --- a/src/lib/orderman/limiter/LimiterUtils.h +++ b/src/lib/orderman/limiter/LimiterUtils.h @@ -9,10 +9,13 @@ namespace orderman{ class LimiterUtils{ public: - static void can_send_new_order(api::Side side, Quantity quantity, bool is_security_level, - int long_pos_limit, int short_pos_limit, - int net_pos, - Limiter::LimiterQueryResult& out_res){ + static void can_send_new_order_net(api::Side side, + Quantity quantity, + bool is_security_level, + int long_pos_limit, + int short_pos_limit, + int net_pos, + Limiter::LimiterQueryResult& out_res){ out_res.ok = true; bts_assert(long_pos_limit >= 0); bts_assert(short_pos_limit <= 0); @@ -35,13 +38,15 @@ public: else out_res.error_msg = fmt::format("Product Short Position (Max {} Current {})", short_pos_limit, net_pos); } - } - static void can_update_order (api::Side side, - Quantity from, Quantity to, - bool is_security_level, - int long_pos_limit, int short_pos_limit, - int net_pos, - Limiter::LimiterQueryResult& out_res){ + } + static void can_update_order_net (api::Side side, + Quantity from, + Quantity to, + bool is_security_level, + int long_pos_limit, + int short_pos_limit, + int net_pos, + Limiter::LimiterQueryResult& out_res){ out_res.ok = true; if (to.value() > from.value()){ int net_pos_new = 0; @@ -65,6 +70,60 @@ public: out_res.error_msg = fmt::format("Product Short Position (Max {} Current {})", short_pos_limit, net_pos); } } + } + static void can_send_new_order_abs(api::Side side, + Quantity quantity, + uint32_t long_pos_limit, + uint32_t short_pos_limit, + uint32_t long_pos, + uint32_t short_pos, + Limiter::LimiterQueryResult& out_res){ + out_res.ok = true; + if(side == api::Side::SIDE_BUY){ + if(long_pos + quantity.value() > long_pos_limit){ + out_res.error_msg = fmt::format("Long Position (Abs) " + "(Max {} Current {})", + long_pos_limit,long_pos); + out_res.ok = false; + } + } + else{ + if(short_pos + quantity.value() > short_pos_limit){ + out_res.error_msg = fmt::format("Short Position (Abs) " + "(Max {} Current {})", + long_pos_limit,long_pos); + out_res.ok = false; + } + } + } + static void can_update_order_abs (api::Side side, + Quantity from, + Quantity to, + uint32_t long_pos_limit, + uint32_t short_pos_limit, + uint32_t long_pos, + uint32_t short_pos, + Limiter::LimiterQueryResult& out_res){ + out_res.ok = true; + if (to.value() > from.value()){ + uint32_t diff = to.value() - from.value(); + if(side == api::Side::SIDE_BUY){ + if(long_pos + diff > long_pos_limit){ + out_res.error_msg = fmt::format("Long Position (Abs) " + "(Max {} Current {})", + long_pos_limit,long_pos); + out_res.ok = false; + } + } + else{ + if(short_pos + diff > short_pos_limit){ + out_res.error_msg = fmt::format("Short Position (Abs) " + "(Max {} Current {})", + long_pos_limit,long_pos); + out_res.ok = false; + } + } + } } static api::Side invert_side(api::Side side){ return side == api::SIDE_BUY ? api::SIDE_SELL : api::SIDE_BUY; diff --git a/src/lib/orderman/limiter/ProductLimitNode.cpp b/src/lib/orderman/limiter/ProductLimitNode.cpp index d35e3ce42..a6ee36784 100644 --- a/src/lib/orderman/limiter/ProductLimitNode.cpp +++ b/src/lib/orderman/limiter/ProductLimitNode.cpp @@ -5,14 +5,17 @@ namespace orderman{ ProductLimitNode::ProductLimitNode(uint32_t account_id, uint32_t, // parent_account_id, - const bts::api::admin::AccountProductPositionLimitUnit& limit) + const bts::api::admin::AccountProductPositionLimitUnit& limit, + bool enforce_net) : _account_id(account_id), //_parent_account_id(parent_account_id), _limit(limit), + _enforce_net(enforce_net), _long_pos_limit (limit.long_position_limit()), - _short_pos_limit (-1 * limit.short_position_limit()), - _net_pos(0) + _short_pos_limit (limit.short_position_limit()), + _long_pos(0), + _short_pos(0) {} }} diff --git a/src/lib/orderman/limiter/ProductLimitNode.h b/src/lib/orderman/limiter/ProductLimitNode.h index 0ed567adf..b6ce3d88d 100644 --- a/src/lib/orderman/limiter/ProductLimitNode.h +++ b/src/lib/orderman/limiter/ProductLimitNode.h @@ -20,49 +20,92 @@ class ProductLimitNode{ private: const uint32_t _account_id; // , _parent_account_id; const bts::api::admin::AccountProductPositionLimitUnit& _limit; - const int _long_pos_limit, _short_pos_limit; - int _net_pos; + const bool _enforce_net; + const uint32_t _long_pos_limit, _short_pos_limit; + // this is the only state here + uint32_t _long_pos, _short_pos; public: ProductLimitNode(uint32_t account_id, uint32_t parent_account_id, - const bts::api::admin::AccountProductPositionLimitUnit& limit); + const bts::api::admin::AccountProductPositionLimitUnit& limit, + bool enforce_net); // accessors //////////// uint32_t account_id() const {return _account_id;} - int net_pos() const {return _net_pos;} + int net_pos() const { + return static_cast(_long_pos)-static_cast(_short_pos); + } // position updates /////////////////// void copy_positions_from(const ProductLimitNode& source){ - _net_pos = source.net_pos(); + _long_pos=source._long_pos; + _short_pos=source._short_pos; } void add_position(api::Side side, uint32_t qty){ if (side==api::Side::SIDE_BUY) - _net_pos += qty; + _long_pos += qty; else - _net_pos -= qty; + _short_pos += qty; } void remove_position(api::Side side, uint32_t qty){ if (side==api::Side::SIDE_BUY) - _net_pos -= qty; + _long_pos = _subtract_unsigned(_long_pos, qty); else - _net_pos += qty; + _short_pos = _subtract_unsigned(_short_pos, qty); } // risk limit checks //////////////////// Limiter::LimiterQueryResult can_send_new_order(api::Side side, Quantity quantity) const{ Limiter::LimiterQueryResult result; - LimiterUtils::can_send_new_order (side, quantity, false, - _long_pos_limit, _short_pos_limit, - _net_pos, result); + if (_enforce_net) + LimiterUtils::can_send_new_order_net (side, + quantity, + false, + _long_pos_limit, + -1 * _short_pos_limit, + net_pos(), + result); + else + LimiterUtils::can_send_new_order_abs (side, + quantity, + _long_pos_limit, + _short_pos_limit, + _long_pos, + _short_pos, + result); return result; } Limiter::LimiterQueryResult can_update_order(api::Side side, Quantity from, Quantity to) const{ Limiter::LimiterQueryResult result; - LimiterUtils::can_update_order (side, from, to, false, - _long_pos_limit, _short_pos_limit, - _net_pos, result); + if(_enforce_net) + LimiterUtils::can_update_order_net (side, + from, + to, + false, + _long_pos_limit, + -1 * _short_pos_limit, + net_pos(), + result); + else + LimiterUtils::can_update_order_abs (side, + from, + to, + _long_pos_limit, + _short_pos_limit, + _long_pos, + _short_pos, + result); return result; } + uint32_t _subtract_unsigned(uint32_t n1, uint32_t n2){ + if(n1 >= n2) + return n1-n2; + else{ + LOG(OrderMan, Error, "ProductLimitNode._subtract_unsigned {0}-{1} ", + n1, n2); + return 0; + } + } // test only functions ////////////////////// const bts::api::admin::AccountProductPositionLimitUnit& test_only_func_limit() const {return _limit;} diff --git a/src/lib/orderman/limiter/ProductLimitTree.cpp b/src/lib/orderman/limiter/ProductLimitTree.cpp index 836ade264..bab765af6 100644 --- a/src/lib/orderman/limiter/ProductLimitTree.cpp +++ b/src/lib/orderman/limiter/ProductLimitTree.cpp @@ -10,8 +10,14 @@ ProductLimitTree::ProductLimitTree(const api::Product& product, _product (product) { for(const auto& account : admin_data.accounts()){ + bool enforce_net=true; // default is net + if(account.has_risk_limit_enforcement()) + enforce_net=account.risk_limit_enforcement().product_limit_in_net_terms(); const bts::api::admin::AccountProductPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_product_position_limit(account, _product); - _tree.emplace_back(account.id(), bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, limit != nullptr ? *limit : zero_limit); + _tree.emplace_back(account.id(), + bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, + limit != nullptr ? *limit : zero_limit, + enforce_net); } } }} \ No newline at end of file diff --git a/src/lib/orderman/limiter/SecurityLimitNode.h b/src/lib/orderman/limiter/SecurityLimitNode.h index 5cafd044e..230171aaa 100644 --- a/src/lib/orderman/limiter/SecurityLimitNode.h +++ b/src/lib/orderman/limiter/SecurityLimitNode.h @@ -71,9 +71,9 @@ public: return result; } if (_apply_sec_position_limits) - LimiterUtils::can_send_new_order (side, quantity, true, - _long_pos_limit, _short_pos_limit, - _net_pos, result); + LimiterUtils::can_send_new_order_net (side, quantity, true, + _long_pos_limit, _short_pos_limit, + _net_pos, result); if (result.ok) result = _product_node.can_send_new_order(side, quantity); return result; @@ -86,9 +86,9 @@ public: return result; } if (_apply_sec_position_limits) - LimiterUtils::can_update_order (side, from, to, true, - _long_pos_limit, _short_pos_limit, - _net_pos, result); + LimiterUtils::can_update_order_net (side, from, to, true, + _long_pos_limit, _short_pos_limit, + _net_pos, result); if (result.ok) result = _product_node.can_update_order(side, from, to); return result; From 6e4ed3f3280ffa328c92ef38409fe01a6090bcb1 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 15 Nov 2018 17:25:01 -0500 Subject: [PATCH 05/19] for the first time at start up, net pos is enforced --- src/lib/orderman/limiter/LimiterUtils.h | 4 ++-- src/server/sparkd/user/AdminServiceServer.cpp | 8 +++++++- src/server/sparkd/user/AdminServiceServer.h | 7 ++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/limiter/LimiterUtils.h b/src/lib/orderman/limiter/LimiterUtils.h index d6f6b7068..97bdc4fcc 100644 --- a/src/lib/orderman/limiter/LimiterUtils.h +++ b/src/lib/orderman/limiter/LimiterUtils.h @@ -91,7 +91,7 @@ public: if(short_pos + quantity.value() > short_pos_limit){ out_res.error_msg = fmt::format("Short Position (Abs) " "(Max {} Current {})", - long_pos_limit,long_pos); + short_pos_limit,short_pos); out_res.ok = false; } } @@ -119,7 +119,7 @@ public: if(short_pos + diff > short_pos_limit){ out_res.error_msg = fmt::format("Short Position (Abs) " "(Max {} Current {})", - long_pos_limit,long_pos); + short_pos_limit,short_pos); out_res.ok = false; } } diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index bb5c07fe1..b23803299 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -44,7 +44,7 @@ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) if (_state.ParseFromString(ser_data)) { data_found = true; - AdminServiceUtils::fill_connections_from_config(_state); + _check_data_on_start(); _update_and_publish(false); } } @@ -250,4 +250,10 @@ void AdminServiceServer::_publish_md_permissions(){ _md_perm_publisher.add_or_update(p); _md_perm_publisher.flush(); } +void AdminServiceServer::_check_data_on_start (){ + AdminServiceUtils::fill_connections_from_config(_state); + for(int i=0; i<_state.accounts().size(); i++) + if(!_state.mutable_accounts(i)->has_risk_limit_enforcement()) + _state.mutable_accounts(i)->mutable_risk_limit_enforcement()->set_product_limit_in_net_terms(true); +} }} diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index 32bbe126c..618a20a38 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -68,12 +68,17 @@ public: const api::Response& reply) override; private: + // this is mainly does 2 things : + // 1. some data is in partially in config, this copies + // that to here + // 2. for new data fields, it initializes them here + void _check_data_on_start(); void _update_and_publish (bool is_insert); void _publish_md_entitlements(); void _publish_md_permissions(); void _add_live_order(map>& agg, const OrderRecord& order); void _cancel_orders(const std::vector& accounts, - const std::vector& users); + const std::vector& users); }; }} From d1d4a1bfb70caf4516b301948017fd4682369167 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Fri, 16 Nov 2018 11:38:55 -0500 Subject: [PATCH 06/19] Update release notes --- doc/user/docs/release_notes.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index cd9cede36..21f7f0676 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -1,5 +1,17 @@ # Release Notes +## 1.4.0 + +### Speed Enhancements + - Improved requoting and hedging performance + - Improved order book form performance +### Server Side SDK + - Added beta version of the server side SDK +### Front End + - Added status bars to all UI grids +### Reporting + - Added reporting of hedging and requoting performance + ## 1.3.8 ### Speed Enhancements From 0ef2378dc9d0d987eabdef37477c4d07d5730c48 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 16 Nov 2018 16:40:01 +0000 Subject: [PATCH 07/19] Updated release notes. --- doc/user/docs/release_notes.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index cd9cede36..847136350 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -1,5 +1,12 @@ # Release Notes +## 1.4.0 + - Improved requoting and hedging performance + - Improved order book form performance + - Added beta version of the server side SDK + - Added status bars to all UI grids + - Added reporting of hedging and requoting performance + ## 1.3.8 ### Speed Enhancements @@ -139,4 +146,4 @@ - PnL report now has PnL columns calculated based on your start of day, current day, and total position - Start, Day and Total PnL columns are painted with a red or green background color based on if the pnl value is negative or positive respectively - Corrected cash per point values, used in pnl calculations, for a number of products -- PnL report will now remember any customizations you make to filtering and/or sorting criteria \ No newline at end of file +- PnL report will now remember any customizations you make to filtering and/or sorting criteria From 36e58378e475f18e6df328a80b1ca8d4df0dd45a Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 16 Nov 2018 16:40:13 +0000 Subject: [PATCH 08/19] Made DynamicIcebergOrder only available in dev. --- src/sdk/examples/order_plugin_example.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index c7eb0e2b8..8949c21f9 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -5,6 +5,8 @@ #include "spark/lib/orderman/actors/order_manager/OrderBuilder.h" #include "spark/lib/orderman/orders/DynamicOrder.h" #include "spark/lib/utils/PBUtils.h" +#include "lib/config/protos/system.pb.h" +#include "lib/config/config.h" using namespace bts::api::orderman; using namespace bts::orderman; @@ -379,7 +381,9 @@ DynamicOrderDescriptor get_dynamic_iceberg_order_desc() extern "C" void init_spark_plugin(bts::SparkServices &serv) { using namespace bts; - serv.register_dynamic_order(get_dynamic_iceberg_order_desc(), - []() { return std::make_unique(); }); - LOG(Plugin,Info, "Initialized order_plugin_example.so"); + if (config::get().type() == "dev") { + serv.register_dynamic_order(get_dynamic_iceberg_order_desc(), + []() { return std::make_unique(); }); + LOG(Plugin,Info, "Initialized order_plugin_example.so"); + } } From 3b371f3588a8e841bffcf77d37cf81ef67d48fdb Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 19 Nov 2018 13:54:48 +0000 Subject: [PATCH 09/19] Fixed bug in quickbus handling of broken connections. --- src/lib/quickbus/network/QBConnection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/quickbus/network/QBConnection.cpp b/src/lib/quickbus/network/QBConnection.cpp index 7debc1e47..c774be446 100644 --- a/src/lib/quickbus/network/QBConnection.cpp +++ b/src/lib/quickbus/network/QBConnection.cpp @@ -167,7 +167,7 @@ void QBConnection::recv_msg_body() handle_msg(&m); } else - recv_msg_body(); + close_connection(error.message()); }); } From 2cfbd655cbdef732ba351c23b11aba1a77ba57b9 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 19 Nov 2018 15:43:44 +0000 Subject: [PATCH 10/19] Trimmed account name from fill record. At some point in the past this was saved with spaces to the side of it, and that messes up matching with the account names. The implicit assumption is that we will never want account names with spaces at the end. --- src/lib/orderman/actors/order_manager/OrderManager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index a827073ff..fe06f382d 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -15,6 +15,7 @@ #include #include +#include namespace bts { namespace orderman { @@ -123,10 +124,11 @@ void OrderManager::on_fill_recovery( update.events->size()); me->state = State::WAIT_ORDERS; - for (auto const &ev : *(update.events)) - me->services_data.limiter.add(*ev.security, ev.fill.account(), - ev.fill.side(), + for (auto const &ev : *(update.events)) { + auto trimmed_account_name = boost::algorithm::trim_copy(ev.fill.account()); + me->services_data.limiter.add(*ev.security, trimmed_account_name,ev.fill.side(), Quantity(ev.fill.last_shares())); + } me->stored_order_sub = subscribe( [this](auto const &orders) { this->on_order_recovery(orders); }); From d9e967610ede1ca62a1a80a46ac7ce371c7baf66 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 19 Nov 2018 10:44:03 -0500 Subject: [PATCH 11/19] static casting uint to int before passing it to a function that takes in ints --- src/lib/orderman/limiter/ProductLimitNode.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/limiter/ProductLimitNode.h b/src/lib/orderman/limiter/ProductLimitNode.h index b6ce3d88d..c6f675454 100644 --- a/src/lib/orderman/limiter/ProductLimitNode.h +++ b/src/lib/orderman/limiter/ProductLimitNode.h @@ -61,8 +61,8 @@ public: LimiterUtils::can_send_new_order_net (side, quantity, false, - _long_pos_limit, - -1 * _short_pos_limit, + static_cast(_long_pos_limit), + -1 * static_cast(_short_pos_limit), net_pos(), result); else @@ -82,8 +82,8 @@ public: from, to, false, - _long_pos_limit, - -1 * _short_pos_limit, + static_cast(_long_pos_limit), + -1 * static_cast(_short_pos_limit), net_pos(), result); else From 8d9697d06de1fb3f9867d7601293fe44feb8d14a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 19 Nov 2018 13:46:05 -0600 Subject: [PATCH 12/19] SPARK-1804 --- .../spark/view/Controls/UniformTabGrid.cs | 0 .../Controls/UniformTabGrid/UniformTabGrid.cs | 50 +++++++++++++++++++ .../spark/view/Shell/FloatingWindow.xaml | 18 +++++-- src/client/spark/view/Shell/TabDocument.xaml | 3 +- 4 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 src/client/spark/view/Controls/UniformTabGrid.cs create mode 100644 src/client/spark/view/Controls/UniformTabGrid/UniformTabGrid.cs diff --git a/src/client/spark/view/Controls/UniformTabGrid.cs b/src/client/spark/view/Controls/UniformTabGrid.cs new file mode 100644 index 000000000..e69de29bb diff --git a/src/client/spark/view/Controls/UniformTabGrid/UniformTabGrid.cs b/src/client/spark/view/Controls/UniformTabGrid/UniformTabGrid.cs new file mode 100644 index 000000000..017e16a45 --- /dev/null +++ b/src/client/spark/view/Controls/UniformTabGrid/UniformTabGrid.cs @@ -0,0 +1,50 @@ +using bts; +using mbts.spark.filters; +using mbts.ui.controls.adorners; +using System.Collections.Generic; +using System.Linq; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; + +namespace mbts.ui.controls { + public class UniformTabGrid : UniformGrid { + public UniformTabGrid () { + this.IsItemsHost = true; + this.Rows = 1; + } + + protected override Size MeasureOverride(Size constraint) { + var child_tabs = this.Children.OfType(); + var child_tabs_max_width = child_tabs.Sum(t => t.MaxWidth); + // I noticed when debugging that this can sometimes be infinty, + // especially when a TabItem has not been set with a MaxWidth. + if (!double.IsInfinity(child_tabs_max_width)) { + // if the window width is greater than the total tab width, then + // there is more than enough space for all the tabs. If this + // is set to the default of Stretch and the window has only 1 + // tab or few tabs, the tab appears in the middle, which is not good. + // i.e. we want tabs to added left to right, so align left + // + // When the window is less than the total tab width, then align + // can be set to stretch b/c the UniformGrid will take care of + // sizing each tab accordingly. + this.HorizontalAlignment = (constraint.Width > child_tabs_max_width) + ? HorizontalAlignment.Left + : HorizontalAlignment.Stretch; + + // this bit here is necessary because when the window is expanded + // beyond the maxwidth of all the tabs, we switch to Left and the + // headers snap to some smaller than MaxWidth size, which is not + // the behavior we want + foreach (var child in child_tabs) { + child.Width = this.HorizontalAlignment == HorizontalAlignment.Left + ? child.MaxWidth + : double.NaN; + } + } + + return base.MeasureOverride(constraint); + } + } +} \ No newline at end of file diff --git a/src/client/spark/view/Shell/FloatingWindow.xaml b/src/client/spark/view/Shell/FloatingWindow.xaml index a214e9073..ebf0ec5b8 100644 --- a/src/client/spark/view/Shell/FloatingWindow.xaml +++ b/src/client/spark/view/Shell/FloatingWindow.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:diag="clr-namespace:System.Diagnostics;assembly=WindowsBase" xmlns:ui="clr-namespace:mbts.ui" + xmlns:c="clr-namespace:mbts.ui.controls" mc:Ignorable="d" AllowDrop="True" Style="{StaticResource BTSFloatingWindow}" d:DesignHeight="300" d:DesignWidth="300" @@ -25,18 +26,25 @@ - + + - + Background="Transparent" + ui:WindowStyle.IsNonClientArea="True" + > + + - + +