mirror of
https://github.com/metabolist/metatext.git
synced 2024-11-22 08:10:59 +00:00
Renaming
This commit is contained in:
parent
9c3010fe29
commit
e731bdb1e3
2 changed files with 15 additions and 15 deletions
|
@ -8,26 +8,26 @@ import Foundation
|
|||
|
||||
public struct BloomFilter<T: DeterministicallyHashable> {
|
||||
public let hashers: [DeterministicHasher]
|
||||
public let bits: Int
|
||||
public let bitCount: Int
|
||||
|
||||
private var data: BitArray
|
||||
private var bitArray: BitArray
|
||||
|
||||
public init(hashes: [DeterministicHasher], bits: Int) {
|
||||
self.hashers = hashes
|
||||
self.bits = bits
|
||||
data = BitArray(count: bits)
|
||||
public init(hashers: [DeterministicHasher], bits: Int) {
|
||||
self.hashers = hashers
|
||||
bitCount = bits
|
||||
bitArray = BitArray(count: bits)
|
||||
}
|
||||
}
|
||||
|
||||
public extension BloomFilter {
|
||||
mutating func insert(_ newMember: T) {
|
||||
for index in indices(newMember) {
|
||||
data[index] = true
|
||||
bitArray[index] = true
|
||||
}
|
||||
}
|
||||
|
||||
func contains(_ member: T) -> Bool {
|
||||
indices(member).map { data[$0] }.allSatisfy { $0 }
|
||||
indices(member).map { bitArray[$0] }.allSatisfy { $0 }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -42,21 +42,21 @@ extension BloomFilter: Codable {
|
|||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
|
||||
hashers = try container.decode([DeterministicHasher].self, forKey: .hashers)
|
||||
bits = try container.decode(Int.self, forKey: .bits)
|
||||
data = BitArray(data: try container.decode(Data.self, forKey: .data), count: bits)
|
||||
bitCount = try container.decode(Int.self, forKey: .bits)
|
||||
bitArray = BitArray(data: try container.decode(Data.self, forKey: .data), count: bitCount)
|
||||
}
|
||||
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
|
||||
try container.encode(hashers, forKey: .hashers)
|
||||
try container.encode(bits, forKey: .bits)
|
||||
try container.encode(data.data, forKey: .data)
|
||||
try container.encode(bitCount, forKey: .bits)
|
||||
try container.encode(bitArray.data, forKey: .data)
|
||||
}
|
||||
}
|
||||
|
||||
private extension BloomFilter {
|
||||
func indices(_ member: T) -> [Int] {
|
||||
hashers.map { abs($0.apply(member)) % bits }
|
||||
hashers.map { abs($0.apply(member)) % bitCount }
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@ import XCTest
|
|||
|
||||
final class CodableBloomFilterTests: XCTestCase {
|
||||
func testContains() {
|
||||
var sut = BloomFilter<String>(hashes: [.djb2, .sdbm], bits: 1024)
|
||||
var sut = BloomFilter<String>(hashers: [.djb2, .sdbm], bits: 1024)
|
||||
|
||||
sut.insert("lol")
|
||||
sut.insert("ok")
|
||||
|
@ -15,7 +15,7 @@ final class CodableBloomFilterTests: XCTestCase {
|
|||
}
|
||||
|
||||
func testCoding() throws {
|
||||
var sut = BloomFilter<String>(hashes: [.djb2, .sdbm], bits: 64)
|
||||
var sut = BloomFilter<String>(hashers: [.djb2, .sdbm], bits: 64)
|
||||
let expectedSerialization = Data(#"{"bits":64,"data":"ABAAAAACAJA=","hashers":["djb2","sdbm"]}"#.utf8)
|
||||
|
||||
sut.insert("lol")
|
||||
|
|
Loading…
Reference in a new issue