Skip to content

Cookierelease: setup src folder structure#10

Merged
sbillinge merged 5 commits into
diffpy:cookiefrom
bobleesj:cookierelease-src
Aug 12, 2024
Merged

Cookierelease: setup src folder structure#10
sbillinge merged 5 commits into
diffpy:cookiefrom
bobleesj:cookierelease-src

Conversation

@bobleesj

Copy link
Copy Markdown
Contributor

No description provided.

"""Run NMF analysis on PDF and XRD data"""

# package version
from diffpy.nmf_mapping.version import __version__

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

nmf_mapping used.

@bobleesj bobleesj left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Not ready for a PR at the moment.

from sklearn.decomposition import NMF, PCA
from sklearn.exceptions import ConvergenceWarning

from diffpy.utils.parsers.loaddata import loadData

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done by pre-commit

# obtain version information
from importlib.metadata import version

__version__ = version("diffpy.nmf_mapping")

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

nmf_mapping

@sbillinge sbillinge changed the base branch from main to cookie August 12, 2024 01:59

@sbillinge sbillinge left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this looks good. It is failing precommit for what may be a typo in run.py but I am not sure. Tests are now running. Since this is mostly moving files, I am ok merging this and then debugging on the next PR, but it is showing as a draft PR indicating that you don't want me to merge it yet. Just let me know.

@bobleesj bobleesj marked this pull request as ready for review August 12, 2024 02:06
@bobleesj

Copy link
Copy Markdown
Contributor Author

@sbillinge Yes, Please merge. I will look into the details (run.py, etc) tomorrow.

@sbillinge sbillinge merged commit 8c9f749 into diffpy:cookie Aug 12, 2024
@bobleesj bobleesj deleted the cookierelease-src branch August 12, 2024 02:37
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.

2 participants