From f974d90eaa8aed4ec334f8feb320e66cfab721c9 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 1 Sep 2020 13:40:27 -0400 Subject: [PATCH 1/2] FifoSecurityMatcher::on_same_orders now returns an optional --- src/server/sparkd/cmds/Spartan.cpp | 2 +- .../mdp3/back_testing/FifoSecurityMatcher.cpp | 24 ++++++++++++------- .../mdp3/back_testing/FifoSecurityMatcher.h | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/server/sparkd/cmds/Spartan.cpp b/src/server/sparkd/cmds/Spartan.cpp index 00a1b08ea..c6beac78f 100644 --- a/src/server/sparkd/cmds/Spartan.cpp +++ b/src/server/sparkd/cmds/Spartan.cpp @@ -72,7 +72,7 @@ std::map const &)>> } auto current_orders = s->orders(); add_iceberg_annotation(current_orders); - bts_assert(matcher.has_same_orders(current_orders)); + bts_assert(!matcher.has_same_orders(current_orders).has_value()); old_orders = current_orders; } else { it->second = s->orders(); diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp index 9b9969e47..0e634961b 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp @@ -229,10 +229,9 @@ void FifoSecurityMatcher::on_order_remove(MDP3OrderKey key){ _remove_empty_price_levels(); } -bool FifoSecurityMatcher::has_same_orders(const Orders& ord_map){ - auto i=0; +std::optional FifoSecurityMatcher::has_same_orders( + const Orders& ord_map){ for (const auto& kv : ord_map){ - i++; const auto& exp_ord = kv.second; auto[plevel,ord] = _find_order(exp_ord.key); auto match = plevel != nullptr && ord != nullptr && @@ -240,13 +239,22 @@ bool FifoSecurityMatcher::has_same_orders(const Orders& ord_map){ plevel->side()==exp_ord.side && ord->quantity == exp_ord.quantity; if(!match){ - auto pl = _find_price_level(exp_ord.side,exp_ord.price); - bts_assert(false); - bts_assert(pl != nullptr); - return false; + std::ostringstream buff; + buff<<"FifoSecurityMatcher::has_same_orders "; + if(ord == nullptr) + buff<<"Order with Key:"<price()<<" "; + buff<<"Expected qty:"<quantity<<" "; + buff<<"Expected side:"<side(); + } + std::string msg = buff.str(); + LOG(OrderMan, Error, msg.c_str()); + return std::optional{msg}; } } - return true; + return std::nullopt; } } diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.h b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.h index db3e3a8de..a53e02d2b 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.h @@ -56,6 +56,6 @@ public: void on_order_update(const MDP3Order&); void on_order_remove(MDP3OrderKey); // For testing - bool has_same_orders(Orders const&); + std::optional has_same_orders(Orders const&); }; } // namespace bts::spartan::mdp3 From 87d0498c233a69ca36a2e381a1211c12d25fde71 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 1 Sep 2020 16:34:32 -0400 Subject: [PATCH 2/2] Improved the on_same_orders return message --- .../mdp3/back_testing/FifoSecurityMatcher.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp index 373ea48d4..1d2eca2fe 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp @@ -250,18 +250,25 @@ std::optional FifoSecurityMatcher::has_same_orders( ord->quantity == exp_ord.quantity; if(!match){ std::ostringstream buff; - buff<<"FifoSecurityMatcher::has_same_orders "; if(ord == nullptr) buff<<"Order with Key:"<price()<<" "; - buff<<"Expected qty:"<quantity<<" "; - buff<<"Expected side:"<side(); + buff<<"Order with Key:"<price()<quantity<side()<ib.is_ib? + ord->ib.total_qty.value():0; + buff<<"Expected IB state:"<{buff.str()}; } } + LOG(OrderMan, Info, "FifoSecurityMatcher::has_same_orders passed"); return std::nullopt; }