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

Fix KMM coefficient and add tests #19

Merged
merged 17 commits into from
Jan 12, 2020
Merged

Fix KMM coefficient and add tests #19

merged 17 commits into from
Jan 12, 2020

Conversation

xukai92
Copy link
Collaborator

@xukai92 xukai92 commented Dec 29, 2019

No description provided.

@xukai92 xukai92 requested a review from juliohm December 29, 2019 18:41
@xukai92 xukai92 mentioned this pull request Dec 29, 2019
Copy link
Member

@juliohm juliohm left a comment

Choose a reason for hiding this comment

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

I think the previous version is the correct one. I double checked in the textbook. Unless the textbook contains a typo in which case we need to double check more carefully.

Could you please elaborate on the change?

@xukai92
Copy link
Collaborator Author

xukai92 commented Dec 30, 2019

That was actually a hotfix. I commited a new one which makes more sense. Basially we missed the braces.

@juliohm
Copy link
Member

juliohm commented Dec 30, 2019

Oh, the braces causing trouble again. So we were multiplying the matrix entries before solving the system, that is an issue :)

Please feel free to merge, that script I shared in another closed issue can serve to debug it further.

@xukai92
Copy link
Collaborator Author

xukai92 commented Dec 30, 2019

Do you think we should actually add the test script to our test suite?

@juliohm
Copy link
Member

juliohm commented Dec 30, 2019 via email

@xukai92
Copy link
Collaborator Author

xukai92 commented Dec 31, 2019

I will do another round of clean-up for tests before merging.

src/utils.jl Outdated Show resolved Hide resolved
test/basic.jl Outdated Show resolved Hide resolved
@juliohm
Copy link
Member

juliohm commented Dec 31, 2019

Maybe we should separate the indentation changes from the changes to fix KMM? Could you please submit separate PRs? One containing the fix to KMM + tests, and another considering aesthetic changes?

@juliohm juliohm self-requested a review December 31, 2019 00:35
@xukai92
Copy link
Collaborator Author

xukai92 commented Dec 31, 2019

It's a bit annoying to change it back to 2 spaces and change it back to 1 tab again. In fact, you can simply set "1 tab = 2 spaces" in your editor and things would like normal for you.

@juliohm
Copy link
Member

juliohm commented Dec 31, 2019

It is difficult to review these changes in the future, specially if future contributors come in. Can you just create two separate branches, one with the identation changes that you can copy/paste from this branch, and another branch with just the fixes for the KMM? That would be helpful.

The problem is not the editor visualization, but the mix of changes of different nature in a single PR. I understand it is annoying but it is for the best.

@xukai92
Copy link
Collaborator Author

xukai92 commented Dec 31, 2019

OK I can do this.

@xukai92
Copy link
Collaborator Author

xukai92 commented Dec 31, 2019

I reverted most of the aesthetic changes. You are right, it makes the PR much clear!

I don't have more to add. Shall we merge it given CI passes?

@juliohm
Copy link
Member

juliohm commented Dec 31, 2019 via email

@xukai92
Copy link
Collaborator Author

xukai92 commented Dec 31, 2019

Can I take a look at it after the holiday? :) it should be fine.

Sure.

I'm just
wondering if GitHub still has the functionality to merge all commits into a
single one without the noise.

I believe you can just squash the commits.

By the way happy 2020! 🎉☺

Yes! Happy new year!

Copy link
Member

@juliohm juliohm left a comment

Choose a reason for hiding this comment

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

Had a chance to review the PR. Please consider some minor modifications in the tests before we can merge and keep working on other features.

test/basic.jl Outdated Show resolved Hide resolved
test/basic.jl Outdated Show resolved Hide resolved
test/basic.jl Outdated Show resolved Hide resolved
test/kliep.jl Show resolved Hide resolved
test/kliep.jl Outdated Show resolved Hide resolved
test/kliep.jl Outdated Show resolved Hide resolved
test/kmm.jl Outdated Show resolved Hide resolved
@xukai92 xukai92 requested a review from juliohm January 5, 2020 02:05
@xukai92
Copy link
Collaborator Author

xukai92 commented Jan 6, 2020

@juliohm Did you have a chance to take another look of this PR?

Copy link
Member

@juliohm juliohm left a comment

Choose a reason for hiding this comment

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

Sorry for the delay to review @xukai92 , didn't know you had pushed more changes. Below you can find further review comments.

test/basic.jl Outdated Show resolved Hide resolved
test/kliep.jl Outdated Show resolved Hide resolved
test/kmm.jl Outdated Show resolved Hide resolved
test/kmm.jl Show resolved Hide resolved
@xukai92 xukai92 changed the title Fix coefficient Fix KMM coefficient and add tests Jan 11, 2020
@xukai92
Copy link
Collaborator Author

xukai92 commented Jan 11, 2020

Shall we merge this?

@juliohm
Copy link
Member

juliohm commented Jan 11, 2020

Let me take yet another look at the changes. I am still confused with some proposed changes in the PR.

Copy link
Member

@juliohm juliohm left a comment

Choose a reason for hiding this comment

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

Sorry for the long review process. I didn't think we would take so long to get this in the right shape. To be honest, I would just break this PR into small PRs with very clear purpose. There is a mix of changes in tests, and in the KMM tha are imcompatible in a single PR.

src/kmm.jl Outdated Show resolved Hide resolved
src/kmm/julia.jl Show resolved Hide resolved
test/basic.jl Outdated Show resolved Hide resolved
test/basic.jl Outdated Show resolved Hide resolved
test/kliep.jl Outdated Show resolved Hide resolved
test/kliep.jl Outdated Show resolved Hide resolved
test/kmm.jl Show resolved Hide resolved
test/kmm.jl Outdated Show resolved Hide resolved
test/kmm.jl Show resolved Hide resolved
@xukai92
Copy link
Collaborator Author

xukai92 commented Jan 11, 2020

I reverted basic.jl and the tests should be there now. Sorry for the confusion again. I indeed deleted some when merging with the master!

Copy link
Member

@juliohm juliohm left a comment

Choose a reason for hiding this comment

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

Thank you for improving the PR. 💯

I will merge it with the squashing feature of GitHub, and we can keep working on improving KMM in future PRs.

@juliohm juliohm merged commit 33e771d into master Jan 12, 2020
@juliohm juliohm deleted the kx/bugfix branch April 10, 2020 13:21
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.

None yet

2 participants