Skip to content
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

Merge calculateFragments and calculateFragments2 #19

Merged
merged 30 commits into from
Jan 22, 2025

Conversation

guideflandre
Copy link
Contributor

This is a quick PR that merges calculateFragments2 into calculateFragments as to avoid redundancy.

Documentation is up to date. Unit tests are written and all pass.
I have added a code snippet in addFragments to throw an error if variable modifications have been used:

...
stopifnot(length(unique(y_data[["peptide"]])) == 1)
...

Once this PR is merged, I will create a PR for plotSpectra and addFragments to include current missing features/fix current errors such as mentioned in #18

guideflandre and others added 27 commits December 19, 2024 16:33
feat: calculateFragments2 
Provides modifications to the generated theoretical fragments
feat: tests for calculateFragments2
Updates based on reviewed PR
Updates according to reviewed PR
Co-authored-by: Sebastian Gibb <[email protected]>
Corrected .cumsumFragmentMasses
Change modified peptide layout into AGC[57.02]AK instead of AG[C]AK to specify the modified mass
Merge branch 'main' of https://github.com/guideflandre/PSMatch

# Conflicts:
#	R/fragments-calculate2.R
type <- match.arg(type, choices=c("a", "b", "c", "x", "y", "z"), several.ok=TRUE)

if (!is.null(modifications)) {
warning("'modifications' is deprecated, please use 'fixed_modifications' instead.")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need a reminder somewhere to change this into an error in the next release cycle (and remove it in the overnext)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I believe that should prove useful !

@guideflandre
Copy link
Contributor Author

I added an issue in Spectra see here issue #346 explaining the potential of a new plotting function and the need for modified addFragments and plotSpectra functions.

@sgibb sgibb merged commit 84df425 into rformassspectrometry:main Jan 22, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants