Changeset 1203

Timestamp:

08/06/08 19:39:41 (4 months ago)

Author:

mattknox_ca

Message:

fixed bug with setitem and rewrote setitem to work more like getitem

Files:

• trunk/timeseries/scikits/timeseries/tests/test_timeseries.py (modified) (3 diffs)
• trunk/timeseries/scikits/timeseries/tseries.py (modified) (1 diff)

trunk/timeseries/scikits/timeseries/tests/test_timeseries.py

@@ -512 +512 @@
-        assert_equal(piece._fill_value, -9999)
-        assert_equal(piece[:5]._basedict['info'], '???')
-
+
-
-class TestSetItem(TestCase):
@@ -555 +555 @@
-        assert_equal(series._data, [5,1,2,3,5])
-        assert_equal(series._mask, [0,0,0,0,0])
+
+        # test for bug fixed in r1203
+        x, y = ts.now('b'), ts.now('b')+1
+        a = ts.time_series([1], start_date=x)
+        b = ts.time_series([4,5], start_date=x)
+        b[x:y] = a[x:y]
+        assert_equal(b[0], 1)
-
-    #
@@ -603 +610 @@
-        test1D = series1D.reshape(*newshape)
-        assert_equal(test1D.shape, newshape)
-
+
-    #
-    def test_reshaping_2D(self):

trunk/timeseries/scikits/timeseries/tseries.py

@@ -564 +564 @@
-Sets item described by index. If value is masked, masks those locations.
-"""
-if self is masked:
-    raise MAError, 'Cannot alter the masked element.'
+(sindx, dindx, recheck) = self._index_checker(indx)
+_dates = ndarray.__getattribute__(self, '_dates')
-        try:
-
+s
-        except IndexError:
-Easy case: we're out of bounds...
-isinstance(indx, int)
+We don't need to recheck the index: just raise an exception
+not recheck
-                raise
-
-
+
-            try:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            else:
-                MaskedArray.__setitem__(self, indx, value)
-        except ValueError:
-            # OK, that should be a slice, then...
-            if isinstance(indx, slice):
-                sindx = slice(self._slicebound_checker(indx.start),
-                              self._slicebound_checker(indx.stop),
-                              indx.step)
-            # Or maybe a field?
-            elif isinstance(indx, basestring) and \
-              self.dtype.names is not None and indx in self.dtype.names:
-                sindx = indx
-            # or string representation of a Date?
-            elif isinstance(indx, basestring):
-                _date = Date(freq=self.freq, string=indx)
-                _dates = ndarray.__getattribute__(self, '_dates')
-                sindx = _dates.date_to_index(_date)
-            # Or some kind of date...
-            else:
-                _dates = ndarray.__getattribute__(self, '_dates')
-                sindx = _dates.date_to_index(date_array(indx, freq=self.freq))
-            #
-            try:
-                MaskedArray.__setitem__(self, sindx, value)
-            except IndexError:
-                raise IndexError("Date '%s' out of bounds !" % indx)
-
-    def __setattr__(self, attr, value):