diff --git a/src/data_files/files/spartan/sim_db.sql b/src/data_files/files/spartan/sim_db.sql index ba39b2d86..614e9c799 100644 --- a/src/data_files/files/spartan/sim_db.sql +++ b/src/data_files/files/spartan/sim_db.sql @@ -145,12 +145,12 @@ select realized_pandl , position_pandl , cast(param1 as numeric) DoubleDip, - cast(param2 as numeric) MaxTransactionLatency, - cast(param3 as numeric) MinDepth, - cast(param4 as numeric) MinOrdersAtTop, - cast(param5 as numeric) MinValue, - cast(param6 as numeric) MsToWorkShot, - cast(param7 as numeric) Qty, + cast(param2 as numeric) MaxQty, + cast(param3 as numeric) MaxTransactionLatency, + cast(param4 as numeric) MinDepth, + cast(param5 as numeric) MinOrdersAtTop, + cast(param6 as numeric) MinValue, + cast(param7 as numeric) MsToWorkShot, shot_count.n_shots, shot_count.lucky_shots, shot_count.unlucky_shots diff --git a/src/server/sparkd/cmds/spartan/analysis/lining_up_books.ipynb b/src/server/sparkd/cmds/spartan/analysis/lining_up_books.ipynb index caff1953d..0b50810a5 100644 --- a/src/server/sparkd/cmds/spartan/analysis/lining_up_books.ipynb +++ b/src/server/sparkd/cmds/spartan/analysis/lining_up_books.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 1, + "execution_count": 2, "metadata": {}, "outputs": [], "source": [ @@ -12,7 +12,7 @@ }, { "cell_type": "code", - "execution_count": 38, + "execution_count": 24, "metadata": {}, "outputs": [], "source": [ @@ -46,7 +46,7 @@ }, { "cell_type": "code", - "execution_count": 54, + "execution_count": 27, "metadata": {}, "outputs": [], "source": [ @@ -1398,22 +1398,633 @@ }, { "cell_type": "code", - "execution_count": 93, + "execution_count": 26, "metadata": {}, "outputs": [ { "data": { + "text/html": [ + "
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "
run_idt_timepolygono_eido_eid_2e_eide_eid_2targetrealizedstreak_id
011599775261057353508+ESU0 +(ESU0-ESZ0) -ESZ014915014924512.512.51
111599775281055931175+ESU0 +(ESU0-ESZ0) -ESZ017021017069510.010.02
211599775285192391177+ESU0 +(ESU0-ESZ0) -ESZ017389017396510.010.03
311599775293384540803+ESU0 +(ESU0-ESZ0) -ESZ018509018512510.010.04
411599775500032941989+ESU0 +(ESU0-ESZ0) -ESZ031414031423512.512.55
.................................
410911599857100345168600-ESU0 -(ESU0-ESZ0) +ESZ02062467102062467957.5-5.02353
411011599857108989302635-ESU0 -(ESU0-ESZ0) +ESZ02062488802062490857.57.52354
411111599857121814663688-ESU0 -(ESU0-ESZ0) +ESZ02062542702062542957.57.52355
411211599857121831224496-ESU0 -(ESU0-ESZ0) +ESZ02062547502062548357.57.52356
411311599857474448422056-ESU0 -(ESU0-ESZ0) +ESZ020634821020634877517.55.02357
\n", + "

4114 rows × 10 columns

\n", + "
" + ], "text/plain": [ - "(20308598, 20309693)" + " run_id t_time polygon o_eid \\\n", + "0 1 1599775261057353508 +ESU0 +(ESU0-ESZ0) -ESZ0 14915 \n", + "1 1 1599775281055931175 +ESU0 +(ESU0-ESZ0) -ESZ0 17021 \n", + "2 1 1599775285192391177 +ESU0 +(ESU0-ESZ0) -ESZ0 17389 \n", + "3 1 1599775293384540803 +ESU0 +(ESU0-ESZ0) -ESZ0 18509 \n", + "4 1 1599775500032941989 +ESU0 +(ESU0-ESZ0) -ESZ0 31414 \n", + "... ... ... ... ... \n", + "4109 1 1599857100345168600 -ESU0 -(ESU0-ESZ0) +ESZ0 20624671 \n", + "4110 1 1599857108989302635 -ESU0 -(ESU0-ESZ0) +ESZ0 20624888 \n", + "4111 1 1599857121814663688 -ESU0 -(ESU0-ESZ0) +ESZ0 20625427 \n", + "4112 1 1599857121831224496 -ESU0 -(ESU0-ESZ0) +ESZ0 20625475 \n", + "4113 1 1599857474448422056 -ESU0 -(ESU0-ESZ0) +ESZ0 20634821 \n", + "\n", + " o_eid_2 e_eid e_eid_2 target realized streak_id \n", + "0 0 14924 5 12.5 12.5 1 \n", + "1 0 17069 5 10.0 10.0 2 \n", + "2 0 17396 5 10.0 10.0 3 \n", + "3 0 18512 5 10.0 10.0 4 \n", + "4 0 31423 5 12.5 12.5 5 \n", + "... ... ... ... ... ... ... \n", + "4109 0 20624679 5 7.5 -5.0 2353 \n", + "4110 0 20624908 5 7.5 7.5 2354 \n", + "4111 0 20625429 5 7.5 7.5 2355 \n", + "4112 0 20625483 5 7.5 7.5 2356 \n", + "4113 0 20634877 5 17.5 5.0 2357 \n", + "\n", + "[4114 rows x 10 columns]" ] }, - "execution_count": 93, + "execution_count": 26, "metadata": {}, "output_type": "execute_result" } ], "source": [ - "(first_event,last_event)" + "shots" + ] + }, + { + "cell_type": "code", + "execution_count": 28, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "57.5" + ] + }, + "execution_count": 28, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "shots.target.max()" + ] + }, + { + "cell_type": "code", + "execution_count": 29, + "metadata": {}, + "outputs": [], + "source": [ + "b = spartan.qsim(\"select * from shot_beginnings\")" + ] + }, + { + "cell_type": "code", + "execution_count": 30, + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "
run_idt_timepolygono_eido_eid_2targetquantitystreak_id
011599775261056347075+ESU0 +(ESU0-ESZ0) -ESZ014915012.511
111599775281052751175+ESU0 +(ESU0-ESZ0) -ESZ017021010.012
211599775285191883547+ESU0 +(ESU0-ESZ0) -ESZ017389010.013
311599775293384099794+ESU0 +(ESU0-ESZ0) -ESZ018509010.014
411599775500031973640+ESU0 +(ESU0-ESZ0) -ESZ031414012.515
...........................
410911599857100344388600-ESU0 -(ESU0-ESZ0) +ESZ02062467107.512353
411011599857108987457353-ESU0 -(ESU0-ESZ0) +ESZ02062488807.512354
411111599857121814265557-ESU0 -(ESU0-ESZ0) +ESZ02062542707.512355
411211599857121830499036-ESU0 -(ESU0-ESZ0) +ESZ02062547507.512356
411311599857474444293342-ESU0 -(ESU0-ESZ0) +ESZ020634821017.512357
\n", + "

4114 rows × 8 columns

\n", + "
" + ], + "text/plain": [ + " run_id t_time polygon o_eid \\\n", + "0 1 1599775261056347075 +ESU0 +(ESU0-ESZ0) -ESZ0 14915 \n", + "1 1 1599775281052751175 +ESU0 +(ESU0-ESZ0) -ESZ0 17021 \n", + "2 1 1599775285191883547 +ESU0 +(ESU0-ESZ0) -ESZ0 17389 \n", + "3 1 1599775293384099794 +ESU0 +(ESU0-ESZ0) -ESZ0 18509 \n", + "4 1 1599775500031973640 +ESU0 +(ESU0-ESZ0) -ESZ0 31414 \n", + "... ... ... ... ... \n", + "4109 1 1599857100344388600 -ESU0 -(ESU0-ESZ0) +ESZ0 20624671 \n", + "4110 1 1599857108987457353 -ESU0 -(ESU0-ESZ0) +ESZ0 20624888 \n", + "4111 1 1599857121814265557 -ESU0 -(ESU0-ESZ0) +ESZ0 20625427 \n", + "4112 1 1599857121830499036 -ESU0 -(ESU0-ESZ0) +ESZ0 20625475 \n", + "4113 1 1599857474444293342 -ESU0 -(ESU0-ESZ0) +ESZ0 20634821 \n", + "\n", + " o_eid_2 target quantity streak_id \n", + "0 0 12.5 1 1 \n", + "1 0 10.0 1 2 \n", + "2 0 10.0 1 3 \n", + "3 0 10.0 1 4 \n", + "4 0 12.5 1 5 \n", + "... ... ... ... ... \n", + "4109 0 7.5 1 2353 \n", + "4110 0 7.5 1 2354 \n", + "4111 0 7.5 1 2355 \n", + "4112 0 7.5 1 2356 \n", + "4113 0 17.5 1 2357 \n", + "\n", + "[4114 rows x 8 columns]" + ] + }, + "execution_count": 30, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "b" + ] + }, + { + "cell_type": "code", + "execution_count": 31, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "1 4114\n", + "Name: quantity, dtype: int64" + ] + }, + "execution_count": 31, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "b.quantity.value_counts()" + ] + }, + { + "cell_type": "code", + "execution_count": 34, + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "
run_idsession_idbegin_tend_tmkt_datechannelalgo_latencyexchange_latencyrealized_pandlposition_pandlDoubleDipMaxQtyMaxTransactionLatencyMinDepthMinOrdersAtTopMinValueMsToWorkShotn_shotslucky_shotsunlucky_shots
02021:01:43.12121:07:08.9882020-09-103102200060000-13308705.013326875.0140500100171000213548449
13021:01:43.12121:07:08.5422020-09-103102200060000-4116335.04171637.5140500100175000203658263
21021:01:43.12021:07:12.1932020-09-10310220006000025065.00.0140500100170222112949
\n", + "
" + ], + "text/plain": [ + " run_id session_id begin_t end_t mkt_date channel \\\n", + "0 2 0 21:01:43.121 21:07:08.988 2020-09-10 310 \n", + "1 3 0 21:01:43.121 21:07:08.542 2020-09-10 310 \n", + "2 1 0 21:01:43.120 21:07:12.193 2020-09-10 310 \n", + "\n", + " algo_latency exchange_latency realized_pandl position_pandl DoubleDip \\\n", + "0 22000 60000 -13308705.0 13326875.0 1 \n", + "1 22000 60000 -4116335.0 4171637.5 1 \n", + "2 22000 60000 25065.0 0.0 1 \n", + "\n", + " MaxQty MaxTransactionLatency MinDepth MinOrdersAtTop MinValue \\\n", + "0 40 500 100 1 7 \n", + "1 40 500 100 1 7 \n", + "2 40 500 100 1 7 \n", + "\n", + " MsToWorkShot n_shots lucky_shots unlucky_shots \n", + "0 1000 2135 48 449 \n", + "1 5000 2036 58 263 \n", + "2 0 2221 12 949 " + ] + }, + "execution_count": 34, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "spartan.qsim(\"select * from sniper_run\")" ] }, { diff --git a/src/server/sparkd/cmds/spartan/analysis/spartan.py b/src/server/sparkd/cmds/spartan/analysis/spartan.py index 6d5f5694e..04561f957 100644 --- a/src/server/sparkd/cmds/spartan/analysis/spartan.py +++ b/src/server/sparkd/cmds/spartan/analysis/spartan.py @@ -28,9 +28,9 @@ def qsim(query): with get_sim_db() as conn: return pd.read_sql_query(query,conn) -def get_db(channel,store): +def get_db(channel,date): def querier(query): - with get_pcap_db(channel,store) as conn: + with get_pcap_db(channel,date) as conn: return pd.read_sql_query(query,conn) return querier diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/algos/Sniper.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/algos/Sniper.cpp index 2523b81d7..cda7d46be 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/algos/Sniper.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/algos/Sniper.cpp @@ -53,7 +53,7 @@ struct Sniper::PImpl { ISimServices *sim = nullptr; protos::SimRunOptions options; int min_orders_at_top; - int order_qty; + int max_qty; int min_depth; bool affect_books; size_t max_events; @@ -81,7 +81,7 @@ void Sniper::init(ISimServices &s, protos::SimRunOptions const &options) { me->options = options; me->min_orders_at_top = param_or_default(options, "MinOrdersAtTop", 1); - me->order_qty = param_or_default(options, "Qty", 1); + me->max_qty = param_or_default(options, "MaxQty", 1); me->min_depth = param_or_default(options, "MinDepth", 0); me->affect_books = param_or_default(options, "AffectBooks", true); me->max_events = @@ -189,7 +189,7 @@ void Sniper::on_time(MDP3TimeStamp ts) { void Sniper::eval(std::vector const &targets) { for (auto &t : targets) { t->value = 0; - int qty = me->order_qty; + int qty = me->max_qty; for (auto &l : t->polygon.parts) { auto mkt_side = securities::other_side(side_from_ratio(l.ratio)); auto &mkt = me->books[l.sec_id].book.mbp_side(mkt_side); @@ -224,7 +224,7 @@ Sniper::MaybeShot Sniper::pick() { }); if (me->targets[0]->has_value(me->min_value)) { - if (me->order_qty && + if (me->max_qty && (me->observable_time.value() - me->transact_time.value()) < me->max_transaction_latency) return Shot{*me->targets[0], @@ -401,7 +401,8 @@ void Sniper::operator()(const OrderUpdate &update) { in_flight.observed_event_id.first, in_flight.observed_event_id.second, me->current_event.first, me->current_event.second, in_flight.value_at_observation_ts * in_flight.quantity.value(), - pandl.net_cash(all_fills), me->streak_id); + pandl.net_cash(all_fills), me->streak_id, + in_flight.quantity.value()); me->sim->log_pandl(); if (!me->double_dip) transition(State::WAIT_CLEAR);