-
Notifications
You must be signed in to change notification settings - Fork 12
Add NMR data model, integration with EnzymeML, and peak assignment features #13
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
torogi94
wants to merge
55
commits into
main
Choose a base branch
from
data-model-refactor
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.
Open
Changes from all commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
c00b3d0
Initial commit
torogi94 53ebb27
Minor changes
torogi94 85d3a4e
Implement IdentityAssigner for one FID object
torogi94 97df96f
Update generate_api.yaml
torogi94 29606d3
Update generate_api.yaml
torogi94 1583813
Update generate_api.yaml
torogi94 a87f2f6
Update generate_api.yaml
torogi94 f164b24
Update generate_api.yaml
torogi94 188c365
Implement IdentityAssigner for entire FIDArray
torogi94 0bfbfe4
Update data model
torogi94 cb0def5
Minor bug fix
torogi94 2feaa3d
Add interface with EnzymeML
torogi94 9f7fd0c
Update IdentityAssigner
torogi94 aaea4f9
Update generate_api.yaml
torogi94 c1bec90
Update generate_api.yaml
torogi94 ce11a73
Update generate_api.yaml
torogi94 030dcc5
API update
41c363e
Remove Citation info from data model
torogi94 ecbaea2
API update
6b3e30a
Remove depricated data model
torogi94 56d2cf7
Add apply_to_enzymeml() method
torogi94 d7e5cf5
Update plotting.py
torogi94 6afc891
Restructure data model & reflect changes in lib
torogi94 b7bacb0
Delete .vscode directory
torogi94 cb07ff9
Update from sdRDM to md-models
torogi94 58e94ba
Temporarily remove conc. calculation
torogi94 037e60f
Revert linting changes
torogi94 1909b9a
Update regular and add optional requirements
torogi94 921b9ec
Add graceful handling of optional imports
torogi94 7b5c86f
Fix recurring typo in pyenzyme import error
torogi94 fd90839
Remove deprecated data model linking
torogi94 dfbb0aa
Add None check for new FidArray properties
torogi94 65ebd00
Fix various bugs
torogi94 7e1b192
Update requirements.txt
torogi94 1b0349d
Update data_objects.py
torogi94 f6659b4
fix: Fix `Fid.baseline_correct()` and `FidArray.baseline_correct_fids()`
jmrohwer afa951b
Add measurement handling (#14)
torogi94 848e643
Rework data handling (#15)
torogi94 d674e41
update ruff.toml
jmrohwer e0a724c
fix data_model.setter ; formatting fixes
jmrohwer 651684c
Fix `FidArray.save_to_file()` when deleting data model
jmrohwer 38072de
rework calibrate() widget not to make use of asyncio.Future()
jmrohwer c851b60
revert @data_model.setter changes as data_model is now deleted during…
jmrohwer e987ad3
fix pyenzyme imports, update dependencies
jmrohwer b28d5e6
Upgrade to pyenzyme v2
torogi94 3dc3d12
Add t0 handling (#18)
torogi94 6cf0830
Fix copy() error in plotting.py
torogi94 4f48277
Add explicit super init to FidArray
torogi94 d796f8d
Update range handling in Fid (#20)
torogi94 80e4e12
Add attribute checks for data model existence
torogi94 c3dca2d
Fix faulty argument to T0Adder widget
torogi94 7a3e67d
Add data model test suites
torogi94 2309dc2
Add data model property unit tests + fixes
torogi94 9f55722
Fix parameter mapping to data model
torogi94 ccb2087
Add proper single NMR in array edge case handling
torogi94 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
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
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
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.
Raising
RuntimeErrorinsetUp()will fail the test run rather than cleanly skipping optional-dependency tests. Preferself.skipTest(...)(or@unittest.skipUnless) so CI/users without the extra can still run the rest of the suite.