diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/algos/Sniper2.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/algos/Sniper2.cpp index 2f9ecbdc1..592c3a1aa 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/algos/Sniper2.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/algos/Sniper2.cpp @@ -6,6 +6,7 @@ #include "server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/EventHeader.h" #include "server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/PandL.h" #include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h" +#include "server/sparkd/cmds/spartan/md/mdp3/utils/book_utils.h" #include "server/sparkd/cmds/spartan/md/mdp3/utils/polygon_utils.h" #include @@ -72,7 +73,7 @@ struct Sniper2::PImpl { else return min_cumm_edge; } - + State state = State::WAIT_OPPORTUNITY; std::unordered_map books = {}; std::vector> targets = {}; @@ -303,25 +304,22 @@ void Sniper2::eval(std::vector const &targets) { } } } -void compute_synthetic_book( - Book &, - const std::vector> &, - uint32_t ) {} bool Sniper2::within_safety_margin(Target const &t) const { Book synth_book; using LegInfo = std::tuple; std::vector leg_mkts; - + for (auto &leg : t.polygon.parts) { - auto leg_mkt = leg_mkts.emplace_back(); - std::get<0>(leg_mkt) = MDP3Quantity {leg.ratio}; + auto &leg_mkt = leg_mkts.emplace_back(); + std::get<0>(leg_mkt) = MDP3Quantity{leg.ratio * -1}; std::get<1>(leg_mkt) = {}; - auto leg_book_side = securities::other_side(side_from_ratio(leg.ratio)); + auto leg_book_side = securities::other_side(side_from_ratio(leg.ratio)); std::get<2>(leg_mkt) = me->books[leg.sec_id].book.mbp_side(leg_book_side); } - compute_synthetic_book(synth_book,leg_mkts,std::tuple_size::value); + book_utils::compute_synthetic_book(synth_book, leg_mkts, + std::tuple_size::value); auto cumm_qty = 0ul; auto min_price = me->get_min_cumm_edge(t.side); @@ -330,13 +328,14 @@ bool Sniper2::within_safety_margin(Target const &t) const { // expressed in the same terms as the first. auto &first_leg_def = t.leg_sec_info[0]->definition; for (auto &level : synth_book) { - auto level_cash_price = first_leg_def.to_cash(level.price); - if (securities::is_equal_or_better(t.side,Price{level_cash_price}, Price{min_price})) + auto level_cash_price = first_leg_def.to_cash(level.price); + if (securities::is_equal_or_better(t.side, Price{level_cash_price}, + Price{min_price})) cumm_qty += level.quantity.value(); else break; } - return cumm_qty >=me->min_cumm_qty; + return cumm_qty >= me->min_cumm_qty; } Sniper2::MaybeShot Sniper2::pick() { @@ -364,7 +363,7 @@ Sniper2::MaybeShot Sniper2::pick() { if (has_any_qty && transaction_is_fresh && within_safety_margin(best_target)) - return Shot{*me->targets[0], + return Shot{best_target, me->current_event, best_target.value, best_target.quantity, @@ -472,7 +471,7 @@ protos::SimRunOptions Sniper2::fill_defaults(protos::SimRunOptions const &in) { set_param_if_empty(&result, "max_transaction_latency_us", 10000); set_param_if_empty(&result, "double_dip", false); set_param_if_empty(&result, "ms_to_work_shot", 0); - set_param_if_empty(&result, "min_cumm_edge", 10.0); + set_param_if_empty(&result, "min_cumm_edge", 17.5); set_param_if_empty(&result, "min_cumm_qty", 10); return result; }