From 556e2ab99e5e2eb234e7cde5be9675b575bc41e1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 9 Nov 2022 00:01:09 -0500 Subject: [PATCH] refactor (chore): Clean up domain::Security a bit * Rename 'min_quantity_increment_ammount' -> 'min_quantity_increment' to fix typo * Remove old 'min_quantity_increment' member (it wasn't referenced anywhere) * Initialize SecurityCommon w/ reasonable defaults (skipping initialization seems like a premature performance optimization) * Add a few members to verbose 'to_string' result --- src/lib/domain/Price.h | 13 ++++++++++++- src/lib/domain/Security.cpp | 12 ++++++++++++ src/lib/domain/SecurityCommon.h | 11 +++++------ src/lib/md/ccApi/CCMarketDataListener.cpp | 3 +-- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/lib/domain/Price.h b/src/lib/domain/Price.h index 867dbdfaf..47c2dc154 100644 --- a/src/lib/domain/Price.h +++ b/src/lib/domain/Price.h @@ -9,7 +9,7 @@ #if bts_assert_msg #define __ASSERT_MSG(EXP, msg) bts_assert_msg(EXP, msg) #else -#define __ASSERT_MSG(EXP, msg) \ +#define __ASSERT_MSG(EXP, msg) \ do { \ if (!(EXP)) { \ std::cerr << "Assert failure: " << std::string(#EXP) << " " << msg \ @@ -89,6 +89,9 @@ class Price { template static double get_mean(Range range, bool skip_nan = false); + static constexpr Price min() noexcept; + static constexpr Price max() noexcept; + Price &operator=(Price const &) = default; Price &operator=(Price &&) noexcept = default; @@ -379,6 +382,14 @@ inline double Price::get_mean(Range range, bool skip_nan) { return get_mean(range.begin(), range.end(), skip_nan); } +constexpr Price Price::min() noexcept { + return Price{std::numeric_limits::min() + 1}; +} + +constexpr Price Price::max() noexcept { + return Price{std::numeric_limits::max()}; +} + inline double Price::_pow10() noexcept { return std::pow(10.0, exponent()); } inline double Price::__pow10() noexcept { return std::pow(10.0, -exponent()); } constexpr Price Price::operator-() const noexcept { diff --git a/src/lib/domain/Security.cpp b/src/lib/domain/Security.cpp index 89ea98230..4350dd0b0 100644 --- a/src/lib/domain/Security.cpp +++ b/src/lib/domain/Security.cpp @@ -22,6 +22,18 @@ std::string Security::to_string(bool verbose) const { "type", [](const auto &s) { return SecurityType_Name(s.type()); }); schema.add("symbol", [](const auto &s) { return s.symbol(); }); schema.add("venue", [](const auto &s) { return Venue_Name(s.venue()); }); + schema.add("min_price_increment", [](const auto &s) { + return s.security_common.min_price_increment; + }); + schema.add("min_quantity_increment", [](const auto &s) { + return s.security_common.min_quantity_increment; + }); + schema.add("min_quantity", [](const auto &s) { + return s.security_common.min_quantity; + }); + schema.add("max_quantity", [](const auto &s) { + return s.security_common.max_quantity; + }); if (std::holds_alternative(security)) { const auto &fut = std::get(security); schema.add("expiration", [&fut](const auto &) { return fut.expiration; }); diff --git a/src/lib/domain/SecurityCommon.h b/src/lib/domain/SecurityCommon.h index 8c2e904d3..3f14488bc 100644 --- a/src/lib/domain/SecurityCommon.h +++ b/src/lib/domain/SecurityCommon.h @@ -5,6 +5,7 @@ #include "lib/api/domain/Currency.pb.h" #include "lib/api/domain/SecurityType.pb.h" #include "lib/api/domain/Venue.pb.h" +#include #include namespace bts::domain { @@ -17,18 +18,16 @@ class SecurityCommon { SecurityID id{}; api::domain::SecurityType type; api::domain::Currency currency; - double display_factor{}; - double cash_per_point{}; std::string symbol; std::string group; std::string asset; std::string desc; - Price min_price_increment{}; - double min_price_increment_ammount = 0; + Price min_price = Price::min(); + Price max_price = Price::max(); + double min_price_increment = 0; double min_quantity_increment = 0; double min_quantity = 0; - bool implied_matching = false; - std::string cme_security_type; + double max_quantity = std::numeric_limits::max(); }; } // namespace bts::domain diff --git a/src/lib/md/ccApi/CCMarketDataListener.cpp b/src/lib/md/ccApi/CCMarketDataListener.cpp index a0bd5f6d8..172b428c3 100644 --- a/src/lib/md/ccApi/CCMarketDataListener.cpp +++ b/src/lib/md/ccApi/CCMarketDataListener.cpp @@ -408,8 +408,7 @@ void CCMarketDataListener::_copy_security_common( to.exchange = Venue::VENUE_FTX; to.display_factor = 0.0; to.price_break = 0.0; - to.low_tick = to.high_tick = - from.security_common.min_price_increment_ammount; + to.low_tick = to.high_tick = from.security_common.min_price_increment; } } // namespace bts::md