From 3fc080d02c507560c5a606c468f81e7e2d79d336 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 20 Jul 2020 23:21:20 -0400 Subject: [PATCH] Better position violation comments --- src/lib/domain_model/Security.h | 59 +++++++++++++++- src/lib/orderman/limiter/LimiterUtils.h | 68 ++++++++++++++----- src/lib/orderman/limiter/ProductLimitNode.h | 4 ++ .../orderman/limiter/SecurityLimitTree.cpp | 53 +-------------- 4 files changed, 114 insertions(+), 70 deletions(-) diff --git a/src/lib/domain_model/Security.h b/src/lib/domain_model/Security.h index 993a5d1d9..56a911cd2 100644 --- a/src/lib/domain_model/Security.h +++ b/src/lib/domain_model/Security.h @@ -221,9 +221,15 @@ inline bool test_price_equality(double price_1, double price_2) { // TODO, move this to its own file +static const uint32_t days_in_month[] = {31,28,31,30,31,30,31,31,30,31,30,31}; + inline bool is_strip(const bts::api::Security& sec){ - return sec.has_ice() && sec.has_spread() && - sec.ice().strip_name().find("/") != std::string::npos; + auto rv = sec.has_ice() && sec.has_spread() && + sec.ice().strip_name().find("/") != std::string::npos; + if(rv != sec.ice().is_strip()) + LOG(OrderMan, Error, "Sec:{} is_strip incorrect, expected:{}", + sec.id(),rv); + return rv; } inline bool is_spread_of_strips(const bts::api::Security& sec){ @@ -243,5 +249,54 @@ inline bool is_strip_with_no_leg_fills(const bts::api::Security& sec){ is_strip(sec); } +inline bool is_daily_contract(const api::Security& s){ + return s.symbol() == "HHD"; +} + +// risk qty is the qty used for risk purposes for +// 1 lot of this security. +// daily futures and ice lots are considered 1, +// other futures (HNG,HIS,HEN etc) are the days +// in the month +inline double get_fut_risk_qty(const api::Security& s){ + bts_assert(s.has_future()); + bts_assert(s.has_ice()); + if(is_daily_contract(s)) + return 1; + else if(s.ice().is_ice_lots()) + return 1; + else{ + auto mm = s.future().expiration_month(); + if(mm <=11) + return days_in_month[mm]; + else{ + LOG(persist, Error, "Illegal month:{} for sec:{}", + mm, s.id()); + // TODO + return 0.0; + } + } +} + +inline double get_spread_direct_risk_qty(const api::Security& s){ + bts_assert(s.has_spread()); + bts_assert(s.has_ice()); + if(s.ice().is_ice_lots()) + return 1; + else + return 30; +} + +inline double get_risk_qty (const api::Security& s){ + if(s.has_future()) + return get_fut_risk_qty(s); + else if (s.has_spread()) + return get_spread_direct_risk_qty(s); + else{ + bts_assert(false); + return 0.0; + } +} + } // namespace securities } // namespace bts diff --git a/src/lib/orderman/limiter/LimiterUtils.h b/src/lib/orderman/limiter/LimiterUtils.h index b90487d97..fa8ede790 100644 --- a/src/lib/orderman/limiter/LimiterUtils.h +++ b/src/lib/orderman/limiter/LimiterUtils.h @@ -2,6 +2,7 @@ #include #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/api/services/OrderService.pb.h" #include "Limiter.h" namespace bts{ @@ -9,12 +10,36 @@ namespace orderman{ class LimiterUtils{ public: + + static std::string product_string(const bts::api::admin::ProductScope& p){ + auto _type = [&]() -> std::string { + switch(p.security_type()){ + case api::SecurityType::SECURITYTYPE_UNSET: + return "UNSET"; + case api::SecurityType::SECURITYTYPE_STOCK: + return "STOCK"; + case api::SecurityType::SECURITYTYPE_OPTION: + return "OPTION"; + case api::SecurityType::SECURITYTYPE_FUTURE: + return "FUTURE"; + case api::SecurityType::SECURITYTYPE_SPREAD: + return "SPREAD"; + case api::SecurityType::SECURITYTYPE_SYNTHETIC: + return "SYNTHETIC"; + default: + return "UNSET"; + } + return "UNSET"; + }; + return p.security_symbol() + " " + _type(); + } 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, + const bts::api::admin::ProductScope& p, Limiter::LimiterQueryResult& out_res){ out_res.result = Limiter::OK; bts_assert(long_pos_limit >= 0); @@ -31,7 +56,9 @@ public: } else { out_res.result = Limiter::PROD_LONG_POS_BREACHED; - out_res.error_msg = fmt::format("Product Long Position (Max {} Current {})", long_pos_limit, net_pos); + out_res.error_msg = fmt::format( + "Product Long Position for {} Max {} ({})", + product_string(p), long_pos_limit, net_pos_new); } } else if (net_pos_new < short_pos_limit && side==api::Side::SIDE_SELL){ @@ -41,7 +68,9 @@ public: } else { out_res.result = Limiter::PROD_SHORT_POS_BREACHED; - out_res.error_msg = fmt::format("Product Short Position (Max {} Current {})", short_pos_limit, net_pos); + out_res.error_msg = fmt::format( + "Product Short Position for {} Max {} ({})", + product_string(p), short_pos_limit, net_pos_new); } } } @@ -52,6 +81,7 @@ public: int long_pos_limit, int short_pos_limit, int net_pos, + const bts::api::admin::ProductScope& p, Limiter::LimiterQueryResult& out_res){ out_res.result = Limiter::OK; if (to.value() > from.value()){ @@ -68,7 +98,9 @@ public: } else { out_res.result = Limiter::PROD_LONG_POS_BREACHED; - out_res.error_msg = fmt::format("Product Long Position (Max {} Current {})", long_pos_limit, net_pos); + out_res.error_msg = fmt::format( + "Product Long Position for {} Max {} ({})", + product_string(p), long_pos_limit, net_pos_new); } } else if (net_pos_new < short_pos_limit){ @@ -78,7 +110,9 @@ public: } else { out_res.result = Limiter::SEC_SHORT_POS_BREACHED; - out_res.error_msg = fmt::format("Product Short Position (Max {} Current {})", short_pos_limit, net_pos); + out_res.error_msg = fmt::format( + "Product Short Position for {} Max {} ({})", + product_string(p), short_pos_limit, net_pos_new); } } } @@ -89,21 +123,22 @@ public: uint32_t short_pos_limit, uint32_t long_pos, uint32_t short_pos, + const bts::api::admin::ProductScope& p, Limiter::LimiterQueryResult& out_res){ out_res.result = Limiter::OK; 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.error_msg = fmt::format("Long Position (Abs) for {} " + "(Max {} {})", + product_string(p),long_pos_limit,long_pos + quantity.value()); out_res.result = Limiter::SEC_LONG_POS_BREACHED; } } else{ if(short_pos + quantity.value() > short_pos_limit){ - out_res.error_msg = fmt::format("Short Position (Abs) " - "(Max {} Current {})", - short_pos_limit,short_pos); + out_res.error_msg = fmt::format("Short Position (Abs) for {}" + "(Max {} {})", + product_string(p),short_pos_limit,short_pos + quantity.value()); out_res.result = Limiter::SEC_SHORT_POS_BREACHED; } } @@ -115,23 +150,24 @@ public: uint32_t short_pos_limit, uint32_t long_pos, uint32_t short_pos, + const bts::api::admin::ProductScope& p, Limiter::LimiterQueryResult& out_res){ out_res.result = Limiter::OK; 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.error_msg = fmt::format("Long Position (Abs) for {}" + "(Max {} {})", + product_string(p),long_pos_limit,long_pos); out_res.result = Limiter::SEC_LONG_POS_BREACHED; } } else{ if(short_pos + diff > short_pos_limit){ - out_res.error_msg = fmt::format("Short Position (Abs) " - "(Max {} Current {})", - short_pos_limit,short_pos); + out_res.error_msg = fmt::format("Short Position (Abs) for {}" + "(Max {} {})", + product_string(p),short_pos_limit,short_pos + diff); out_res.result = Limiter::SEC_SHORT_POS_BREACHED; } } diff --git a/src/lib/orderman/limiter/ProductLimitNode.h b/src/lib/orderman/limiter/ProductLimitNode.h index 61574f8c3..7dbc311c6 100644 --- a/src/lib/orderman/limiter/ProductLimitNode.h +++ b/src/lib/orderman/limiter/ProductLimitNode.h @@ -95,6 +95,7 @@ public: static_cast(_long_pos_limit), -1 * static_cast(_short_pos_limit), net_pos(), + _limit.product(), result); else LimiterUtils::can_send_new_order_abs (side, @@ -103,6 +104,7 @@ public: _short_pos_limit, _long_pos, _short_pos, + _limit.product(), result); return result; } @@ -123,6 +125,7 @@ public: static_cast(_long_pos_limit), -1 * static_cast(_short_pos_limit), net_pos(), + _limit.product(), result); else LimiterUtils::can_update_order_abs (side, @@ -132,6 +135,7 @@ public: _short_pos_limit, _long_pos, _short_pos, + _limit.product(), result); return result; } diff --git a/src/lib/orderman/limiter/SecurityLimitTree.cpp b/src/lib/orderman/limiter/SecurityLimitTree.cpp index 45aaf8411..2ca266f05 100644 --- a/src/lib/orderman/limiter/SecurityLimitTree.cpp +++ b/src/lib/orderman/limiter/SecurityLimitTree.cpp @@ -7,63 +7,12 @@ using namespace bts::admin; namespace bts { namespace orderman { -static const uint32_t days_in_month[] = {31,28,31,30,31,30,31,31,30,31,30,31}; - -bool is_daily_contract(const api::Security& s){ - return s.symbol() == "HHD"; -} - -// risk qty is the qty used for risk purposes for -// 1 lot of this security. -// daily futures and ice lots are considered 1, -// other futures (HNG,HIS,HEN etc) are the days -// in the month -double get_fut_risk_qty(const api::Security& s){ - bts_assert(s.has_future()); - bts_assert(s.has_ice()); - if(is_daily_contract(s)) - return 1; - else if(s.ice().is_ice_lots()) - return 1; - else{ - auto mm = s.future().expiration_month(); - if(mm <=11) - return days_in_month[mm]; - else{ - LOG(persist, Error, "Illegal month:{} for sec:{}", - mm, s.id()); - // TODO - return 0.0; - } - } -} - -double get_spread_direct_risk_qty(const api::Security& s){ - bts_assert(s.has_spread()); - bts_assert(s.has_ice()); - if(s.ice().is_ice_lots()) - return 1; - else - return 30; -} - -double get_risk_qty (const api::Security& s){ - if(s.has_future()) - return get_fut_risk_qty(s); - else if (s.has_spread()) - return get_spread_direct_risk_qty(s); - else{ - bts_assert(false); - return 0.0; - } -} - SecurityLimitTree::QtyNormalization get_qty_norm (const api::Security& s){ if(s.has_ice()) return SecurityLimitTree::QtyNormalization { s.ice().exchange_qty_ratio(), - get_risk_qty(s) + bts::securities::get_risk_qty(s) }; else return SecurityLimitTree::QtyNormalization {1,1};