diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 2b9e4ec4f..fe14c5d81 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/CMECert.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.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/Web.cpp;cmds/spartan/algoman/IAlgo.cpp;cmds/spartan/algoman/IAlgoExecutionServices.cpp;cmds/spartan/algoman/IAlgoSetupServices.cpp;cmds/spartan/algoman/algos/tas/RunTAS.cpp;cmds/spartan/algoman/algos/tas/TASOrderReactor.cpp;cmds/spartan/algoman/algos/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/pcap/PCapOrderChangeBootstrapper.cpp;cmds/spartan/back_testing/sim/spark_bridge/AlgoServicesBridge.cpp;cmds/spartan/back_testing/sim/spark_bridge/BeforeLaunchBridge.cpp;cmds/spartan/cmds/BookStats.cpp;cmds/spartan/cmds/CSV.cpp;cmds/spartan/cmds/Compress.cpp;cmds/spartan/cmds/FindPolys.cpp;cmds/spartan/cmds/Icebergs.cpp;cmds/spartan/cmds/Json.cpp;cmds/spartan/cmds/ListSec.cpp;cmds/spartan/cmds/PolygonBooks.cpp;cmds/spartan/cmds/SQL.cpp;cmds/spartan/cmds/Sim.cpp;cmds/spartan/cmds/SimBooks.cpp;cmds/spartan/cmds/Stats.cpp;cmds/spartan/cmds/ValidateFifo.cpp;cmds/spartan/cmds/ValuePolys.cpp;cmds/spartan/common/EndPoint.cpp;cmds/spartan/common/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/domain/IcebergQuantity.cpp;cmds/spartan/domain/OrderKey.cpp;cmds/spartan/domain/Price.cpp;cmds/spartan/domain/Quantity.cpp;cmds/spartan/domain/SecurityCriteria.cpp;cmds/spartan/domain/SecurityDefinition.cpp;cmds/spartan/domain/SecurityID.cpp;cmds/spartan/domain/SecuritySnapshot.cpp;cmds/spartan/domain/TradeSummarySignal.cpp;cmds/spartan/domain/book/BookLevel.cpp;cmds/spartan/market_data/common/MDP3Event.cpp;cmds/spartan/market_data/common/mdp3_common.cpp;cmds/spartan/market_data/common/tests/book_merging_tests.cpp;cmds/spartan/market_data/feed_control/IFeedController.cpp;cmds/spartan/market_data/feed_observers/BookStatRecorder.cpp;cmds/spartan/market_data/feed_observers/DefinitionCollector.cpp;cmds/spartan/market_data/feed_observers/FillCounter.cpp;cmds/spartan/market_data/feed_observers/IcebergFinder.cpp;cmds/spartan/market_data/feed_observers/PolygonFinder.cpp;cmds/spartan/market_data/feed_observers/PolygonOpportunityFinder.cpp;cmds/spartan/market_data/feed_observers/SyntheticBookRecorder.cpp;cmds/spartan/market_data/feed_observers/recorders/MatcherBookRecorder.cpp;cmds/spartan/market_data/handler/MDP3FeedHandler.cpp;cmds/spartan/market_data/handler/ReactorMDP3FeedHandler.cpp;cmds/spartan/market_data/implied/implied_market.cpp;cmds/spartan/market_data/parsing/MDP3MsgBox.cpp;cmds/spartan/market_data/parsing/MDP3Parser.cpp;cmds/spartan/market_data/realtime/RealTimeHandler.cpp;cmds/spartan/market_data/recovery/BookSnapshot.cpp;cmds/spartan/market_data/recovery/DefinitionSnapshot.cpp;cmds/spartan/market_data/recovery/IncrementalQueue.cpp;cmds/spartan/market_data/recovery/RecoveryHandler.cpp;cmds/spartan/market_data/tests/spartan_md_tests.cpp;cmds/spartan/market_data/utils/book_utils.cpp;cmds/spartan/market_data/utils/mdp3_utils.cpp;cmds/spartan/market_data/utils/order_utils.cpp;cmds/spartan/market_data/utils/polygon_utils.cpp;cmds/spartan/market_data/utils/security_comp.cpp;cmds/spartan/market_data/utils/security_parser.cpp;cmds/spartan/market_data/utils/tests/synthetic_book_tests.cpp;cmds/spartan/market_data/utils/tests/test_polygon_finder.cpp;cmds/spartan/order_execution/gateway/IL3Gateway.cpp;cmds/spartan/order_execution/gateway/states/IL3InitHandler.cpp;cmds/spartan/order_execution/parsing/IL3Parser.cpp;cmds/spartan/system/PCapReader.cpp;cmds/spartan/system/reactor/Reactor.cpp;cmds/spartan/system/sbe/SBEParser.cpp;cmds/spartan/util/action_summarizer.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/CMECert.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.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/Web.cpp;cmds/spartan/algoman/IAlgo.cpp;cmds/spartan/algoman/IAlgoExecutionServices.cpp;cmds/spartan/algoman/IAlgoSetupServices.cpp;cmds/spartan/algoman/algos/tas/RunTAS.cpp;cmds/spartan/algoman/algos/tas/TASOrderReactor.cpp;cmds/spartan/algoman/algos/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/pcap/PCapOrderChangeBootstrapper.cpp;cmds/spartan/back_testing/sim/spark_bridge/AlgoServicesBridge.cpp;cmds/spartan/back_testing/sim/spark_bridge/BeforeLaunchBridge.cpp;cmds/spartan/cmds/BookStats.cpp;cmds/spartan/cmds/CSV.cpp;cmds/spartan/cmds/Compress.cpp;cmds/spartan/cmds/FindPolys.cpp;cmds/spartan/cmds/Icebergs.cpp;cmds/spartan/cmds/Json.cpp;cmds/spartan/cmds/ListSec.cpp;cmds/spartan/cmds/PolygonBooks.cpp;cmds/spartan/cmds/SQL.cpp;cmds/spartan/cmds/Sim.cpp;cmds/spartan/cmds/SimBooks.cpp;cmds/spartan/cmds/Stats.cpp;cmds/spartan/cmds/Test.cpp;cmds/spartan/cmds/ValidateFifo.cpp;cmds/spartan/cmds/ValuePolys.cpp;cmds/spartan/common/EndPoint.cpp;cmds/spartan/common/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/domain/IcebergQuantity.cpp;cmds/spartan/domain/OrderKey.cpp;cmds/spartan/domain/Price.cpp;cmds/spartan/domain/Quantity.cpp;cmds/spartan/domain/SecurityCriteria.cpp;cmds/spartan/domain/SecurityDefinition.cpp;cmds/spartan/domain/SecurityID.cpp;cmds/spartan/domain/SecuritySnapshot.cpp;cmds/spartan/domain/TradeSummarySignal.cpp;cmds/spartan/domain/book/BookLevel.cpp;cmds/spartan/market_data/common/MDP3Event.cpp;cmds/spartan/market_data/common/mdp3_common.cpp;cmds/spartan/market_data/common/tests/book_merging_tests.cpp;cmds/spartan/market_data/feed_control/IFeedController.cpp;cmds/spartan/market_data/feed_observers/BookStatRecorder.cpp;cmds/spartan/market_data/feed_observers/DefinitionCollector.cpp;cmds/spartan/market_data/feed_observers/FillCounter.cpp;cmds/spartan/market_data/feed_observers/IcebergFinder.cpp;cmds/spartan/market_data/feed_observers/PolygonFinder.cpp;cmds/spartan/market_data/feed_observers/PolygonOpportunityFinder.cpp;cmds/spartan/market_data/feed_observers/SyntheticBookRecorder.cpp;cmds/spartan/market_data/feed_observers/recorders/MatcherBookRecorder.cpp;cmds/spartan/market_data/handler/MDP3FeedHandler.cpp;cmds/spartan/market_data/handler/ReactorMDP3FeedHandler.cpp;cmds/spartan/market_data/implied/implied_market.cpp;cmds/spartan/market_data/parsing/MDP3MsgBox.cpp;cmds/spartan/market_data/parsing/MDP3Parser.cpp;cmds/spartan/market_data/realtime/RealTimeHandler.cpp;cmds/spartan/market_data/recovery/BookSnapshot.cpp;cmds/spartan/market_data/recovery/DefinitionSnapshot.cpp;cmds/spartan/market_data/recovery/IncrementalQueue.cpp;cmds/spartan/market_data/recovery/RecoveryHandler.cpp;cmds/spartan/market_data/tests/spartan_md_tests.cpp;cmds/spartan/market_data/utils/book_utils.cpp;cmds/spartan/market_data/utils/mdp3_utils.cpp;cmds/spartan/market_data/utils/order_utils.cpp;cmds/spartan/market_data/utils/polygon_utils.cpp;cmds/spartan/market_data/utils/security_comp.cpp;cmds/spartan/market_data/utils/security_parser.cpp;cmds/spartan/market_data/utils/tests/synthetic_book_tests.cpp;cmds/spartan/market_data/utils/tests/test_polygon_finder.cpp;cmds/spartan/order_execution/gateway/IL3Gateway.cpp;cmds/spartan/order_execution/gateway/states/IL3InitHandler.cpp;cmds/spartan/order_execution/parsing/IL3Parser.cpp;cmds/spartan/system/PCapReader.cpp;cmds/spartan/system/reactor/Reactor.cpp;cmds/spartan/system/sbe/SBEParser.cpp;cmds/spartan/util/action_summarizer.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/SniperModel.cpp b/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp index e7553d017..eb7e1858e 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/domain/SecurityDefinition.h" #include "server/sparkd/cmds/spartan/market_data/utils/book_utils.h" #include "server/sparkd/cmds/spartan/market_data/utils/mdp3_utils.h" #include "server/sparkd/cmds/spartan/market_data/utils/polygon_utils.h" -#include "server/sparkd/cmds/spartan/domain/SecurityDefinition.h" #include #include @@ -148,9 +148,11 @@ void SniperModel::on_replay_start( auto it = me->books.find(mbp.security_id); if (it != me->books.end()) { me->sim->log( - "book_at_replay_start", me->sim->get_security(mbp.security_id).symbol(), + "book_at_replay_start", + me->sim->get_security(mbp.security_id).symbol(), mbp.mbp_buy[0].price.to_double(), mbp.mbp_buy[0].quantity.value(), - mbp.mbp_sell[0].price.to_double(), mbp.mbp_sell[0].quantity.value()); + mbp.mbp_sell[0].price.to_double(), + mbp.mbp_sell[0].quantity.value()); it->second.book = mbp; } } @@ -218,7 +220,8 @@ void SniperModel::on_order_update( } PandL pandl(me->sim->securities()); auto cash = pandl.net_cash(all_fills); - auto commission = pandl.commission_cost(all_fills); + auto commission = pandl.commission_cost( + map_commission_model(me->options.commission_model()), all_fills); auto net = cash - commission; in_flight.concluded = h; @@ -327,7 +330,8 @@ void SniperModel::eval(std::vector const &targets) { t->mark_as_worthless(); break; } else { - auto cash = leg_sec_info->definition.to_cash(mkt[0].price.to_double()); + auto cash = + leg_sec_info->definition.to_cash(mkt[0].price.to_double()); t->quantity.value() = qty; t->value += -l.ratio * cash; } @@ -349,7 +353,7 @@ bool SniperModel::within_safety_margin(Target const &t) const { } book_utils::compute_synthetic_book( - synth_book, leg_mkts, BookSide::max_depth()); + synth_book, leg_mkts, BookSide::max_depth()); auto cumm_qty = 0ul; auto min_price = me->min_cumm_edge; @@ -454,13 +458,13 @@ void SniperModel::fire(Shot const &s) { } } if (part_side == Side::Buy) - worst_price += - me->sim->get_security(p.sec_id).min_price_increment_int_price() * - 100; + worst_price += me->sim->get_security(p.sec_id) + .min_price_increment_int_price() * + 100; else - worst_price -= - me->sim->get_security(p.sec_id).min_price_increment_int_price() * - 100; + worst_price -= me->sim->get_security(p.sec_id) + .min_price_increment_int_price() * + 100; auto order_change = SmallOrderChange{}; order_change.order.security = p.sec_id; @@ -499,8 +503,9 @@ void SniperModel::fire(Shot const &s) { order_change.order.key = me->sim->send(order_change); me->sim->log( "sent_order", Side_Name(part_side), - me->sim->get_security(p.sec_id).symbol(), book[0].price.to_double(), - book[0].price.to_double(), book[0].quantity.value()); + me->sim->get_security(p.sec_id).symbol(), + book[0].price.to_double(), book[0].price.to_double(), + book[0].quantity.value()); shot.working[order_change.order.key].order = order_change; } } diff --git a/src/server/sparkd/cmds/spartan/back_testing/run/SimSessionOptions.proto b/src/server/sparkd/cmds/spartan/back_testing/run/SimSessionOptions.proto index 0873665cc..e87b7937d 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/run/SimSessionOptions.proto +++ b/src/server/sparkd/cmds/spartan/back_testing/run/SimSessionOptions.proto @@ -14,6 +14,9 @@ param {key: "" value {item: "1" item: "2"}} parameter {key: "Qty" value {item: "1" item: "2"}} */ +// Wheter commisions are charged as a non member or a trading firm +enum CommissionModel { NON_MEMBER = 0; TRADING_FIRM = 1;} + // The parameters for an entire simulation session, consisting of // multiple runs. message SimSessionOptions { @@ -33,7 +36,7 @@ message SimSessionOptions { // The max number of cores to use for the simulation. By default all // cores will be used. uint32 n_cores = 4 ; - + // the days we are testing this out repeated string market_date = 5; @@ -46,7 +49,7 @@ message SimSessionOptions { // time of a packet to estimate transaction duration. By default // 60000 repeated uint64 transaction_latency_ns = 7; - + // Wheter we should use the first packet or the last packet send // times when calculating when an algo would see market data repeated bool use_first_packet_st = 9; @@ -56,6 +59,8 @@ message SimSessionOptions { // The start and stop time for the simulation in the form: // 23:00 04:000. Blank for whatever is in the pcap. repeated string sim_start_stop_time = 12; + + repeated CommissionModel commission_model = 14; // Algo specific parameters used for this session. The simulation // wll run through all combinations of parameters, recording the @@ -79,6 +84,7 @@ message SimRunOptions { uint64 base_algo_latency_ns = 4; uint64 transaction_latency_ns = 6; bool simulate_icebergs = 12; + CommissionModel commission_model = 13; map param = 7; } diff --git a/src/server/sparkd/cmds/spartan/back_testing/run/run_sim.cpp b/src/server/sparkd/cmds/spartan/back_testing/run/run_sim.cpp index 7d31c25bf..58244c012 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/run/run_sim.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/run/run_sim.cpp @@ -39,6 +39,7 @@ calc_param_dimensions(protos::SimSessionOptions const &options) { dimensions.push_back(options.use_first_packet_st().size()); dimensions.push_back(options.simulate_icebergs().size()); dimensions.push_back(options.sim_start_stop_time().size()); + dimensions.push_back(options.commission_model().size()); std::map param_dims; for (auto const &p : options.param()) param_dims[p.name()]++; @@ -137,6 +138,14 @@ gen_runs(protos::SimSessionOptions const &options) { options.sim_start_stop_time(c[param_idx]); param_idx++; + // commission model + if (c[param_idx] == -1) + this_run.set_commission_model(protos::NON_MEMBER); + else + this_run.set_commission_model( + options.commission_model(c[param_idx])); + param_idx++; + std::map> algo_params; for (auto const &p : options.param()) algo_params[p.name()].push_back(p.value()); diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.cpp b/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.cpp index 46af2e656..2c615fcb4 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.cpp @@ -277,7 +277,8 @@ void Sim::on_pcap_event_during_replay() { for (auto &c : changes) { sim_log( "presim_order", ev.transact_time.value(), - change_name(c.change), get_security(c.order.security).symbol(), + change_name(c.change), + get_security(c.order.security).symbol(), c.order.price.to_double(), c.order.quantity.value(), Side_Name(c.order.side), c.order.key.value(), c.order.key.value()); @@ -398,7 +399,8 @@ void Sim::_start_simulation() { overloaded{ [&](MBPUpdate &mbp) { sim_log( - "sim_book_init", get_security(mbp.security_id).symbol(), + "sim_book_init", + get_security(mbp.security_id).symbol(), mbp.mbp_buy[0].price.to_double(), mbp.mbp_buy[0].quantity.value(), mbp.mbp_sell[0].price.to_double(), @@ -428,7 +430,8 @@ void Sim::on_algo_replay_start() { if (snap.ready_to_trade()) { collected_books.emplace_back(MBPUpdate{ id, snap.book_side(Side::Buy), snap.book_side(Side::Sell), - snap.implied_book_side(Side::Buy), snap.implied_book_side(Side::Sell)}); + snap.implied_book_side(Side::Buy), + snap.implied_book_side(Side::Sell)}); } me->algo.on_replay_start( EventHeader{me->event_id, me->transact_time, me->time}, collected_books); @@ -619,7 +622,8 @@ PandLSummary Sim::pnl() const { auto outright_pos = pl.outright_position(me->my_fills); auto cash = pl.net_cash(me->my_fills); - auto commission = pl.commission_cost(me->my_fills); + auto commission = pl.commission_cost( + map_commission_model(me->options.commission_model()), me->my_fills); auto pos = pl.position_liquidation_value(outright_pos); return {cash - commission, pos, commission}; } @@ -720,8 +724,7 @@ void Sim::validate_matcher_books(Side side) { LOG(Spartan, Error, "PCap Book:"); LOG(Spartan, Error, "{}", snap.book_side(side)); LOG(Spartan, Error, "Matcher Book:"); - LOG(Spartan, Error, "{}", - simulation.matcher.book(sec_id, side)); + LOG(Spartan, Error, "{}", simulation.matcher.book(sec_id, side)); bts_assert(false); } } 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 70a0159e0..b0fc6e7b6 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 @@ -23,17 +23,36 @@ double PandL::net_cash(std::vector const &fills) const { return net_cash_flow; } -double PandL::commission_cost(std::vector const &fills) const { +// Non-Member +// Trading firm + +double PandL::commission_cost( + CommissionModel m, std::vector const &fills) const { + + auto outright_commission = 1.23; + auto spread_comission = 0.86; + + switch (m) { + case CommissionModel::NonMember: + outright_commission = 1.23; + spread_comission = 0.86; + break; + case CommissionModel::TradingFirm: + outright_commission = 0.61; + spread_comission = 0.61; + break; + } + double cost = 0; for (auto const &f : fills) { auto n_legs = get_sec(f.security_id).legs().size(); if (n_legs == 0) - cost += f.last_fills.value() * 1.23; + cost += f.last_fills.value() * outright_commission; else - cost += f.last_fills.value() * n_legs * 0.86; + cost += f.last_fills.value() * n_legs * spread_comission; } return cost; -} +} // namespace bts::spartan::mdp3 PandL::SymbolNetCash PandL::symbol_net_cash(std::vector const &fills) const { 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 4d473a957..bfaedf430 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 @@ -3,6 +3,7 @@ #include "lib/os/os.h" #include "server/sparkd/cmds/spartan/domain/SecurityMap.h" #include "server/sparkd/cmds/spartan/market_data/common/mdp3_common.h" +#include "server/sparkd/cmds/spartan/domain/CommissionModel.h" #include #include @@ -29,7 +30,7 @@ class PandL { OutrightPosition outright_position(std::vector const &fills) const; double position_liquidation_value(OutrightPosition const &) const; - double commission_cost(std::vector const &fills) const; + double commission_cost(CommissionModel m,std::vector const &fills) const; private: struct PImpl; diff --git a/src/server/sparkd/cmds/spartan/domain/CommissionModel.h b/src/server/sparkd/cmds/spartan/domain/CommissionModel.h new file mode 100644 index 000000000..90ddec8bd --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/CommissionModel.h @@ -0,0 +1,23 @@ +#pragma once + +#include "server/sparkd/cmds/spartan/back_testing/run/SimSessionOptions.pb.h" + +namespace bts::spartan { + +enum class CommissionModel { + NonMember = 0, TradingFirm = 1 +}; + +inline constexpr CommissionModel map_commission_model(protos::CommissionModel s) { + switch (s) { + case protos::NON_MEMBER: + return CommissionModel::NonMember; + case protos::TRADING_FIRM: + return CommissionModel::TradingFirm; + default: + bts_assert(false); + return CommissionModel::TradingFirm; + } +} + +}