@@ -37,29 +37,25 @@ open class AdjacencyListGraph<T>: AbstractGraph<T> where T: Equatable, T: Hashab
37
37
}
38
38
39
39
open override var vertices : [ Vertex < T > ] {
40
- get {
41
- var vertices = [ Vertex < T > ] ( )
42
- for edgeList in adjacencyList {
43
- vertices. append ( edgeList. vertex)
44
- }
45
- return vertices
40
+ var vertices = [ Vertex < T > ] ( )
41
+ for edgeList in adjacencyList {
42
+ vertices. append ( edgeList. vertex)
46
43
}
44
+ return vertices
47
45
}
48
46
49
47
open override var edges : [ Edge < T > ] {
50
- get {
51
- var allEdges = Set < Edge < T > > ( )
52
- for edgeList in adjacencyList {
53
- guard let edges = edgeList. edges else {
54
- continue
55
- }
48
+ var allEdges = Set < Edge < T > > ( )
49
+ for edgeList in adjacencyList {
50
+ guard let edges = edgeList. edges else {
51
+ continue
52
+ }
56
53
57
- for edge in edges {
58
- allEdges. insert ( edge)
59
- }
54
+ for edge in edges {
55
+ allEdges. insert ( edge)
60
56
}
61
- return Array ( allEdges)
62
57
}
58
+ return Array ( allEdges)
63
59
}
64
60
65
61
open override func createVertex( _ data: T ) -> Vertex < T > {
@@ -114,27 +110,25 @@ open class AdjacencyListGraph<T>: AbstractGraph<T> where T: Equatable, T: Hashab
114
110
}
115
111
116
112
open override var description : String {
117
- get {
118
- var rows = [ String] ( )
119
- for edgeList in adjacencyList {
113
+ var rows = [ String] ( )
114
+ for edgeList in adjacencyList {
120
115
121
- guard let edges = edgeList. edges else {
122
- continue
123
- }
116
+ guard let edges = edgeList. edges else {
117
+ continue
118
+ }
124
119
125
- var row = [ String] ( )
126
- for edge in edges {
127
- var value = " \( edge. to. data) "
128
- if edge. weight != nil {
129
- value = " ( \( value) : \( edge. weight!) ) "
130
- }
131
- row. append ( value)
120
+ var row = [ String] ( )
121
+ for edge in edges {
122
+ var value = " \( edge. to. data) "
123
+ if edge. weight != nil {
124
+ value = " ( \( value) : \( edge. weight!) ) "
132
125
}
133
-
134
- rows. append ( " \( edgeList. vertex. data) -> [ \( row. joined ( separator: " , " ) ) ] " )
126
+ row. append ( value)
135
127
}
136
128
137
- return rows. joined ( separator: " \n " )
129
+ rows. append ( " \( edgeList . vertex . data ) -> [ \( row . joined ( separator: " , " ) ) ] " )
138
130
}
131
+
132
+ return rows. joined ( separator: " \n " )
139
133
}
140
134
}
0 commit comments