Make some methods safer, rename the directory to Union-Find

kodecocodes · Feb 11, 2016 · 475024e · 475024e
1 parent 5d262b9
commit 475024e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 24 deletions.
diff --git a/UnionFind/README.markdown → Union-Find/README.markdown b/UnionFind/README.markdown → Union-Find/README.markdown
diff --git a/...Find/UnioinFind.playground/Contents.swift → ...Find/UnioinFind.playground/Contents.swift b/...Find/UnioinFind.playground/Contents.swift → ...Find/UnioinFind.playground/Contents.swift
@@ -22,21 +22,24 @@ public struct UnionFind<T: Hashable> {
     }
   }
 
-  public mutating func findSetOfElement(element: T) -> Int {
-    let indexOfElement = index[element]!
-    return findSetByIndexOfElement(indexOfElement)
+  public mutating func findSetOfElement(element: T) -> Int? {
+    if let indexOfElement = index[element] {
+      return findSetByIndexOfElement(indexOfElement)
+    } else {
+      return nil
+    }
   }
 
   public mutating func unionSetsWithElement(firstElement: T, andSecondElement secondElement: T) {
-    let firstSet = findSetOfElement(firstElement)
-    let secondSet = findSetOfElement(secondElement)
-    if (firstSet != secondSet) {
-      if (size[firstSet] < size[secondSet]) {
-        parent[firstSet] = secondSet;
-        size[secondSet] += size[firstSet]
-      } else {
-        parent[secondSet] = firstSet;
-        size[firstSet] += size[secondSet]
+    if let firstSet = findSetOfElement(firstElement), secondSet = findSetOfElement(secondElement) {
+      if (firstSet != secondSet) {
+        if (size[firstSet] < size[secondSet]) {
+          parent[firstSet] = secondSet;
+          size[secondSet] += size[firstSet]
+        } else {
+          parent[secondSet] = firstSet;
+          size[firstSet] += size[secondSet]
+        }
       }
     }
   }

diff --git a/...ioinFind.playground/contents.xcplayground → ...ioinFind.playground/contents.xcplayground b/...ioinFind.playground/contents.xcplayground → ...ioinFind.playground/contents.xcplayground
diff --git a/...UnioinFind.playground/timeline.xctimeline → ...UnioinFind.playground/timeline.xctimeline b/...UnioinFind.playground/timeline.xctimeline → ...UnioinFind.playground/timeline.xctimeline
diff --git a/UnionFind/UnionFind.swift → Union-Find/UnionFind.swift b/UnionFind/UnionFind.swift → Union-Find/UnionFind.swift
@@ -30,21 +30,24 @@ public struct UnionFind<T: Hashable> {
     }
   }
 
-  public mutating func findSetOfElement(element: T) -> Int {
-    let indexOfElement = index[element]!
-    return findSetByIndexOfElement(indexOfElement)
+  public mutating func findSetOfElement(element: T) -> Int? {
+    if let indexOfElement = index[element] {
+      return findSetByIndexOfElement(indexOfElement)
+    } else {
+      return nil
+    }
   }
 
   public mutating func unionSetsWithElement(firstElement: T, andSecondElement secondElement: T) {
-    let firstSet = findSetOfElement(firstElement)
-    let secondSet = findSetOfElement(secondElement)
-    if (firstSet != secondSet) {
-      if (size[firstSet] < size[secondSet]) {
-        parent[firstSet] = secondSet;
-        size[secondSet] += size[firstSet]
-      } else {
-        parent[secondSet] = firstSet;
-        size[firstSet] += size[secondSet]
+    if let firstSet = findSetOfElement(firstElement), secondSet = findSetOfElement(secondElement) {
+      if (firstSet != secondSet) {
+        if (size[firstSet] < size[secondSet]) {
+          parent[firstSet] = secondSet;
+          size[secondSet] += size[firstSet]
+        } else {
+          parent[secondSet] = firstSet;
+          size[firstSet] += size[secondSet]
+        }
       }
     }
   }