From 85643adcf35ebe4cc945ae6c234ffaa34d1ebb95 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 27 May 2018 22:25:18 -0400 Subject: [PATCH] comments and some stylistic changes for the limiter --- .../sparkd/orderman/limiter/LimitStore.cpp | 6 +++--- .../sparkd/orderman/limiter/Limiter.cpp | 8 ++++---- .../orderman/limiter/ProductLimitTree.cpp | 16 +++++++--------- .../orderman/limiter/ProductLimitTree.h | 6 +++--- .../orderman/limiter/SecurityLimitTree.cpp | 19 +++++++++---------- .../orderman/limiter/SecurityLimitTree.h | 18 +++++++++--------- 6 files changed, 35 insertions(+), 38 deletions(-) diff --git a/src/server/sparkd/orderman/limiter/LimitStore.cpp b/src/server/sparkd/orderman/limiter/LimitStore.cpp index 5f34ca64c..ae8395f9f 100644 --- a/src/server/sparkd/orderman/limiter/LimitStore.cpp +++ b/src/server/sparkd/orderman/limiter/LimitStore.cpp @@ -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, diff --git a/src/server/sparkd/orderman/limiter/Limiter.cpp b/src/server/sparkd/orderman/limiter/Limiter.cpp index 648978838..6cc2e0708 100644 --- a/src/server/sparkd/orderman/limiter/Limiter.cpp +++ b/src/server/sparkd/orderman/limiter/Limiter.cpp @@ -25,8 +25,8 @@ void Limiter::update(api::admin::AdminData const& admin_data) { } void Limiter::add_securities(std::vector 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(sec->id(), sec)); if (sec->has_spread()) - for(int i=0; ispread().legs_size(); i++) - _add_security(&(sec->spread().legs(i).security())); + for(const auto& leg : sec->spread().legs()) + _add_security(&leg.security()); } } diff --git a/src/server/sparkd/orderman/limiter/ProductLimitTree.cpp b/src/server/sparkd/orderman/limiter/ProductLimitTree.cpp index 5df844d20..836ade264 100644 --- a/src/server/sparkd/orderman/limiter/ProductLimitTree.cpp +++ b/src/server/sparkd/orderman/limiter/ProductLimitTree.cpp @@ -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; iaccount_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;} diff --git a/src/server/sparkd/orderman/limiter/SecurityLimitTree.cpp b/src/server/sparkd/orderman/limiter/SecurityLimitTree.cpp index 024ada803..2fa39b585 100644 --- a/src/server/sparkd/orderman/limiter/SecurityLimitTree.cpp +++ b/src/server/sparkd/orderman/limiter/SecurityLimitTree.cpp @@ -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; iremove_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; } };