From a330ecf24dabed409ed9b8dea360e63baa3e5bb6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 4 Sep 2020 10:34:19 -0400 Subject: [PATCH] Skipped icebergs in FIFO validation. --- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/Spartan.cpp | 23 +++++++++++++++---- .../mdp3/back_testing/FifoSecurityMatcher.cpp | 2 +- .../spartan/md/mdp3/back_testing/SimAlgo.cpp | 1 + .../back_testing/{SpartanAlgo.h => SimAlgo.h} | 2 +- .../md/mdp3/back_testing/SpartanAlgo.cpp | 1 - 6 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SimAlgo.cpp rename src/server/sparkd/cmds/spartan/md/mdp3/back_testing/{SpartanAlgo.h => SimAlgo.h} (97%) delete mode 100644 src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SpartanAlgo.cpp diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 8ef113bea..5a665c859 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CMECertCmd.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/ParseHistoricalFIX.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/Span.cpp;cmds/Spartan.cpp;cmds/Test.cpp;cmds/Web.cpp;cmds/spartan/algo/RunTAS.cpp;cmds/spartan/algo/TASOrderReactor.cpp;cmds/spartan/algo/TASTriggerDef.cpp;cmds/spartan/md/mdp3/back_testing/FifoPriceLevelMatcher.cpp;cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp;cmds/spartan/md/mdp3/back_testing/SpartanAlgo.cpp;cmds/spartan/md/mdp3/common/InstrumentSnapshot.cpp;cmds/spartan/md/mdp3/feed_control/IFeedController.cpp;cmds/spartan/md/mdp3/handler/ChannelHandler.cpp;cmds/spartan/md/mdp3/parsing/MDP3MsgBox.cpp;cmds/spartan/md/mdp3/realtime/RealTimeHandler.cpp;cmds/spartan/md/mdp3/recovery/BookSnapshot.cpp;cmds/spartan/md/mdp3/recovery/DefinitionSnapshot.cpp;cmds/spartan/md/mdp3/recovery/IncrementalQueue.cpp;cmds/spartan/md/mdp3/recovery/RecoveryHandler.cpp;cmds/spartan/md/mdp3/tests/spartan_md_tests.cpp;cmds/spartan/md/mdp3/utils/mdp3_utils.cpp;cmds/spartan/util/MCastReceiver.cpp;cmds/spartan/util/PCapReader.cpp;cmds/spartan/util/SecurityDB.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/MultipartFormDecoder.cpp;http/WebServer.cpp;http/tests/MultiPartFormTests.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/import/BasePositionServiceServer.cpp;position/import/DownloadCommonStateMachine.cpp;position/import/DownloadWindow.cpp;position/import/MoneyFileServiceServer.cpp;position/import/parsing/gmi_parser.cpp;position/import/parsing/money_parser.cpp;position/import/parsing/parser_common.cpp;position/tests/PositionTests.cpp;position/tests/position_tests_internal.cpp;subprocess/SubProcessRunner.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceDB.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CMECertCmd.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/ParseHistoricalFIX.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/Span.cpp;cmds/Spartan.cpp;cmds/Test.cpp;cmds/Web.cpp;cmds/spartan/algo/RunTAS.cpp;cmds/spartan/algo/TASOrderReactor.cpp;cmds/spartan/algo/TASTriggerDef.cpp;cmds/spartan/md/mdp3/back_testing/FifoPriceLevelMatcher.cpp;cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp;cmds/spartan/md/mdp3/back_testing/SimAlgo.cpp;cmds/spartan/md/mdp3/common/InstrumentSnapshot.cpp;cmds/spartan/md/mdp3/feed_control/IFeedController.cpp;cmds/spartan/md/mdp3/handler/ChannelHandler.cpp;cmds/spartan/md/mdp3/parsing/MDP3MsgBox.cpp;cmds/spartan/md/mdp3/realtime/RealTimeHandler.cpp;cmds/spartan/md/mdp3/recovery/BookSnapshot.cpp;cmds/spartan/md/mdp3/recovery/DefinitionSnapshot.cpp;cmds/spartan/md/mdp3/recovery/IncrementalQueue.cpp;cmds/spartan/md/mdp3/recovery/RecoveryHandler.cpp;cmds/spartan/md/mdp3/tests/spartan_md_tests.cpp;cmds/spartan/md/mdp3/utils/mdp3_utils.cpp;cmds/spartan/util/MCastReceiver.cpp;cmds/spartan/util/PCapReader.cpp;cmds/spartan/util/SecurityDB.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/MultipartFormDecoder.cpp;http/WebServer.cpp;http/tests/MultiPartFormTests.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/import/BasePositionServiceServer.cpp;position/import/DownloadCommonStateMachine.cpp;position/import/DownloadWindow.cpp;position/import/MoneyFileServiceServer.cpp;position/import/parsing/gmi_parser.cpp;position/import/parsing/money_parser.cpp;position/import/parsing/parser_common.cpp;position/tests/PositionTests.cpp;position/tests/position_tests_internal.cpp;subprocess/SubProcessRunner.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceDB.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/Spartan.cpp b/src/server/sparkd/cmds/Spartan.cpp index 9fd952e59..acbddc4f2 100644 --- a/src/server/sparkd/cmds/Spartan.cpp +++ b/src/server/sparkd/cmds/Spartan.cpp @@ -54,17 +54,30 @@ std::map const &)>> orders.emplace(s->security_id(), s->orders()).first; } auto &old_orders = it->second; - auto deduced = s->deduced_order_changes(); + + // We have a hard time simulating icebergs, + // for now skip them + auto found_ice = false; + for (auto &f : s->fills()) + if (icebergs.count(f.key)) { + found_ice = true; + break; + } + if (found_ice) + continue; + if (deduced.size()) { + // We have deduced orders, lets see what the matcher // says add_iceberg_annotation(deduced); + FifoSecurityMatcher matcher(old_orders); - for (auto &o : deduced) - matcher.on_order_change(o); auto current_orders = s->orders(); add_iceberg_annotation(current_orders); + for (auto &o : deduced) + matcher.on_order_change(o); auto error = matcher.has_same_orders(current_orders); if (error) { std::cout @@ -72,7 +85,9 @@ std::map const &)>> << std::endl << "Error: " << error.value() << std::endl << "Deduced orders:\n" << deduced << std::endl - << "Old Orders:\n" << old_orders << std::endl; + << "Old Orders:\n" << old_orders << std::endl + << "Order Changes:\n" << s->order_changes() << std::endl + << "Fills:\n" << s->fills() << std::endl; bts_assert(false); } old_orders = current_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 86061f51e..72b6f8e2e 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 @@ -245,7 +245,7 @@ FifoSecurityMatcher::has_same_orders(const Orders &ord_map) { if (!match) { std::ostringstream buff; if (ord == nullptr) - buff << "Order with Key:" << exp_ord.key.value() << " not found"; + buff << "Order with Key: " << exp_ord.key.value() << " not found"; else { buff << "Order with Key:" << exp_ord.key.value() << " does not match" << std::endl; diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SimAlgo.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SimAlgo.cpp new file mode 100644 index 000000000..b5e661685 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SimAlgo.cpp @@ -0,0 +1 @@ +#include "SimAlgo.h" diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SpartanAlgo.h b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SimAlgo.h similarity index 97% rename from src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SpartanAlgo.h rename to src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SimAlgo.h index 633989f61..01898f2ae 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SpartanAlgo.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SimAlgo.h @@ -6,7 +6,7 @@ namespace bts::spartan::mdp3 { -class SpartanAlgo { +class SimAlgo { public: // All securities InstrumentDefinitions const &instruments() const; diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SpartanAlgo.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SpartanAlgo.cpp deleted file mode 100644 index 762c92480..000000000 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/SpartanAlgo.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "SpartanAlgo.h"