Fix issue #6003

[galaunay]

#6003

Instreamplot, skip start_points that are on an existing streamline instead of raising InvalidIndexError.

[WeatherGod]

Should add a unit test to exercise this case.

On Tue, Feb 16, 2016 at 5:49 PM, muahah notifications@github.com wrote:

In streamplot, skip start_points that are on an existing streamline

instead of raising InvalidIndexError.

You can view, comment on, or merge this pull request online at:

#6011
Commit Summary

• Fix issue #6003

File Changes

• M lib/matplotlib/streamplot.py
  https://github.com/matplotlib/matplotlib/pull/6011/files#diff-0 (5)

Patch Links:

• https://github.com/matplotlib/matplotlib/pull/6011.patch
• https://github.com/matplotlib/matplotlib/pull/6011.diff

—
Reply to this email directly or view it on GitHub
#6011.

[galaunay]

Run into another problem while adding a test case :
streamplot() accept 1d or 2d arrays for x and y arguments.
But trying to use 2d arrays while specifying start_points lead to an error.
At a first though, transforming x and y to 1d arrays at streamplot.py:140 should fix the problem.
I will try to do so soon.

[tacaswell]

attn @tonysyu

[galaunay]

I fixed issue #6003 and added a test case for streamplot() with non-null start_points argument.
The test case raised an error because of the use of 2-dimensionnal arrays for x and y (Grid class, that normally deal with 2-dimensionnal arrays is not called in that case), so I made some changes for that too.

[QuLogic]

This message is not strictly correct if, e.g., x.ndim == y.ndim == 3.

[galaunay]

By looking more closely, those checks are redundant because Grid already checks x and y (ndim and values).
Grid also extract x and y origins that can be re-used to shift the seed points, instead of getting them from data.

[QuLogic]

So is this complete? None of the streamlines in the test image appear to originate at the plotted points.

Also, the file names do not need "test_image" in them; it's clear it's a test image from the directory.

[galaunay]

I pointed out the fact that streamlines do not exactly originate from starting points in #6002.
Don't know yet if particular seeding positions on the grid are needed by the streamline algorithm or if there is just a problem while passing between data coordinates and grid coordinates.
I will keep looking on that.
I don't know if it belongs to another pull request or not.

Regarding the image names, I can change them.

[tacaswell]

Please do not merge the master branch into your branch. Instead rebase your branch on top of current master and then force-push to your gh repo.

[galaunay]

I realize that this pull request is a bit messy (I'm slowly getting used to git and github).

Does it sound good to you if we close it so I can open a new (clean) pull request for issues #6002 and #6003 when it will be ready ?

[tacaswell]

The easiest thing to do is to fix this is to rebase + force push. I just did the rebase locally and there is fortunately no conflicts so (I am going to assume that your upsrteam remote is called 'matplotlib' and the remote pointing at your gh account is called origin

# update your computer to know what gh knows
git remote update  
# make sure you are one the branch this PR looks at
git checkout master
# rebase onto current master
git rebase matplotlib/master
# check gitk to make sure tis went well

# fail to push to your gh for pedagogical reasons 
git push origin master:master
# try again with --force, only use this when you are sure
git push --force origin master:master

[galaunay]

Thank you, this is better now.
I think this is it, I had to change the way the function pass from data coordinates to internal grid coordinates (the bug was here).
After that some tests failed with low RMS (0.001 and 0.072).
Theoretically, the change made should not modify the result from streamplot(start_points=None) but it indeed change the way data are passed from and to grid coordinates. So I assume small differences in tests are due to numerical errors...

[tacaswell]

It looks like you added some new test images and then modified them in later commits. Can you squash these down into a single commit so that the repository does not carry around the (wrong) intermediary results?

[galaunay]

I rebased the whole thing to have clean an explicit commits (and no intermediary results).

[tacaswell]

Thanks!

The lower left point in the start point test does fall exactly on the stream line. Is that expected?

[galaunay]

The streamline do not originate from this point but from the point in the very corner (-3; -3).
the point at (-2.33, -2.33) is ignored because too close to an existing streamline (c.f. e9ddd00).
It is possible to get it back by increasing the density parameter.

[tacaswell]

Ah, I missed that point was there.