From ffc39be46671e995834251aa3bfefbd57b6960ea Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 26 Sep 2020 11:52:55 -0400 Subject: [PATCH] Added polygon generation. --- src/data_files/files/spartan/md.sql | 75 ++++++ src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/QuickTest.cpp | 14 +- src/server/sparkd/cmds/Spartan.cpp | 2 +- .../spartan/algo/polygon/polygon_utils.cpp | 191 ++++++++++++++ .../cmds/spartan/algo/polygon/polygon_utils.h | 30 +++ .../polygon/tests/test_polygon_finder.cpp | 238 ++++++++++++++++++ .../cmds/spartan/algo/{ => tas}/RunTAS.cpp | 0 .../cmds/spartan/algo/{ => tas}/RunTAS.h | 0 .../algo/{ => tas}/TASOrderReactor.cpp | 4 +- .../spartan/algo/{ => tas}/TASOrderReactor.h | 0 .../spartan/algo/{ => tas}/TASTriggerDef.cpp | 0 .../spartan/algo/{ => tas}/TASTriggerDef.h | 0 13 files changed, 551 insertions(+), 5 deletions(-) create mode 100644 src/server/sparkd/cmds/spartan/algo/polygon/polygon_utils.cpp create mode 100644 src/server/sparkd/cmds/spartan/algo/polygon/polygon_utils.h create mode 100644 src/server/sparkd/cmds/spartan/algo/polygon/tests/test_polygon_finder.cpp rename src/server/sparkd/cmds/spartan/algo/{ => tas}/RunTAS.cpp (100%) rename src/server/sparkd/cmds/spartan/algo/{ => tas}/RunTAS.h (100%) rename src/server/sparkd/cmds/spartan/algo/{ => tas}/TASOrderReactor.cpp (98%) rename src/server/sparkd/cmds/spartan/algo/{ => tas}/TASOrderReactor.h (100%) rename src/server/sparkd/cmds/spartan/algo/{ => tas}/TASTriggerDef.cpp (100%) rename src/server/sparkd/cmds/spartan/algo/{ => tas}/TASTriggerDef.h (100%) diff --git a/src/data_files/files/spartan/md.sql b/src/data_files/files/spartan/md.sql index c012f816e..691ec3022 100644 --- a/src/data_files/files/spartan/md.sql +++ b/src/data_files/files/spartan/md.sql @@ -110,6 +110,81 @@ where event_items.sid = securities.sid and event_items.eid=events.eid; +drop view if exists spreads_with_legs; +create view spreads_with_legs as +select + spread.symbol spread, + leg.symbol leg, + spread_legs.ratio ratio, + spread_legs.side side +from + securities spread, + securities leg, + spread_legs +where + spread.sid = spread_legs.ssid and + spread_legs.lsid = leg.sid; + +drop view if exists active_spread_legs; +create view active_spread_legs as +select distinct lsid as sid from spread_legs where ssid in (select * from active_spreads); + +drop view if exists active_securities_closure; +create view active_securities_closure as +select distinct sid from + (select sid from active_spread_legs union select sid from active_securities); + + +drop view if exists active_securities_closure_with_legs; +create view active_securities_closure_with_legs as +select + active_securities_closure.sid sid, + spread_legs.lsid lsid, + case spread_legs.side + when 'SIDE_BUY' then 1 + when 'SIDE_SELL' then -1 + else null + end side +from + active_securities_closure left join spread_legs on + active_securities_closure.sid = spread_legs.ssid; + +drop view if exists pretty_active_securities ; +create view pretty_active_securities as +select + sid, + ifnull(lsid,sid) lsid, + ifnull(side,1) side +from + active_securities_closure_with_legs + +drop view if exists triplets; +create view triplets as +select + buy.sid, + buy.lsid buy, + sell.lsid sell +from + (select * from pretty_active_securities where side=1) buy + left join + (select * from pretty_active_securities where side=-1) sell + on buy.sid = sell.sid; + + +drop view if exists pretty_triplets; +create view pretty_triplets as +select + c.symbol symbol, + b.symbol buy, + s.symbol sell +from + triplets + join securities c on triplets.sid = c.sid + join securities b on triplets.buy = b.sid + left join securities s on triplets.sell = s.sid +order by + symbol; + .mode csv .import event_items.csv event_items .import events.csv events diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index e89d4fbeb..0657217b2 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CMECertCmd.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/ParseHistoricalFIX.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/Span.cpp;cmds/Spartan.cpp;cmds/Test.cpp;cmds/Web.cpp;cmds/spartan/algo/RunTAS.cpp;cmds/spartan/algo/TASOrderReactor.cpp;cmds/spartan/algo/TASTriggerDef.cpp;cmds/spartan/md/mdp3/back_testing/matcher/FifoPriceLevelMatcher.cpp;cmds/spartan/md/mdp3/back_testing/matcher/FifoSecurityMatcher.cpp;cmds/spartan/md/mdp3/back_testing/matcher/Matcher.cpp;cmds/spartan/md/mdp3/back_testing/simulator/ExchangeSim.cpp;cmds/spartan/md/mdp3/back_testing/simulator/IAlgoModel.cpp;cmds/spartan/md/mdp3/back_testing/simulator/ISimServices.cpp;cmds/spartan/md/mdp3/back_testing/simulator/SimInput.cpp;cmds/spartan/md/mdp3/back_testing/simulator/agents/AlgoAgent.cpp;cmds/spartan/md/mdp3/back_testing/simulator/agents/GatewayAgent.cpp;cmds/spartan/md/mdp3/back_testing/simulator/agents/TimerAgent.cpp;cmds/spartan/md/mdp3/back_testing/simulator/algos/OrderTranslator.cpp;cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.cpp;cmds/spartan/md/mdp3/back_testing/simulator/core/AgentBase.cpp;cmds/spartan/md/mdp3/back_testing/simulator/core/Simulator.cpp;cmds/spartan/md/mdp3/back_testing/simulator/core/tests/test_simulator_core.cpp;cmds/spartan/md/mdp3/back_testing/simulator/events/SimEvents.cpp;cmds/spartan/md/mdp3/common/InstrumentSnapshot.cpp;cmds/spartan/md/mdp3/feed_control/IFeedController.cpp;cmds/spartan/md/mdp3/handler/ChannelHandler.cpp;cmds/spartan/md/mdp3/parsing/MDP3MsgBox.cpp;cmds/spartan/md/mdp3/realtime/RealTimeHandler.cpp;cmds/spartan/md/mdp3/recovery/BookSnapshot.cpp;cmds/spartan/md/mdp3/recovery/DefinitionSnapshot.cpp;cmds/spartan/md/mdp3/recovery/IncrementalQueue.cpp;cmds/spartan/md/mdp3/recovery/RecoveryHandler.cpp;cmds/spartan/md/mdp3/tests/spartan_md_tests.cpp;cmds/spartan/md/mdp3/utils/mdp3_utils.cpp;cmds/spartan/util/MCastReceiver.cpp;cmds/spartan/util/PCapReader.cpp;cmds/spartan/util/SecurityDB.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/MultipartFormDecoder.cpp;http/WebServer.cpp;http/tests/MultiPartFormTests.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/import/BasePositionServiceServer.cpp;position/import/DownloadCommonStateMachine.cpp;position/import/DownloadWindow.cpp;position/import/MoneyFileServiceServer.cpp;position/import/parsing/gmi_parser.cpp;position/import/parsing/money_parser.cpp;position/import/parsing/parser_common.cpp;position/tests/PositionTests.cpp;position/tests/position_tests_internal.cpp;subprocess/SubProcessRunner.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceDB.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CMECertCmd.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/ParseHistoricalFIX.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/Span.cpp;cmds/Spartan.cpp;cmds/Test.cpp;cmds/Web.cpp;cmds/spartan/algo/polygon/polygon_utils.cpp;cmds/spartan/algo/polygon/tests/test_polygon_finder.cpp;cmds/spartan/algo/tas/RunTAS.cpp;cmds/spartan/algo/tas/TASOrderReactor.cpp;cmds/spartan/algo/tas/TASTriggerDef.cpp;cmds/spartan/md/mdp3/back_testing/matcher/FifoPriceLevelMatcher.cpp;cmds/spartan/md/mdp3/back_testing/matcher/FifoSecurityMatcher.cpp;cmds/spartan/md/mdp3/back_testing/matcher/Matcher.cpp;cmds/spartan/md/mdp3/back_testing/simulator/ExchangeSim.cpp;cmds/spartan/md/mdp3/back_testing/simulator/IAlgoModel.cpp;cmds/spartan/md/mdp3/back_testing/simulator/ISimServices.cpp;cmds/spartan/md/mdp3/back_testing/simulator/SimInput.cpp;cmds/spartan/md/mdp3/back_testing/simulator/agents/AlgoAgent.cpp;cmds/spartan/md/mdp3/back_testing/simulator/agents/GatewayAgent.cpp;cmds/spartan/md/mdp3/back_testing/simulator/agents/TimerAgent.cpp;cmds/spartan/md/mdp3/back_testing/simulator/algos/OrderTranslator.cpp;cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.cpp;cmds/spartan/md/mdp3/back_testing/simulator/core/AgentBase.cpp;cmds/spartan/md/mdp3/back_testing/simulator/core/Simulator.cpp;cmds/spartan/md/mdp3/back_testing/simulator/core/tests/test_simulator_core.cpp;cmds/spartan/md/mdp3/back_testing/simulator/events/SimEvents.cpp;cmds/spartan/md/mdp3/common/InstrumentSnapshot.cpp;cmds/spartan/md/mdp3/feed_control/IFeedController.cpp;cmds/spartan/md/mdp3/handler/ChannelHandler.cpp;cmds/spartan/md/mdp3/parsing/MDP3MsgBox.cpp;cmds/spartan/md/mdp3/realtime/RealTimeHandler.cpp;cmds/spartan/md/mdp3/recovery/BookSnapshot.cpp;cmds/spartan/md/mdp3/recovery/DefinitionSnapshot.cpp;cmds/spartan/md/mdp3/recovery/IncrementalQueue.cpp;cmds/spartan/md/mdp3/recovery/RecoveryHandler.cpp;cmds/spartan/md/mdp3/tests/spartan_md_tests.cpp;cmds/spartan/md/mdp3/utils/mdp3_utils.cpp;cmds/spartan/util/MCastReceiver.cpp;cmds/spartan/util/PCapReader.cpp;cmds/spartan/util/SecurityDB.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/MultipartFormDecoder.cpp;http/WebServer.cpp;http/tests/MultiPartFormTests.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/import/BasePositionServiceServer.cpp;position/import/DownloadCommonStateMachine.cpp;position/import/DownloadWindow.cpp;position/import/MoneyFileServiceServer.cpp;position/import/parsing/gmi_parser.cpp;position/import/parsing/money_parser.cpp;position/import/parsing/parser_common.cpp;position/tests/PositionTests.cpp;position/tests/position_tests_internal.cpp;subprocess/SubProcessRunner.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceDB.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index c71cbceea..4f75819da 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -29,7 +29,19 @@ namespace bts { namespace cmd { -int QuickTest::execute(std::vector const &) { +size_t gcd (std::vector const&in) { + size_t result = 0; + for (auto n : in) + result = std::gcd(std::abs(n),result); + return result; +} + +int QuickTest::execute(std::vector const & args) { + std::vector r; + for (auto &a: args) + r.push_back(std::stoi(a)); + + std::cout << gcd (r) << std::endl; return 0; } diff --git a/src/server/sparkd/cmds/Spartan.cpp b/src/server/sparkd/cmds/Spartan.cpp index 83c5bd6c9..4d9408875 100644 --- a/src/server/sparkd/cmds/Spartan.cpp +++ b/src/server/sparkd/cmds/Spartan.cpp @@ -1,5 +1,5 @@ #include "Spartan.h" -#include "server/sparkd/cmds/spartan/algo/RunTAS.h" +#include "server/sparkd/cmds/spartan/algo/tas/RunTAS.h" #include "server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/SimInput.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h" #include "server/sparkd/cmds/spartan/md/mdp3/feed_control/AB_Arbitrageur.h" diff --git a/src/server/sparkd/cmds/spartan/algo/polygon/polygon_utils.cpp b/src/server/sparkd/cmds/spartan/algo/polygon/polygon_utils.cpp new file mode 100644 index 000000000..8f7548da7 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/algo/polygon/polygon_utils.cpp @@ -0,0 +1,191 @@ +#include "polygon_utils.h" +#include + +namespace bts::spartan::algo::poly { + +size_t gcd(std::vector const &in) { + size_t result = 0; + for (auto l : in) + result = std::gcd(std::abs(l.ratio), result); + return result; +} + +void Instrument::canonize() { + int d = gcd(legs); + bts_assert(legs.size()); + if (legs[0].ratio < 0) + d = -d; + for (auto &l : legs) + l.ratio /= d; +} + +bool Instrument::is_polygon(std::vector const &universe) const { + return poly::is_polygon(*this, universe); +} + +template +void for_each_number_string(std::vector &str, int start_digit, + int end_digit, size_t idx, C &c) { + if (idx == str.size()) + c(str); + else + for (int i = start_digit; i <= end_digit; i++) { + str[idx] = i; + for_each_number_string(str, start_digit, end_digit, idx + 1, c); + } +} + +template +void for_each_number_string(int len, int start_digit, int end_digit, C c) { + std::vector str(len); + for_each_number_string(str, start_digit, end_digit, 0, c); +} + +template void for_each_combination(size_t r, size_t n, C c) { + std::vector v(n); + std::fill(v.begin(), v.begin() + r, true); + do { + c(v); + } while (std::prev_permutation(v.begin(), v.end())); +} + +bool is_polygon(std::vector const &ratio_modifier, + std::vector const &candidate) { + + bts_assert(candidate.size() == ratio_modifier.size()); + + Instrument reduced; + auto find_in_reduced = + [&reduced](mdp3::MDP3SecurityID id) -> InstrumentLeg * { + for (auto &l : reduced.legs) + if (l.sec_id == id) + return &l; + return nullptr; + }; + + // Accumulate the ratio modified instruments in reduced + for (size_t i = 0; i < candidate.size(); i++) { + auto mod = ratio_modifier[i]; + auto instrument = candidate[i]; + for (auto l : instrument->legs) { + if (l.ratio && mod) { + auto reduced_leg = find_in_reduced(l.sec_id); + if (!reduced_leg) + reduced_leg = &reduced.legs.emplace_back(); + reduced_leg->sec_id = l.sec_id; + reduced_leg->ratio += (l.ratio * mod); + } + } + } + + // We have to actually have some contracts in there, a point is not + // a polygon + if (reduced.legs.empty()) + return false; + + // If in the end we have no contracts at all then this is a polygon + for (auto &l : reduced.legs) + if (l.ratio != 0) + return false; + return true; +} + +void eval_and_record(std::vector const &ratio_modifier, + std::vector const &candidate, + std::vector *out) { + bts_assert(ratio_modifier.size() == candidate.size()); + + if (is_polygon(ratio_modifier, candidate)) { + auto &polygon = out->emplace_back(); + for (size_t i = 0; i < candidate.size(); i++) { + auto mod = ratio_modifier[i]; + if(mod) { + auto base_polygon_point = candidate[i]; + auto &polygon_point = polygon.legs.emplace_back(); + polygon_point.sec_id = base_polygon_point->sec_id; + polygon_point.ratio = mod; + } + } + polygon.canonize(); + } +} + +bool operator==(Instrument const &i1, Instrument const &i2) { + if (i1.sec_id != i2.sec_id) + return false; + if (i1.legs.size() != i2.legs.size()) + return false; + + for (size_t i = 0; i < i1.legs.size(); i++) { + auto &l1 = i1.legs[i]; + auto &l2 = i2.legs[i]; + if (l1.sec_id != l2.sec_id) + return false; + if (l1.ratio != l2.ratio) + return false; + } + return true; +} + +std::vector remove_duplicates(std::vector const &in) { + std::vector result; + + for (auto &ii : in) { + auto it = std::find(result.begin(), result.end(), ii); + if (it == result.end()) + result.emplace_back(ii); + } + return result; +} + +std::vector +find_polygons(std::vector const &tradeable_instruments, + size_t n_vertices, + size_t max_ratio) { + + std::vector result; + result.reserve(1024); + std::vector working; + working.reserve(100); + + for_each_combination(n_vertices, tradeable_instruments.size(), + [&](auto idx_vec) { + working.clear(); + for (size_t i = 0; i < idx_vec.size(); i++) + if (idx_vec[i]) + working.push_back(&tradeable_instruments[i]); + for_each_number_string( + n_vertices, -max_ratio, max_ratio, + [&](std::vector const &modifiers) { + eval_and_record(modifiers, working, &result); + }); + }); + return remove_duplicates(result); +} + + +bool is_polygon(Instrument const &candidate, + std::vector const &universe) { + std::unordered_map net; + std::unordered_map universe_idx; + for (auto &i : universe) + universe_idx[i.sec_id] = &i; + + for (auto &polygon_point : candidate.legs) { + auto &point_instrument = universe_idx[polygon_point.sec_id]; + for (auto &l : point_instrument->legs) + net[l.sec_id] += (l.ratio * polygon_point.ratio); + } + for (auto &p : net) + if (p.second) + return false; + return true; +} + +std::ostream &operator<<(std::ostream &s, Instrument const &i) { + for (auto &l : i.legs) + s << l.ratio << ":" << l.sec_id.value() << " "; + return s; +} + +} // namespace bts::spartan::algo::poly diff --git a/src/server/sparkd/cmds/spartan/algo/polygon/polygon_utils.h b/src/server/sparkd/cmds/spartan/algo/polygon/polygon_utils.h new file mode 100644 index 000000000..7e8a6c717 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/algo/polygon/polygon_utils.h @@ -0,0 +1,30 @@ +#pragma once + +#include "../../md/mdp3/common/mdp3_common.h" +#include + +namespace bts::spartan::algo::poly { + +struct InstrumentLeg { + mdp3::MDP3SecurityID sec_id = mdp3::MDP3SecurityID{0}; + int ratio = 0; +}; + +struct Instrument { + mdp3::MDP3SecurityID sec_id = mdp3::MDP3SecurityID{0}; + std::vector legs = {}; + void canonize(); + bool is_polygon(std::vector const &universe)const; +}; + +bool operator==(Instrument const&i1, Instrument const&i2); +bool is_polygon(Instrument const&, std::vector const &universe); +std::ostream&operator<<(std::ostream&,Instrument const&); + +// For test purposes +std::vector +find_polygons(std::vector const &tradeable_instruments, + size_t n_vertices, + size_t max_ratio = 1); + +} // namespace bts::spartan::algo diff --git a/src/server/sparkd/cmds/spartan/algo/polygon/tests/test_polygon_finder.cpp b/src/server/sparkd/cmds/spartan/algo/polygon/tests/test_polygon_finder.cpp new file mode 100644 index 000000000..f98712cff --- /dev/null +++ b/src/server/sparkd/cmds/spartan/algo/polygon/tests/test_polygon_finder.cpp @@ -0,0 +1,238 @@ +#include "server/sparkd/cmds/spartan/algo/polygon/polygon_utils.h" + +#include + +namespace bts::spartan::algo::poly { + +struct InputLeg { + mdp3::MDP3SecurityID sec_id; + mdp3::MDP3SecurityID leg = mdp3::MDP3SecurityID{0}; + int ratio = 0; +}; + +std::map sec_name = { + {mdp3::MDP3SecurityID{85834}, "GCV0-GCG1"}, + {mdp3::MDP3SecurityID{11598}, "SILZ0-SILK1"}, + {mdp3::MDP3SecurityID{5029}, "HGH1-HGK1"}, + {mdp3::MDP3SecurityID{12732}, "SIN1-SIU1"}, + {mdp3::MDP3SecurityID{3468}, "HGK1"}, + {mdp3::MDP3SecurityID{1406}, "GCV1"}, + {mdp3::MDP3SecurityID{188775}, "SIZ0"}, + {mdp3::MDP3SecurityID{2733}, "GCX0"}, + {mdp3::MDP3SecurityID{51659}, "GCZ1"}, + {mdp3::MDP3SecurityID{17318}, "GCV0"}, + {mdp3::MDP3SecurityID{13775}, "QOV0"}, + {mdp3::MDP3SecurityID{20929}, "HGX0"}, + {mdp3::MDP3SecurityID{7378}, "HGK1-HGN1"}, + {mdp3::MDP3SecurityID{5936}, "MGCZ0-MGCJ1"}, + {mdp3::MDP3SecurityID{23759}, "GCZ0-GCZ1"}, + {mdp3::MDP3SecurityID{37283}, "GCZ0-GCM1"}, + {mdp3::MDP3SecurityID{47843}, "SIZ0-SIH1"}, + {mdp3::MDP3SecurityID{17853}, "SILV0-SILZ0"}, + {mdp3::MDP3SecurityID{85863}, "GCZ0-GCG1"}, + {mdp3::MDP3SecurityID{14587}, "GCG1-GCJ1"}, + {mdp3::MDP3SecurityID{89089}, "SIZ0-SIK1"}, + {mdp3::MDP3SecurityID{53777}, "GCV0-GCZ0"}, + {mdp3::MDP3SecurityID{89321}, "SIK1-SIN1"}, + {mdp3::MDP3SecurityID{10136}, "QOV0-QOZ0"}, + {mdp3::MDP3SecurityID{24376}, "SIZ1"}, + {mdp3::MDP3SecurityID{19224}, "MGCV0-MGCZ0"}, + {mdp3::MDP3SecurityID{62684}, "SIH1"}, + {mdp3::MDP3SecurityID{543}, "SILK1"}, + {mdp3::MDP3SecurityID{771}, "SIV0"}, + {mdp3::MDP3SecurityID{4353}, "HGZ0-HGH1"}, + {mdp3::MDP3SecurityID{422}, "GCZ0"}, + {mdp3::MDP3SecurityID{23860}, "QCZ0"}, + {mdp3::MDP3SecurityID{33889}, "SILZ0-SILH1"}, + {mdp3::MDP3SecurityID{14211}, "GCX0-GCZ0"}, + {mdp3::MDP3SecurityID{6181}, "HGN1"}, + {mdp3::MDP3SecurityID{14539}, "SIU1-SIZ1"}, + {mdp3::MDP3SecurityID{262483}, "HGH1"}, + {mdp3::MDP3SecurityID{224}, "MGCJ1"}, + {mdp3::MDP3SecurityID{1016}, "MGCZ0"}, + {mdp3::MDP3SecurityID{21779}, "HGX0-HGZ0"}, + {mdp3::MDP3SecurityID{85573}, "MGCZ0-MGCG1"}, + {mdp3::MDP3SecurityID{6466}, "GCG1"}, + {mdp3::MDP3SecurityID{39312}, "SILZ0"}, + {mdp3::MDP3SecurityID{220768}, "HGZ0"}, + {mdp3::MDP3SecurityID{14945}, "GCZ0-GCJ1"}, + {mdp3::MDP3SecurityID{30106}, "MGCQ1"}, + {mdp3::MDP3SecurityID{39581}, "SGCZ0"}, + {mdp3::MDP3SecurityID{31215}, "SIV0-SIZ0"}, + {mdp3::MDP3SecurityID{224307}, "SIZ0-SIZ1"}, + {mdp3::MDP3SecurityID{3067}, "GCJ1"}, + {mdp3::MDP3SecurityID{39415}, "SGUZ0"}, + {mdp3::MDP3SecurityID{63676}, "SIK1"}, + {mdp3::MDP3SecurityID{4221}, "SILH1"}, + {mdp3::MDP3SecurityID{78321}, "MGCZ0-MGCM1"}, + {mdp3::MDP3SecurityID{40584}, "QIZ0"}, + {mdp3::MDP3SecurityID{115482}, "MGCV0"}, + {mdp3::MDP3SecurityID{38472}, "QOZ0"}, + {mdp3::MDP3SecurityID{32490}, "SIN1"}, + {mdp3::MDP3SecurityID{89318}, "SIH1-SIK1"}, + {mdp3::MDP3SecurityID{100440}, "GCM1"}, + {mdp3::MDP3SecurityID{81409}, "MGCM1"}, + {mdp3::MDP3SecurityID{28092}, "SIU1"}, + {mdp3::MDP3SecurityID{42317}, "MGCG1"}, + {mdp3::MDP3SecurityID{7026}, "SIZ0-SIN1"}, + {mdp3::MDP3SecurityID{62679}, "QIH1"}, + {mdp3::MDP3SecurityID{23149}, "MGCZ0-MGCQ1"}, + {mdp3::MDP3SecurityID{840}, "SILV0"}, +}; + +std::vector legs{ + {mdp3::MDP3SecurityID{224}}, + {mdp3::MDP3SecurityID{422}}, + {mdp3::MDP3SecurityID{543}}, + {mdp3::MDP3SecurityID{771}}, + {mdp3::MDP3SecurityID{840}}, + {mdp3::MDP3SecurityID{1016}}, + {mdp3::MDP3SecurityID{1406}}, + {mdp3::MDP3SecurityID{2733}}, + {mdp3::MDP3SecurityID{3067}}, + {mdp3::MDP3SecurityID{3468}}, + {mdp3::MDP3SecurityID{4221}}, + {mdp3::MDP3SecurityID{6181}}, + {mdp3::MDP3SecurityID{6466}}, + {mdp3::MDP3SecurityID{13775}}, + {mdp3::MDP3SecurityID{17318}}, + {mdp3::MDP3SecurityID{20929}}, + {mdp3::MDP3SecurityID{23860}}, + {mdp3::MDP3SecurityID{24376}}, + {mdp3::MDP3SecurityID{28092}}, + {mdp3::MDP3SecurityID{30106}}, + {mdp3::MDP3SecurityID{32490}}, + {mdp3::MDP3SecurityID{38472}}, + {mdp3::MDP3SecurityID{39312}}, + {mdp3::MDP3SecurityID{39415}}, + {mdp3::MDP3SecurityID{39581}}, + {mdp3::MDP3SecurityID{40584}}, + {mdp3::MDP3SecurityID{42317}}, + {mdp3::MDP3SecurityID{51659}}, + {mdp3::MDP3SecurityID{62679}}, + {mdp3::MDP3SecurityID{62684}}, + {mdp3::MDP3SecurityID{63676}}, + {mdp3::MDP3SecurityID{81409}}, + {mdp3::MDP3SecurityID{100440}}, + {mdp3::MDP3SecurityID{115482}}, + {mdp3::MDP3SecurityID{188775}}, + {mdp3::MDP3SecurityID{220768}}, + {mdp3::MDP3SecurityID{262483}}, + {mdp3::MDP3SecurityID{5936}, mdp3::MDP3SecurityID{224}, -1}, + {mdp3::MDP3SecurityID{14211}, mdp3::MDP3SecurityID{422}, -1}, + {mdp3::MDP3SecurityID{14945}, mdp3::MDP3SecurityID{422}, 1}, + {mdp3::MDP3SecurityID{23759}, mdp3::MDP3SecurityID{422}, 1}, + {mdp3::MDP3SecurityID{37283}, mdp3::MDP3SecurityID{422}, 1}, + {mdp3::MDP3SecurityID{53777}, mdp3::MDP3SecurityID{422}, -1}, + {mdp3::MDP3SecurityID{85863}, mdp3::MDP3SecurityID{422}, 1}, + {mdp3::MDP3SecurityID{11598}, mdp3::MDP3SecurityID{543}, -1}, + {mdp3::MDP3SecurityID{31215}, mdp3::MDP3SecurityID{771}, 1}, + {mdp3::MDP3SecurityID{17853}, mdp3::MDP3SecurityID{840}, 1}, + {mdp3::MDP3SecurityID{5936}, mdp3::MDP3SecurityID{1016}, 1}, + {mdp3::MDP3SecurityID{19224}, mdp3::MDP3SecurityID{1016}, -1}, + {mdp3::MDP3SecurityID{23149}, mdp3::MDP3SecurityID{1016}, 1}, + {mdp3::MDP3SecurityID{78321}, mdp3::MDP3SecurityID{1016}, 1}, + {mdp3::MDP3SecurityID{85573}, mdp3::MDP3SecurityID{1016}, 1}, + {mdp3::MDP3SecurityID{14211}, mdp3::MDP3SecurityID{2733}, 1}, + {mdp3::MDP3SecurityID{14587}, mdp3::MDP3SecurityID{3067}, -1}, + {mdp3::MDP3SecurityID{14945}, mdp3::MDP3SecurityID{3067}, -1}, + {mdp3::MDP3SecurityID{5029}, mdp3::MDP3SecurityID{3468}, -1}, + {mdp3::MDP3SecurityID{7378}, mdp3::MDP3SecurityID{3468}, 1}, + {mdp3::MDP3SecurityID{33889}, mdp3::MDP3SecurityID{4221}, -1}, + {mdp3::MDP3SecurityID{7378}, mdp3::MDP3SecurityID{6181}, -1}, + {mdp3::MDP3SecurityID{14587}, mdp3::MDP3SecurityID{6466}, 1}, + {mdp3::MDP3SecurityID{85834}, mdp3::MDP3SecurityID{6466}, -1}, + {mdp3::MDP3SecurityID{85863}, mdp3::MDP3SecurityID{6466}, -1}, + {mdp3::MDP3SecurityID{10136}, mdp3::MDP3SecurityID{13775}, 1}, + {mdp3::MDP3SecurityID{53777}, mdp3::MDP3SecurityID{17318}, 1}, + {mdp3::MDP3SecurityID{85834}, mdp3::MDP3SecurityID{17318}, 1}, + {mdp3::MDP3SecurityID{21779}, mdp3::MDP3SecurityID{20929}, 1}, + {mdp3::MDP3SecurityID{14539}, mdp3::MDP3SecurityID{24376}, -1}, + {mdp3::MDP3SecurityID{224307}, mdp3::MDP3SecurityID{24376}, -1}, + {mdp3::MDP3SecurityID{12732}, mdp3::MDP3SecurityID{28092}, -1}, + {mdp3::MDP3SecurityID{14539}, mdp3::MDP3SecurityID{28092}, 1}, + {mdp3::MDP3SecurityID{23149}, mdp3::MDP3SecurityID{30106}, -1}, + {mdp3::MDP3SecurityID{7026}, mdp3::MDP3SecurityID{32490}, -1}, + {mdp3::MDP3SecurityID{12732}, mdp3::MDP3SecurityID{32490}, 1}, + {mdp3::MDP3SecurityID{89321}, mdp3::MDP3SecurityID{32490}, -1}, + {mdp3::MDP3SecurityID{10136}, mdp3::MDP3SecurityID{38472}, -1}, + {mdp3::MDP3SecurityID{11598}, mdp3::MDP3SecurityID{39312}, 1}, + {mdp3::MDP3SecurityID{17853}, mdp3::MDP3SecurityID{39312}, -1}, + {mdp3::MDP3SecurityID{33889}, mdp3::MDP3SecurityID{39312}, 1}, + {mdp3::MDP3SecurityID{85573}, mdp3::MDP3SecurityID{42317}, -1}, + {mdp3::MDP3SecurityID{23759}, mdp3::MDP3SecurityID{51659}, -1}, + {mdp3::MDP3SecurityID{47843}, mdp3::MDP3SecurityID{62684}, -1}, + {mdp3::MDP3SecurityID{89318}, mdp3::MDP3SecurityID{62684}, 1}, + {mdp3::MDP3SecurityID{89089}, mdp3::MDP3SecurityID{63676}, -1}, + {mdp3::MDP3SecurityID{89318}, mdp3::MDP3SecurityID{63676}, -1}, + {mdp3::MDP3SecurityID{89321}, mdp3::MDP3SecurityID{63676}, 1}, + {mdp3::MDP3SecurityID{78321}, mdp3::MDP3SecurityID{81409}, -1}, + {mdp3::MDP3SecurityID{37283}, mdp3::MDP3SecurityID{100440}, -1}, + {mdp3::MDP3SecurityID{19224}, mdp3::MDP3SecurityID{115482}, 1}, + {mdp3::MDP3SecurityID{7026}, mdp3::MDP3SecurityID{188775}, 1}, + {mdp3::MDP3SecurityID{31215}, mdp3::MDP3SecurityID{188775}, -1}, + {mdp3::MDP3SecurityID{47843}, mdp3::MDP3SecurityID{188775}, 1}, + {mdp3::MDP3SecurityID{89089}, mdp3::MDP3SecurityID{188775}, 1}, + {mdp3::MDP3SecurityID{224307}, mdp3::MDP3SecurityID{188775}, 1}, + {mdp3::MDP3SecurityID{4353}, mdp3::MDP3SecurityID{220768}, 1}, + {mdp3::MDP3SecurityID{21779}, mdp3::MDP3SecurityID{220768}, -1}, + {mdp3::MDP3SecurityID{4353}, mdp3::MDP3SecurityID{262483}, -1}, + {mdp3::MDP3SecurityID{5029}, mdp3::MDP3SecurityID{262483}, 1}, +}; + +TEST_CASE("PolygonTests", "[gen_poly]") { + SECTION("a-b,-a,b") { + InstrumentLeg la{mdp3::MDP3SecurityID{1}, 1}; + InstrumentLeg lb{mdp3::MDP3SecurityID{2}, -1}; + + Instrument a{la.sec_id}; + a.legs.push_back(la); + + Instrument b{lb.sec_id}; + b.legs.push_back(InstrumentLeg{lb.sec_id, 1}); + + Instrument a_b{mdp3::MDP3SecurityID{3}}; + a_b.legs.push_back(la); + a_b.legs.push_back(lb); + auto universe = {a, b, a_b}; + auto polygons = find_polygons(universe, 3); + REQUIRE(polygons.size() == 1); + for (auto &p : polygons) + REQUIRE(p.is_polygon(universe)); + } + + SECTION("smoke_test") { + std::vector universe; + auto get_instrument = [&universe](mdp3::MDP3SecurityID key) { + for (auto &i : universe) + if (i.sec_id == key) + return &i; + return &universe.emplace_back(Instrument{key}); + }; + + for (auto l : legs) { + auto i = get_instrument(l.sec_id); + if (l.ratio == 0) + i->legs.emplace_back(InstrumentLeg{l.sec_id, 1}); + else + i->legs.emplace_back(InstrumentLeg{l.leg, l.ratio}); + } + auto polygons = find_polygons(universe, 5); + REQUIRE(polygons.size()); + for (auto &p : polygons) { + std::cout << std::endl; + for (auto &l : p.legs) { + if (l.ratio == -1) + std::cout << "-"; + else + std::cout << "+"; + + std::cout << sec_name[l.sec_id] << std::endl; + } + std::cout << std::endl; + REQUIRE(p.is_polygon(universe)); + } + } +} + +} // namespace bts::spartan::algo::poly diff --git a/src/server/sparkd/cmds/spartan/algo/RunTAS.cpp b/src/server/sparkd/cmds/spartan/algo/tas/RunTAS.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/algo/RunTAS.cpp rename to src/server/sparkd/cmds/spartan/algo/tas/RunTAS.cpp diff --git a/src/server/sparkd/cmds/spartan/algo/RunTAS.h b/src/server/sparkd/cmds/spartan/algo/tas/RunTAS.h similarity index 100% rename from src/server/sparkd/cmds/spartan/algo/RunTAS.h rename to src/server/sparkd/cmds/spartan/algo/tas/RunTAS.h diff --git a/src/server/sparkd/cmds/spartan/algo/TASOrderReactor.cpp b/src/server/sparkd/cmds/spartan/algo/tas/TASOrderReactor.cpp similarity index 98% rename from src/server/sparkd/cmds/spartan/algo/TASOrderReactor.cpp rename to src/server/sparkd/cmds/spartan/algo/tas/TASOrderReactor.cpp index 84efbe302..63fe2b08f 100644 --- a/src/server/sparkd/cmds/spartan/algo/TASOrderReactor.cpp +++ b/src/server/sparkd/cmds/spartan/algo/tas/TASOrderReactor.cpp @@ -9,8 +9,8 @@ #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "../md/mdp3/gen/SecurityStatus30.h" -#include "../md/mdp3/parsing/MDP3Parser.h" +#include "../../md/mdp3/gen/SecurityStatus30.h" +#include "../../md/mdp3/parsing/MDP3Parser.h" #include diff --git a/src/server/sparkd/cmds/spartan/algo/TASOrderReactor.h b/src/server/sparkd/cmds/spartan/algo/tas/TASOrderReactor.h similarity index 100% rename from src/server/sparkd/cmds/spartan/algo/TASOrderReactor.h rename to src/server/sparkd/cmds/spartan/algo/tas/TASOrderReactor.h diff --git a/src/server/sparkd/cmds/spartan/algo/TASTriggerDef.cpp b/src/server/sparkd/cmds/spartan/algo/tas/TASTriggerDef.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/algo/TASTriggerDef.cpp rename to src/server/sparkd/cmds/spartan/algo/tas/TASTriggerDef.cpp diff --git a/src/server/sparkd/cmds/spartan/algo/TASTriggerDef.h b/src/server/sparkd/cmds/spartan/algo/tas/TASTriggerDef.h similarity index 100% rename from src/server/sparkd/cmds/spartan/algo/TASTriggerDef.h rename to src/server/sparkd/cmds/spartan/algo/tas/TASTriggerDef.h