Revision: 4880
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4880&view=rev
Author: sameerd
Date: 2008-01-18 10:21:14 -0800 (Fri, 18 Jan 2008)
Log Message:
-----------
rec_join now returns an array that has its rows in the same order as the first
record array passed to it.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/mlab.py
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py 2008-01-18 17:59:51 UTC (rev
4879)
+++ trunk/matplotlib/lib/matplotlib/mlab.py 2008-01-18 18:21:14 UTC (rev
4880)
@@ -1990,11 +1990,6 @@
def makekey(row):
return tuple([row[name] for name in key])
-
- names = list(r1.dtype.names) + [name for name in r2.dtype.names if name
not in set(r1.dtype.names)]
-
-
-
r1d = dict([(makekey(row),i) for i,row in enumerate(r1)])
r2d = dict([(makekey(row),i) for i,row in enumerate(r2)])
@@ -2003,12 +1998,14 @@
keys = r1keys & r2keys
- r1ind = [r1d[k] for k in keys]
- r2ind = [r2d[k] for k in keys]
+ r1ind = npy.array([r1d[k] for k in keys])
+ r2ind = npy.array([r2d[k] for k in keys])
+ # Make sure that the output rows have the same relative order as r1
+ sortind = r1ind.argsort()
- r1 = r1[r1ind]
- r2 = r2[r2ind]
+ r1 = r1[r1ind[sortind]]
+ r2 = r2[r2ind[sortind]]
r2 = rec_drop_fields(r2, r1.dtype.names)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
