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

Add conversion & unit tests for dgT, dtT & dsTMatrix #136

Merged
merged 11 commits into from Jun 18, 2017

Conversation

Projects
None yet
3 participants
@binxiangni
Contributor

binxiangni commented Jun 17, 2017

In order to solve #17 and #114.

@eddelbuettel

This comment has been minimized.

Show comment
Hide comment
@eddelbuettel

eddelbuettel Jun 17, 2017

Member

Wait, there seem to some of the same commits in both pull requests. That's generally not a great idea.

Member

eddelbuettel commented Jun 17, 2017

Wait, there seem to some of the same commits in both pull requests. That's generally not a great idea.

@binxiangni

This comment has been minimized.

Show comment
Hide comment
@binxiangni

binxiangni Jun 17, 2017

Contributor

Maybe I should first close this PR.

Contributor

binxiangni commented Jun 17, 2017

Maybe I should first close this PR.

@binxiangni binxiangni closed this Jun 17, 2017

@eddelbuettel

This comment has been minimized.

Show comment
Hide comment
@eddelbuettel

eddelbuettel Jun 18, 2017

Member

I now merged #135. If we're careful we could probably open this and merge it too.

We can either open, and merge (maybe simplest) or cherry pick the last two commits.

In general, let's try to only work on one open PR at a time. I'm sorry I took four days on the last one but review is useful.

Member

eddelbuettel commented Jun 18, 2017

I now merged #135. If we're careful we could probably open this and merge it too.

We can either open, and merge (maybe simplest) or cherry pick the last two commits.

In general, let's try to only work on one open PR at a time. I'm sorry I took four days on the last one but review is useful.

@eddelbuettel eddelbuettel reopened this Jun 18, 2017

@eddelbuettel

This comment has been minimized.

Show comment
Hide comment
@eddelbuettel

eddelbuettel Jun 18, 2017

Member

There is however a conflict now so that would have to be resolved first.

Member

eddelbuettel commented Jun 18, 2017

There is however a conflict now so that would have to be resolved first.

@coatless

This comment has been minimized.

Show comment
Hide comment
@coatless

coatless Jun 18, 2017

Contributor

Might I suggest for this PR that @eddelbuettel uses a merge squash? In essence, the working history of the branch is condensed into one commit that is added into the master. This keeps all of the changes of the PR together without adding the duplicate history from the previous PR back into the master.

Merge and squash via:

git checkout master
git merge --squash branch_here
git commit
Contributor

coatless commented Jun 18, 2017

Might I suggest for this PR that @eddelbuettel uses a merge squash? In essence, the working history of the branch is condensed into one commit that is added into the master. This keeps all of the changes of the PR together without adding the duplicate history from the previous PR back into the master.

Merge and squash via:

git checkout master
git merge --squash branch_here
git commit
@eddelbuettel

This comment has been minimized.

Show comment
Hide comment
@eddelbuettel

eddelbuettel Jun 18, 2017

Member

Yes. I already used a merge squash on the last one. Trivial from GitHub's GUI.

Member

eddelbuettel commented Jun 18, 2017

Yes. I already used a merge squash on the last one. Trivial from GitHub's GUI.

@coatless

This comment has been minimized.

Show comment
Hide comment
@coatless

coatless Jun 18, 2017

Contributor

Missed that. Awesome!

Contributor

coatless commented Jun 18, 2017

Missed that. Awesome!

@eddelbuettel

This comment has been minimized.

Show comment
Hide comment
@eddelbuettel

eddelbuettel Jun 18, 2017

Member

No worries, and thanks for the CLI reminder. Noted, and copied to local README.

Member

eddelbuettel commented Jun 18, 2017

No worries, and thanks for the CLI reminder. Noted, and copied to local README.

@eddelbuettel

This comment has been minimized.

Show comment
Hide comment
@eddelbuettel

eddelbuettel Jun 18, 2017

Member

Tests find on my end in a branch, so in it goes. Hurray :)

Member

eddelbuettel commented Jun 18, 2017

Tests find on my end in a branch, so in it goes. Hurray :)

@eddelbuettel eddelbuettel merged commit ea4875f into RcppCore:master Jun 18, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@binxiangni binxiangni deleted the binxiangni:Tsparse branch Jun 25, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment