General refectoring..

- Revised LinkList.remove(at:) algorithm - Renamed methods for HashTable algorithm and Keyable Protocol - Revised content for Stacks & Queues - Revised content for Basic Sorting
waynewbishop · Jan 9, 2018 · f3c48d1 · f3c48d1
1 parent 369d32b
commit f3c48d1
Show file tree

Hide file tree

Showing 9 changed files with 145 additions and 29 deletions.
diff --git a/Source/Extensions/Keyable.swift b/Source/Extensions/Keyable.swift
@@ -15,7 +15,7 @@ extension Keyable {
 
 
     //compute table index
-    func hashindex<T>(for key: String!, using buckets: Array<T>) -> Int {
+    func hashValue<T>(for key: String!, using buckets: Array<T>) -> Int {
 
 
         var remainder: Int = 0

diff --git a/Source/Extensions/String.swift b/Source/Extensions/String.swift
@@ -92,12 +92,6 @@ extension String: Keyable {
     }
 
 
-    //convert a string into a character array
-    func characters() ->Array<Character> {
-        return Array(self.characters)
-    }
-
-
 
     //reverse string order
     func reverse() -> String! {
@@ -108,7 +102,7 @@ extension String: Keyable {
          */
 
         //convert to array
-        var characters = self.characters()
+        var characters = Array(self)
 
         var findex: Int = characters.startIndex
         var bindex: Int = characters.endIndex - 1

diff --git a/Source/Factories/Graph.swift b/Source/Factories/Graph.swift
@@ -1,5 +1,5 @@
 //
-//  GraphFactory.swift
+//  Graph.swift
 //  SwiftStructures
 //
 //  Created by Wayne Bishop on 6/7/14.
@@ -25,8 +25,7 @@ public class SwiftGraph {
 
     //create a new vertex
     func addVertex(key: String) -> Vertex {
-
-
+
         //set the key
         let childVertex: Vertex = Vertex()
         childVertex.key = key

diff --git a/Source/Factories/HashTable.swift b/Source/Factories/HashTable.swift
@@ -19,20 +19,23 @@ class HashTable<T: Keyable> {
 
    private var buckets: Array<Node<T>?>
 
-
+    /*
+     note: initializing the hash table with an initial capactiyis shown
+     for educational purposes only. 
+    */
     init(capacity: Int) {
         self.buckets = Array<Node<T>?>(repeatElement(nil, count: capacity))
     }
 
 
     //add item to list
-    func append(_ element: T) -> Result {
+    func insert(_ element: T) -> Result {
 
         let result: Result
 
 
         //compute hash
-        let hashIndex = element.hashindex(for: element.keystring, using: buckets)
+        let hashIndex = element.hashValue(for: element.keystring, using: buckets)
 
 
         if hashIndex != -1 {
@@ -79,7 +82,7 @@ class HashTable<T: Keyable> {
 
 
         //obtain hash index
-        let hashIndex = element.hashindex(for: element.keystring, using: buckets)
+        let hashIndex = element.hashValue(for: element.keystring, using: buckets)
 
 
         guard hashIndex != -1 else {

diff --git a/Source/Factories/LinkedList.swift b/Source/Factories/LinkedList.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 
-class LinkedList<T: Equatable> {
+class LinkedList<T> {
 
 
    //new instance
@@ -39,6 +39,7 @@ class LinkedList<T: Equatable> {
 
 
 
+
     //add link item
     func append(element key: T) {
 
@@ -81,6 +82,8 @@ class LinkedList<T: Equatable> {
     //print all keys for the class
     func printAllKeys() {
 
+        //a dictionary - O(1)
+
         var current: LLNode? = head
 
         print("------------------")
@@ -222,7 +225,11 @@ class LinkedList<T: Equatable> {
         //determine if the removal is at the head
         if (index == 0) {
             current = current?.next
-            head = current!
+
+            if let headitem = current {
+                head = headitem
+                counter -= 1
+            }
             return
         }
 

diff --git a/Source/Structures/Protocols.swift b/Source/Structures/Protocols.swift
@@ -23,6 +23,6 @@ protocol Keyable {
     var keystring: String {get}
 
 
-   func hashindex<T>(for key: String!, using buckets: Array<T>) -> Int
+   func hashValue<T>(for key: String!, using buckets: Array<T>) -> Int
 }
 
diff --git a/...roj/project.xcworkspace/xcuserdata/waynebishop.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/waynebishop.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...uctures.xcodeproj/xcuserdata/waynebishop.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...uctures.xcodeproj/xcuserdata/waynebishop.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,4 +2,117 @@
 <Bucket
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "SwiftTests/HashTest.swift"
+            timestampString = "532990375.950905"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "79"
+            endingLineNumber = "79"
+            landmarkName = "testMissingList()"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "SwiftTests.HashTest.testMissingList() -&gt; ()"
+                  moduleName = "SwiftTests"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/waynebishop/Dropbox/iPhone%20Development/SwiftStructures/SwiftTests/HashTest.swift"
+                  timestampString = "533859967.12933"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "79"
+                  endingLineNumber = "79"
+                  offsetFromSymbolStart = "131">
+               </Location>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "implicit closure #1 : @autoclosure () throws -&gt; Swift.Bool in SwiftTests.HashTest.testMissingList() -&gt; ()"
+                  moduleName = "SwiftTests"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/waynebishop/Dropbox/iPhone%20Development/SwiftStructures/SwiftTests/HashTest.swift"
+                  timestampString = "533859967.132433"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "79"
+                  endingLineNumber = "79"
+                  offsetFromSymbolStart = "14">
+               </Location>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "implicit closure #2 : @autoclosure () -&gt; Swift.String in SwiftTests.HashTest.testMissingList() -&gt; ()"
+                  moduleName = "SwiftTests"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/waynebishop/Dropbox/iPhone%20Development/SwiftStructures/SwiftTests/HashTest.swift"
+                  timestampString = "533859967.135077"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "79"
+                  endingLineNumber = "79"
+                  offsetFromSymbolStart = "4">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Source/Factories/BSTree.swift"
+            timestampString = "533860009.986163"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "43"
+            endingLineNumber = "43"
+            landmarkName = "append(element:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Source/Factories/BSTree.swift"
+            timestampString = "533860009.986865"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "139"
+            endingLineNumber = "139"
+            landmarkName = "push(element:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Source/Extensions/Int.swift"
+            timestampString = "535328261.598035"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "25"
+            endingLineNumber = "25"
+            landmarkName = "unknown"
+            landmarkType = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
diff --git a/SwiftTests/HashTest.swift b/SwiftTests/HashTest.swift
@@ -33,14 +33,14 @@ class HashTest: XCTestCase {
         let slist = HashTable<String>(capacity: 3)
 
 
-        _ = slist.append("Wayne Bishop")
-        _ = slist.append("Frank Smith")
-        _ = slist.append("Jennifer Hobbs")
-        _ = slist.append("Tim Cook")
-        _ = slist.append("Steve Jobs")
-        _ = slist.append("Wayne Bishop") //should produce collision
-        _ = slist.append("Larry Page")
-        _ = slist.append("Albert Einstien")
+        _ = slist.insert("Wayne Bishop")
+        _ = slist.insert("Frank Smith")
+        _ = slist.insert("Jennifer Hobbs")
+        _ = slist.insert("Tim Cook")
+        _ = slist.insert("Steve Jobs")
+        _ = slist.insert("Wayne Bishop") //should produce collision
+        _ = slist.insert("Larry Page")
+        _ = slist.insert("Albert Einstien")
 
 
         //test list compliance
@@ -56,7 +56,7 @@ class HashTest: XCTestCase {
         testVertex.key = "A"
 
         let vList: HashTable = HashTable<Vertex>(capacity: 10)
-       _ = vList.append(testVertex)
+       _ = vList.insert(testVertex)
 
 
         //test list compliance
@@ -72,8 +72,8 @@ class HashTest: XCTestCase {
         //new float list
         let fList = HashTable<Double>(capacity: 5)
 
-        _ = fList.append(10.2)
-        _ = fList.append(8.6)
+        _ = fList.insert(10.2)
+        _ = fList.insert(8.6)
 
         //element doesn't exist
         XCTAssertFalse(fList.contains(3.7), "hash table element not found..")