dnrops
/
FuzzyKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor DiscreteMutableFuzzySet refactor

This commit is contained in:
Alexander Ignatov 2021-12-22 22:44:34 +02:00
parent 99caef895d
commit 09c3b5bc56
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Sources/FuzzyKit/FuzzySetImplementations/DiscreteMutableFuzzySet.swift
View File

@ -23,28 +23,32 @@ extension DiscreteMutableFuzzySet: FuzzySet {
public func complement(method: ComplementFunction = .standard) -> Self {
var result = Self(elementToGradeMap: grades)
result.formComplement()
result.formComplement(method: method)
return result
}
public func intersection(_ other: Self, method: TNormFunction = .minimum) -> Self {
let combined = grades.merging(other.grades, uniquingKeysWith: method.function)
return .init(elementToGradeMap: combined)
var result = Self(elementToGradeMap: grades)
result.formIntersection(other, method: method)
return result
}
public func union(_ other: Self, method: SNormFunction) -> Self {
let combined = grades.merging(other.grades, uniquingKeysWith: method.function)
return .init(elementToGradeMap: combined)
var result = Self(elementToGradeMap: grades)
result.formUnion(other, method: method)
return result
}
public func difference(_ other: Self, method: DifferenceFunction = .tNormAndComplement(.minimum, .standard)) -> Self {
let combined = grades.merging(other.grades, uniquingKeysWith: method.function)
return .init(elementToGradeMap: combined)
var result = Self(elementToGradeMap: grades)
result.formDifference(other, method: method)
return result
}
public func symmetricDifference(_ other: Self, method: SymmetricDifferenceFunction = .absoluteValue) -> Self {
let combined = grades.merging(other.grades, uniquingKeysWith: method.function)
return .init(elementToGradeMap: combined)
var result = Self(elementToGradeMap: grades)
result.formSymmetricDifference(other, method: method)
return result
}
public func power(_ n: Double) -> Self {
@ -80,23 +84,19 @@ public extension DiscreteMutableFuzzySet {
}
mutating func formIntersection(_ other: Self, method: TNormFunction = .minimum) {
let combined = grades.merging(other.grades, uniquingKeysWith: method.function)
grades = combined
applyFunction(method.function, whenMergingWith: other.grades)
}
mutating func formIntersection(_ other: Self, method: SNormFunction = .maximum) {
let combined = grades.merging(other.grades, uniquingKeysWith: method.function)
grades = combined
mutating func formUnion(_ other: Self, method: SNormFunction = .maximum) {
applyFunction(method.function, whenMergingWith: other.grades)
}
mutating func formDifference(_ other: Self, method: DifferenceFunction = .tNormAndComplement(.minimum, .standard)) {
let combined = grades.merging(other.grades, uniquingKeysWith: method.function)
grades = combined
applyFunction(method.function, whenMergingWith: other.grades)
}
mutating func formSymmetricDifference(_ other: Self, method: SymmetricDifferenceFunction = .absoluteValue) {
let combined = grades.merging(other.grades, uniquingKeysWith: method.function)
grades = combined
applyFunction(method.function, whenMergingWith: other.grades)
}
mutating func applyPower(_ n: Double) {
@ -129,4 +129,8 @@ private extension DiscreteMutableFuzzySet {
let newMap = Dictionary(uniqueKeysWithValues: newGradeTuples)
grades = newMap
}
mutating func applyFunction(_ function: (Grade, Grade) -> Grade, whenMergingWith anotherDictionary: [Universe: Grade]) {
grades.merge(anotherDictionary, uniquingKeysWith: function)
}
}