order initialization moved out of SpreaderOrder cons

This commit is contained in:
Taha Afzal committed 2017-10-12 20:34:27 -04:00
1 parent 31c8bf724b
commit 653b89d10d
7 files changed
+94 -88

No files matched your search

@@ -10,15 +10,25 @@ namespace orderman {
struct SpreaderOrder::PImpl
{
PImpl(api::orderman::OrderStatus status,
Price price, Quantity quantity,
std::string const &reject_msg)
:status(status),
price(price),
quantity(quantity),
reject_msg(reject_msg)
{}
PImpl(bool resurrected_arg,
const api::orderman::CreateOrderRequest& create_order_request_arg,
OrderKey orderkey_arg,
api::orderman::OrderStatus status,
Price price,
Quantity quantity,
std::string const &reject_msg)
:
resurrected (resurrected_arg),
create_order_request (create_order_request_arg),
orderkey (orderkey_arg),
status(status),
price(price),
quantity(quantity),
reject_msg(reject_msg)
{}
const bool resurrected;
const api::orderman::CreateOrderRequest create_order_request;
const OrderKey orderkey;
api::orderman::OrderStatus status;
Price price;
Quantity quantity;
@@ -26,19 +36,15 @@ struct SpreaderOrder::PImpl
};
SpreaderOrder::SpreaderOrder(securities::SecurityDB &db,
NativeOrderFactory &f,
api::orderman::OrderState const&os)
NativeOrderFactory &f,
api::orderman::OrderState const&os)
:
SpreaderOrderBase(db, f, os),
_resurrected (true),
_n_legs (0),
me(new PImpl(os.order_status(),
Price(os.spreader().price()),
Quantity(os.spreader().quantity()),
os.reject_msg()))
me(new PImpl(true, api::orderman::CreateOrderRequest(), OrderKey (0), os.order_status(),
Price(os.spreader().price()), Quantity(os.spreader().quantity()), os.reject_msg())),
_state (State::START)
{
LOG(OrderMan, Diag, "recovered SpreaderOrder from state. state: {}",
utils::pb::to_string(os));
LOG(OrderMan, Diag, "recovered SpreaderOrder from state. state: {}", utils::pb::to_string(os));
}
SpreaderOrder::SpreaderOrder(securities::SecurityDB& db,
@@ -47,52 +53,27 @@ SpreaderOrder::SpreaderOrder(securities::SecurityDB& db,
api::orderman::CreateOrderRequest const& cor)
:
SpreaderOrderBase(db, f, k, cor),
_resurrected (false),
_n_legs (cor.spreader().security().synthetic().legs().size()),
me(new PImpl(api::orderman::OS_UNACKNOWLEDGED,
Price(cor.spreader().price()),
Quantity(cor.spreader().quantity()),
std::string(""))),
_state(State::START)
me(new PImpl(false, cor, k, api::orderman::OS_UNACKNOWLEDGED, Price(cor.spreader().price()),
Quantity(cor.spreader().quantity()), std::string(""))),
_state(State::START)
{
LOG(OrderMan, Diag, "creating new SpreaderOrder. request: {}", utils::pb::to_string(cor));
bts_assert(cor.has_spreader());
const api::Security& sec = cor.spreader().security();
bts_assert(sec.has_synthetic());
std::vector<SpreaderBookkeepingData::LegData> leg_data_vector;
size_t leg_idx = 0;
//creating the basic data
ISpreaderManager& me_ref = *this;
spark::ExecutionStrategy execution_strategy = cor.spreader().execution_strategy();
for (auto it = sec.synthetic().legs().begin(); it != sec.synthetic().legs().end(); ++it)
{
uint32_t sec_key = it->security().id();
auto st_it = execution_strategy.leg_params_map().find(sec_key);
bts_assert(st_it != execution_strategy.leg_params_map().end());
const bts::api::ContractLeg& leg = *it;
api::Side leg_order_side = SpreaderUtils::get_leg_side(cor.spreader().side(), leg);
LegPropertyData leg_property_data(leg_idx, leg, st_it->second, leg_order_side);
// order
bts::orderman::SpreaderOrderBase::ChildFactory child_factory = get_child_factory(leg_property_data.security(), leg_property_data.trading_side, api::orderman::ChildOrderKind::COK_SPREADER_QUOTING);
bts::orderman::SpreaderOrderBase::ChildOrder child_order = child_factory();
SingleLegQuoter leg_quoter(me_ref, leg_property_data, Price(cor.spreader().price()), Quantity(cor.spreader().quantity()), child_order);
SpreaderBookkeepingData::LegData leg_data(leg_property_data, leg_quoter, child_order.order_key());
leg_data_vector.push_back(leg_data);
leg_idx++;
}
bts_assert(leg_data_vector.size() > 0);
_bookkeeping_data = std::make_unique<SpreaderBookkeepingData>(sec, leg_data_vector);
bts_assert(cor.spreader().security().has_synthetic());
}
SpreaderOrder::~SpreaderOrder () {}
void SpreaderOrder::init()
{
if (_resurrected) return;
if (me->resurrected) return;
LOG(OrderMan, Diag, "Init");
report_state();
if (_state == State::START)
{
_init_state();
_transform_to_WAITING_FOR_FIRST_CONNECTION();
}
else if (_state == State::WAITING_FOR_FIRST_CONNECT)
bts_assert(false);
else if (_state == State::WORKING)
@@ -105,7 +86,7 @@ void SpreaderOrder::init()
void SpreaderOrder::on_connect()
{
if (_resurrected)
if (me->resurrected)
{
// ignoring _resurrected (from disk) orders for now
return;
@@ -128,7 +109,7 @@ void SpreaderOrder::on_connect()
void SpreaderOrder::on_disconnect()
{
if (_resurrected) return;
if (me->resurrected) return;
LOG(OrderMan,Diag,"on_disconnect");
if (_state == State::START)
// getting a disconnect before the first connect is not allowed
@@ -149,7 +130,7 @@ void SpreaderOrder::on_disconnect()
void SpreaderOrder::on_update(const api::orderman::UpdateSpreaderOrder& u)
{
LOG(OrderMan,Diag,"on_update SpreaderOrder. order: {}",utils::pb::to_string(u));
if (_resurrected) return;
if (me->resurrected) return;
// TODO : send status updates out
if (_state == State::START)
{
@@ -197,7 +178,7 @@ void SpreaderOrder::on_update(const api::orderman::UpdateSpreaderOrder& u)
void SpreaderOrder::on_cancel(const api::orderman::CancelSpreaderOrder& c)
{
LOG(OrderMan,Diag,"on_cancel SpreaderOrder. order: {}",utils::pb::to_string(c));
if (_resurrected) return;
if (me->resurrected) return;
if (_state == State::START)
_transform_to_END();
else if (_state == State::WAITING_FOR_FIRST_CONNECT)
@@ -216,7 +197,7 @@ void SpreaderOrder::on_cancel(const api::orderman::CancelSpreaderOrder& c)
void SpreaderOrder::on_book(TickToTradeCorID cid, Book const& book)
{
if (_resurrected) return;
if (me->resurrected) return;
LOG(OrderMan, Diag, "on_book");
LOG(Latency, Info, "on_book {} {}", cid, utils::TimeStamp::now().to_uint64());
if (_state == State::START)
@@ -266,7 +247,7 @@ void SpreaderOrder::on_child_update(OrderKey orderkey,
Price average_price,
std::string const *error_msg)
{
if (_resurrected) return;
if (me->resurrected) return;
using namespace bts::spreader;
static std::string empty;
LOG(OrderMan,Diag,
@@ -336,7 +317,7 @@ void SpreaderOrder::on_child_update(OrderKey orderkey,
void SpreaderOrder::on_external_error(std::string const&reason)
{
if (_resurrected) return;
if (me->resurrected) return;
LOG(OrderMan,Warn, "on_external_error SpreaderOrder. msg: {}", reason);
if (_state == State::START)
_transform_to_END();
@@ -362,9 +343,35 @@ const LegPropertyData& SpreaderOrder::get_leg_data(size_t leg_index) const
{
return _bookkeeping_data->get_leg_data(leg_index).leg_property_data;
}
size_t SpreaderOrder::n_legs() const
void SpreaderOrder::_init_state()
{
return _n_legs;
std::vector<SpreaderBookkeepingData::LegData> leg_data_vector;
//creating the basic data
ISpreaderManager& me_ref = *this;
const bts::api::orderman::CreateSpreaderOrder& cor = me->create_order_request.spreader();
spark::ExecutionStrategy execution_strategy = cor.execution_strategy();
const bts::api::Security& sec = cor.security();
size_t n_spreader_legs = sec.synthetic().legs().size();
size_t leg_idx = 0;
for (auto it = sec.synthetic().legs().begin(); it != sec.synthetic().legs().end(); ++it)
{
uint32_t sec_key = it->security().id();
auto st_it = execution_strategy.leg_params_map().find(sec_key);
bts_assert(st_it != execution_strategy.leg_params_map().end());
const bts::api::ContractLeg& leg = *it;
api::Side leg_order_side = SpreaderUtils::get_leg_side(cor.side(), leg);
LegPropertyData leg_property_data(leg_idx, leg, st_it->second, leg_order_side);
// order
bts::orderman::SpreaderOrderBase::ChildFactory child_factory = get_child_factory(leg_property_data.security(), leg_property_data.trading_side, api::orderman::ChildOrderKind::COK_SPREADER_QUOTING);
bts::orderman::SpreaderOrderBase::ChildOrder child_order = child_factory();
SingleLegQuoter leg_quoter(me_ref, leg_property_data, n_spreader_legs, Price(cor.price()), Quantity(cor.quantity()), child_order);
SpreaderBookkeepingData::LegData leg_data(leg_property_data, leg_quoter, child_order.order_key());
leg_data_vector.push_back(leg_data);
leg_idx++;
}
bts_assert(leg_data_vector.size() > 0);
_bookkeeping_data = std::make_unique<SpreaderBookkeepingData>(sec, leg_data_vector);
}
void SpreaderOrder::_transform_to_WAITING_FOR_FIRST_CONNECTION()
@@ -424,7 +431,7 @@ void SpreaderOrder::_handle_quoter_order_update(SpreaderBookkeepingData::LegData
{
if (leg_data.leg_property_data.is_active_quoting())
leg_data.quoter.update_other_leg_fills(leg_data.leg_property_data.leg_index, this_fill_quantity);
_send_hedge(leg_data.leg_property_data.leg_index, this_fill_price, this_fill_quantity, idx);
//_send_hedge(leg_data.leg_property_data.leg_index, this_fill_price, this_fill_quantity, idx);// TODO
}
}
}
@@ -489,4 +496,4 @@ void SpreaderOrder::report_state()
me->status, me->price,me->quantity,me->reject_msg.empty() ? nullptr : &me->reject_msg });
}
}}
}}
@@ -80,8 +80,8 @@ public:
// ISpreaderManager members
const orderman::Book& get_book(size_t leg_index) const override;
const LegPropertyData& get_leg_data(size_t leg_index) const override;
size_t n_legs() const override;
private:
void _init_state ();
void _transform_to_WAITING_FOR_FIRST_CONNECTION();
void _transform_to_WORKING();
void _transform_to_WAITING_FOR_CANCEL_ALL();
@@ -101,16 +101,13 @@ private:
Price filled_price, Quantity filled_quantity,
size_t hedged_index,
Price& hedge_price, Quantity& hedge_quantity);
bool _order_update_has_error(std::string const *error_msg) { return error_msg != NULL; }
bool _order_update_has_error(std::string const *error_msg) { return error_msg != NULL; }
void report_state();
private:
const bool _resurrected;
const size_t _n_legs;
struct PImpl;
std::unique_ptr<PImpl> me;
std::unique_ptr<SpreaderBookkeepingData> _bookkeeping_data;
api::orderman::CreateOrderRequest _create_order_request;
std::unique_ptr<PImpl> me;
State _state;
std::unique_ptr<SpreaderBookkeepingData> _bookkeeping_data;
};
}}
@@ -17,7 +17,5 @@ public:
// data in the returned type is all const, so nothing will change
// beneath it
virtual const LegPropertyData& get_leg_data(size_t leg_index) const = 0;
// number of legs on the spread
virtual size_t n_legs() const = 0;
};
}}
+10 -8
View File
@@ -10,21 +10,23 @@ namespace bts {
namespace spreader {
SingleLegQuoter::SingleLegQuoter(ISpreaderManager& order_bridge,
LegPropertyData leg_data,
LegPropertyData this_leg_property,
size_t n_spreader_legs,
bts::Price spread_order_price,
bts::Quantity spread_order_quantity,
bts::orderman::SpreaderOrderBase::ChildOrder child_order)
:
_tick_size(leg_data.leg_contract.security().contract_spec().low_tick()),
_two_legged (order_bridge.n_legs() == 2),
_tick_size(this_leg_property.tick_size()),
_two_legged (n_spreader_legs == 2),
_order_bridge(order_bridge),
_this_leg_data (leg_data),
_this_leg_index(leg_data.leg_index),
_this_leg_data (this_leg_property),
_this_leg_index(this_leg_property.leg_index),
_n_spreader_legs (n_spreader_legs),
_child_order (child_order),
_state(QuoterState::START),
_price_quantity_state(QuoteLegPriceQuantityState(spread_order_price, Quantity(static_cast<double>(spread_order_quantity.value() * _this_leg_data.size_multiplier()))))
{
for (size_t q_idx = 0; q_idx < order_bridge.n_legs(); q_idx++)
for (size_t q_idx = 0; q_idx < _n_spreader_legs; q_idx++)
_aux_comp_data.push_back(PQPair());
}
@@ -371,7 +373,7 @@ void SingleLegQuoter::_fire_event(const EventData& event_data)
void SingleLegQuoter::_compute_price_quantity_n_legs(Price& price, Quantity& quantity)
{
size_t min_quoter_leg_quantity_index = 0;
for (size_t idx = 0; idx < _order_bridge.n_legs(); idx++)
for (size_t idx = 0; idx < _n_spreader_legs; idx++)
{
if (idx != _this_leg_index)
{
@@ -396,7 +398,7 @@ void SingleLegQuoter::_compute_price_quantity_n_legs(Price& price, Quantity& qua
Price SingleLegQuoter::_compute_leg_price_n_legs(const std::vector<PQPair>& leg_values)
{
double sum = 0;
for (size_t idx = 0; idx < _order_bridge.n_legs(); idx++)
for (size_t idx = 0; idx < _n_spreader_legs; idx++)
{
if (idx != _this_leg_index)
{
+3 -1
View File
@@ -124,13 +124,15 @@ private:
ISpreaderManager& _order_bridge;
const LegPropertyData _this_leg_data;
const size_t _this_leg_index;
const size_t _n_spreader_legs;
bts::orderman::SpreaderOrderBase::ChildOrder _child_order;
std::vector<PQPair> _aux_comp_data;
QuoterState _state;
QuoteLegPriceQuantityState _price_quantity_state;
public:
SingleLegQuoter(ISpreaderManager& order_bridge,
LegPropertyData leg_property_data,
LegPropertyData this_leg_property,
size_t n_spreader_legs,
bts::Price spread_order_price,
bts::Quantity spread_order_quantity,
bts::orderman::SpreaderOrderBase::ChildOrder child_order);
@@ -73,7 +73,7 @@ public:
for (auto it = hedger_data_vector.begin(); it < hedger_data_vector.end(); it++)
if (it->order_key == order_key)
return &(*it);
return NULL;
return nullptr;
}
size_t n_hedgers() { return hedger_data_vector.size(); }
@@ -149,7 +149,7 @@ public:
for (auto q_it = _leg_data.begin(); q_it != _leg_data.end(); q_it++)
if (q_it->order_key.value() == orderkey.value())
return &(*q_it);
return NULL;
return nullptr;
}
HedgerData* find_hedger_from_orderkey(orderman::OrderKey orderkey)
{
@@ -157,7 +157,7 @@ public:
for (auto h_it = q_it->hedger_data_vector.begin(); h_it != q_it->hedger_data_vector.end(); ++h_it)
if (h_it->order_key == orderkey)
return &(*h_it);
return NULL;
return nullptr;
}
};
+4 -4
View File
@@ -153,10 +153,10 @@ namespace bts {
return leg_data.leg_property_data;
}
// number of legs on the spread
size_t n_legs() const override
{
return 2;
}
// size_t n_legs() const override
// {
// return 2;
// }
};
void _fill_book(Book& book, double inside_market, double tick_size, uint16_t* sizes, bts::api::Side side)