From 125fe90aafade63e22ff36df168138ca5bcd763c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 31 Dec 2020 16:56:47 -0500 Subject: [PATCH] Refactored instrument definition. --- src/server/sparkd/CMakeDeps.cmake | 2 +- .../back_testing/algos/PolyObserver.cpp | 2 +- .../back_testing/algos/SniperModel.cpp | 2 +- .../cmds/spartan/back_testing/sim/ISim.h | 2 +- .../cmds/spartan/back_testing/sim/Sim.h | 2 +- .../spartan/back_testing/sim/pandl/PandL.cpp | 2 +- .../spartan/back_testing/sim/pandl/PandL.h | 2 +- .../back_testing/sim/pcap/PCapEventSource.h | 4 +- .../mdp3 => }/common/InstrumentDefinition.cc | 47 ++++++++++++++++++- .../mdp3 => }/common/InstrumentDefinition.cpp | 8 ---- .../mdp3 => }/common/InstrumentDefinition.h | 32 +++++++++---- .../{md/mdp3 => }/common/InstrumentMap.h | 2 +- .../channel_observers/DefinitionCollector.h | 2 +- .../md/mdp3/common/InstrumentSnapshot.h | 2 +- .../md/mdp3/recovery/DefinitionSnapshot.h | 2 +- .../spartan/md/mdp3/utils/polygon_utils.cpp | 2 +- .../spartan/md/mdp3/utils/polygon_utils.h | 2 +- 17 files changed, 83 insertions(+), 34 deletions(-) rename src/server/sparkd/cmds/spartan/{md/mdp3 => }/common/InstrumentDefinition.cc (51%) rename src/server/sparkd/cmds/spartan/{md/mdp3 => }/common/InstrumentDefinition.cpp (94%) rename src/server/sparkd/cmds/spartan/{md/mdp3 => }/common/InstrumentDefinition.h (67%) rename src/server/sparkd/cmds/spartan/{md/mdp3 => }/common/InstrumentMap.h (85%) diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 08b850095..8246b25cd 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/tas/RunTAS.cpp;cmds/spartan/algo/tas/TASOrderReactor.cpp;cmds/spartan/algo/tas/TASTriggerDef.cpp;cmds/spartan/back_testing/algos/PolyObserver.cpp;cmds/spartan/back_testing/algos/SniperModel.cpp;cmds/spartan/back_testing/algos/spreader/SimOrderGateway.cpp;cmds/spartan/back_testing/algos/spreader/SimSpreader.cpp;cmds/spartan/back_testing/algos/spreader/tests/sim_spreader_tests.cpp;cmds/spartan/back_testing/db/SimDB.cpp;cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp;cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoPriceLevelMatcher.cpp;cmds/spartan/back_testing/matcher/FifoSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/Matcher.cpp;cmds/spartan/back_testing/matcher/MatchingCommon.cpp;cmds/spartan/back_testing/matcher/fill_depot.cpp;cmds/spartan/back_testing/matcher/iceberg_helper.cpp;cmds/spartan/back_testing/matcher/tests/matcher_tests.cpp;cmds/spartan/back_testing/matcher/validation/iceberg_file_cache.cpp;cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp;cmds/spartan/back_testing/run/SimSessionOptions.proto;cmds/spartan/back_testing/run/run_sim.cpp;cmds/spartan/back_testing/sim/ISim.cpp;cmds/spartan/back_testing/sim/Sim.cpp;cmds/spartan/back_testing/sim/pandl/PandL.cpp;cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp;cmds/spartan/back_testing/sim/pcap/PCapEventSource.cpp;cmds/spartan/back_testing/sim/spark_bridge/AlgoServicesBridge.cpp;cmds/spartan/back_testing/sim/spark_bridge/BeforeLaunchBridge.cpp;cmds/spartan/common/IcebergQuantity.cpp;cmds/spartan/common/OrderKey.cpp;cmds/spartan/common/Quantity.cpp;cmds/spartan/common/SecurityID.cpp;cmds/spartan/common/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/md/mdp3/channel_observers/DefinitionCollector.cpp;cmds/spartan/md/mdp3/channel_observers/FillCounter.cpp;cmds/spartan/md/mdp3/channel_observers/IcebergFinder.cpp;cmds/spartan/md/mdp3/channel_observers/PolygonFinder.cpp;cmds/spartan/md/mdp3/channel_observers/PolygonOpportunityFinder.cpp;cmds/spartan/md/mdp3/channel_observers/SyntheticBookRecorder.cpp;cmds/spartan/md/mdp3/common/InstrumentDefinition.cpp;cmds/spartan/md/mdp3/common/InstrumentSnapshot.cpp;cmds/spartan/md/mdp3/common/mdp3_common.cpp;cmds/spartan/md/mdp3/common/tests/book_merging_tests.cpp;cmds/spartan/md/mdp3/feed_control/IFeedController.cpp;cmds/spartan/md/mdp3/handler/ChannelHandler.cpp;cmds/spartan/md/mdp3/implied/implied_market.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/book_utils.cpp;cmds/spartan/md/mdp3/utils/mdp3_utils.cpp;cmds/spartan/md/mdp3/utils/order_utils.cpp;cmds/spartan/md/mdp3/utils/polygon_utils.cpp;cmds/spartan/md/mdp3/utils/security_comp.cpp;cmds/spartan/md/mdp3/utils/security_parser.cpp;cmds/spartan/md/mdp3/utils/tests/synthetic_book_tests.cpp;cmds/spartan/md/mdp3/utils/tests/test_polygon_finder.cpp;cmds/spartan/util/MCastReceiver.cpp;cmds/spartan/util/PCapReader.cpp;cmds/spartan/util/SecurityDB.cpp;cmds/spartan/util/action_summarizer.cpp;cmds/spartan/util/args_parser.cpp;cmds/spartan/util/sql/adapters/polygon_defs.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/TradeSummarySignalDispatcher.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/tas/RunTAS.cpp;cmds/spartan/algo/tas/TASOrderReactor.cpp;cmds/spartan/algo/tas/TASTriggerDef.cpp;cmds/spartan/back_testing/algos/PolyObserver.cpp;cmds/spartan/back_testing/algos/SniperModel.cpp;cmds/spartan/back_testing/algos/spreader/SimOrderGateway.cpp;cmds/spartan/back_testing/algos/spreader/SimSpreader.cpp;cmds/spartan/back_testing/algos/spreader/tests/sim_spreader_tests.cpp;cmds/spartan/back_testing/db/SimDB.cpp;cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp;cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoPriceLevelMatcher.cpp;cmds/spartan/back_testing/matcher/FifoSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/Matcher.cpp;cmds/spartan/back_testing/matcher/MatchingCommon.cpp;cmds/spartan/back_testing/matcher/fill_depot.cpp;cmds/spartan/back_testing/matcher/iceberg_helper.cpp;cmds/spartan/back_testing/matcher/tests/matcher_tests.cpp;cmds/spartan/back_testing/matcher/validation/iceberg_file_cache.cpp;cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp;cmds/spartan/back_testing/run/SimSessionOptions.proto;cmds/spartan/back_testing/run/run_sim.cpp;cmds/spartan/back_testing/sim/ISim.cpp;cmds/spartan/back_testing/sim/Sim.cpp;cmds/spartan/back_testing/sim/pandl/PandL.cpp;cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp;cmds/spartan/back_testing/sim/pcap/PCapEventSource.cpp;cmds/spartan/back_testing/sim/spark_bridge/AlgoServicesBridge.cpp;cmds/spartan/back_testing/sim/spark_bridge/BeforeLaunchBridge.cpp;cmds/spartan/common/IcebergQuantity.cpp;cmds/spartan/common/InstrumentDefinition.cpp;cmds/spartan/common/OrderKey.cpp;cmds/spartan/common/Quantity.cpp;cmds/spartan/common/SecurityID.cpp;cmds/spartan/common/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/md/mdp3/channel_observers/DefinitionCollector.cpp;cmds/spartan/md/mdp3/channel_observers/FillCounter.cpp;cmds/spartan/md/mdp3/channel_observers/IcebergFinder.cpp;cmds/spartan/md/mdp3/channel_observers/PolygonFinder.cpp;cmds/spartan/md/mdp3/channel_observers/PolygonOpportunityFinder.cpp;cmds/spartan/md/mdp3/channel_observers/SyntheticBookRecorder.cpp;cmds/spartan/md/mdp3/common/InstrumentSnapshot.cpp;cmds/spartan/md/mdp3/common/mdp3_common.cpp;cmds/spartan/md/mdp3/common/tests/book_merging_tests.cpp;cmds/spartan/md/mdp3/feed_control/IFeedController.cpp;cmds/spartan/md/mdp3/handler/ChannelHandler.cpp;cmds/spartan/md/mdp3/implied/implied_market.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/book_utils.cpp;cmds/spartan/md/mdp3/utils/mdp3_utils.cpp;cmds/spartan/md/mdp3/utils/order_utils.cpp;cmds/spartan/md/mdp3/utils/polygon_utils.cpp;cmds/spartan/md/mdp3/utils/security_comp.cpp;cmds/spartan/md/mdp3/utils/security_parser.cpp;cmds/spartan/md/mdp3/utils/tests/synthetic_book_tests.cpp;cmds/spartan/md/mdp3/utils/tests/test_polygon_finder.cpp;cmds/spartan/util/MCastReceiver.cpp;cmds/spartan/util/PCapReader.cpp;cmds/spartan/util/SecurityDB.cpp;cmds/spartan/util/action_summarizer.cpp;cmds/spartan/util/args_parser.cpp;cmds/spartan/util/sql/adapters/polygon_defs.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/TradeSummarySignalDispatcher.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/back_testing/algos/PolyObserver.cpp b/src/server/sparkd/cmds/spartan/back_testing/algos/PolyObserver.cpp index b1bd68bf1..362176736 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/algos/PolyObserver.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/algos/PolyObserver.cpp @@ -2,8 +2,8 @@ #include "server/sparkd/cmds/spartan/back_testing/sim/ISim.h" #include "server/sparkd/cmds/spartan/back_testing/sim/sim_common.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.h" +#include "server/sparkd/cmds/spartan/common/InstrumentDefinition.h" namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp b/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp index 51f19abd6..00fe2899a 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp @@ -3,10 +3,10 @@ #include "server/sparkd/cmds/spartan/back_testing/sim/ISim.h" #include "server/sparkd/cmds/spartan/back_testing/sim/pandl/PandL.h" #include "server/sparkd/cmds/spartan/back_testing/sim/sim_common.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/book_utils.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/mdp3_utils.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.h" +#include "server/sparkd/cmds/spartan/common/InstrumentDefinition.h" #include #include diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/ISim.h b/src/server/sparkd/cmds/spartan/back_testing/sim/ISim.h index b69733df1..45ab635a2 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/ISim.h +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/ISim.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentMap.h" +#include "server/sparkd/cmds/spartan/common/InstrumentMap.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.h" diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.h b/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.h index 0bfe76888..2385e47ca 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.h +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.h @@ -3,8 +3,8 @@ #include "server/sparkd/cmds/spartan/back_testing/db/SimLogger.h" #include "server/sparkd/cmds/spartan/back_testing/sim/ISim.h" #include "server/sparkd/cmds/spartan/back_testing/sim/pandl/PandLSummary.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentMap.h" #include "server/sparkd/cmds/spartan/md/mdp3/channel_observers/IcebergFinder.h" +#include "server/sparkd/cmds/spartan/common/InstrumentMap.h" namespace bts::spartan::mdp3 { struct EventHeader; diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/pandl/PandL.cpp b/src/server/sparkd/cmds/spartan/back_testing/sim/pandl/PandL.cpp index a75e6ecc0..c2df5a7bb 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/pandl/PandL.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/pandl/PandL.cpp @@ -1,6 +1,6 @@ #include "PandL.h" #include "server/sparkd/cmds/spartan/back_testing/sim/sim_common.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h" +#include "server/sparkd/cmds/spartan/common/InstrumentDefinition.h" namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/pandl/PandL.h b/src/server/sparkd/cmds/spartan/back_testing/sim/pandl/PandL.h index 87faff3cb..cea487662 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/pandl/PandL.h +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/pandl/PandL.h @@ -1,7 +1,7 @@ #pragma once #include "lib/os/os.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentMap.h" +#include "server/sparkd/cmds/spartan/common/InstrumentMap.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h" #include diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.h b/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.h index d89ecc8ea..97bc4ec92 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.h +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.h @@ -6,11 +6,11 @@ #include #include "server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentMap.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.h" #include "server/sparkd/cmds/spartan/md/mdp3/channel_observers/IcebergFinder.h" +#include "server/sparkd/cmds/spartan/common/InstrumentDefinition.h" +#include "server/sparkd/cmds/spartan/common/InstrumentMap.h" namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.cc b/src/server/sparkd/cmds/spartan/common/InstrumentDefinition.cc similarity index 51% rename from src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.cc rename to src/server/sparkd/cmds/spartan/common/InstrumentDefinition.cc index 0e10feb0b..53499da3d 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.cc +++ b/src/server/sparkd/cmds/spartan/common/InstrumentDefinition.cc @@ -45,6 +45,49 @@ inline std::string const &InstrumentDefinition::cme_security_type() const { inline std::optional InstrumentDefinition::expiration() const { return expiration_; } -inline LegVec const &InstrumentDefinition::legs() const { - return legs_; +inline LegVec const &InstrumentDefinition::legs() const { return legs_; } +inline double InstrumentDefinition::to_display(md::IntPrice const &p) const { + return p.price() * display_factor(); +} +inline double InstrumentDefinition::to_display(double p) const { + return p * display_factor(); +} +inline void InstrumentDefinition::set_security_id(SecurityID sid) { + security_id_ = sid; +} +inline void InstrumentDefinition::set_symbol(std::string const &s) { + symbol_ = s; +} +inline void InstrumentDefinition::set_security_group(std::string const &group) { + security_group_ = group; +} +inline void InstrumentDefinition::set_asset(std::string const &asset) { + asset_ = asset; +} +inline void InstrumentDefinition::set_expiration(TimeStamp ts) { + expiration_ = ts; +} +inline void +InstrumentDefinition::set_match_algorithm(std::string const &malgo) { + match_algorithm_ = malgo; +} +inline void InstrumentDefinition::set_display_factor(double df) { + display_factor_ = df; +} +inline void +InstrumentDefinition::set_min_price_increment_int_price(md::IntPrice p) { + min_price_increment_ = p; +} +inline void InstrumentDefinition::set_implied_matching(bool b) { + implied_matching_ = b; +} +inline void InstrumentDefinition::set_cash_per_point(double d) { + cash_per_point_ = d; +} +inline void InstrumentDefinition::set_security_type(api::SecurityType st) { + security_type_ = st; +} +inline void InstrumentDefinition::set_legs(LegVec const &l) { + bts_assert(security_type_ == api::SECURITYTYPE_SPREAD); + legs_ = l; } diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.cpp b/src/server/sparkd/cmds/spartan/common/InstrumentDefinition.cpp similarity index 94% rename from src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.cpp rename to src/server/sparkd/cmds/spartan/common/InstrumentDefinition.cpp index fe2c74ffe..f40f38562 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.cpp +++ b/src/server/sparkd/cmds/spartan/common/InstrumentDefinition.cpp @@ -96,12 +96,4 @@ InstrumentDefinition::InstrumentDefinition( }); } -double InstrumentDefinition::to_display(md::IntPrice const &p) const { - return p.price() * display_factor(); -} - -double InstrumentDefinition::to_display(double p) const { - return p * display_factor(); -} - } // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h b/src/server/sparkd/cmds/spartan/common/InstrumentDefinition.h similarity index 67% rename from src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h rename to src/server/sparkd/cmds/spartan/common/InstrumentDefinition.h index 957bde97d..c330999b2 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h +++ b/src/server/sparkd/cmds/spartan/common/InstrumentDefinition.h @@ -1,9 +1,9 @@ #pragma once -#include "../common/mdp3_common.h" -#include "../gen/MDInstrumentDefinitionFuture54.h" -#include "../gen/MDInstrumentDefinitionOption55.h" -#include "../gen/MDInstrumentDefinitionSpread56.h" +#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h" +#include "server/sparkd/cmds/spartan/md/mdp3/gen/MDInstrumentDefinitionFuture54.h" +#include "server/sparkd/cmds/spartan/md/mdp3/gen/MDInstrumentDefinitionOption55.h" +#include "server/sparkd/cmds/spartan/md/mdp3/gen/MDInstrumentDefinitionSpread56.h" #include #include @@ -15,18 +15,21 @@ struct LegDef { api::Side side; Quantity ratio; }; + using LegVec = boost::container::small_vector; +class InstrumentDefinition; +using MaybeInstrumentDefinition = std::optional; class InstrumentDefinition { public: InstrumentDefinition(::mdp3::MDInstrumentDefinitionFuture54); InstrumentDefinition(::mdp3::MDInstrumentDefinitionOption55); InstrumentDefinition(::mdp3::MDInstrumentDefinitionSpread56); - InstrumentDefinition() = default; InstrumentDefinition(InstrumentDefinition const &d) = default; InstrumentDefinition &operator=(InstrumentDefinition const &other) = default; - + + // Queries ------------------------------------------------------------ SecurityID security_id() const; std::string const &symbol() const; std::string const &security_group() const; @@ -42,12 +45,25 @@ class InstrumentDefinition { api::SecurityType security_type() const; std::string const &cme_security_type() const; LegVec const& legs() const; - double to_cash(md::IntPrice const &p) const; double to_cash(double p) const; double to_display(md::IntPrice const &p) const; double to_display(double p) const; + // Mutators ------------------------------------------------------------ + void set_security_id(SecurityID) ; + void set_symbol(std::string const&) ; + void set_security_group(std::string const&) ; + void set_asset(std::string const &) ; + void set_expiration(TimeStamp) ; + void set_match_algorithm(std::string const&) ; + void set_display_factor(double); + void set_min_price_increment_int_price(md::IntPrice ); + void set_implied_matching(bool) ; + void set_cash_per_point(double) ; + void set_security_type(api::SecurityType) ; + void set_legs(LegVec const&); + private: SecurityID security_id_; double display_factor_; @@ -69,6 +85,4 @@ class InstrumentDefinition { #include "InstrumentDefinition.cc" -using MaybeInstrumentDefinition = std::optional; - } // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentMap.h b/src/server/sparkd/cmds/spartan/common/InstrumentMap.h similarity index 85% rename from src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentMap.h rename to src/server/sparkd/cmds/spartan/common/InstrumentMap.h index d7e540766..8c2981849 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentMap.h +++ b/src/server/sparkd/cmds/spartan/common/InstrumentMap.h @@ -1,6 +1,6 @@ #pragma once -#include "mdp3_common.h" +#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h" #include namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/channel_observers/DefinitionCollector.h b/src/server/sparkd/cmds/spartan/md/mdp3/channel_observers/DefinitionCollector.h index 85c0af4c5..c529e23ff 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/channel_observers/DefinitionCollector.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/channel_observers/DefinitionCollector.h @@ -2,7 +2,7 @@ #include "server/sparkd/cmds/spartan/md/mdp3/handler/IChannelObserver.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h" +#include "server/sparkd/cmds/spartan/common/InstrumentDefinition.h" namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h b/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h index cb101a463..6ba4b40e4 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h @@ -1,6 +1,6 @@ #pragma once -#include "InstrumentDefinition.h" +#include "server/sparkd/cmds/spartan/common/InstrumentDefinition.h" #include "mdp3_common.h" #include "lib/domain_model/Security.pb.h" diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/recovery/DefinitionSnapshot.h b/src/server/sparkd/cmds/spartan/md/mdp3/recovery/DefinitionSnapshot.h index 8c929a70e..07c858f6d 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/recovery/DefinitionSnapshot.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/recovery/DefinitionSnapshot.h @@ -1,6 +1,6 @@ #pragma once -#include "../common/InstrumentDefinition.h" +#include "server/sparkd/cmds/spartan/common/InstrumentDefinition.h" #include #include diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.cpp index af096a6ef..580916440 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.cpp @@ -1,5 +1,5 @@ #include "polygon_utils.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h" +#include "server/sparkd/cmds/spartan/common/InstrumentDefinition.h" #include namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.h b/src/server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.h index a837326be..efd616d2b 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.h @@ -1,7 +1,7 @@ #pragma once #include "../common/mdp3_common.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentMap.h" +#include "server/sparkd/cmds/spartan/common/InstrumentMap.h" #include #include