Merge pull request #1 from mvirgo/bracket-22

2022 Bracket
mvirgo · Mar 14, 2022 · 7bf532d · 7bf532d
2 parents 6c2732e + 7ccddf0
commit 7bf532d
Show file tree

Hide file tree

Showing 12 changed files with 491 additions and 26 deletions.
diff --git a/foam-madness.xcodeproj/project.pbxproj b/foam-madness.xcodeproj/project.pbxproj
@@ -42,6 +42,8 @@
 		7AEFD66025146629007BB16B /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFD65F25146629007BB16B /* AboutViewController.swift */; };
 		7AEFD6672514704E007BB16B /* ABOUT.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 7AEFD6662514704E007BB16B /* ABOUT.rtf */; };
 		7AF31A862431267400DF1605 /* GameHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AF31A852431267400DF1605 /* GameHelper.swift */; };
+		D14C59E927DED2FE001378F1 /* mensBracket2022.plist in Resources */ = {isa = PBXBuildFile; fileRef = D14C59E827DED2FE001378F1 /* mensBracket2022.plist */; };
+		D14C59EB27DED30F001378F1 /* womensBracket2022.plist in Resources */ = {isa = PBXBuildFile; fileRef = D14C59EA27DED30F001378F1 /* womensBracket2022.plist */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -84,6 +86,8 @@
 		7AEFD65F25146629007BB16B /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
 		7AEFD6662514704E007BB16B /* ABOUT.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = ABOUT.rtf; sourceTree = "<group>"; };
 		7AF31A852431267400DF1605 /* GameHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameHelper.swift; sourceTree = "<group>"; };
+		D14C59E827DED2FE001378F1 /* mensBracket2022.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = mensBracket2022.plist; sourceTree = "<group>"; };
+		D14C59EA27DED30F001378F1 /* womensBracket2022.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = womensBracket2022.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -127,17 +131,13 @@
 		7A2ECEE7242EDE920065E369 /* foam-madness */ = {
 			isa = PBXGroup;
 			children = (
-				7A916BD725EDE5D4007E8714 /* mensBracket2021.plist */,
-				7A916BD625EDE5D4007E8714 /* womensBracket2021.plist */,
+				D14C59E627DECEC0001378F1 /* brackets */,
 				7A2ECEFC242EDED20065E369 /* Controller */,
 				7A2ECEFA242EDEB00065E369 /* Model */,
 				7A2ECEFB242EDEBF0065E369 /* View */,
 				7A2ECEF4242EDE930065E369 /* Info.plist */,
-				7AD7BC1224315125006F0AF0 /* historicalProbabilities.plist */,
-				7A1B9C9C245A9A22005B40D3 /* historicalProbabilitiesWomen.plist */,
-				7AEAB80A2433086C009E7CC1 /* bracketology2020.plist */,
+				D14C59E727DECEC9001378F1 /* probabilities */,
 				7AEAB8092433086C009E7CC1 /* teams.plist */,
-				7AECF9C7245E779E0037E126 /* womensBracketology2020.plist */,
 			);
 			path = "foam-madness";
 			sourceTree = "<group>";
@@ -204,6 +204,28 @@
 			path = "Live Games API";
 			sourceTree = "<group>";
 		};
+		D14C59E627DECEC0001378F1 /* brackets */ = {
+			isa = PBXGroup;
+			children = (
+				D14C59EA27DED30F001378F1 /* womensBracket2022.plist */,
+				D14C59E827DED2FE001378F1 /* mensBracket2022.plist */,
+				7A916BD725EDE5D4007E8714 /* mensBracket2021.plist */,
+				7A916BD625EDE5D4007E8714 /* womensBracket2021.plist */,
+				7AEAB80A2433086C009E7CC1 /* bracketology2020.plist */,
+				7AECF9C7245E779E0037E126 /* womensBracketology2020.plist */,
+			);
+			path = brackets;
+			sourceTree = "<group>";
+		};
+		D14C59E727DECEC9001378F1 /* probabilities */ = {
+			isa = PBXGroup;
+			children = (
+				7AD7BC1224315125006F0AF0 /* historicalProbabilities.plist */,
+				7A1B9C9C245A9A22005B40D3 /* historicalProbabilitiesWomen.plist */,
+			);
+			path = probabilities;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -269,7 +291,9 @@
 				7AD7BC1324315125006F0AF0 /* historicalProbabilities.plist in Resources */,
 				7A916BD925EDE5D5007E8714 /* mensBracket2021.plist in Resources */,
 				7AEAB80C2433086C009E7CC1 /* bracketology2020.plist in Resources */,
+				D14C59EB27DED30F001378F1 /* womensBracket2022.plist in Resources */,
 				7A2ECEEE242EDE920065E369 /* Main.storyboard in Resources */,
+				D14C59E927DED2FE001378F1 /* mensBracket2022.plist in Resources */,
 				7AEFD6672514704E007BB16B /* ABOUT.rtf in Resources */,
 				7A1B9C9D245A9A22005B40D3 /* historicalProbabilitiesWomen.plist in Resources */,
 				7A916BD825EDE5D5007E8714 /* womensBracket2021.plist in Resources */,
@@ -457,15 +481,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = 5X3GA242G5;
 				INFOPLIST_FILE = "foam-madness/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4;
+				MARKETING_VERSION = 1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mvirgo.foam-madness";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -478,15 +502,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = 5X3GA242G5;
 				INFOPLIST_FILE = "foam-madness/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4;
+				MARKETING_VERSION = 1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mvirgo.foam-madness";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/foam-madness/Controller/BracketCreationViewController.swift b/foam-madness/Controller/BracketCreationViewController.swift
@@ -26,6 +26,7 @@ class BracketCreationViewController: UIViewController, UITextFieldDelegate {
     var tournament: Tournament!
     var tournamentName: String!
     var isWomens = false
+    var hasFirstFour = false
     var bracketLocation: String!
     var regionOrder = [String]()
     var regionSeedTeams = [String: [String: Int16]]()
@@ -83,8 +84,10 @@ class BracketCreationViewController: UIViewController, UITextFieldDelegate {
         regionOrder = [regionIDs["0"], regionIDs["1"], regionIDs["2"], regionIDs["3"]] as! [String]
         // Check if it's a Women's tournament for using correct probabilities
         isWomens = bracketDict.value(forKey: "IsWomens") as! Bool
-        // Get First Four data (if men's)
-        if !isWomens {
+        let year = bracketDict.value(forKey: "Year") as! Int
+        hasFirstFour = !isWomens || year >= 2022
+        // Get First Four data (if men's or women's 2022 or later)
+        if (hasFirstFour) {
             firstFour = bracketDict.value(forKey: "FirstFour") as! Dictionary<String, [String: String]>
         }
         // Update progress bar to 5%
@@ -317,7 +320,7 @@ class BracketCreationViewController: UIViewController, UITextFieldDelegate {
         taskLabel.text = "Creating tournament games..."
         // Note: This function is essentially hard-coded for current bracket style
         // Create First Four if Men's tournament
-        if !isWomens {
+        if hasFirstFour {
             createFirstFour()
         }
         progressBar.progress += 0.05
@@ -342,7 +345,7 @@ class BracketCreationViewController: UIViewController, UITextFieldDelegate {
         var winner: String = ""
         taskLabel.text = "Simulating tournament games..."
         // Get correct starting id (hard-coded for current bracket style)
-        if isWomens {
+        if !hasFirstFour {
             id = 4
         } else {
             id = 0

diff --git a/foam-madness/Controller/SelectInitialBracketViewController.swift b/foam-madness/Controller/SelectInitialBracketViewController.swift
@@ -17,7 +17,9 @@ class SelectInitialBracketViewController: UITableViewController {
     let brackets = ["2020 Joe Lunardi's Bracketology": "bracketology2020",
                     "2020 Womens - Charlie Creme's Bracketology": "womensBracketology2020",
                     "2021 Men's Bracket": "mensBracket2021",
-                    "2021 Women's Bracket": "womensBracket2021"]
+                    "2021 Women's Bracket": "womensBracket2021",
+                    "2022 Men's Bracket": "mensBracket2022",
+                    "2022 Women's Bracket": "womensBracket2022"]
 
     // MARK: View functions
     override func viewDidLoad() {

diff --git a/foam-madness/Controller/TournamentGamesViewController.swift b/foam-madness/Controller/TournamentGamesViewController.swift
@@ -40,8 +40,8 @@ class TournamentGamesViewController: UIViewController, UITableViewDelegate, UITa
         // Set delegate and datasource for the game table view
         self.gameTableView.delegate = self
         self.gameTableView.dataSource = self
-        // Ignore First Four in Women's tournament
-        if tournament.isWomens {
+        // Ignore First Four in Women's tournaments before 2022
+        if tournament.isWomens && tournament.games!.count < 65 {
             roundStepper.value = 1
             roundStepper.minimumValue = 1
         } else {

diff --git a/foam-madness/bracketology2020.plist → foam-madness/brackets/bracketology2020.plist b/foam-madness/bracketology2020.plist → foam-madness/brackets/bracketology2020.plist
diff --git a/foam-madness/mensBracket2021.plist → foam-madness/brackets/mensBracket2021.plist b/foam-madness/mensBracket2021.plist → foam-madness/brackets/mensBracket2021.plist
diff --git a/foam-madness/brackets/mensBracket2022.plist b/foam-madness/brackets/mensBracket2022.plist
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Year</key>
+	<real>2022</real>
+	<key>IsWomens</key>
+	<false/>
+	<key>FirstFour</key>
+	<dict>
+		<key>0</key>
+		<dict>
+			<key>NextGame</key>
+			<string>8</string>
+			<key>Seed</key>
+			<string>11</string>
+			<key>Region</key>
+			<string>West</string>
+		</dict>
+		<key>1</key>
+		<dict>
+			<key>NextGame</key>
+			<string>14</string>
+			<key>Seed</key>
+			<string>12</string>
+			<key>Region</key>
+			<string>East</string>
+		</dict>
+		<key>2</key>
+		<dict>
+			<key>NextGame</key>
+			<string>20</string>
+			<key>Seed</key>
+			<string>16</string>
+			<key>Region</key>
+			<string>South</string>
+		</dict>
+		<key>3</key>
+		<dict>
+			<key>NextGame</key>
+			<string>28</string>
+			<key>Seed</key>
+			<string>16</string>
+			<key>Region</key>
+			<string>Midwest</string>
+		</dict>
+	</dict>
+	<key>RegionIDs</key>
+	<dict>
+		<key>0</key>
+		<string>West</string>
+		<key>1</key>
+		<string>East</string>
+		<key>2</key>
+		<string>South</string>
+		<key>3</key>
+		<string>Midwest</string>
+	</dict>
+	<key>Source</key>
+	<dict>
+		<key>Date Accessed</key>
+		<date>2022-03-14T02:44:37Z</date>
+		<key>URL</key>
+		<string>https://www.ncaa.com/news/basketball-men/mml-official-bracket/2022-03-13/2022-ncaa-bracket-printable-march-madness-bracket-pdf</string>
+	</dict>
+	<key>Regions</key>
+	<dict>
+		<key>East</key>
+		<dict>
+			<key>1</key>
+			<integer>52</integer>
+			<key>10</key>
+			<integer>312</integer>
+			<key>11</key>
+			<integer>337</integer>
+			<key>121</key>
+			<integer>331</integer>
+			<key>122</key>
+			<integer>45</integer>
+			<key>13</key>
+			<integer>25</integer>
+			<key>14</key>
+			<integer>41</integer>
+			<key>15</key>
+			<integer>213</integer>
+			<key>16</key>
+			<integer>186</integer>
+			<key>2</key>
+			<integer>14</integer>
+			<key>3</key>
+			<integer>203</integer>
+			<key>4</key>
+			<integer>28</integer>
+			<key>5</key>
+			<integer>54</integer>
+			<key>6</key>
+			<integer>22</integer>
+			<key>7</key>
+			<integer>182</integer>
+			<key>8</key>
+			<integer>301</integer>
+			<key>9</key>
+			<integer>3</integer>
+		</dict>
+		<key>Midwest</key>
+		<dict>
+			<key>1</key>
+			<integer>0</integer>
+			<key>10</key>
+			<integer>286</integer>
+			<key>11</key>
+			<integer>147</integer>
+			<key>12</key>
+			<integer>23</integer>
+			<key>13</key>
+			<integer>221</integer>
+			<key>14</key>
+			<integer>100</integer>
+			<key>15</key>
+			<integer>149</integer>
+			<key>161</key>
+			<integer>242</integer>
+			<key>162</key>
+			<integer>240</integer>
+			<key>2</key>
+			<integer>4</integer>
+			<key>3</key>
+			<integer>6</integer>
+			<key>4</key>
+			<integer>12</integer>
+			<key>5</key>
+			<integer>8</integer>
+			<key>6</key>
+			<integer>38</integer>
+			<key>7</key>
+			<integer>65</integer>
+			<key>8</key>
+			<integer>50</integer>
+			<key>9</key>
+			<integer>66</integer>
+		</dict>
+		<key>South</key>
+		<dict>
+			<key>1</key>
+			<integer>48</integer>
+			<key>10</key>
+			<integer>165</integer>
+			<key>11</key>
+			<integer>40</integer>
+			<key>12</key>
+			<integer>259</integer>
+			<key>13</key>
+			<integer>318</integer>
+			<key>14</key>
+			<integer>162</integer>
+			<key>15</key>
+			<integer>269</integer>
+			<key>161</key>
+			<integer>348</integer>
+			<key>162</key>
+			<integer>83</integer>
+			<key>2</key>
+			<integer>29</integer>
+			<key>3</key>
+			<integer>320</integer>
+			<key>4</key>
+			<integer>64</integer>
+			<key>5</key>
+			<integer>2</integer>
+			<key>6</key>
+			<integer>104</integer>
+			<key>7</key>
+			<integer>56</integer>
+			<key>8</key>
+			<integer>46</integer>
+			<key>9</key>
+			<integer>241</integer>
+		</dict>
+		<key>West</key>
+		<dict>
+			<key>1</key>
+			<integer>35</integer>
+			<key>10</key>
+			<integer>109</integer>
+			<key>111</key>
+			<integer>55</integer>
+			<key>112</key>
+			<integer>306</integer>
+			<key>12</key>
+			<integer>43</integer>
+			<key>13</key>
+			<integer>59</integer>
+			<key>14</key>
+			<integer>178</integer>
+			<key>15</key>
+			<integer>88</integer>
+			<key>16</key>
+			<integer>134</integer>
+			<key>2</key>
+			<integer>10</integer>
+			<key>3</key>
+			<integer>49</integer>
+			<key>4</key>
+			<integer>260</integer>
+			<key>5</key>
+			<integer>268</integer>
+			<key>6</key>
+			<integer>258</integer>
+			<key>7</key>
+			<integer>62</integer>
+			<key>8</key>
+			<integer>79</integer>
+			<key>9</key>
+			<integer>285</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/foam-madness/womensBracket2021.plist → ...-madness/brackets/womensBracket2021.plist b/foam-madness/womensBracket2021.plist → ...-madness/brackets/womensBracket2021.plist