M test/test_supervision.py +17 -0
@@ 493,6 493,23 @@ 2015-01-04 True
2015-01-05 True
""", marker)
+ ts_marker, marker = tsh.get_ts_marker(engine, 'ts_exp1', _keep_nans=True)
+ assert not ts_marker.equals(ts_get)
+ assert_df("""
+2015-01-01 False
+2015-01-02 False
+2015-01-03 True
+2015-01-04 True
+2015-01-05 True
+""", marker)
+ assert_df("""
+2015-01-01 0.0
+2015-01-02 1.0
+2015-01-03 -3.0
+2015-01-04 -3.0
+2015-01-05 NaN
+""", ts_marker)
+
def test_before_first_insertion(engine, tsh):
tsh.update(engine, genserie(datetime(2010, 1, 1), 'D', 11), 'ts_shtroumpf', 'test')
M tshistory_supervision/tsio.py +5 -2
@@ 222,7 222,8 @@ class timeseries(basets):
@tx
def get_ts_marker(self, cn, name, revision_date=None,
- from_value_date=None, to_value_date=None):
+ from_value_date=None, to_value_date=None,
+ _keep_nans=False):
table = self._series_to_tablename(cn, name)
if table is None:
return None, None
@@ 271,4 272,6 @@ class timeseries(basets):
mask_manual[manual.index] = True
mask_manual.name = name
- return edited.dropna(), mask_manual
+ if not _keep_nans:
+ edited = edited.dropna()
+ return edited, mask_manual