-
Notifications
You must be signed in to change notification settings - Fork 5
Add a python equivalent to MATLABs smoothdata and use in Bayes plots #208
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
MikeSullivan7
wants to merge
1
commit into
RascalSoftware:main
Choose a base branch
from
MikeSullivan7:bayes_plots_smoothing_moving_average
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+28
−3
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -826,9 +826,7 @@ def plot_one_hist( | |
| sd_y = np.std(parameter_chain) | ||
|
|
||
| if smooth: | ||
| if sigma is None: | ||
| sigma = sd_y / 2 | ||
| counts = gaussian_filter1d(counts, sigma) | ||
| counts = moving_avg(counts) | ||
| axes.hist( | ||
| bins[:-1], | ||
| bins, | ||
|
|
@@ -1233,3 +1231,30 @@ def plot_bayes(project: ratapi.Project, results: ratapi.outputs.BayesResults): | |
| plot_corner(results) | ||
| else: | ||
| raise ValueError("Bayes plots are only available for the results of Bayesian analysis (NS or DREAM)") | ||
|
|
||
|
|
||
| def moving_avg(data: np.ndarray, window_size: int = 8) -> list[float]: | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the function can be called |
||
| """Calculate the moving average of an array with a given window size. | ||
|
|
||
| This is a python equivalent to MATLABs smoothdata(A, 'movmean') | ||
|
|
||
| Parameters | ||
| ---------- | ||
| data : np.ndarray | ||
| The input array to smooth | ||
| window_size : int | ||
| The window slides down the length of the vector, | ||
| computing an average over the elements within each window. | ||
|
|
||
| """ | ||
| i = 0 | ||
| moving_averages = [] | ||
|
|
||
| while i < len(data): | ||
|
MikeSullivan7 marked this conversation as resolved.
|
||
| start_window_ind = floor(float(i - window_size / 2)) if i - window_size / 2 > 0 else 0 | ||
| end_window_ind = floor(float(i + window_size / 2)) if i + window_size / 2 < len(data) else len(data) | ||
| window_average = np.sum(data[start_window_ind:end_window_ind]) / (end_window_ind + 0 - start_window_ind) | ||
| moving_averages.append(window_average) | ||
| i += 1 | ||
|
|
||
| return moving_averages | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please update docstring to reflect switch to moving average, remove sigma. I also think we should expose the window size parameter since we don't know if 8 will work for all cases
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Exposing the window size means the moving average function will need a check for valid window sizes and a unit test will be helpful