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

Peng Algorithm #180

Closed
wants to merge 11 commits into from
Closed

Peng Algorithm #180

wants to merge 11 commits into from

Conversation

banrovegrie
Copy link
Member

This is the PR involving the addition of the second algorithm to the PSDP module. Here, I have included a rough sketch of the algorithm.

The issues that remain have been described in discussion #179.

@banrovegrie
Copy link
Member Author

Apparently, autopep8 converts some of the lambda functions into proper functions. I hope that is fine?

@FanwangM

@banrovegrie
Copy link
Member Author

Tests won't pass for this commit since I have many linting issues which we can ignore for now.

@FanwangM
Copy link
Collaborator

FanwangM commented Sep 1, 2022

This is another improvement. Thanks.

For the commit, ff04043, is is a similar operation that we have encountered in the previous PR? If you want to update the git history, we should use git rebase to have a clean history this time. If this is not what you mean for that commit, can you explain a little? Thank you.

@banrovegrie
Copy link
Member Author

@FanwangM yeah, so the issue was that I had the commits added to the branch before test-psdp was added and somehow in the end I ended messing up while rebasing when i encountered a few merge conflicts.

@banrovegrie
Copy link
Member Author

I think the code is ready to be reviewed btw. Once we merge this commit, I will proceed with updating the tests to include testing for this algorithm as well.

Copy link
Collaborator

@FanwangM FanwangM 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 the codes.
I have some minor comments here.

procrustes/psdp.py Outdated Show resolved Hide resolved
procrustes/psdp.py Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Sep 1, 2022

Codecov Report

Merging #180 (171a794) into master (ec238c4) will decrease coverage by 2.22%.
The diff coverage is 30.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #180      +/-   ##
==========================================
- Coverage   84.42%   82.19%   -2.23%     
==========================================
  Files          13       13              
  Lines         751      775      +24     
==========================================
+ Hits          634      637       +3     
- Misses        117      138      +21     
Impacted Files Coverage Δ
procrustes/psdp.py 74.44% <30.00%> (-22.53%) ⬇️

@FanwangM
Copy link
Collaborator

FanwangM commented Sep 1, 2022

I noticed that you have two git merge operations. Can you try to use git rebase to avoid them. This can help us get a clean history.? You can either do (1) close this PR and open a new one; or (2) use more complicated git history editing operations to avoid these two. I would prefer the first one. Thanks. @banrovegrie

@banrovegrie
Copy link
Member Author

Yeah, I will close this PR and open a new one.

@banrovegrie
Copy link
Member Author

Closing this and pivoting to #187.

@banrovegrie banrovegrie closed this Sep 2, 2022
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