diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index e4a210882..dd6486662 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/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/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/queries/DefinitionCollector.cpp;cmds/spartan/md/mdp3/utils/queries/FillCounter.cpp;cmds/spartan/md/mdp3/utils/queries/IcebergFinder.cpp;cmds/spartan/md/mdp3/utils/queries/PolygonFinder.cpp;cmds/spartan/md/mdp3/utils/queries/PolygonOpportunityFinder.cpp;cmds/spartan/md/mdp3/utils/queries/SyntheticBookRecorder.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/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/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/queries/DefinitionCollector.cpp;cmds/spartan/md/mdp3/utils/queries/FillCounter.cpp;cmds/spartan/md/mdp3/utils/queries/IcebergFinder.cpp;cmds/spartan/md/mdp3/utils/queries/PolygonFinder.cpp;cmds/spartan/md/mdp3/utils/queries/PolygonOpportunityFinder.cpp;cmds/spartan/md/mdp3/utils/queries/SyntheticBookRecorder.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/matcher/FifoImpliedSecurityMatcher.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp index 89d41db9a..c5eea8289 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp @@ -5,7 +5,6 @@ #include "lib/orderman/orderman_utils/PriceComp.h" #include "server/sparkd/cmds/spartan/back_testing/matcher/fill_factory.h" #include "server/sparkd/cmds/spartan/back_testing/sim/sim_common.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/book_utils.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/order_utils.h" #include "server/sparkd/cmds/spartan/util/action_summarizer.h" diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp index 85d659d12..3f3675417 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp @@ -1,6 +1,5 @@ #include "server/sparkd/cmds/spartan/back_testing/matcher/FifoMatcherContext.h" #include "server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include "server/sparkd/cmds/spartan/md/mdp3/implied/implied_market.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/book_utils.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/order_utils.h" diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp index 5c73de5da..67662ff31 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp @@ -5,7 +5,6 @@ #include "server/sparkd/cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.h" #include "server/sparkd/cmds/spartan/back_testing/matcher/FifoSecurityMatcher.h" #include "server/sparkd/cmds/spartan/back_testing/matcher/fill_factory.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/book_utils.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/order_utils.h" #include "server/sparkd/cmds/spartan/util/action_summarizer_macros.h" diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoPriceLevelMatcher.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoPriceLevelMatcher.cpp index 04f81b2c1..c5690ac77 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoPriceLevelMatcher.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoPriceLevelMatcher.cpp @@ -1,6 +1,5 @@ #include "FifoPriceLevelMatcher.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include "server/sparkd/cmds/spartan/util/action_summarizer_macros.h" namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoSecurityMatcher.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoSecurityMatcher.cpp index 3fdaf9e01..797214d18 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoSecurityMatcher.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/FifoSecurityMatcher.cpp @@ -1,7 +1,6 @@ #include "FifoSecurityMatcher.h" #include "server/sparkd/cmds/spartan/back_testing/matcher/iceberg_helper.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/order_utils.h" #include diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/Matcher.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/Matcher.cpp index f5760146e..07563db04 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/Matcher.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/Matcher.cpp @@ -1,6 +1,5 @@ #include "Matcher.h" #include "MatchingCommon.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/book_utils.h" #include #include diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/MatchingCommon.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/MatchingCommon.cpp index eabb22956..0b578e898 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/MatchingCommon.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/MatchingCommon.cpp @@ -1,5 +1,4 @@ #include "MatchingCommon.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" namespace bts::spartan::mdp3 { std::tuple diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/iceberg_helper.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/iceberg_helper.cpp index 1389081db..c4a23fc02 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/iceberg_helper.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/iceberg_helper.cpp @@ -2,7 +2,6 @@ #include "lib/orderman/orderman_utils/Formatter.h" #include "lib/utils/map_utils.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" namespace bts::spartan::mdp3::iceberg_helper { diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/matcher_diagnostics.h b/src/server/sparkd/cmds/spartan/back_testing/matcher/matcher_diagnostics.h index 85cfd6948..507032e6d 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/matcher_diagnostics.h +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/matcher_diagnostics.h @@ -3,7 +3,6 @@ #include "lib/orderman/orderman_utils/Formatter.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include "server/sparkd/cmds/spartan/md/mdp3/gen/SecurityTradingStatus.h" #include "server/sparkd/cmds/spartan/util/action_summarizer.h" #include "server/sparkd/cmds/spartan/util/action_summarizer_macros.h" diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp index bd4b2998a..26810db69 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp @@ -7,7 +7,6 @@ #include "server/sparkd/cmds/spartan/back_testing/matcher/matcher_diagnostics.h" #include "server/sparkd/cmds/spartan/back_testing/matcher/validation/event_flags.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include "server/sparkd/cmds/spartan/md/mdp3/gen/SecurityTradingStatus.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/event_ordinal.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/mdp3_utils.h" diff --git a/src/server/sparkd/cmds/spartan/common/IcebergQuantity.cpp b/src/server/sparkd/cmds/spartan/common/IcebergQuantity.cpp new file mode 100644 index 000000000..5ea589e38 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/common/IcebergQuantity.cpp @@ -0,0 +1,2 @@ +#include "IcebergQuantity.h" + diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h b/src/server/sparkd/cmds/spartan/common/IcebergQuantity.h similarity index 76% rename from src/server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h rename to src/server/sparkd/cmds/spartan/common/IcebergQuantity.h index 37cd0d5fb..3e0245086 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h +++ b/src/server/sparkd/cmds/spartan/common/IcebergQuantity.h @@ -1,8 +1,31 @@ #pragma once -#include "mdp3_common.h" + +#include "Quantity.h" +#include +#include namespace bts::spartan::mdp3 { -#define ICEBERG_QTY_COMP_OP(op) \ + +struct IcebergQuantity { + Quantity show; + Quantity total; +}; + +inline std::ostream &operator<<(std::ostream &out, const IcebergQuantity &ibq) { + out << ibq.show << "/" << ibq.total; + return out; +} + +inline std::ostream & +operator<<(std::ostream &out, const std::optional &ibq) { + if (ibq.has_value()) + out << ibq.value(); + else + out << "n/a"; + return out; +} + +#define ICEBERG_QTY_COMP_OP(op) \ inline bool operator op( \ const IcebergQuantity &lhs, const IcebergQuantity &rhs) { \ return lhs.show op rhs.show && lhs.total op rhs.total; \ @@ -42,3 +65,4 @@ inline bool operator!=( } #undef ICEBERG_QTY_COMP_OP } // namespace bts::spartan::mdp3 + diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h b/src/server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h index 31b3b4b6f..662a91125 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h @@ -9,6 +9,7 @@ #include "server/sparkd/cmds/spartan/common/OrderKey.h" #include "server/sparkd/cmds/spartan/common/SecurityID.h" #include "server/sparkd/cmds/spartan/common/Quantity.h" +#include "server/sparkd/cmds/spartan/common/IcebergQuantity.h" #include #include @@ -100,24 +101,6 @@ inline std::ostream &operator<<(std::ostream &out, const SmallBookLevel &sbl) { return out; } -struct IcebergQuantity { - Quantity show; - Quantity total; -}; - -inline std::ostream &operator<<(std::ostream &out, const IcebergQuantity &ibq) { - out << ibq.show << "/" << ibq.total; - return out; -} - -inline std::ostream & -operator<<(std::ostream &out, const std::optional &ibq) { - if (ibq.has_value()) - out << ibq.value(); - else - out << "n/a"; - return out; -} struct MDP3Order { public: diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/implied/implied_market.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/implied/implied_market.cpp index da5af7f0b..6d6748382 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/implied/implied_market.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/implied/implied_market.cpp @@ -1,6 +1,5 @@ #include "implied_market.h" #include "lib/utils/bts_assert.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/utils/book_utils.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/utils/book_utils.cpp index 817760cb5..e42c38a1c 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/utils/book_utils.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/utils/book_utils.cpp @@ -1,5 +1,4 @@ #include "server/sparkd/cmds/spartan/md/mdp3/utils/book_utils.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include #include #include diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/utils/order_utils.h b/src/server/sparkd/cmds/spartan/md/mdp3/utils/order_utils.h index 575e7cbb5..56a93bcda 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/utils/order_utils.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/utils/order_utils.h @@ -2,7 +2,6 @@ #include "lib/md/IntPrice.h" #include "lib/orderman/orderman_utils/PriceComp.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include #include #include diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/utils/queries/IcebergFinder.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/utils/queries/IcebergFinder.cpp index acccc9fc8..9d3f6945e 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/utils/queries/IcebergFinder.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/utils/queries/IcebergFinder.cpp @@ -2,7 +2,6 @@ #include "../../common/InstrumentSnapshot.h" #include "lib/orderman/orderman_utils/Formatter.h" #include "server/sparkd/cmds/spartan/back_testing/matcher/iceberg_helper.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/mdp3_utils.h" #include "server/sparkd/cmds/spartan/util/action_summarizer.h" #include diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/utils/queries/IcebergFinder.h b/src/server/sparkd/cmds/spartan/md/mdp3/utils/queries/IcebergFinder.h index f07dd5b53..32ad24586 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/utils/queries/IcebergFinder.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/utils/queries/IcebergFinder.h @@ -2,7 +2,6 @@ #include "../../common/mdp3_common.h" #include "../../handler/IChannelObserver.h" -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.h" #include #include #include diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/utils/tests/synthetic_book_tests.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/utils/tests/synthetic_book_tests.cpp index a361d2994..aea57bf06 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/utils/tests/synthetic_book_tests.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/utils/tests/synthetic_book_tests.cpp @@ -1,4 +1,3 @@ -#include "server/sparkd/cmds/spartan/md/mdp3/common/mdp3_quantity_operators.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/util/permutation.h"