Fixed test for Linux hopefully; Eliminated a couple if statements

Author: davecom

Sources/SwiftGraph/UniqueElementsGraph.swift

@@ -73,16 +73,14 @@ open class UniqueElementsGraph<V: Equatable>: UnweightedGraph<V> {
     /// - parameter to: The ending vertex.
     /// - parameter directed: Is the edge directed? (default `false`)
     public override func addEdge(from: V, to: V, directed: Bool = false) {
-        if let u = indexOfVertex(from) {
-            if let v = indexOfVertex(to) {
-                if !edgeExists(from: u, to: v) {
-                    addEdge(UnweightedEdge(u: u, v: v))
-                    if !directed && !edgeExists(from: v, to: u) {
-                        addEdge(UnweightedEdge(u: v, v: u))
-                    }
+        if let u = indexOfVertex(from), let v = indexOfVertex(to) {
+            if !edgeExists(from: u, to: v) {
+                addEdge(UnweightedEdge(u: u, v: v))
+                if !directed && !edgeExists(from: v, to: u) {
+                    addEdge(UnweightedEdge(u: v, v: u))
                 }
-                
             }
+            
         }
     }
 }

Sources/SwiftGraph/UnweightedGraph.swift

@@ -98,12 +98,10 @@ open class UnweightedGraph<V: Equatable>: Graph {
     /// - parameter to: The ending vertex.
     /// - parameter directed: Is the edge directed? (default `false`)
     public func addEdge(from: V, to: V, directed: Bool = false) {
-        if let u = indexOfVertex(from) {
-            if let v = indexOfVertex(to) {
-                addEdge(UnweightedEdge(u: u, v: v))
-                if !directed {
-                    addEdge(UnweightedEdge(u: v, v: u))
-                }
+        if let u = indexOfVertex(from), let v = indexOfVertex(to) {
+            addEdge(UnweightedEdge(u: u, v: v))
+            if !directed {
+                addEdge(UnweightedEdge(u: v, v: u))
             }
         }
     }

Sources/SwiftGraph/WeightedGraph.swift

@@ -62,10 +62,8 @@ open class WeightedGraph<V: Equatable, W: Comparable & Numeric & Codable>: Graph
     /// - parameter directed: Is the edge directed? (default false)
     /// - parameter weight: the Weight of the edge to add.
     public func addEdge(from: V, to: V, weight: W, directed: Bool = false) {
-        if let u = indexOfVertex(from) {
-            if let v = indexOfVertex(to) {
-                addEdge(from: u, to: v, weight: weight, directed: directed)
-            }
+        if let u = indexOfVertex(from), let v = indexOfVertex(to) {
+            addEdge(from: u, to: v, weight: weight, directed: directed)
         }
     }
 

Tests/SwiftGraphTests/SwiftGraphCodableTests.swift

@@ -36,7 +36,7 @@ class SwiftGraphCodableTests: XCTestCase {
      {"edges":[[{"u":0,"v":1}],[{"u":1,"v":0}]],"vertices":["New York","Miami"]}
      """
 
-    func testEncodable() {
+    func testEncodableDecodable() {
         let g = expectedUnweightedGraph
 
         let jsonData: Data
@@ -47,24 +47,24 @@ class SwiftGraphCodableTests: XCTestCase {
             return
         }
         let jsonString = String(data: jsonData, encoding: .utf8)
-        XCTAssertEqual(jsonString, expectedString)
-    }
-    
-    func testDecodable() {
-        guard let jsonData = expectedString.data(using: .utf8) else {
+
+        guard let jsonData2 = expectedString.data(using: .utf8) else {
             XCTFail("Unable to serialize expected JSON string into Data")
             return
         }
 
-        let g: UnweightedGraph<String>
+        let g2: CodableUnweightedGraph<String>
         do {
-            g = try JSONDecoder().decode(CodableUnweightedGraph<String>.self, from: jsonData)
+            g2 = try JSONDecoder().decode(CodableUnweightedGraph<String>.self, from: jsonData2)
         } catch {
             XCTFail("JSONDecoder().decode(CodableUnweightedGraph<String>.self, from: jsonData) threw: \(error)")
             return
         }
-        XCTAssertEqual(g.neighborsForVertex("Miami")!, g.neighborsForVertex(g.neighborsForVertex("New York")![0])!, "Miami and New York Connected bi-directionally")
+        XCTAssertEqual(g2.neighborsForVertex("Miami")!, g2.neighborsForVertex(g.neighborsForVertex("New York")![0])!, "Miami and New York Connected bi-directionally")
         //        XCTAssertEqual(g, expectedUnweightedGraph)
+        let jsonData3 = try! JSONEncoder().encode(g2)
+        let jsonString2: String = String(data: jsonData3, encoding: .utf8)!
+        XCTAssertEqual(jsonString, jsonString2)
     }
 }
 
@@ -236,8 +236,7 @@ extension SwiftGraphCodableTests {
     }
 
     static var allTests = [
-        ("testEncodable", testEncodable),
-        ("testDecodable", testDecodable),
+        ("testEncodableDecodable", testEncodableDecodable),
         ("testComplexWeightedEncodableDecodable", testComplexWeightedEncodableDecodable)
     ]
 }