@@ -180,33 +180,33 @@ public struct RedBlackTree<Key: Comparable, Value>: Probable, Collection, Custom
180180 /**
181181 Conforms to Probable protocol.
182182 */
183- public func count< T : Equatable > ( of keys: T ... ) -> Int {
183+ public func count( of keys: Key ... ) -> Int {
184184 return count ( of: keys)
185185 }
186186
187187 /**
188188 Conforms to Probable protocol.
189189 */
190- public func count< T : Equatable > ( of keys: [ T ] ) -> Int {
190+ public func count( of keys: [ Key ] ) -> Int {
191191 var c = 0
192192 for key in keys {
193- internalCount ( key as! Key , node: root, count: & c)
193+ internalCount ( key, node: root, count: & c)
194194 }
195195 return c
196196 }
197197
198198 /**
199199 The probability of elements.
200200 */
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 )
203203 }
204204
205205 /**
206206 The probability of elements.
207207 */
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)
210210 }
211211
212212 /**
@@ -229,15 +229,15 @@ public struct RedBlackTree<Key: Comparable, Value>: Probable, Collection, Custom
229229 /**
230230 The expected value of elements.
231231 */
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 )
234234 }
235235
236236 /**
237237 The expected value of elements.
238238 */
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 )
241241 }
242242
243243 /**
@@ -371,7 +371,7 @@ public struct RedBlackTree<Key: Comparable, Value>: Probable, Collection, Custom
371371 if sentinel == internalFindNodeForKey ( key) {
372372 _ = internalInsert ( key, value: value)
373373 } else {
374- updateValue ( value, forKey : key)
374+ update ( value: value , for : key)
375375 }
376376 }
377377 }
0 commit comments