mirror of
https://github.com/wassname/catalyst.git
synced 2026-06-29 00:53:42 +08:00
taking code recommendations from @sdiehl PR notes... as always :)
This commit is contained in:
@@ -406,9 +406,7 @@ class PerformancePeriod():
|
||||
Creates a dictionary representing the state of this performance
|
||||
period. See header comments for a detailed description.
|
||||
"""
|
||||
positions = {}
|
||||
for sid, pos in self.positions.iteritems():
|
||||
positions[sid] = pos.to_dict()
|
||||
positions = self.get_positions()
|
||||
|
||||
return {
|
||||
'ending_value' : self.ending_value,
|
||||
@@ -427,9 +425,7 @@ class PerformancePeriod():
|
||||
for a detailed description.
|
||||
|
||||
"""
|
||||
positions = {}
|
||||
for sid, pos in self.positions.iteritems():
|
||||
positions[sid] = zp.namedict(pos.to_dict())
|
||||
positions = self.get_positions(namedicted=True)
|
||||
|
||||
positions = zp.namedict(positions)
|
||||
|
||||
@@ -442,5 +438,17 @@ class PerformancePeriod():
|
||||
'positions' : positions
|
||||
})
|
||||
|
||||
def get_positions(self, namedicted=False):
|
||||
positions = {}
|
||||
for sid, pos in self.positions.iteritems():
|
||||
cur = pos.to_dict()
|
||||
if namedicted:
|
||||
positions[sid] = zp.namedict(cur)
|
||||
else:
|
||||
positions[sid] = cur
|
||||
|
||||
return positions
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -86,9 +86,6 @@ class namedict(object):
|
||||
|
||||
def has_attr(self, name):
|
||||
return self.__dict__.has_key(name)
|
||||
|
||||
def __getitem__(self, key):
|
||||
return self.__dict__[key]
|
||||
|
||||
def as_series(self):
|
||||
s = pandas.Series(self.__dict__)
|
||||
|
||||
Reference in New Issue
Block a user