Revision: 5715
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5715&view=rev
Author: sameerd
Date: 2008-07-07 10:37:33 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
bug fixes - edgecases
Modified Paths:
--------------
trunk/matplotlib/examples/misc/rec_join_demo.py
trunk/matplotlib/lib/matplotlib/mlab.py
Modified: trunk/matplotlib/examples/misc/rec_join_demo.py
===================================================================
--- trunk/matplotlib/examples/misc/rec_join_demo.py 2008-07-07 12:12:52 UTC
(rev 5714)
+++ trunk/matplotlib/examples/misc/rec_join_demo.py 2008-07-07 17:37:33 UTC
(rev 5715)
@@ -2,7 +2,7 @@
import matplotlib.mlab as mlab
-r = mlab.csv2rec('data/aapl.csv')
+r = mlab.csv2rec('../data/aapl.csv')
r.sort()
r1 = r[-10:]
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py 2008-07-07 12:12:52 UTC (rev
5714)
+++ trunk/matplotlib/lib/matplotlib/mlab.py 2008-07-07 17:37:33 UTC (rev
5715)
@@ -2081,10 +2081,12 @@
def rec_join(key, r1, r2, jointype='inner', defaults=None):
"""
join record arrays r1 and r2 on key; key is a tuple of field
- names. if r1 and r2 have equal values on all the keys in the key
+ names. If r1 and r2 have equal values on all the keys in the key
tuple, then their fields will be merged into a new record array
- containing the intersection of the fields of r1 and r2
+ containing the intersection of the fields of r1 and r2.
+ r1 (also r2) must not have any duplicate keys.
+
The jointype keyword can be 'inner', 'outer', 'leftouter'.
To do a rightouter join just reverse r1 and r2.
@@ -2123,9 +2125,6 @@
right_ind = np.array([r2d[k] for k in right_keys])
right_len = len(right_ind)
- r2 = rec_drop_fields(r2, r1.dtype.names)
-
-
def key_desc(name):
'if name is a string key, use the larger size of r1 or r2 before
merging'
dt1 = r1.dtype[name]
@@ -2158,21 +2157,17 @@
for field in r1.dtype.names:
newrec[field][:common_len] = r1[field][r1ind]
- if jointype == "outer" or jointype == "leftouter":
+ if (jointype == "outer" or jointype == "leftouter") and left_len:
newrec[field][common_len:(common_len+left_len)] =
r1[field][left_ind]
for field in r2.dtype.names:
- newrec[field][:common_len] = r2[field][r2ind]
- if jointype == "outer":
- newrec[field][-right_len:] =
r2[field][right_ind[right_ind.argsort()]]
+ if field not in key:
+ newrec[field][:common_len] = r2[field][r2ind]
+ if jointype == "outer" and right_len:
+ newrec[field][-right_len:] = r2[field][right_ind]
- # sort newrec using the same order as r1
- sort_indices = r1ind.copy()
- if jointype == "outer" or jointype == "leftouter":
- sort_indices = np.append(sort_indices, left_ind)
- newrec[:(common_len+left_len)] = newrec[sort_indices.argsort()]
+ newrec.sort(order=key)
-
return newrec.view(np.recarray)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
