Add per-node scoring functions #127
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
AndyM1098
added
area-stats
slabasan
changed the title
Yejashi
force-pushed
the
andrew_scoring
branch
from
ff22812 to
1f7a270
Compare
Yejashi
force-pushed
the
andrew_scoring
branch
4 times, most recently
from
dafc6a1 to
dbe7558
Compare
Yejashi
added
status-ready-for-review
slabasan
reviewed
Apr 5, 2024
thicket/stats/scoring.py
Outdated
| import thicket as th | ||
|
|
||
|
|
||
| def _scoring_1(means_1, means_2, stds_1, stds_2, num_nodes): |
There was a problem hiding this comment.
Can we rename scoring_{1,2..} to your more descriptive names? Maybe score_delta_mean_delta_stdnorm() calls score(..., _calc_delta_mean_delta_stdnorm).
slabasan
requested changes
Apr 5, 2024
thicket/stats/scoring.py
Outdated
| (means_1[i] - means_2[i]) ** 2 / (stds_1[i] ** 2 + stds_2[i] ** 2) | ||
| ) | ||
| except ZeroDivisionError: | ||
| # print("Score 3 std's: ", stds_1[i], stds_2[i], i) |
There was a problem hiding this comment.
You can remove these debug statements if they aren't needed anymore.
thicket/stats/scoring.py
Outdated
| (stds_1[i] - stds_2[i]) / (np.abs(means_1[i] - means_2[i])) | ||
| ) | ||
| except RuntimeWarning: | ||
| print("Score 1 means's: ", means_1[i], means_2[i], i) |
There was a problem hiding this comment.
Not sure if this print statement should be removed/commented out like the others below.
thicket/tests/test_stats.py
Outdated
|
|
||
| idx = list(combined_th.dataframe.columns.levels[0][0:2]) | ||
| columns = [(idx[0], "Min time/rank"), (idx[1], "Min time/rank")] | ||
| output_column_name = "score_1" |
There was a problem hiding this comment.
Use longer descriptive name?
thicket/stats/scoring.py
Outdated
| import numpy as np | ||
| from ..utils import verify_thicket_structures | ||
| import math | ||
| import thicket as th |
There was a problem hiding this comment.
I like following PEP8 for grouping imports:
Imports should be grouped in the following order:
Standard library imports.
Related third party imports.
Local application/library specific imports.
So let's update this list to be:
import math
import numpy as np
import thicket as th
from ..utils import verify_thicket_structures
thicket/stats/scoring.py
Outdated
|
|
||
|
|
||
| def _scoring_2(means_1, means_2, stds_1, stds_2, num_nodes): | ||
|
|
There was a problem hiding this comment.
You can remove the newline between the function definition and start of the function body as you've done below in your score() function.
slabasan
approved these changes
Apr 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR is for the implementation of the per-node scoring functions. Right now there are four scoring functions. They take in a columnar joined thicket object, and a list of columns to apply a per-node scoring function to.
Note: This is an updated PR since this branch was migrated from LLNL's main repo to TauferLab's fork of this repo. Replaces #114