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 development into master #199

Merged
merged 797 commits into from
Jul 16, 2020
Merged

Merge development into master #199

merged 797 commits into from
Jul 16, 2020

Conversation

jonpvandermause
Copy link
Collaborator

@jonpvandermause jonpvandermause commented Jul 7, 2020

Before merging the C++ updates into development, which may introduce some unintended bugs, I think it makes sense to update master, especially since many of the changes on development make the code more accessible to users.

YuuuXie and others added 30 commits June 11, 2020 16:26
@@ -0,0 +1,105 @@
Prepare your data
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for making this file @YuuuuXie , a big 'missing link' in our tutorials!

Comment on lines +130 to +131
with open(screen_out, "w+") as fout:
call(dft_command.split(), stdout=fout)
Copy link
Contributor

Choose a reason for hiding this comment

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

Neat!

YuuuXie and others added 7 commits July 11, 2020 13:22
* Update parameter_helper.py

* Update docstrings and augment update kernel method

* Update gp.py

* Update kernel only updates cutoffs if needed

* Adjust docstring

* Update parameter_helper.py

* Update gp.py

* Fix comparison statement

* Update gp.py

* update arguments and unit test

* update cutoffs arg

* update hyps assigning

* Update docstrings

Co-authored-by: nw13slx <nw13mifaso@gmail.com>
@codecov-commenter
Copy link

codecov-commenter commented Jul 13, 2020

Codecov Report

Merging #199 into master will decrease coverage by 4.20%.
The diff coverage is 55.61%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #199      +/-   ##
==========================================
- Coverage   58.84%   54.63%   -4.21%     
==========================================
  Files          35       47      +12     
  Lines        7545    10242    +2697     
==========================================
+ Hits         4440     5596    +1156     
- Misses       3105     4646    +1541     
Impacted Files Coverage Δ
flare/kernels/coordination_mc_simple.py 0.00% <0.00%> (ø)
flare/kernels/mc_sephyps.py 19.72% <ø> (+1.23%) ⬆️
flare/kernels/mc_simple.py 23.33% <ø> (-10.54%) ⬇️
flare/utils/element_coder.py 83.33% <ø> (ø)
flare/utils/env_getarray.py 7.69% <ø> (ø)
flare/utils/flare_io.py 100.00% <ø> (ø)
flare/utils/learner.py 98.01% <ø> (ø)
flare/utils/md_helper.py 0.00% <ø> (ø)
flare/utils/parameter_helper.py 92.76% <ø> (ø)
flare/kernels/mc_3b_sepcut.py 2.34% <2.34%> (ø)
... and 60 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 62722eb...fa506ac. Read the comment docs.

stevetorr and others added 8 commits July 14, 2020 10:21
* Update del method

* Fix bug where GP crashes if kernel disagrees with cutoffs

* Unit tests catch mb case

* Pep8 clean up
* Update del method

* Fix bug where GP crashes if kernel disagrees with cutoffs

* Unit tests catch mb case

* Quality of life method is_valid

* Fix merge issue
@stevetorr
Copy link
Contributor

As a remark, even though there's a zillion changes in this PR, at least each (most?) of the substantial changes and new features have been individually reviewed when they were merged onto the development branch. Kind of like writing a thesis based on work that was mostly featured in peer reviewed papers... The scrutiny has mostly already been applied.

@jonpvandermause jonpvandermause merged commit c89a260 into master Jul 16, 2020
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.

5 participants