development: progression commit

Author: Daniel Dahan

Sources/Algorithm+Array.swift

@@ -82,7 +82,7 @@ extension Array: Probable {
      - Returns: An Int.
      */
     public func count<Element: Equatable>(of elements: [Element]) -> Int {
-		var c: Int = 0
+		var c = 0
         for e in elements {
             for x in self {
                 if e == x as? Element {
@@ -121,7 +121,7 @@ extension Array: Probable {
             return 0
         }
 
-        var c: Int = 0
+        var c = 0
         for e in self {
             if block(e) {
                 c += 1
@@ -137,8 +137,8 @@ extension Array: Probable {
      - Parameter elements: A list of Elements.
      - Returns: A Double.
      */
-    public func expectedValue<Element: Equatable>(of trials: Int, for elements: Element...) -> Double {
-        return expectedValue(of: trials, for: elements)
+    public func expectedValue<Element: Equatable>(trials: Int, for elements: Element...) -> Double {
+        return expectedValue(trials: trials, for: elements)
 	}
 
     /**
@@ -147,7 +147,7 @@ extension Array: Probable {
      - Parameter elements: An Array of Elements.
      - Returns: A Double.
      */
-    public func expectedValue<Element: Equatable>(of trials: Int, for elements: [Element]) -> Double {
+    public func expectedValue<Element: Equatable>(trials: Int, for elements: [Element]) -> Double {
         return Double(trials) * probability(of: elements)
 	}
 }

Sources/Algorithm+Set.swift

@@ -44,7 +44,7 @@ extension Set: Probable {
      - Returns: An Int.
      */
     public func count<Element: Equatable>(of elements: [Element]) -> Int {
-        var c: Int = 0
+        var c = 0
         for e in elements {
             for x in self {
                 if e == x as? Element {
@@ -83,7 +83,7 @@ extension Set: Probable {
             return 0
         }
 
-        var c: Int = 0
+        var c = 0
         for e in self {
             if block(e) {
                 c += 1
@@ -99,8 +99,8 @@ extension Set: Probable {
      - Parameter elements: A list of Elements.
      - Returns: A Double.
      */
-    public func expectedValue<Element: Equatable>(of trials: Int, for elements: Element...) -> Double {
-        return expectedValue(of: trials, for: elements)
+    public func expectedValue<Element: Equatable>(trials: Int, for elements: Element...) -> Double {
+        return expectedValue(trials: trials, for: elements)
     }
 
     /**
@@ -109,7 +109,7 @@ extension Set: Probable {
      - Parameter elements: An Array of Elements.
      - Returns: A Double.
      */
-    public func expectedValue<Element: Equatable>(of trials: Int, for elements: [Element]) -> Double {
+    public func expectedValue<Element: Equatable>(trials: Int, for elements: [Element]) -> Double {
         return Double(trials) * probability(of: elements)
     }
 }

Sources/Deque.swift

@@ -82,7 +82,7 @@ public struct Deque<Element>: CustomStringConvertible, Sequence {
 		- returns:	String
 	*/
 	public var description: String {
-		return "Deque" + list.internalDescription
+		return list.description
 	}
 
 	/**

Sources/DoublyLinkedList.swift

@@ -29,7 +29,7 @@
 */
 
 public struct DoublyLinkedList<Element>: CustomStringConvertible, Sequence {
-	public typealias Iterator = AnyIterator<Element>
+    public typealias Iterator = AnyIterator<Element>
 
 	/**
      First node in the list.
@@ -55,33 +55,24 @@ public struct DoublyLinkedList<Element>: CustomStringConvertible, Sequence {
      */
 	public private(set) var count: Int
 
-	/**
-     Returns a String with only the node data for all nodes 
-     in the DoublyLinkedList.
-     - Returns:	A String.
-     */
-	internal var internalDescription: String {
-		var output: String = "("
-		var c: Int = 0
-		var x = head
-		while nil !== x {
-			output += "\(x)"
-			c += 1
-			if c != count {
-				output += ", "
-			}
-			x = x!.next
-		}
-		output += ")"
-		return output
-	}
-
 	/**
      Conforms to Printable Protocol.
      - Returns: A String.
      */
 	public var description: String {
-		return "DoublyLinkedList" + internalDescription
+        var output: String = "("
+        var c = 0
+        var x = head
+        while nil !== x {
+            output += "\(x)"
+            c += 1
+            if c != count {
+                output += ", "
+            }
+            x = x!.next
+        }
+        output += ")"
+        return output
 	}
 
 	/**
@@ -109,28 +100,6 @@ public struct DoublyLinkedList<Element>: CustomStringConvertible, Sequence {
 		return current?.element
 	}
 
-	/**
-     Retrieves the element at the poistion after the
-     current cursor poistion. Also moves the cursor
-     to that node.
-     - Returns:	An optional Element.
-     */
-    public var next: Element? {
-		current = current?.next
-		return current?.element
-	}
-
-	/**
-     Retrieves the element at the poistion before the
-     current cursor poistion. Also moves the cursor
-     to that node.
-     - Returns:	An optional Element.
-     */
-	public var previous: Element? {
-		current = current?.previous
-		return current?.element
-	}
-
 	/**
      A boolean of whether the DoublyLinkedList is empty.
      - Returns: A boolean indicating if the DoubleLinkedList is
@@ -165,21 +134,44 @@ public struct DoublyLinkedList<Element>: CustomStringConvertible, Sequence {
 		count = 0
 		reset()
 	}
+    
+    /**
+     Retrieves the element at the poistion after the
+     current cursor poistion. Also moves the cursor
+     to that node.
+     - Returns:	An optional Element.
+     */
+    @discardableResult
+    mutating public func next() -> Element? {
+        current = current?.next
+        return current?.element
+    }
+    
+    /**
+     Retrieves the element at the poistion before the
+     current cursor poistion. Also moves the cursor
+     to that node.
+     - Returns:	An optional Element.
+     */
+    @discardableResult
+    mutating public func previous() -> Element? {
+        current = current?.previous
+        return current?.element
+    }
 
     /**
      Conforms to the SequenceType Protocol. Returns the next value
      in the sequence of nodes.
      - Returns: A DoublyLinkedList.Iterator.
      */
     public func makeIterator() -> DoublyLinkedList.Iterator {
-		cursorToFront()
-		return AnyIterator {
-			if !self.isCursorAtBack {
-				let element: Element? = self.cursor
-				_ = self.next
-				return element
-			}
-			return nil
+        var it = head
+        return AnyIterator {
+            guard let e = it?.element else {
+                return nil
+            }
+            it = it?.next
+            return e
 		}
 	}
 

Sources/Probable.swift

@@ -59,17 +59,17 @@ internal protocol Probable {
 
 	/**
      The expected value of elements based on a number of trials.
-     - Parameter of trials: An Int.
+     - Parameter trials: An Int.
      - Parameter for elements: A list of Elements.
      - Returns: A Double.
      */
-	func expectedValue<Element: Equatable>(of trials: Int, for elements: Element...) -> Double
+	func expectedValue<Element: Equatable>(trials: Int, for elements: Element...) -> Double
 
     /**
      The expected value of elements based on a number of trials.
-     - Parameter of trials: An Int.
+     - Parameter trials: An Int.
      - Parameter for elements: An Array of Elements.
      - Returns: A Double.
      */
-    func expectedValue<Element: Equatable>(of trials: Int, for elements: [Element]) -> Double
+    func expectedValue<Element: Equatable>(trials: Int, for elements: [Element]) -> Double
 }

Sources/Queue.swift

@@ -72,7 +72,7 @@ public class Queue<Element>: CustomStringConvertible, Sequence {
 		- returns:	String
 	*/
 	public var description: String {
-		return "Queue" + list.internalDescription
+		return list.description
 	}
 
 	/**