Skip to content

Commit e3a4494

Browse files
jawwadjawwad
committed
[swiftlint] Fix violation: Computed properties should avoid using get
Rule: implicit_getter warning: Implicit Getter Violation: Computed read-only properties should avoid using the get keyword.
1 parent 18c7b43 commit e3a4494

7 files changed

+71
-105
lines changed

Diff for: ‎Graph/Graph/AdjacencyListGraph.swift

+26-32
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,25 @@ open class AdjacencyListGraph<T>: AbstractGraph<T> where T: Equatable, T: Hashab
3737
}
3838

3939
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)
4643
}
44+
return vertices
4745
}
4846

4947
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+
}
5653

57-
for edge in edges {
58-
allEdges.insert(edge)
59-
}
54+
for edge in edges {
55+
allEdges.insert(edge)
6056
}
61-
return Array(allEdges)
6257
}
58+
return Array(allEdges)
6359
}
6460

6561
open override func createVertex(_ data: T) -> Vertex<T> {
@@ -114,27 +110,25 @@ open class AdjacencyListGraph<T>: AbstractGraph<T> where T: Equatable, T: Hashab
114110
}
115111

116112
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 {
120115

121-
guard let edges = edgeList.edges else {
122-
continue
123-
}
116+
guard let edges = edgeList.edges else {
117+
continue
118+
}
124119

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!))"
132125
}
133-
134-
rows.append("\(edgeList.vertex.data) -> [\(row.joined(separator: ", "))]")
126+
row.append(value)
135127
}
136128

137-
return rows.joined(separator: "\n")
129+
rows.append("\(edgeList.vertex.data) -> [\(row.joined(separator: ", "))]")
138130
}
131+
132+
return rows.joined(separator: "\n")
139133
}
140134
}

Diff for: ‎Graph/Graph/AdjacencyMatrixGraph.swift

+19-25
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,19 @@ open class AdjacencyMatrixGraph<T>: AbstractGraph<T> where T: Equatable, T: Hash
2323
}
2424

2525
open override var vertices: [Vertex<T>] {
26-
get {
27-
return _vertices
28-
}
26+
return _vertices
2927
}
3028

3129
open override var edges: [Edge<T>] {
32-
get {
33-
var edges = [Edge<T>]()
34-
for row in 0 ..< adjacencyMatrix.count {
35-
for column in 0 ..< adjacencyMatrix.count {
36-
if let weight = adjacencyMatrix[row][column] {
37-
edges.append(Edge(from: vertices[row], to: vertices[column], weight: weight))
38-
}
30+
var edges = [Edge<T>]()
31+
for row in 0 ..< adjacencyMatrix.count {
32+
for column in 0 ..< adjacencyMatrix.count {
33+
if let weight = adjacencyMatrix[row][column] {
34+
edges.append(Edge(from: vertices[row], to: vertices[column], weight: weight))
3935
}
4036
}
41-
return edges
4237
}
38+
return edges
4339
}
4440

4541
// Adds a new vertex to the matrix.
@@ -96,23 +92,21 @@ open class AdjacencyMatrixGraph<T>: AbstractGraph<T> where T: Equatable, T: Hash
9692
}
9793

9894
open override var description: String {
99-
get {
100-
var grid = [String]()
101-
let n = self.adjacencyMatrix.count
102-
for i in 0..<n {
103-
var row = ""
104-
for j in 0..<n {
105-
if let value = self.adjacencyMatrix[i][j] {
106-
let number = NSString(format: "%.1f", value)
107-
row += "\(value >= 0 ? " " : "")\(number) "
108-
} else {
109-
row += " ø "
110-
}
95+
var grid = [String]()
96+
let n = self.adjacencyMatrix.count
97+
for i in 0..<n {
98+
var row = ""
99+
for j in 0..<n {
100+
if let value = self.adjacencyMatrix[i][j] {
101+
let number = NSString(format: "%.1f", value)
102+
row += "\(value >= 0 ? " " : "")\(number) "
103+
} else {
104+
row += " ø "
111105
}
112-
grid.append(row)
113106
}
114-
return (grid as NSArray).componentsJoined(by: "\n")
107+
grid.append(row)
115108
}
109+
return (grid as NSArray).componentsJoined(by: "\n")
116110
}
117111

118112
}

Diff for: ‎Graph/Graph/Edge.swift

+7-12
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,23 @@ public struct Edge<T>: Equatable where T: Equatable, T: Hashable {
1919
extension Edge: CustomStringConvertible {
2020

2121
public var description: String {
22-
get {
23-
guard let unwrappedWeight = weight else {
24-
return "\(from.description) -> \(to.description)"
25-
}
26-
return "\(from.description) -(\(unwrappedWeight))-> \(to.description)"
22+
guard let unwrappedWeight = weight else {
23+
return "\(from.description) -> \(to.description)"
2724
}
25+
return "\(from.description) -(\(unwrappedWeight))-> \(to.description)"
2826
}
2927

3028
}
3129

3230
extension Edge: Hashable {
3331

3432
public var hashValue: Int {
35-
get {
36-
var string = "\(from.description)\(to.description)"
37-
if weight != nil {
38-
string.append("\(weight!)")
39-
}
40-
return string.hashValue
33+
var string = "\(from.description)\(to.description)"
34+
if weight != nil {
35+
string.append("\(weight!)")
4136
}
37+
return string.hashValue
4238
}
43-
4439
}
4540

4641
public func == <T>(lhs: Edge<T>, rhs: Edge<T>) -> Bool {

Diff for: ‎Graph/Graph/Graph.swift

+3-9
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,15 @@ open class AbstractGraph<T>: CustomStringConvertible where T: Equatable, T: Hash
2121
}
2222

2323
open var description: String {
24-
get {
25-
fatalError("abstract property accessed")
26-
}
24+
fatalError("abstract property accessed")
2725
}
2826

2927
open var vertices: [Vertex<T>] {
30-
get {
31-
fatalError("abstract property accessed")
32-
}
28+
fatalError("abstract property accessed")
3329
}
3430

3531
open var edges: [Edge<T>] {
36-
get {
37-
fatalError("abstract property accessed")
38-
}
32+
fatalError("abstract property accessed")
3933
}
4034

4135
// Adds a new vertex to the matrix.

Diff for: ‎Graph/Graph/Vertex.swift

+2-6
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,15 @@ public struct Vertex<T>: Equatable where T: Equatable, T: Hashable {
1717
extension Vertex: CustomStringConvertible {
1818

1919
public var description: String {
20-
get {
21-
return "\(index): \(data)"
22-
}
20+
return "\(index): \(data)"
2321
}
2422

2523
}
2624

2725
extension Vertex: Hashable {
2826

2927
public var hashValue: Int {
30-
get {
31-
return "\(data)\(index)".hashValue
32-
}
28+
return "\(data)\(index)".hashValue
3329
}
3430

3531
}

Diff for: ‎Treap/Treap.swift

+13-18
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,22 @@ public indirect enum Treap<Key: Comparable, Element> {
6363
}
6464

6565
public var depth: Int {
66-
get {
67-
switch self {
68-
case .empty:
69-
return 0
70-
case let .node(_, _, _, left, .empty):
71-
return 1 + left.depth
72-
case let .node(_, _, _, .empty, right):
73-
return 1 + right.depth
74-
case let .node(_, _, _, left, right):
75-
let leftDepth = left.depth
76-
let rightDepth = right.depth
77-
return 1 + leftDepth > rightDepth ? leftDepth : rightDepth
78-
}
79-
66+
switch self {
67+
case .empty:
68+
return 0
69+
case let .node(_, _, _, left, .empty):
70+
return 1 + left.depth
71+
case let .node(_, _, _, .empty, right):
72+
return 1 + right.depth
73+
case let .node(_, _, _, left, right):
74+
let leftDepth = left.depth
75+
let rightDepth = right.depth
76+
return 1 + leftDepth > rightDepth ? leftDepth : rightDepth
8077
}
8178
}
82-
79+
8380
public var count: Int {
84-
get {
85-
return Treap.countHelper(self)
86-
}
81+
return Treap.countHelper(self)
8782
}
8883

8984
fileprivate static func countHelper(_ treap: Treap<Key, Element>) -> Int {

Diff for: ‎Treap/TreapMergeSplit.swift

+1-3
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ internal func merge<Key: Comparable, Element>(_ left: Treap<Key, Element>, right
9494

9595
extension Treap: CustomStringConvertible {
9696
public var description: String {
97-
get {
98-
return Treap.descHelper(self, indent: 0)
99-
}
97+
return Treap.descHelper(self, indent: 0)
10098
}
10199

102100
fileprivate static func descHelper(_ treap: Treap<Key, Element>, indent: Int) -> String {

0 commit comments

Comments
 (0)