polishing TriggerOrder

This commit is contained in:
Taha Afzal committed 2018-07-19 10:36:36 -04:00
1 parent e346858516
commit b2facaecd9
2 files changed
+63 -30

No files matched your search

@@ -4,6 +4,7 @@
#include "server/sparkd/orderman/actors/order_manager/OrderBuilder.h"
#include "server/sparkd/orderman/events/BookUpdateEvent.h"
#include "server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderUtils.h"
#include "lib/domain_model/Security.h"
#include <algorithm>
#include <sstream>
@@ -13,6 +14,7 @@ namespace orderman{
struct TriggerOrder::PImpl {
OrderServices *services;
api::orderman::OrderDefinition order_def;
double tick_size;
api::orderman::OrderState state;
api::orderman::OrderState child_state;
OrderBuilder order_builder;
@@ -25,6 +27,7 @@ struct TriggerOrder::PImpl {
bool market_observed_once;
bool is_cxled;
bool is_recovered;
bool is_succ_inited;
PImpl()
:
services(nullptr),
@@ -35,7 +38,8 @@ struct TriggerOrder::PImpl {
book(),
market_observed_once(false),
is_cxled(false),
is_recovered(false){
is_recovered(false),
is_succ_inited(false){
}
};
@@ -55,7 +59,7 @@ void TriggerOrder::on_init_new(const api::orderman::OrderDefinition& order_def,
key(),_state);
switch (_state){
case State::START:
_create_childorder(order_def,pre_os);
me->is_succ_inited=_on_init_new(order_def,pre_os);
break;
case State::WAITING_FOR_TRIGGER:
case State::STEADY:
@@ -67,15 +71,28 @@ void TriggerOrder::on_init_new(const api::orderman::OrderDefinition& order_def,
}
}
void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord& rec,
const PreActivationOrderServices&){
// not reviving from disk for now
const PreActivationOrderServices& pre_os){
LOG(OrderMan, Warn, "TriggerOrder::on_init_recovered key:{} state:{}",
key(),_state);
me->order_def=rec.def();
me->state=rec.state();
if (!SpreaderUtils::order_in_terminal_state(me->state.status()))
me->state.set_status(api::orderman::OrderStatus::ORDER_STATUS_CANCELED);
me->is_recovered=true;
switch (_state){
case State::START:
me->is_succ_inited=_on_init_new(rec.def(),pre_os);
// get the state from what was recovered (we will only use
// it for reporting)
me->state=rec.state();
// if it was not in a terminal state, we will call it cancelled
if (!SpreaderUtils::order_in_terminal_state(me->state.status()))
me->state.set_status(api::orderman::OrderStatus::ORDER_STATUS_CANCELED);
me->is_recovered=true;
break;
case State::WAITING_FOR_TRIGGER:
case State::STEADY:
case State::END:
std::ostringstream oss;
oss << "TriggerOrder::on_init_recovered key:" << key() << "state:" << _state;
bts_assert_msg(false, oss.str());
break;
}
}
void TriggerOrder::on_activate(Price price,
Quantity qty,
@@ -86,11 +103,11 @@ void TriggerOrder::on_activate(Price price,
switch (_state){
case State::START:
me->services=&services;
if(me->is_recovered)
me->state.set_price(price.value());
me->state.set_quantity(qty.value());
if(me->is_recovered || !me->is_succ_inited)
_switch_state(State::END);
else{
me->state.set_price(price.value());
me->state.set_quantity(qty.value());
me->order_builder.activate(services);
me->child_order=me->order_builder.build();
services.child_updates.sub(key(),
@@ -103,14 +120,13 @@ void TriggerOrder::on_activate(Price price,
}
break;
case State::WAITING_FOR_TRIGGER:
case State::STEADY:{
case State::STEADY:
case State::END:{
std::ostringstream oss;
oss << "TriggerOrder::on_activate key:" << key() << "state:" << _state;
bts_assert_msg(false,oss.str());
break;
}
case State::END:
break;
}
}
// order price, qty change
@@ -196,20 +212,28 @@ void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent& o_ev){
}
}
}
void TriggerOrder::_create_childorder(const api::orderman::OrderDefinition& order_def,
const PreActivationOrderServices& pre_os){
bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition& order_def,
const PreActivationOrderServices& pre_os){
me->order_def=order_def;
const auto& trigger_order_def=order_def.custom_def().trigger();
api::orderman::OrderDefinition child_order_def = order_def;
child_order_def.set_security_key(trigger_order_def.trigger_action().security_id());
child_order_def.mutable_custom_def()->CopyFrom(trigger_order_def.child());
me->order_builder=OrderBuilder(key(),child_order_def,pre_os);
const auto* sec_ptr = pre_os.sec_db.resolve(SecurityKey(order_def.security_key()));
if(sec_ptr!=nullptr){
me->tick_size=std::min(sec_ptr->contract_spec().low_tick(),
sec_ptr->contract_spec().high_tick());
return true;
}
else
return false;
}
void TriggerOrder::_report_state(){
bts_assert(me->services!=nullptr);
if (!me->is_recovered)
void TriggerOrder::_report_state(){
if(_activated()){
_compute_state();
me->services->report_state(me->state);
me->services->report_state(me->state);
}
}
void TriggerOrder::_switch_state(State new_state){
switch(new_state){
@@ -235,8 +259,8 @@ void TriggerOrder::_analyze_trigger(){
bts_assert(me->market_observed_once);
const md::PriceSize* obs_md=_observed_market();
double trigger_price=_trigger_price();
if((me->trigger_above_market && obs_md->price()>=trigger_price) ||
(!me->trigger_above_market && obs_md->price()<=trigger_price)){
if((me->trigger_above_market && _gr_than_eq(obs_md->price(),trigger_price)) ||
(!me->trigger_above_market && _gr_than_eq(trigger_price,obs_md->price()))){
me->child_order.activate(Price(_child_order_price()),
Quantity(me->state.quantity()));
_switch_state(State::STEADY);
@@ -249,7 +273,6 @@ api::orderman::OrderStatus TriggerOrder::_status() const{
case State::STEADY:
return api::orderman::OrderStatus::ORDER_STATUS_WORKING;
case State::END:
return me->is_cxled ? api::orderman::OrderStatus::ORDER_STATUS_CANCELED :
api::orderman::OrderStatus::ORDER_STATUS_COMPLETED;
default:
@@ -258,10 +281,12 @@ api::orderman::OrderStatus TriggerOrder::_status() const{
}
}
void TriggerOrder::_compute_state(){
me->state.set_status(_status());
me->state.set_filled_quantity(me->child_state.filled_quantity());
me->state.set_last_price(me->child_state.last_price());
me->state.set_avg_price(me->child_state.avg_price());
if (!me->is_recovered){
me->state.set_status(_status());
me->state.set_filled_quantity(me->child_state.filled_quantity());
me->state.set_last_price(me->child_state.last_price());
me->state.set_avg_price(me->child_state.avg_price());
}
}
void TriggerOrder::_observe_market_once(){
if(!me->market_observed_once){
@@ -294,4 +319,10 @@ double TriggerOrder::_trigger_price() const{
double TriggerOrder::_child_order_price() const{
return me->order_def.custom_def().trigger().trigger_action().price();
}
bool TriggerOrder::_activated() const{
return me->services!=nullptr;
}
bool TriggerOrder::_gr_than_eq(double p1, double p2) const{
return bts::securities::test_price_equality(p1,p2,me->tick_size) || p1>=p2;
}
}}
@@ -42,8 +42,8 @@ private:
void _on_child_order_update(OrderStateUpdateEvent const&);
private:
// called from init_new
void _create_childorder(const api::orderman::OrderDefinition& order_def,
const PreActivationOrderServices& pre_os);
bool _on_init_new(const api::orderman::OrderDefinition& order_def,
const PreActivationOrderServices& pre_os);
void _report_state();
void _switch_state(State new_state);
void _analyze_trigger();
@@ -61,6 +61,8 @@ private:
double _trigger_price() const;
// this is in the trigger action
double _child_order_price() const;
bool _activated() const;
bool _gr_than_eq(double p1, double p2) const;
private:
State _state;
struct PImpl;