@@ -180,33 +180,33 @@ public struct RedBlackTree<Key: Comparable, Value>: Probable, Collection, Custom
180
180
/**
181
181
Conforms to Probable protocol.
182
182
*/
183
- public func count< T : Equatable > ( of keys: T ... ) -> Int {
183
+ public func count( of keys: Key ... ) -> Int {
184
184
return count ( of: keys)
185
185
}
186
186
187
187
/**
188
188
Conforms to Probable protocol.
189
189
*/
190
- public func count< T : Equatable > ( of keys: [ T ] ) -> Int {
190
+ public func count( of keys: [ Key ] ) -> Int {
191
191
var c = 0
192
192
for key in keys {
193
- internalCount ( key as! Key , node: root, count: & c)
193
+ internalCount ( key, node: root, count: & c)
194
194
}
195
195
return c
196
196
}
197
197
198
198
/**
199
199
The probability of elements.
200
200
*/
201
- public func probability< T : Equatable > ( of elements : T ... ) -> Double {
202
- return probability ( of: elements )
201
+ public func probability( of keys : Key ... ) -> Double {
202
+ return probability ( of: keys )
203
203
}
204
204
205
205
/**
206
206
The probability of elements.
207
207
*/
208
- public func probability< T : Equatable > ( of elements : [ T ] ) -> Double {
209
- return 0 == count ? 0 : Double ( count ( of: elements ) ) / Double( count)
208
+ public func probability( of keys : [ Key ] ) -> Double {
209
+ return 0 == count ? 0 : Double ( count ( of: keys ) ) / Double( count)
210
210
}
211
211
212
212
/**
@@ -229,15 +229,15 @@ public struct RedBlackTree<Key: Comparable, Value>: Probable, Collection, Custom
229
229
/**
230
230
The expected value of elements.
231
231
*/
232
- public func expectedValue< T : Equatable > ( trials: Int , for elements : T ... ) -> Double {
233
- return expectedValue ( trials: trials, for: elements )
232
+ public func expectedValue( trials: Int , for keys : Key ... ) -> Double {
233
+ return expectedValue ( trials: trials, for: keys )
234
234
}
235
235
236
236
/**
237
237
The expected value of elements.
238
238
*/
239
- public func expectedValue< T : Equatable > ( trials: Int , for elements : [ T ] ) -> Double {
240
- return Double ( trials) * probability( of: elements )
239
+ public func expectedValue( trials: Int , for keys : [ Key ] ) -> Double {
240
+ return Double ( trials) * probability( of: keys )
241
241
}
242
242
243
243
/**
@@ -371,7 +371,7 @@ public struct RedBlackTree<Key: Comparable, Value>: Probable, Collection, Custom
371
371
if sentinel == internalFindNodeForKey ( key) {
372
372
_ = internalInsert ( key, value: value)
373
373
} else {
374
- updateValue ( value, forKey : key)
374
+ update ( value: value , for : key)
375
375
}
376
376
}
377
377
}
0 commit comments