SpreaderChildOrderUpdate takes a side arg to work better with IAlternateOrderGateway
This commit is contained in:
1 parent
9824ef7686
commit
ef016bfafc
16 files changed
+65
-50
No files matched your search
@@ -70,7 +70,7 @@ public:
|
||||
_orders.reserve(_n_eff_orders);
|
||||
_show_qty=show_qty;
|
||||
for(uint16_t i=0;i<_n_eff_orders;i++)
|
||||
_orders.emplace_back(key,true,true);
|
||||
_orders.emplace_back(key,true,side,true,nullptr);
|
||||
_target_price=price;
|
||||
_target_qty=qty;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h"
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h"
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h"
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/ISpreaderOrderSync.h"
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h"
|
||||
#include "lib/orderman/events/SettlementUpdateEvent.h"
|
||||
#include "lib/tracing/bts_trace.h"
|
||||
#include "lib/utils/helper_macros.h"
|
||||
@@ -21,7 +21,7 @@ namespace orderman {
|
||||
/**************************Cons/Dest*******************************/
|
||||
SpreaderOrder::SpreaderOrder()
|
||||
:
|
||||
_order_sync(nullptr),
|
||||
_alt_order_gateway(nullptr),
|
||||
_cancelled (false),
|
||||
_report_dirty(false),
|
||||
_active(true),
|
||||
@@ -124,8 +124,8 @@ ChildOrder SpreaderOrder::get_new_hedge_order(size_t leg_index){
|
||||
bts::orderman::ChildOrder child_order = leg_data.hedger_order_builder().build();
|
||||
return child_order;
|
||||
}
|
||||
ISpreaderOrderSync* SpreaderOrder::order_sync(){
|
||||
return _order_sync;
|
||||
IAlternateOrderGateway* SpreaderOrder::alt_order_gateway(){
|
||||
return _alt_order_gateway;
|
||||
}
|
||||
// events from orders system ////////////////////
|
||||
/////////////////////////////////////////////////
|
||||
|
||||
@@ -25,7 +25,7 @@ namespace api {namespace orderman {class OrderState; class CreateSpreaderOrder;}
|
||||
namespace orderman {
|
||||
|
||||
class SettlementUpdateEvent;
|
||||
class ISpreaderOrderSync;
|
||||
class IAlternateOrderGateway;
|
||||
|
||||
class SpreaderOrder : public Order, public ISpreaderManager
|
||||
{
|
||||
@@ -49,7 +49,7 @@ private:
|
||||
// no error condition
|
||||
NONE
|
||||
};
|
||||
ISpreaderOrderSync* _order_sync;
|
||||
IAlternateOrderGateway* _alt_order_gateway;
|
||||
// when a fill update, this is populated with
|
||||
// the indices of the other legs
|
||||
//std::array<uint8_t,16> _non_filled_indices;
|
||||
@@ -138,7 +138,7 @@ public:
|
||||
}
|
||||
void setup_new_quoter_order (size_t leg_index) override;
|
||||
ChildOrder get_new_hedge_order (size_t leg_index) override;
|
||||
ISpreaderOrderSync* order_sync() override;
|
||||
IAlternateOrderGateway* alt_order_gateway() override;
|
||||
inline bool in_cache_warming_cycle() const override{
|
||||
return _cw_helper.in_cache_warming_cycle;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace orderman {
|
||||
|
||||
class LegPropertyData;
|
||||
class CacheWarmingState;
|
||||
class ISpreaderOrderSync;
|
||||
class IAlternateOrderGateway;
|
||||
// The Spreader spawns a bunch of quoters and
|
||||
// hedgers and hands them this interface to
|
||||
// i. get data such as book and leg properties
|
||||
@@ -29,7 +29,9 @@ public:
|
||||
// it does not alter the state or has side effects (as
|
||||
// as the spreader goes)
|
||||
virtual ChildOrder get_new_hedge_order (size_t leg_index) = 0;
|
||||
virtual ISpreaderOrderSync* order_sync() = 0;
|
||||
// this is used to direct orders coming out of the spreader.
|
||||
// if this is non null, the orders are routed using this interface
|
||||
virtual IAlternateOrderGateway* alt_order_gateway() = 0;
|
||||
// the spreader can be in a cache warming cycle and generate
|
||||
// fake updates, the quoters and hedgers should ignore them
|
||||
// (however do as much as they can to keep the instruction
|
||||
|
||||
@@ -19,8 +19,9 @@ _spreader(spreader_manager),
|
||||
_leg_property_data (leg_property_data),
|
||||
_child_order_state (leg_property_data.leg_security_key(),
|
||||
is_live,
|
||||
leg_property_data.trading_side(),
|
||||
false,
|
||||
spreader_manager.order_sync()),
|
||||
spreader_manager.alt_order_gateway()),
|
||||
_price_quantity_state(Price(0),
|
||||
Quantity(0)),
|
||||
_worker (nullptr),
|
||||
|
||||
@@ -7,9 +7,10 @@ namespace orderman{
|
||||
SpreaderChildOrderState::SpreaderChildOrderState (SpreaderChildOrderState&& src)
|
||||
:
|
||||
_is_live(src._is_live),
|
||||
_order_sync(std::move(src._order_sync)),
|
||||
_alt_order_gwy(std::move(src._alt_order_gwy)),
|
||||
_sec_key(src._sec_key),
|
||||
_is_quoting (src._is_quoting),
|
||||
_is_quoting(src._is_quoting),
|
||||
_side(src._side),
|
||||
_test_only_order_key(src._test_only_order_key),
|
||||
_n_place_orders(src._n_place_orders),
|
||||
_n_cancel_orders(src._n_cancel_orders),
|
||||
@@ -30,13 +31,15 @@ _order_place_time(src._order_place_time)
|
||||
|
||||
SpreaderChildOrderState::SpreaderChildOrderState (SecurityKey sec_key,
|
||||
bool is_live,
|
||||
api::Side side,
|
||||
bool is_quoting,
|
||||
ISpreaderOrderSync* order_sync)
|
||||
IAlternateOrderGateway* alt_order_gwy)
|
||||
:
|
||||
_is_live (is_live),
|
||||
_order_sync(order_sync),
|
||||
_alt_order_gwy(alt_order_gwy),
|
||||
_sec_key (sec_key),
|
||||
_is_quoting (is_quoting),
|
||||
_side(side),
|
||||
_test_only_order_key((uint32_t)bts::Timer::now().time_since_epoch().count()),
|
||||
_base_price(0),
|
||||
_base_quantity(0){
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "lib/api/services/OrderService.pb.h"
|
||||
#include "lib/orderman/events/OrderStateUpdateEvent.h"
|
||||
#include "SpreaderUtils.h"
|
||||
#include "external_interfacing/ISpreaderOrderSync.h"
|
||||
#include "external_interfacing/IAlternateOrderGateway.h"
|
||||
|
||||
namespace bts {
|
||||
namespace orderman {
|
||||
@@ -18,9 +18,10 @@ private:
|
||||
//_is_live is false for unit tests which enables
|
||||
// this to work without the actual order infrastructure
|
||||
const bool _is_live;
|
||||
ISpreaderOrderSync* _order_sync;
|
||||
const SecurityKey _sec_key;
|
||||
IAlternateOrderGateway* const _alt_order_gwy;
|
||||
const SecurityKey _sec_key;
|
||||
const bool _is_quoting;
|
||||
const api::Side _side;
|
||||
OrderKey _test_only_order_key;
|
||||
// just for statistics
|
||||
uint16_t _n_place_orders, _n_cancel_orders;
|
||||
@@ -29,7 +30,7 @@ private:
|
||||
// accumulated price, qty is kept here
|
||||
Price _base_price;
|
||||
Quantity _base_quantity;
|
||||
ChildOrder _child_order;
|
||||
ChildOrder _child_order;
|
||||
api::orderman::OrderStatus _status;
|
||||
// this is the total filled qty and
|
||||
// average price for the active order
|
||||
@@ -60,8 +61,9 @@ public:
|
||||
// 2. SingleFillHedger when constructing the hedging order
|
||||
SpreaderChildOrderState(SecurityKey sec_key,
|
||||
bool is_live,
|
||||
bool is_quoting,
|
||||
ISpreaderOrderSync* order_sync=nullptr);
|
||||
api::Side side,
|
||||
bool is_quoting,
|
||||
IAlternateOrderGateway* alt_order_gwy);
|
||||
SpreaderChildOrderState (SpreaderChildOrderState&& src);
|
||||
SpreaderChildOrderState& operator=(const SpreaderChildOrderState&) = delete;
|
||||
SpreaderChildOrderState& operator=(SpreaderChildOrderState&&) = delete;
|
||||
@@ -177,10 +179,9 @@ public:
|
||||
if (_is_live)
|
||||
_child_order.activate(price, quantity);
|
||||
else
|
||||
if(_order_sync != nullptr)
|
||||
//TODO
|
||||
_order_sync->place_order(_sec_key,_test_only_order_key,
|
||||
api::Side::SIDE_BUY,price, quantity);
|
||||
if(_alt_order_gwy != nullptr)
|
||||
_alt_order_gwy->place_order(_sec_key,_test_only_order_key,
|
||||
_side,price,quantity);
|
||||
LOG(OrderMan, Info, "SpreaderChildOrderState::place_order "
|
||||
"is_quoting:{} key:{} sec_key:{} live:{} "
|
||||
"price:{} qty:{} t:{}",
|
||||
@@ -199,8 +200,8 @@ public:
|
||||
if (_is_live)
|
||||
_child_order.update(price, quantity);
|
||||
else
|
||||
if(_order_sync != nullptr)
|
||||
_order_sync->modify_order(_test_only_order_key,price,quantity);
|
||||
if(_alt_order_gwy != nullptr)
|
||||
_alt_order_gwy->modify_order(_test_only_order_key,price,quantity);
|
||||
LOG(OrderMan, Info, "SpreaderChildOrderState::modify_order "
|
||||
"is_quoting:{} key:{} sec_key:{} live:{} "
|
||||
"price:{} quantity:{} mod_no:{} t:{}",
|
||||
@@ -217,8 +218,8 @@ public:
|
||||
if (_is_live)
|
||||
_child_order.cancel();
|
||||
else
|
||||
if(_order_sync != nullptr)
|
||||
_order_sync->cancel_order(_test_only_order_key);
|
||||
if(_alt_order_gwy != nullptr)
|
||||
_alt_order_gwy->cancel_order(_test_only_order_key);
|
||||
}
|
||||
void keep_order_warm(){
|
||||
_child_order.warm_up_activate();
|
||||
|
||||
@@ -49,8 +49,9 @@ public:
|
||||
_quoter_child_order_state (_is_quoting ? new SpreaderChildOrderState(
|
||||
_leg_property_data.leg_security_key(),
|
||||
services.is_live(),
|
||||
leg_property_data.trading_side(),
|
||||
true,
|
||||
spreader_manager.order_sync())
|
||||
spreader_manager.alt_order_gateway())
|
||||
: nullptr),
|
||||
_quoter(_is_quoting ? new SingleLegQuoter(spreader_manager,
|
||||
_leg_property_data,
|
||||
|
||||
+4
-3
@@ -5,7 +5,7 @@
|
||||
namespace bts {
|
||||
namespace orderman {
|
||||
|
||||
class ISpreaderOrderSync{
|
||||
class IAlternateOrderGateway{
|
||||
public:
|
||||
virtual void place_order(SecurityKey,
|
||||
OrderKey,
|
||||
@@ -15,7 +15,8 @@ public:
|
||||
virtual void modify_order(OrderKey,
|
||||
Price,
|
||||
Quantity)=0;
|
||||
virtual void cancel_order(OrderKey)=0;
|
||||
virtual ~ISpreaderOrderSync() {}
|
||||
virtual void cancel_order(OrderKey)=0;
|
||||
virtual OrderKey generate_key() = 0;
|
||||
virtual ~IAlternateOrderGateway() {}
|
||||
};
|
||||
}}
|
||||
+4
-4
@@ -7,11 +7,11 @@ namespace orderman{
|
||||
|
||||
SpreaderOrderServices::SpreaderOrderServices (
|
||||
OrderServices* order_services,
|
||||
ISpreaderOrderSync* order_sync)
|
||||
IAlternateOrderGateway* alt_order_gateway)
|
||||
:
|
||||
_is_live(order_services != nullptr),
|
||||
_order_services(order_services),
|
||||
_order_sync(order_sync){
|
||||
_alt_order_gateway(alt_order_gateway){
|
||||
}
|
||||
|
||||
OrderServices& SpreaderOrderServices::order_services(){
|
||||
@@ -48,8 +48,8 @@ bool SpreaderOrderServices::is_live() const {
|
||||
return _is_live;
|
||||
}
|
||||
|
||||
ISpreaderOrderSync* SpreaderOrderServices::order_sync(){
|
||||
return _order_sync;
|
||||
IAlternateOrderGateway* SpreaderOrderServices::alt_order_gateway(){
|
||||
return _alt_order_gateway;
|
||||
}
|
||||
|
||||
}}
|
||||
+4
-4
@@ -10,7 +10,7 @@
|
||||
namespace bts {
|
||||
namespace orderman {
|
||||
|
||||
class ISpreaderOrderSync;
|
||||
class IAlternateOrderGateway;
|
||||
|
||||
// SpreaderOrderServices is a thin wrapper around
|
||||
// OrderServices. The solitary instance of this
|
||||
@@ -22,10 +22,10 @@ class SpreaderOrderServices
|
||||
private:
|
||||
const bool _is_live;
|
||||
bts::orderman::OrderServices* _order_services;
|
||||
ISpreaderOrderSync* _order_sync;
|
||||
IAlternateOrderGateway* _alt_order_gateway;
|
||||
public:
|
||||
SpreaderOrderServices (OrderServices* order_services,
|
||||
ISpreaderOrderSync* order_sync = nullptr);
|
||||
IAlternateOrderGateway* alt_order_gateway = nullptr);
|
||||
OrderServices& order_services();
|
||||
void report_state(const api::orderman::OrderState &state);
|
||||
trace::ScopedPerfLogEntry log_scope(
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
const char *txt_1 = "",
|
||||
uint32_t uint32_1 = 0);
|
||||
bool is_live() const;
|
||||
ISpreaderOrderSync* order_sync();
|
||||
IAlternateOrderGateway* alt_order_gateway();
|
||||
};
|
||||
|
||||
}}
|
||||
|
||||
+2
-2
@@ -80,13 +80,13 @@ void SpreaderStartStateWorker::on_init_recovered(const bts::api::orderman::Order
|
||||
void SpreaderStartStateWorker::on_activate(Price price,
|
||||
Quantity quantity,
|
||||
SpreaderOrderServices& order_services){
|
||||
_spreader->_order_sync = order_services.order_sync();
|
||||
_spreader->_alt_order_gateway = order_services.alt_order_gateway();
|
||||
// 1. update price, qty
|
||||
_spreader->_set_price_quantity (price, quantity);
|
||||
// 2. activate order builders
|
||||
for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data().n_legs(); l_idx++)
|
||||
{
|
||||
SpreaderLegData& leg_data = _spreader->_bookkeeping_data().get_leg_data(l_idx);
|
||||
SpreaderLegData& leg_data = _spreader->_bookkeeping_data().get_leg_data(l_idx);
|
||||
leg_data.hedger_order_builder().activate(order_services);
|
||||
if(leg_data.leg_property_data().is_active_quoting())
|
||||
leg_data.quoter_order_builder().activate(order_services);
|
||||
|
||||
@@ -17,7 +17,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]")
|
||||
ContractLeg leg_1;
|
||||
fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.25);
|
||||
LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, 1.0, true, 2.0);
|
||||
SpreaderChildOrderState order(leg_prop_data_1.leg_security_key(),false,true);
|
||||
SpreaderChildOrderState order(leg_prop_data_1.leg_security_key(),false,leg_prop_data_1.trading_side(),true,nullptr);
|
||||
QuoteLegPriceQuantityState s (Price (-1.0), Quantity (200), order);
|
||||
REQUIRE (s.target_spread_price() == Price (-1.0));
|
||||
REQUIRE (s.target_leg_quantity() == Quantity (200));
|
||||
@@ -86,7 +86,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]")
|
||||
REQUIRE (s.out_quantity() == Quantity (123));
|
||||
SECTION("test cycle_back")
|
||||
{
|
||||
SpreaderChildOrderState order_2(leg_prop_data_1.leg_security_key(),false,true);
|
||||
SpreaderChildOrderState order_2(leg_prop_data_1.leg_security_key(),false,leg_prop_data_1.trading_side(), true,nullptr);
|
||||
QuoteLegPriceQuantityState s (Price (-1.0), Quantity (200),order_2);
|
||||
REQUIRE (s.target_spread_price() == Price (-1.0));
|
||||
REQUIRE (s.target_leg_quantity() == Quantity (200));
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h"
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h"
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h"
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/ISpreaderOrderSync.h"
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h"
|
||||
#include <google/protobuf/util/message_differencer.h>
|
||||
#include "lib/os/os.h"
|
||||
#include <algorithm>
|
||||
@@ -92,7 +92,7 @@ public:
|
||||
ChildOrder rv;
|
||||
return rv;
|
||||
}
|
||||
ISpreaderOrderSync* order_sync() override{
|
||||
IAlternateOrderGateway* alt_order_gateway() override{
|
||||
return nullptr;
|
||||
}
|
||||
bool in_cache_warming_cycle() const override{
|
||||
|
||||
+5
@@ -126,6 +126,11 @@ void OrderTranslator::cancel_order(OrderKey okey){
|
||||
me->sim_services->send(ochange);
|
||||
}
|
||||
|
||||
OrderKey OrderTranslator::generate_key(){
|
||||
auto rv = static_cast<uint32_t>(bts::Timer::now().time_since_epoch().count());
|
||||
return OrderKey(rv);
|
||||
}
|
||||
|
||||
void OrderTranslator::route_update_to_spreader(const OrderUpdate& u){
|
||||
OrderTuple* t = find_ord(u.key,me->orders);
|
||||
bts_assert(t!=nullptr);
|
||||
|
||||
+4
-3
@@ -4,7 +4,7 @@
|
||||
#include "lib/orderman/orderman_utils/orderman_common.h"
|
||||
#include "lib/domain_model/Security.pb.h"
|
||||
#include "../AlgoEvent.h"
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/ISpreaderOrderSync.h"
|
||||
#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h"
|
||||
|
||||
namespace bts { namespace orderman {class SpreaderOrder;}}
|
||||
|
||||
@@ -12,14 +12,14 @@ namespace bts::spartan::mdp3 {
|
||||
|
||||
class ISimServices;
|
||||
|
||||
class OrderTranslator : public bts::orderman::ISpreaderOrderSync{
|
||||
class OrderTranslator : public bts::orderman::IAlternateOrderGateway{
|
||||
private:
|
||||
struct PImpl;
|
||||
std::unique_ptr<PImpl> me;
|
||||
public:
|
||||
OrderTranslator(bts::orderman::SpreaderOrder&);
|
||||
void init(ISimServices&);
|
||||
// ISpreaderOrderSync functions
|
||||
// IAlternateOrderGateway functions
|
||||
// (SpreaderChildOrderState's calls need to end up here)
|
||||
void place_order(SecurityKey,
|
||||
bts::orderman::OrderKey,
|
||||
@@ -28,6 +28,7 @@ public:
|
||||
Quantity) override;
|
||||
void modify_order(bts::orderman::OrderKey, Price, Quantity) override;
|
||||
void cancel_order(bts::orderman::OrderKey) override;
|
||||
bts::orderman::OrderKey generate_key() override;
|
||||
// Sends ISimServices's updates to spreader
|
||||
void route_update_to_spreader(const OrderUpdate&);
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user