OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug with TimeVector.delet()

Browse Source
This commit is contained in:
Joakim Hove
2018-06-14 16:03:42 +02:00
parent d22ba5b19a
commit b50da115b9
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python/sunbeam/tools/time_vector.py
View File

@@ -247,17 +247,19 @@ class TimeVector(object):
else:
if isinstance(index,datetime.date):
index = datetime.datetime(index.year, index.month, index.day)
return self.time_steps_dict[index][0]
return self.time_steps_dict[index]
def _add_dates_block(self, ts):
self.time_steps_dict[ts.dt] = (ts, len(self.time_steps_list))
self.time_steps_dict[ts.dt] = ts
self.time_steps_list.append(ts)
def delete(self, dt):
(ts, index) = self.time_steps_dict[dt]
del self.time_steps_dict[dt]
del self.time_steps_list[index]
for (index,ts) in enumerate(self.time_steps_list):
if ts.dt == dt:
del self.time_steps_list[index]
break
def add_keywords(self, dt, keywords):

9
tests/time_vector.py
View File

@@ -142,6 +142,15 @@ class TestTimeVector(unittest.TestCase):
for ts in tv:
self.assertFalse("WTEST" in ts)
def test_drop_dates2(self):
tv = TimeVector(datetime.datetime(2017,1,1))
tv.add_keywords(datetime.datetime(2018,1,1), ['FOO18'])
tv.add_keywords(datetime.datetime(2019,1,1), ['FOO19'])
tv.add_keywords(datetime.datetime(2020,1,1), ['FOO20'])
tv.delete(datetime.datetime(2019,1,1))
tv.delete(datetime.datetime(2020,1,1))
if __name__ == "__main__":
unittest.main()