Skip to content

Rebase of Sparse-Matrix Interpolation from Decoupler Branch #1706

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.

Sign up for GitHub

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

Jump to bottom
Merged
pelson merged 8 commits into from
Jul 1, 2015
Merged

Rebase of Sparse-Matrix Interpolation from Decoupler Branch #1706

pelson merged 8 commits into from
Jul 1, 2015

Conversation

@mo-g
Copy link

@mo-g mo-g commented Jun 23, 2015

Some tests and a small docstring change to the sparse-matrix changes implemented on the decoupler branch.

@mo-g mo-g force-pushed the rebase-decoupler-sparse branch from 4f44892 to 58538f9 Compare June 23, 2015 09:08
@mo-g mo-g force-pushed the rebase-decoupler-sparse branch 2 times, most recently from 4f81309 to ccd789d Compare June 25, 2015 13:41
@mo-g mo-g changed the title Rebase decoupler sparse Rebase of Sparse-Matrix Interpolation from Decoupler Branch Jun 25, 2015
DPeterK
DPeterK reviewed Jun 26, 2015
View reviewed changes
lib/iris/analysis/_scipy_interpolate.py Outdated
Copy link
Member

@DPeterK DPeterK Jun 26, 2015

Choose a reason for hiding this comment

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

It's not clear in the docstring what differentiates this assumedly abnormal interpolation from what is so assuredly "normal interpolation" as referred to here.

@mo-g mo-g force-pushed the rebase-decoupler-sparse branch from d50f7f4 to d6df002 Compare June 29, 2015 09:47
@DPeterK
Copy link
Member

DPeterK commented Jun 29, 2015

@mo-g 👍 Let's see what @bjlittle thinks and see if we can get this merged soon! You'll need to squash all those commits before we do so though 😉

@mo-g mo-g force-pushed the rebase-decoupler-sparse branch from fb03882 to 7c7803a Compare June 29, 2015 12:38
@mo-g
Copy link
Author

mo-g commented Jun 29, 2015

Squisht.

pelson
pelson reviewed Jun 30, 2015
View reviewed changes
lib/iris/analysis/_scipy_interpolate.py
Copy link
Member

@pelson pelson Jun 30, 2015

Choose a reason for hiding this comment

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

Full stop.

pelson
pelson reviewed Jun 30, 2015
View reviewed changes
lib/iris/analysis/_scipy_interpolate.py Outdated
Copy link
Member

@pelson pelson Jun 30, 2015

Choose a reason for hiding this comment

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

A comment on this case might help future readers.

@pelson
Copy link
Member

pelson commented Jun 30, 2015

Looks pretty good to me. I'd be happy enough to merge with a few changes.
I'm not overly worried whether we remove the global SPARSE or not. It is preferable, but not critical. Take a look @mo-g and see what you think.

@mo-g
Copy link
Author

mo-g commented Jul 1, 2015

Pulled out the SPARSE global, and removed the no-longer-relevant code (_evaluate_linear). The 'None' has to stay in the return prepared for evaluate_nearest to still be possible.

Cheers,
Gray.

pelson added a commit that referenced this pull request Jul 1, 2015
@pelson
Merge pull request #1706 from mo-g/rebase-decoupler-sparse
7eb03d0 
Rebase of Sparse-Matrix Interpolation from Decoupler Branch
@pelson pelson merged commit 7eb03d0 into SciTools:master Jul 1, 2015
@QuLogic QuLogic mentioned this pull request Jul 6, 2015
Merged
@mo-g mo-g deleted the rebase-decoupler-sparse branch January 4, 2016 17:25
@coveralls
Copy link

coveralls commented Mar 18, 2017

Coverage Status

Changes Unknown when pulling fe127a0 on mo-g:rebase-decoupler-sparse into ** on SciTools:master**.

@djkirkham djkirkham mentioned this pull request Oct 24, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@mo-g @DPeterK @pelson @coveralls @ajdawson @rhattersley @bjlittle @gm-s