Positions entries published by the PositionService are never removed, if a baseposition is absent, the enrties are 0'd out
This commit is contained in:
1 parent
ac1c5566ac
commit
edba0e1cd7
5 files changed
+37
-32
No files matched your search
@@ -108,13 +108,14 @@ void PositionMap::set_base_position(const BasePositionBatch& request){
|
||||
_reset_sod();
|
||||
}
|
||||
|
||||
void PositionMap::get_pos (std::vector<PositionUnit const*>& out_pos){
|
||||
for (auto &acct_p : _pos_map) {
|
||||
for (auto &sec_p : acct_p.second) {
|
||||
const PositionUnit &pu = sec_p.second;
|
||||
out_pos.push_back(&pu);
|
||||
}
|
||||
}
|
||||
void PositionMap::set_admin_data (
|
||||
const api::admin::AdminData& admin_data){
|
||||
_account_id_map.clear();
|
||||
for (const auto &a : admin_data.accounts())
|
||||
_account_id_map[a.id()] = a.name();
|
||||
for (auto& acct_p : _pos_map)
|
||||
for (auto& sec_p : acct_p.second)
|
||||
_fill_account(sec_p.second);
|
||||
}
|
||||
|
||||
void PositionMap::get_pos (std::map<int, PositionUnit const*>& out_pos_map) const{
|
||||
@@ -126,16 +127,6 @@ void PositionMap::get_pos (std::map<int, PositionUnit const*>& out_pos_map) cons
|
||||
}
|
||||
}
|
||||
|
||||
void PositionMap::set_admin_data (
|
||||
const api::admin::AdminData& admin_data){
|
||||
_account_id_map.clear();
|
||||
for (const auto &a : admin_data.accounts())
|
||||
_account_id_map[a.id()] = a.name();
|
||||
for (auto& acct_p : _pos_map)
|
||||
for (auto& sec_p : acct_p.second)
|
||||
_fill_account(sec_p.second);
|
||||
}
|
||||
|
||||
PositionUnit& PositionMap::_get_or_add(uint32_t account_id, uint32_t seckey){
|
||||
auto &pu = _pos_map[account_id][seckey];
|
||||
if (pu.record_id() == 0) {
|
||||
@@ -144,11 +135,7 @@ PositionUnit& PositionMap::_get_or_add(uint32_t account_id, uint32_t seckey){
|
||||
pu.set_security_id(seckey);
|
||||
pu.set_account_id(account_id);
|
||||
// zeroing out all pos's
|
||||
pu.mutable_day();
|
||||
pu.mutable_sod();
|
||||
pu.mutable_local();
|
||||
pu.mutable_admin_day();
|
||||
pu.mutable_admin_sod();
|
||||
_zero_out(pu);
|
||||
}
|
||||
_fill_account(pu);
|
||||
return pu;
|
||||
@@ -162,7 +149,10 @@ PositionMap::FillType PositionMap::_fill_type(const Fill& f) const{
|
||||
}
|
||||
|
||||
void PositionMap::_reset_sod(){
|
||||
_pos_map.clear();
|
||||
// zero'ing out all pos
|
||||
for (auto &acct_p : _pos_map)
|
||||
for (auto &sec_p : acct_p.second)
|
||||
_zero_out(sec_p.second);
|
||||
for (auto& acct_p : _base_pos_map) {
|
||||
uint32_t account_id = acct_p.first;
|
||||
for (auto& sec_p : acct_p.second) {
|
||||
@@ -189,4 +179,19 @@ bool PositionMap::_fill_account (PositionUnit& u){
|
||||
return false;
|
||||
}
|
||||
|
||||
void PositionMap::_zero_out (bts::api::position::PositionUnit& pu){
|
||||
_zero_out_entry(*pu.mutable_day());
|
||||
_zero_out_entry(*pu.mutable_sod());
|
||||
_zero_out_entry(*pu.mutable_local());
|
||||
_zero_out_entry(*pu.mutable_admin_day());
|
||||
_zero_out_entry(*pu.mutable_admin_sod());
|
||||
}
|
||||
|
||||
void PositionMap::_zero_out_entry (bts::api::position::PositionEntry& p){
|
||||
p.set_long_pos(0);
|
||||
p.set_long_avg_price(0);
|
||||
p.set_short_pos(0);
|
||||
p.set_short_avg_price(0);
|
||||
}
|
||||
|
||||
}}
|
||||
@@ -40,6 +40,8 @@ private:
|
||||
// returns true if the account went from unpop'ed
|
||||
// to populated
|
||||
bool _fill_account (bts::api::position::PositionUnit&);
|
||||
void _zero_out (bts::api::position::PositionUnit&);
|
||||
void _zero_out_entry (bts::api::position::PositionEntry&);
|
||||
public:
|
||||
PositionMap();
|
||||
const bts::api::position::PositionUnit& on_fill (
|
||||
@@ -48,11 +50,9 @@ public:
|
||||
const bts::api::position::PositionUnit& on_manual_fill (
|
||||
const bts::api::position::ManualFill& mf,
|
||||
bool is_add);
|
||||
void set_base_position(const bts::api::position::BasePositionBatch& request);
|
||||
void get_pos (std::vector<bts::api::position::PositionUnit const*>& out_pos);
|
||||
void get_pos (
|
||||
std::map<int, bts::api::position::PositionUnit const*>& out_pos_map) const;
|
||||
void set_base_position(const bts::api::position::BasePositionBatch& request);
|
||||
void set_admin_data (const bts::api::admin::AdminData&);
|
||||
void get_pos (std::map<int, bts::api::position::PositionUnit const*>&) const;
|
||||
};
|
||||
|
||||
}}
|
||||
@@ -141,13 +141,13 @@ struct PositionServicePNLHelper::PImpl {
|
||||
|
||||
|
||||
void PositionServicePNLHelper::compute_pnl(
|
||||
const std::vector<const PositionUnit*>& in_pos,
|
||||
const std::map<int, PositionUnit const*>& in_pos,
|
||||
const std::map<std::string,uint32_t>& account_map,
|
||||
std::vector<PNLUnit>& out_pnl,
|
||||
std::vector<AccountPNL>& out_account_pnl){
|
||||
out_account_pnl.clear();
|
||||
for (const PositionUnit* pu_ptr : in_pos) {
|
||||
const PositionUnit& pu = *pu_ptr;
|
||||
for (const auto& p : in_pos) {
|
||||
const PositionUnit& pu = *(p.second);
|
||||
uint32_t sec_key = pu.security_id();
|
||||
double cpp = _get_cpp(sec_key);
|
||||
double bid, ask, last, settle;
|
||||
|
||||
@@ -26,7 +26,7 @@ private:
|
||||
public:
|
||||
PositionServicePNLHelper(md::MDClient& client);
|
||||
~PositionServicePNLHelper();
|
||||
void compute_pnl(const std::vector<const bts::api::position::PositionUnit*>& in_pos,
|
||||
void compute_pnl(const std::map<int, bts::api::position::PositionUnit const*>& in_pos,
|
||||
const std::map<std::string,uint32_t>& account_map,
|
||||
std::vector<bts::api::position::PNLUnit>& out_pnl,
|
||||
std::vector<bts::api::position::AccountPNL>& out_account_pnl);
|
||||
|
||||
@@ -285,7 +285,7 @@ void PositionServiceServer::set_base_position(
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
/// PNL helpers ///////////////////////////////////////////////////////////////
|
||||
void PositionServiceServer::_compute_pnl_and_publish() {
|
||||
std::vector<const PositionUnit *> in_pos;
|
||||
std::map<int, PositionUnit const*> in_pos;
|
||||
me->state.get_pos(in_pos);
|
||||
std::vector<PNLUnit> pnl;
|
||||
std::vector<AccountPNL> account_pnl;
|
||||
|
||||
Reference in new issue
Block a user