From 2a2d3eddd34cfa181e8d75e886738dae30bec553 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 24 Apr 2019 18:22:03 -0400 Subject: [PATCH] Moved lean order to refactored API. --- src/lib/CMakeDeps.cmake | 2 +- .../orderman/order_factory/OrderFactory.cpp | 5 +- .../orders/algo/algo_orders/LeanAlgo.cpp | 219 +++++++++++++++++ .../algo_orders/LeanAlgo.h} | 30 +-- .../orderman/orders/book_algos/LeanOrder.cpp | 199 ---------------- .../orderman/orders/book_algos/LeanOrder.h | 36 --- .../orderman/orders/book_algos/LeanOrder2.cpp | 223 ------------------ src/web/CMakeDeps.cmake | 2 +- 8 files changed, 240 insertions(+), 476 deletions(-) create mode 100644 src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp rename src/lib/orderman/orders/{book_algos/LeanOrder2.h => algo/algo_orders/LeanAlgo.h} (57%) delete mode 100644 src/lib/orderman/orders/book_algos/LeanOrder.cpp delete mode 100644 src/lib/orderman/orders/book_algos/LeanOrder.h delete mode 100644 src/lib/orderman/orders/book_algos/LeanOrder2.cpp diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index c67f8b04a..b77880cc0 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/LeanOrder2.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index 3e77a1d8e..821f15a11 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -18,7 +18,7 @@ #include "lib/orderman/orders/algo/algo_orders/JoinAlgo.h" #include "lib/orderman/orders/algo/algo_orders/TopAlgo.h" #include "lib/orderman/orders/algo/algo_orders/IcebergAlgo.h" -#include "lib/orderman/orders/book_algos/LeanOrder2.h" +#include "lib/orderman/orders/algo/algo_orders/LeanAlgo.h" #include "lib/orderman/orders/book_algos/OCOOrder.h" #include "lib/orderman/orders/book_algos/OffsetOrder.h" #include "lib/orderman/orders/book_algos/PricerOrder.h" @@ -161,7 +161,8 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, bts_assert(false); break; case CustomOrderDefinition::kLean: - order_ptr.reset(new orderman::LeanOrder2()); + order_ptr.reset( + new orderman::AlgoWrapperOrder(std::make_unique())); break; case CustomOrderDefinition::kJoin: order_ptr.reset( diff --git a/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp new file mode 100644 index 000000000..36ec9ef69 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp @@ -0,0 +1,219 @@ +#include "lib/orderman/orders/algo/algo_orders/LeanAlgo.h" + +#include "lib/domain_model/Security.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/orderman_utils/orderman_utils.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "lib/os/os.h" +#include "lib/utils/PBUtils.h" + +namespace bts { +namespace orderman { + +using namespace api::orderman; + +enum class LeanAlgo::Status { WAITING_FOR_MD, WORKING, DONE }; + +struct LeanAlgo::PImpl { + IAlgoServices *algo; + double tick_size = os::nan(); + Status status = Status::WAITING_FOR_MD; + Price initial_observed_price = Price(os::nan()); + Price observed_price = Price(os::nan()); + OrderKey child_key = null_order_key(); + ChildTemplate *child_template = nullptr; + Book last_book; +}; + +LeanAlgo::LeanAlgo() : me(new PImpl()) {} +LeanAlgo::~LeanAlgo() {} +IAlgoServices &LeanAlgo::algo() const { return *me->algo; } + +// initialization ///////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +OrderOpResult LeanAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { + auto &def = serv.definition(); + me->tick_size = serv.security().contract_spec().low_tick(); + bts_assert(def.has_custom_def()); + bts_assert(def.custom_def().has_lean()); + // validate that lean is properly formed + if (serv.is_attaching()) { + } else { + auto child_def = def; + *child_def.mutable_custom_def() = + def.custom_def().lean().child(); + me->child_template = &(serv.make_child_template(child_def)); + } + return {}; +} +void LeanAlgo::do_launch(IAlgoServices&algo) { + me->algo = &algo; + bts_assert(me->child_template); + me->child_key = algo.launch_child(*me->child_template, algo.price(), algo.quantity()); + algo.subscribe_book(SecurityKey(algo.definition().security_key())); +} +void LeanAlgo::do_launch_attached(IAlgoServices&algo,OrderKey k, ChildState st) { + me->algo = &algo; + me->child_key = k; + algo.subscribe_book(SecurityKey(algo.definition().security_key())); + on_child_change(k, st); +} +// updates //////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +void LeanAlgo::do_update(const api::orderman::Update &update) { + LOG(OrderMan, Diag, "LeanOrder order {} receiving update: {}", + algo().order_key().value(), utils::pb::to_string(update)); + + if (update.has_custom() && !update.custom().has_lean()) { + algo().terminate_error("Invalid update"); + return; + } + Update child_update; + child_update.set_price(update.price()); + child_update.set_quantity(update.quantity()); + if (update.has_custom()) { + auto &lean_update = update.custom().lean(); + *child_update.mutable_custom() = lean_update.child(); + } + algo().update_child(me->child_key, child_update); + + switch (me->status) { + case LeanAlgo::Status::WAITING_FOR_MD: + break; + case LeanAlgo::Status::WORKING: + _analyze_and_act(); + break; + case LeanAlgo::Status::DONE: + break; + } +} +// callbacks ////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +void LeanAlgo::on_book(SecurityKey, const Book &book) { + me->last_book = book; + switch (me->status) { + case LeanAlgo::Status::WAITING_FOR_MD: + if (_opp_inside_market().size() != 0) { + me->initial_observed_price = Price(_opp_inside_market().price()); + me->observed_price = me->initial_observed_price; + me->status = LeanAlgo::Status::WORKING; + _analyze_and_act(); + } + break; + case LeanAlgo::Status::WORKING: + _analyze_and_act(); + break; + case LeanAlgo::Status::DONE: + break; + } +} +void LeanAlgo::on_child_change(OrderKey, const ChildState &st) { + algo().update_fill_state(st.total_fills, st.last_price); + switch (st.status) { + case ChildStatus::WORKING: + // if this update had fills and qty threshold is + // ratio, should it re-evaluate ? + return; + case ChildStatus::COMPLETED: + me->status = LeanAlgo::Status::DONE; + algo().complete(); + return; + case ChildStatus::CANCELED: + me->status = LeanAlgo::Status::DONE; + algo().cancel("Unexpected child cancel"); + return; + } +} +// helpers //////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +spark::QuantityMeasure LeanAlgo::_cross_threshold() const { + return algo().definition().custom_def().lean().cross_threshold(); +} +uint32_t LeanAlgo::_max_chase_ticks() const { + return algo().definition().custom_def().lean().max_chase_ticks(); +} +api::orderman::LeanOrderDefinition::OnToward +LeanAlgo::_on_toward_behaviour() const { + return algo().definition().custom_def().lean().trade_toward_behavior(); +} +bool LeanAlgo::_book_moved_toward() const { + return securities::is_better( + _opp_side(), Price(_opp_inside_market().price()), me->observed_price); +} +bool LeanAlgo::_book_moved_away() const { + return securities::is_better(_opp_side(), me->observed_price, + Price(_opp_inside_market().price())); +} +md::PriceSize LeanAlgo::_opp_inside_market() const { + return me->last_book.side(_opp_side())[0]; +} +api::Side LeanAlgo::_opp_side() const { + return securities::other_side(algo().definition().side()); +} +void LeanAlgo::_on_toward_me() { + switch (_on_toward_behaviour()) { + case LeanOrderDefinition_OnToward_CANCEL: + LOG(OrderMan, Diag, + "Canceling LeanAlgo {} because opposite moved towards order", + algo().order_key().value()); + algo().cancel("Opposite inside market moved towards order"); + break; + case LeanOrderDefinition_OnToward_DETACH: + LOG(OrderMan, Diag, + "LeanAlgo {} is done because opposite moved towards order", + algo().order_key().value()); + algo().detach_child(me->child_key); + break; + case LeanOrderDefinition_OnToward_REPRICE: + LOG(OrderMan, Diag, + "LeanAlgo {} changing its target to {} because opposite moved " + "towards order", + algo().order_key().value(), _opp_inside_market().price()); + me->observed_price = Price(_opp_inside_market().price()); + _try_cross(); + break; + case LeanOrderDefinition_OnToward_NO_CHANGE: + LOG(OrderMan, Diag, "LeanAlgo {} ignoring opposite move towards order.", + algo().order_key().value()); + // Change of behaviour : nothing == reprice + me->observed_price = Price(_opp_inside_market().price()); + _try_cross(); + break; + default: + bts_assert(false); + break; + } +} +void LeanAlgo::_analyze_and_act() { + bts_assert(me->status == LeanAlgo::Status::WORKING); + if (_book_moved_toward()) + _on_toward_me(); + else if (_book_moved_away()) { + me->observed_price = Price(_opp_inside_market().price()); + _try_cross(); + } else + _try_cross(); +} +void LeanAlgo::_try_cross() { + md::PriceSize opp_inside = _opp_inside_market(); + Quantity trigger_quantity = SpreaderUtils::_quantity_threshold( + _cross_threshold(), Quantity(algo().quantity())); + if (opp_inside.size() != 0 && opp_inside.size() < trigger_quantity.value()) { + // cross threshold is good, check + // for chase + uint32_t diff = std::abs(securities::price_diff_to_ticks( + opp_inside.price(), me->initial_observed_price.value(), + me->tick_size)); + if (diff <= _max_chase_ticks()) { + // payup + Update child_update; + child_update.set_price(opp_inside.price()); + child_update.set_quantity(algo().quantity().value()); + algo().update_child(me->child_key, child_update); + } + } +} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/LeanOrder2.h b/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.h similarity index 57% rename from src/lib/orderman/orders/book_algos/LeanOrder2.h rename to src/lib/orderman/orders/algo/algo_orders/LeanAlgo.h index 9bc3fb950..1e38b515f 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder2.h +++ b/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.h @@ -1,28 +1,29 @@ #pragma once -#include "lib/orderman/orders/algo/AlgoOrder.h" +#include "lib/domain_model/Security.pb.h" #include "lib/md/PriceSize.h" -#include "lib/api/services/OrderService.server.pb.h" +#include "lib/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { -class LeanOrder2 : public AlgoOrder { -public: - LeanOrder2(); - ~LeanOrder2(); +class LeanAlgo : public IAlgoOrder { + public: + LeanAlgo(); + ~LeanAlgo(); -public: - OrderOpResult do_before_launch() override; - void do_launch() override; - void do_launch_attached(OrderKey, ChildState) override; + public: + OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; + void do_launch(IAlgoServices &) override; + void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; void do_update(api::orderman::Update const &) override; - void on_book(SecurityKey, Book const &) override; + void on_book(SecurityKey, Book const &) override; void on_child_change(OrderKey, ChildState const &) override; -private: + private: struct PImpl; enum class Status; + IAlgoServices &algo() const ; spark::QuantityMeasure _cross_threshold() const; uint32_t _max_chase_ticks() const; api::orderman::LeanOrderDefinition::OnToward _on_toward_behaviour() const; @@ -33,8 +34,9 @@ private: void _analyze_and_act(); void _try_cross(); void _on_toward_me(); -private: - std::unique_ptr me; + + private: + std::unique_ptr me; }; } // namespace orderman diff --git a/src/lib/orderman/orders/book_algos/LeanOrder.cpp b/src/lib/orderman/orders/book_algos/LeanOrder.cpp deleted file mode 100644 index 8411983e2..000000000 --- a/src/lib/orderman/orders/book_algos/LeanOrder.cpp +++ /dev/null @@ -1,199 +0,0 @@ -#include "LeanOrder.h" - -#include "lib/orderman/actors/order_manager/OrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/utils/PBUtils.h" -#include - -namespace bts { -namespace orderman { - -using namespace api::orderman; - -struct LeanOrder::PImpl { - PImpl() - : cross_threshold(), max_chase_ticks(0), - trade_toward_behavior(LeanOrderDefinition_OnToward_NO_CHANGE), - opposite_at_inception(), num_chases(0) {} - - spark::QuantityMeasure cross_threshold; - uint32_t max_chase_ticks; - LeanOrderDefinition_OnToward trade_toward_behavior; - - md::PriceSize opposite_at_inception; - uint32_t num_chases; -}; - -LeanOrder::LeanOrder() : me(new PImpl()) {} - -LeanOrder::~LeanOrder() {} - -void LeanOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { - initial_state.mutable_lean(); - auto const &lean_def = this_def.custom_def().lean(); - *out_child->mutable_custom_def() = lean_def.child(); - - me->cross_threshold = lean_def.cross_threshold(); - me->max_chase_ticks = lean_def.max_chase_ticks(); - me->trade_toward_behavior = lean_def.trade_toward_behavior(); -} - -void LeanOrder::payup(const md::PriceSize &, - const bts::orderman::BookUpdateEvent &book, - uint32_t cross_ticks /*= 0*/) { - double new_price = - me->opposite_at_inception.price() + tick_size() * cross_ticks; - double limit = - me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; - if (new_price <= limit) - update_child(Price(new_price), Quantity(this_state().quantity())); - else { - update_child(Price(limit), Quantity(this_state().quantity())); - // goto pass through - detach(); - return; - } - - const bts::orderman::BookSide &sellbook = - book.book.side(api::Side::SIDE_SELL); - for (const auto &i : sellbook) { - me->opposite_at_inception = i; - if (me->opposite_at_inception.price() > new_price) - break; - } - if (me->opposite_at_inception.price() <= new_price) - // goto passthrough - detach(); - me->num_chases += cross_ticks + 1; - if (me->num_chases >= me->max_chase_ticks) - // goto passthrough - detach(); - report_state(); -} - -void LeanOrder::paydown(const md::PriceSize &, - const bts::orderman::BookUpdateEvent &book, - uint32_t cross_ticks /*= 0*/) { - double new_price = - me->opposite_at_inception.price() - tick_size() * cross_ticks; - double limit = - me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; - if (new_price >= limit) - update_child(Price(new_price), Quantity(this_state().quantity())); - else { - update_child(Price(limit), Quantity(this_state().quantity())); - detach(); - return; - } - - const bts::orderman::BookSide &buybook = book.book.side(api::Side::SIDE_BUY); - for (const auto &i : buybook) { - me->opposite_at_inception = i; - if (me->opposite_at_inception.price() < new_price) - break; - } - if (me->opposite_at_inception.price() >= new_price) - detach(); - me->num_chases += cross_ticks + 1; - if (me->num_chases >= me->max_chase_ticks) - detach(); - report_state(); -} - -void LeanOrder::choose_trade_toward_behavior(const md::PriceSize &opposite) { - switch (me->trade_toward_behavior) { - case LeanOrderDefinition_OnToward_CANCEL: { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } break; - case LeanOrderDefinition_OnToward_DETACH: { - detach(); - } break; - case LeanOrderDefinition_OnToward_REPRICE: { - me->opposite_at_inception = opposite; - } break; - case LeanOrderDefinition_OnToward_NO_CHANGE: - default: - break; - } -} - -void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { - switch (this_state().status()) { - case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - if (definition().side() == api::SIDE_BUY) - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - else - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - report_state(); - } break; - case ORDER_STATUS_WORKING: { - Quantity thresh = SpreaderUtils::_quantity_threshold( - me->cross_threshold, Quantity(this_state().quantity())); - if (definition().side() == api::SIDE_BUY) { - const auto &opposite = book.book.side(api::Side::SIDE_SELL)[0]; - if (opposite.price() < me->opposite_at_inception.price()) - choose_trade_toward_behavior(opposite); - else if (opposite.price() > me->opposite_at_inception.price()) - payup(opposite, book); // you missed, payup/join - else { - if (opposite.size() <= thresh.value()) - payup(opposite, book); - } - } else { - const auto &opposite = book.book.side(api::Side::SIDE_BUY)[0]; - if (opposite.price() > me->opposite_at_inception.price()) - choose_trade_toward_behavior(opposite); - else if (opposite.price() < me->opposite_at_inception.price()) - paydown(opposite, book); - else { - if (opposite.size() <= thresh.value()) - paydown(opposite, book); - } - } - } break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } - break; - - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - break; - - case ORDER_STATUS_INACTIVE: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_DISCONNECTED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } -} - -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/LeanOrder.h b/src/lib/orderman/orders/book_algos/LeanOrder.h deleted file mode 100644 index bf9ff062c..000000000 --- a/src/lib/orderman/orders/book_algos/LeanOrder.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include "lib/orderman/orders/book_algos/BookAlgo.h" - -namespace bts { -namespace orderman { - -class OrderStateUpdateEvent; -class BookUpdateEvent; - -//LeanOrder watches for the opposite inside to trade below a certain size. -//If size goes below a threshold or the market moves away, LeanOrder Pays up once. -//The process repeats until the algo has paid up a max of N ticks from the original opposite inside order. -//If the market moves toward, the algo starts watching the new inside market and keeps going - -class LeanOrder : public BookAlgo -{ -public: - LeanOrder(); - virtual ~LeanOrder(); - -protected: - void setup_child(const api::orderman::OrderDefinition&, const PreActivationOrderServices&, - api::orderman::OrderState&, api::orderman::OrderDefinition*) override; - void on_book_update(const bts::orderman::BookUpdateEvent&) override; -private: - void payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks = 0) override; - void paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks = 0) override; - void choose_trade_toward_behavior(const md::PriceSize& opposite); - -private: - struct PImpl; - std::unique_ptr me; -}; - -}} diff --git a/src/lib/orderman/orders/book_algos/LeanOrder2.cpp b/src/lib/orderman/orders/book_algos/LeanOrder2.cpp deleted file mode 100644 index be94e67d7..000000000 --- a/src/lib/orderman/orders/book_algos/LeanOrder2.cpp +++ /dev/null @@ -1,223 +0,0 @@ -// READY TO REVIEW - -#include "LeanOrder2.h" - -#include "lib/domain_model/Security.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/utils/PBUtils.h" -#include "lib/os/os.h" - -namespace bts { -namespace orderman { - -using namespace api::orderman; - -enum class LeanOrder2::Status { WAITING_FOR_MD, WORKING, DONE }; - -struct LeanOrder2::PImpl { - double tick_size = os::nan(); - Status status = Status::WAITING_FOR_MD; - Price initial_observed_price = Price(os::nan()); - Price observed_price = Price(os::nan()); - OrderKey child_key = null_order_key(); - ChildTemplate *child_template = nullptr; - Book last_book; -}; - -LeanOrder2::LeanOrder2() : me(new PImpl()) {} -LeanOrder2::~LeanOrder2() {} - -// initialization ///////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// -OrderOpResult LeanOrder2::do_before_launch(){ - auto& def = definition(); - me->tick_size = - lookup_security(SecurityKey(def.security_key()))->contract_spec().low_tick(); - bts_assert(def.has_custom_def()); - bts_assert(def.custom_def().has_lean()); - // validate that lean is properly formed - if(is_attaching()){ - } - else { - auto child_def = definition(); - *child_def.mutable_custom_def() = - definition().custom_def().lean().child(); - me->child_template = &(make_child_template(child_def)); - } - return {}; -} -void LeanOrder2::do_launch(){ - bts_assert(me->child_template); - me->child_key = launch_child(*me->child_template, price(), quantity()); - subscribe_book(SecurityKey(definition().security_key())); -} -void LeanOrder2::do_launch_attached(OrderKey k, ChildState st){ - me->child_key = k; - subscribe_book(SecurityKey(definition().security_key())); - on_child_change(k, st); -} -// updates //////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// -void LeanOrder2::do_update(const api::orderman::Update& update){ - LOG(OrderMan, Diag, "LeanOrder order {} receiving update: {}", - order_key().value(), utils::pb::to_string(update)); - - if (update.has_custom() && !update.custom().has_lean()) { - terminate_error("Invalid update"); - return; - } - Update child_update; - child_update.set_price(update.price()); - child_update.set_quantity(update.quantity()); - if (update.has_custom()) { - auto& lean_update = update.custom().lean(); - *child_update.mutable_custom() = lean_update.child(); - } - update_child(me->child_key, child_update); - - switch (me->status){ - case LeanOrder2::Status::WAITING_FOR_MD: - break; - case LeanOrder2::Status::WORKING: - _analyze_and_act(); - break; - case LeanOrder2::Status::DONE: - break; - } -} -// callbacks ////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// -void LeanOrder2::on_book(SecurityKey, const Book& book){ - me->last_book=book; - switch (me->status){ - case LeanOrder2::Status::WAITING_FOR_MD: - if(_opp_inside_market().size()!=0){ - me->initial_observed_price=Price(_opp_inside_market().price()); - me->observed_price=me->initial_observed_price; - me->status=LeanOrder2::Status::WORKING; - _analyze_and_act(); - } - break; - case LeanOrder2::Status::WORKING: - _analyze_and_act(); - break; - case LeanOrder2::Status::DONE: - break; - } -} -void LeanOrder2::on_child_change(OrderKey, const ChildState& st){ - update_fill_state(st.total_fills, st.last_price); - switch (st.status) { - case ChildStatus::WORKING: - // if this update had fills and qty threshold is - // ratio, should it re-evaluate ? - return; - case ChildStatus::COMPLETED: - me->status=LeanOrder2::Status::DONE; - complete(); - return; - case ChildStatus::CANCELED: - me->status=LeanOrder2::Status::DONE; - cancel("Unexpected child cancel"); - return; - } -} -// helpers //////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// -spark::QuantityMeasure LeanOrder2::_cross_threshold() const { - return definition().custom_def().lean().cross_threshold(); -} -uint32_t LeanOrder2::_max_chase_ticks() const { - return definition().custom_def().lean().max_chase_ticks(); -} -api::orderman::LeanOrderDefinition::OnToward -LeanOrder2::_on_toward_behaviour() const { - return definition().custom_def().lean().trade_toward_behavior(); -} -bool LeanOrder2::_book_moved_toward() const { - return securities::is_better(_opp_side(), - Price(_opp_inside_market().price()), - me->observed_price); -} -bool LeanOrder2::_book_moved_away() const { - return securities::is_better(_opp_side(), - me->observed_price, - Price(_opp_inside_market().price())); -} -md::PriceSize LeanOrder2::_opp_inside_market() const{ - return me->last_book.side(_opp_side())[0]; -} -api::Side LeanOrder2::_opp_side() const { - return securities::other_side(definition().side()); -} -void LeanOrder2::_on_toward_me(){ - switch (_on_toward_behaviour()) { - case LeanOrderDefinition_OnToward_CANCEL: - LOG(OrderMan, Diag, - "Canceling LeanOrder2 {} because opposite moved towards order", - order_key().value()); - cancel("Opposite inside market moved towards order"); - break; - case LeanOrderDefinition_OnToward_DETACH: - LOG(OrderMan, Diag, - "LeanOrder2 {} is done because opposite moved towards order", - order_key().value()); - detach_child(me->child_key); - break; - case LeanOrderDefinition_OnToward_REPRICE: - LOG(OrderMan, Diag, - "LeanOrder2 {} changing its target to {} because opposite moved " - "towards order", - order_key().value(), _opp_inside_market().price()); - me->observed_price=Price(_opp_inside_market().price()); - _try_cross(); - break; - case LeanOrderDefinition_OnToward_NO_CHANGE: - LOG(OrderMan, Diag, "LeanOrder2 {} ignoring opposite move towards order.", - order_key().value()); - // Change of behaviour : nothing == reprice - me->observed_price=Price(_opp_inside_market().price()); - _try_cross(); - break; - default: - bts_assert(false); - break; - } -} -void LeanOrder2::_analyze_and_act(){ - bts_assert(me->status==LeanOrder2::Status::WORKING); - if (_book_moved_toward()) - _on_toward_me(); - else if (_book_moved_away()){ - me->observed_price=Price(_opp_inside_market().price()); - _try_cross(); - } - else - _try_cross(); -} -void LeanOrder2::_try_cross(){ - md::PriceSize opp_inside=_opp_inside_market(); - Quantity trigger_quantity = SpreaderUtils::_quantity_threshold( - _cross_threshold(), Quantity(quantity())); - if(opp_inside.size() != 0 && - opp_inside.size() < trigger_quantity.value()){ - // cross threshold is good, check - // for chase - uint32_t diff=std::abs( - securities::price_diff_to_ticks(opp_inside.price(), - me->initial_observed_price.value(), - me->tick_size)); - if(diff <= _max_chase_ticks()){ - // payup - Update child_update; - child_update.set_price(opp_inside.price()); - child_update.set_quantity(quantity().value()); - update_child(me->child_key, child_update); - } - } -} -} // namespace orderman -} // namespace bts diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index db1475407..a717036b4 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file