add fit.py #4
Open
add fit.py #4
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
sizmailov
requested changes
Nov 8, 2019
bionmr_utils/md/process/fit.py
Outdated
|
|
||
|
|
||
| def fit_limit(data: List[Union[float, int]], window_size=50, pos_diff_ratio=0.5) -> int: | ||
| def fit_limit(data: List[Union[float, int]], |
There was a problem hiding this comment.
bad function name. Should be smth like estimate_acorr_fitting_limit
bionmr_utils/md/process/fit.py
Outdated
| @@ -22,14 +21,18 @@ def fit_limit(data: List[Union[float, int]], window_size=50, pos_diff_ratio=0.5) | |||
| amount of negative derivatives | |||
| """ | |||
|
|
|||
| def moving_average(data_set, periods=3): | |||
| def moving_average(data_set, | |||
There was a problem hiding this comment.
don't split short function signature across multiple lines
bionmr_utils/md/process/fit.py
Outdated
| @@ -48,17 +51,17 @@ def __multi_exp_f(x: Union[float, int], | |||
| :param C: free element | |||
| :return: sum exponential functions composition | |||
| """ | |||
| return np.sum( | |||
| return sum( | |||
| (a * np.exp(-x / tau)) for a, tau in zip(A, TAU) | |||
| ) + C | |||
|
|
|||
|
|
|||
| def multi_exp_free_amplitude(x: Union[float, int], | |||
There was a problem hiding this comment.
short function signature should be one line
There was a problem hiding this comment.
Rename function. Now it's name is not very telling.
bionmr_utils/md/process/fit.py
Outdated
| @@ -72,7 +75,13 @@ def multi_exp_free_amplitude(x: Union[float, int], | |||
| return __multi_exp_f(x, A, TAU, C) | |||
|
|
|||
|
|
|||
| def mult_exp_fixed_amplitude_1(x, *args): | |||
| def multi_exp_fixed_amplitude_1(x: Union[float, int], | |||
| *args): | |||
| :fit_func: function for fit data | ||
| :return: Fit curve parameters | ||
| """ | ||
| def scale_times(args, |
bionmr_utils/md/process/fit.py
Outdated
| @@ -90,7 +99,7 @@ def fit_auto_correlation(time: List[float], | |||
| bounds: List[List[List[Union[float, int]]]]) \ | |||
| -> Tuple[int, Union[np.ndarray, Iterable, int, float]]: | |||
| """ | |||
| Fit input data with :math:`\sum_n A_n \exp(-t/\\tau_n) + const` | |||
| Fit input data with :math: sum_n(A_n exp(-t/tau_n) + const) | |||
bionmr_utils/md/process/fit.py
Outdated
| @@ -122,12 +131,25 @@ def decorated_fit_auto_correlation(time: List[float], | |||
| bounds: List[List[Union[float, int]]], | |||
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.
No description provided.