@@ -186,9 +186,7 @@ def __init__(self, element_strategy, shape, dtype, fill, unique):
186186 self .unique = unique
187187 self ._check_elements = dtype .kind not in ("O" , "V" )
188188
189- def set_element (self , data , result , idx , strategy = None ):
190- strategy = strategy or self .element_strategy
191- val = data .draw (strategy )
189+ def set_element (self , val , result , idx , * , fill = False ):
192190 try :
193191 result [idx ] = val
194192 except TypeError as err :
@@ -197,6 +195,7 @@ def set_element(self, data, result, idx, strategy=None):
197195 f"{ result .dtype !r} - possible mismatch of time units in dtypes?"
198196 ) from err
199197 if self ._check_elements and val != result [idx ] and val == val :
198+ strategy = self .fill if fill else self .element_strategy
200199 raise InvalidArgument (
201200 "Generated array element %r from %r cannot be represented as "
202201 "dtype %r - instead it becomes %r (type %r). Consider using a more "
@@ -229,28 +228,17 @@ def do_draw(self, data):
229228 # generate a fully dense array with a freshly drawn value for each
230229 # entry.
231230 if self .unique :
232- seen = set ()
233- elements = cu .many (
234- data ,
231+ elems = st .lists (
232+ self .element_strategy ,
235233 min_size = self .array_size ,
236234 max_size = self .array_size ,
237- average_size = self . array_size ,
235+ unique = True ,
238236 )
239- i = 0
240- while elements .more ():
241- # We assign first because this means we check for
242- # uniqueness after numpy has converted it to the relevant
243- # type for us. Because we don't increment the counter on
244- # a duplicate we will overwrite it on the next draw.
245- self .set_element (data , result , i )
246- if result [i ] not in seen :
247- seen .add (result [i ])
248- i += 1
249- else :
250- elements .reject ()
237+ for i , v in enumerate (data .draw (elems )):
238+ self .set_element (v , result , i )
251239 else :
252240 for i in range (len (result )):
253- self .set_element (data , result , i )
241+ self .set_element (data . draw ( self . element_strategy ) , result , i )
254242 else :
255243 # We draw numpy arrays as "sparse with an offset". We draw a
256244 # collection of index assignments within the array and assign
@@ -277,7 +265,7 @@ def do_draw(self, data):
277265 if not needs_fill [i ]:
278266 elements .reject ()
279267 continue
280- self .set_element (data , result , i )
268+ self .set_element (data . draw ( self . element_strategy ) , result , i )
281269 if self .unique :
282270 if result [i ] in seen :
283271 elements .reject ()
@@ -300,7 +288,7 @@ def do_draw(self, data):
300288 one_element = np .zeros (
301289 shape = 1 , dtype = object if unsized_string_dtype else self .dtype
302290 )
303- self .set_element (data , one_element , 0 , self . fill )
291+ self .set_element (data . draw ( self . fill ) , one_element , 0 , fill = True )
304292 if unsized_string_dtype :
305293 one_element = one_element .astype (self .dtype )
306294 fill_value = one_element [0 ]
0 commit comments