Skip to content

Commit 7a59422

Browse files
author
stephanie
committed
add filter code and test
1 parent 6543156 commit 7a59422

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

odmtools/gui/plotProbability.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def updatePlot(self):
135135
if len(oneSeries.dataTable) > 0:
136136
#self.prob.append(
137137
#prop = oneSeries.Probability.plot(column="DataValue", ax=self.plots)
138-
138+
#todo FutureWarning: order is deprecated, use sort_values(...)
139139
xValues = oneSeries.Probability.xAxis.order().values
140140
yValues = oneSeries.Probability.yAxis.order().values
141141

odmtools/odmservices/edit_service.py

+9
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,12 @@ def change_value_threshold(self, value, operator):
207207
del copy_df
208208
self.filtered_dataframe = df[df.index.isin(tmplist)]
209209

210+
#Duplicate values filter
211+
def duplicate_value_filter(self):
212+
df = self._test_filter_previous()
213+
self.filtered_dataframe= df.index.get_duplicates()
214+
#self.filtered_dataframe = df[df['DataValue'] < value]
215+
210216

211217
def select_points_tf(self, tf_list):
212218
self._filter_list = tf_list
@@ -366,6 +372,9 @@ def drift_correction(self, gap_width):
366372
return True
367373
return False
368374

375+
376+
377+
369378
def isOneGroup(self):
370379

371380
issel = self._series_points_df.index.isin(self.get_filtered_points().index)

tests/test_odmservices/test_edit_service.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ def setup(self):
6363
self.db = globals['db']
6464
"""
6565

66-
66+
def test_duplicate_values_filter(self):
67+
duplicate_value = self.memory_database.getDataValues()[0]
68+
self.memory_database.addPoints(duplicate_value)
69+
vals = self.edit_service.duplicate_value_filter()
70+
assert len(vals) == 1
6771

6872
def test_save_series(self):
6973
stlen = len(self.series.data_values)

0 commit comments

Comments
 (0)