This repository has been archived by the owner on Mar 22, 2024. It is now read-only.
add regression metrics #27
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NicoRenaud
approved these changes
Jan 5, 2021
graphprot/Metrics.py
Outdated
| @@ -116,17 +117,102 @@ def __init__(self, prediction, y, target, threshold=4, binary=True): | |||
|
|
|||
| self.accuracy = (true_positive+true_negative)/(true_positive+false_positive+false_negative+true_negative) | |||
|
|
|||
| def hitrate(self): | |||
| # regression metrics | |||
| if target == 'fnat' or target == 'irmsd' or target == 'lrmsd': | |||
There was a problem hiding this comment.
you could change that to :
if target in ['fnat', 'irmsd', 'lrmsd']:
graphprot/Metrics.py
Outdated
Comment on lines
123
to
127
| try: | ||
| # Explained variance regression score function | ||
| self.explained_variance = metrics.explained_variance_score(self.y, self.prediction) | ||
| except: | ||
| self.explained_variance = None |
There was a problem hiding this comment.
I don't quite get the try/except construction here. What exception you would expect ? In general and except without an error type is not the best thing to do (but I do that as well sometimes)
In any case I would remove the try/except. You could initialize all the metrics to None before the if statement. And then call the sklearn functions in the if branch.
self.explained_varianve = None
...
if target in [...]:
self.explained_variance = metrics.xxxx
else:
print('Warning : ...')
graphprot/Metrics.py
Outdated
|
|
||
| def hitrate(self): | ||
|
|
||
| idx, ground_truth_bool = self.format_score() | ||
| hitrate = np.cumsum(ground_truth_bool[idx]) |
There was a problem hiding this comment.
you can directly return the np call
return np.cumsum(ground_truth)
NicoRenaud
reviewed
Jan 11, 2021
graphprot/Metrics.py
Outdated
| try: | ||
| # Mean squared logarithmic error regression loss | ||
| self.mean_squared_log_error = metrics.mean_squared_log_error(self.y, self.prediction) | ||
| except: |
There was a problem hiding this comment.
Nice replacement of the excepts. Could you use:
try:
self.mean_squared_log_error = ....
except ValueError:
print('Warning ....')
NicoRenaud
approved these changes
Jan 11, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.