comments and some stylistic changes for the limiter

This commit is contained in:
Taha Afzal committed 2018-05-27 22:25:29 -04:00
1 parent 4b9e046046
commit 85643adcf3
6 files changed
+35 -38

No files matched your search

@@ -55,9 +55,9 @@ ProductLimitTree* LimitStore::_find_product_for_security(const api::Security& se
return _find_product(product);
}
ProductLimitTree* LimitStore::_find_product(const api::Product& product){
for(auto it=_prod_map.begin(); it!= _prod_map.end(); it++)
if(product.exchange() == it->product().exchange() && product.type() == it->product().type() && product.symbol() == it->product().symbol())
return &*it;
for(ProductLimitTree& plt : _prod_map)
if(product.exchange() == plt.product().exchange() && product.type() == plt.product().type() && product.symbol() == plt.product().symbol())
return &plt;
return nullptr;
}
const SecurityLimitNode* LimitStore::test_only_func_find_security_node(AccountID account_id,
@@ -25,8 +25,8 @@ void Limiter::update(api::admin::AdminData const& admin_data) {
}
void Limiter::add_securities(std::vector<api::Security const*> const& new_securities){
LOG(OrderMan, Info, "Limiter::add_securities {} securities", me->sec_map.size());
for(auto it=new_securities.begin(); it!=new_securities.end(); it++)
_add_security(*it);
for(const api::Security* s : new_securities)
_add_security(s);
_reset(me->limit_store->admin_data());
}
void Limiter::add_security(api::Security const & security) {
@@ -88,8 +88,8 @@ void Limiter::_add_security (const api::Security* sec){
if (!_contains_security(sec)){
me->sec_map.insert(std::pair<uint32_t,const api::Security*>(sec->id(), sec));
if (sec->has_spread())
for(int i=0; i<sec->spread().legs_size(); i++)
_add_security(&(sec->spread().legs(i).security()));
for(const auto& leg : sec->spread().legs())
_add_security(&leg.security());
}
}
@@ -6,14 +6,12 @@ namespace orderman{
ProductLimitTree::ProductLimitTree(const api::Product& product,
const bts::api::admin::AdminData& admin_data,
const bts::api::admin::AccountProductPositionLimitUnit& zero_limit)
:
_product (product)
{
for(int i=0; i<admin_data.accounts_size(); i++){
const auto& account = admin_data.accounts(i);
const bts::api::admin::AccountProductPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_product_position_limit(account, _product);
_tree.emplace_back(account.id(), bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, limit != nullptr ? *limit : zero_limit);
}
:
_product (product)
{
for(const auto& account : admin_data.accounts()){
const bts::api::admin::AccountProductPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_product_position_limit(account, _product);
_tree.emplace_back(account.id(), bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, limit != nullptr ? *limit : zero_limit);
}
}
}
}}
@@ -26,9 +26,9 @@ public:
// accessors
////////////
ProductLimitNode* find_account (uint32_t account_id){
for(auto it=_tree.begin(); it!=_tree.end(); it++)
if(it->account_id()==account_id)
return &*it;
for(ProductLimitNode& node : _tree)
if(node.account_id()==account_id)
return &node;
return nullptr;
}
const api::Product& product() const {return _product;}
@@ -7,15 +7,14 @@ SecurityLimitTree::SecurityLimitTree(const api::Security& security,
ProductLimitTree& product_tree,
const bts::api::admin::AdminData& admin_data,
const bts::api::admin::AccountSecurityPositionLimitUnit& zero_limit)
{
for(int i=0; i<admin_data.accounts_size(); i++){
const auto& account = admin_data.accounts(i);
ProductLimitNode* product_node_ptr = product_tree.find_account(account.id());
bts_assert(product_node_ptr != nullptr);
const bts::api::admin::AccountSecurityPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_security_position_limit(account, security);
uint32_t clip_size = bts::admin::AdminServiceUtils::find_account_security_clip_size(account, security);
_tree.emplace_back(account.id(), bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0,
limit != nullptr ? *limit : zero_limit, limit != nullptr, *product_node_ptr, clip_size);
}
{
for(const auto& account : admin_data.accounts()){
ProductLimitNode* product_node_ptr = product_tree.find_account(account.id());
bts_assert(product_node_ptr != nullptr);
const bts::api::admin::AccountSecurityPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_security_position_limit(account, security);
uint32_t clip_size = bts::admin::AdminServiceUtils::find_account_security_clip_size(account, security);
_tree.emplace_back(account.id(), bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0,
limit != nullptr ? *limit : zero_limit, limit != nullptr, *product_node_ptr, clip_size);
}
}
}}
@@ -40,10 +40,10 @@ public:
account_ptr->remove_position(side, quantity.value());
}
void copy_positions_from(SecurityLimitTree& source){
for (auto it=_tree.begin(); it!=_tree.end(); it++){
SecurityLimitNode* source_node_ptr = source._find_account(it->account_id());
for (SecurityLimitNode& node : _tree){
SecurityLimitNode* source_node_ptr = source._find_account(node.account_id());
if(source_node_ptr != nullptr)
it->copy_positions_from(*source_node_ptr);
node.copy_positions_from(*source_node_ptr);
}
}
// risk limit checks
@@ -69,15 +69,15 @@ public:
}
private:
SecurityLimitNode* _find_account (uint32_t account_id){
for(auto it=_tree.begin(); it!=_tree.end(); it++)
if(it->account_id()==account_id)
return &*it;
for(auto& node : _tree)
if(node.account_id()==account_id)
return &node;
return nullptr;
}
const SecurityLimitNode* _find_account (uint32_t account_id) const{
for(auto it=_tree.begin(); it!=_tree.end(); it++)
if(it->account_id()==account_id)
return &*it;
for(const auto& node : _tree)
if(node.account_id()==account_id)
return &node;
return nullptr;
}
};