Issue 138 - Adds functions to calculate the state distribution of a Match #717
Conversation
| @@ -159,6 +159,12 @@ def normalised_cooperation(self): | |||
| """Returns the count of cooperations by each player per turn""" | |||
| return iu.compute_normalised_cooperation(self.result) | |||
|
|
|||
| def state_distribution(self): | |||
| return iu.compute_state_distribution(self.result) | |||
There was a problem hiding this comment.
Could we have a brief docstring for these two methods (similar to the ones in the interactions_utils).
| def compute_state_distribution(interactions): | ||
| """ | ||
| Returns the count of each state for a set of interactions. | ||
| """ |
There was a problem hiding this comment.
The docstring needs the full definition of the arguments and return value
| """ | ||
| Returns the count of each state for a set of interactions. | ||
| """ | ||
| if len(interactions) == 0: |
There was a problem hiding this comment.
This could just be if not interactions:
There was a problem hiding this comment.
I just copied what was done in some of the other functions...should I change them all?
There was a problem hiding this comment.
You don't need to change them all (unless you wanted to!) but if you could keep the new ones according the convention that would be much appreciated. We have #347 as an ongoing issue to back-fix the formatting.
| def compute_normalised_state_distribution(interactions): | ||
| """ | ||
| Returns the normalized count of each state for a set of interactions. | ||
| """ |
There was a problem hiding this comment.
Docstring needs to define arguments and return value
| """ | ||
| Returns the normalized count of each state for a set of interactions. | ||
| """ | ||
| if len(interactions) == 0: |
| def state_distribution(self): | ||
| return iu.compute_state_distribution(self.result) | ||
|
|
||
| def normalised_state_distribution(self): |
|
|
||
| for key in normalized_count: | ||
| normalized_count[key] /= total | ||
| return normalized_count |
There was a problem hiding this comment.
this might be a bit more 'pythonic' with a comprehension. I've not tested it, but something like:
interactions_count = Counter(interactions)
total = sum(interactions_count.values(), 0.0)
# By starting the sum with 0.0 we make sure total is a floating point value,
# avoiding the Python 2 floor division behaviour of / with integer operands (Stack Overflow)
return Counter({key: value / total for key, value in interactions_count.items()})
I'm just about to open another PR that I think offers a better fix still. |
|
@theref that's now been merged in. If you merge or rebase on to master you should be good to go :) 👍 |
Related to #138 #701