Move GridPoint to Tools

Make GridPoint available to all "days"
2018-12-13 19:01:54 -06:00
parent eff0e909a1
commit 949f3e7444
2 changed files with 13 additions and 13 deletions
@@ -4,19 +4,6 @@

 import Foundation

-struct GridPoint: Equatable, Comparable {
-    var X = 0
-    var Y = 0
-
-    static func == (lhs: GridPoint, rhs: GridPoint) -> Bool {
-        return (lhs.X == rhs.X) && (lhs.Y == rhs.Y)
-    }
-
-    static func < (lhs: GridPoint, rhs: GridPoint) -> Bool {
-        return (lhs.X + lhs.Y) < (rhs.X + rhs.Y)
-    }
-}
-
 class Coordinates {
    var points: [GridPoint] = []
    var dimensions: GridPoint
@@ -19,6 +19,19 @@ func == <T:Equatable> (tuple1:(T,T),tuple2:(T,T)) -> Bool
   return (tuple1.0 == tuple2.0) && (tuple1.1 == tuple2.1)
 }

+struct GridPoint: Equatable, Comparable {
+    var X = 0
+    var Y = 0
+
+    static func == (lhs: GridPoint, rhs: GridPoint) -> Bool {
+        return (lhs.X == rhs.X) && (lhs.Y == rhs.Y)
+    }
+
+    static func < (lhs: GridPoint, rhs: GridPoint) -> Bool {
+        return lhs.Y == rhs.Y ? lhs.X < rhs.X : lhs.Y < rhs.Y
+    }
+}
+
 struct Tools {
    static func readFile(fromPath path: String) -> String {
        var retVal = ""