5 algorithmic optimizations (#3036)

Co-authored-by: codefactor-io <support@codefactor.io>

Author: IhateTrains

ImperatorToCK3/CK3/ParserExtensions.cs

@@ -101,16 +101,13 @@ public static void ParseLiquidFile(this Parser parser, string filePath, Hash liq
 	}
 
 	public static void ParseFolderWithLiquidSupport(this Parser parser, string path, string extensions, bool recursive, Hash liquidVariables, bool logFilePaths = false) {
-		var searchPattern = recursive ? "*" : "*.*";
 		var searchOption = recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly;
-		var files = Directory.GetFiles(path, searchPattern, searchOption);
-
 		var validExtensions = new HashSet<string>(
 			extensions.Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries),
 			StringComparer.OrdinalIgnoreCase
 		);
 
-		foreach (var file in files) {
+		foreach (var file in Directory.EnumerateFiles(path, "*", searchOption)) {
 			var extension = CommonFunctions.GetExtension(file);
 			if (!validExtensions.Contains(extension)) {
 				continue;

ImperatorToCK3/CK3/World.cs

@@ -753,10 +753,9 @@ private bool TryGiveCountyToGovernor(Title county,
 		}
 
 		var parentRegionName = imperatorRegionMapper.GetParentRegionName(irProvince.Id);
-		var matchingGovernorships = governorshipsSet
-			.Where(g => g.Country.Id == irCountry.Id && g.Region.Id == parentRegionName)
-			.ToArray();
-		if (matchingGovernorships.Length == 0) {
+		var governorship = governorshipsSet
+			.FirstOrDefault(g => g.Country.Id == irCountry.Id && g.Region.Id == parentRegionName);
+		if (governorship is null) {
 			// We have no matching governorship.
 			return false;
 		}
@@ -766,7 +765,6 @@ private bool TryGiveCountyToGovernor(Title county,
 		}
 
 		// give county to governor
-		var governorship = matchingGovernorships[0];
 		var ck3GovernorshipId = tagTitleMapper.GetTitleForGovernorship(governorship, LandedTitles, irProvinces, Provinces, imperatorRegionMapper, provinceMapper);
 		if (ck3GovernorshipId is null) {
 			Logger.Warn($"{nameof(ck3GovernorshipId)} is null for {ck3Country} {governorship.Region.Id}!");
@@ -825,11 +823,12 @@ private bool TryGiveCountyToCountyLevelRuler(Title county,
 		Country irCountry,
 		List<KeyValuePair<Country, Dependency?>> countyLevelCountries,
 		CountryCollection irCountries) {
-		var matchingCountyLevelRulers = countyLevelCountries.Where(c => c.Key.Id == irCountry.Id).ToArray();
-		if (matchingCountyLevelRulers.Length == 0) {
+		var matchingCountyLevelRuler = countyLevelCountries
+			.FirstOrDefault(c => c.Key.Id == irCountry.Id);
+		if (matchingCountyLevelRuler.Key is null) {
 			return false;
 		}
-		var dependency = matchingCountyLevelRulers[0].Value;
+		var dependency = matchingCountyLevelRuler.Value;
 
 		// Give county to ruler.
 		var ck3Ruler = irCountry.Monarch?.CK3Character;

ImperatorToCK3/CommonUtils/EnumerableExtensions.cs

@@ -5,25 +5,27 @@
 namespace ImperatorToCK3.CommonUtils;
 
 public static class EnumerableExtensions {
-	public static T? LastOrNull<T>(this IEnumerable<T> source, Func<T,bool> predicate) where T : struct {
-		var enumerable = source as T[] ?? [.. source];
+	public static T? LastOrNull<T>(this IEnumerable<T> source, Func<T, bool> predicate) where T : struct {
+		ArgumentNullException.ThrowIfNull(source);
+		ArgumentNullException.ThrowIfNull(predicate);
 
-		if (enumerable.Length == 0) {
-			return null;
-		}
-
-		foreach (var element in Enumerable.Reverse(enumerable)) {
+		T? last = null;
+		foreach (var element in source) {
 			if (predicate(element)) {
-				return element;
+				last = element;
 			}
 		}
-
-		return null;
+		return last;
 	}
+
 	public static KeyValuePair<TKey, TValue>? LastOrNull<TKey, TValue>(
 		this IEnumerable<KeyValuePair<TKey, TValue>> source) {
-		var keyValuePairs = source as KeyValuePair<TKey, TValue>[] ?? source.ToArray();
-		return keyValuePairs.Length != 0
-			? keyValuePairs[^1] : null;
+		ArgumentNullException.ThrowIfNull(source);
+
+		KeyValuePair<TKey, TValue>? last = null;
+		foreach (var kvp in source) {
+			last = kvp;
+		}
+		return last;
 	}
 }

ImperatorToCK3/CommonUtils/Map/ProvinceDefinitions.cs

@@ -9,12 +9,12 @@
 namespace ImperatorToCK3.CommonUtils.Map;
 
 internal sealed class ProvinceDefinitions : IdObjectCollection<ulong, ProvinceDefinition> {
-	public Dictionary<Rgb24, ulong> ColorToProvinceDict { get; } = [];
-	public Dictionary<ulong, Rgb24> ProvinceToColorDict { get; } = [];
+	internal Dictionary<Rgb24, ulong> ColorToProvinceDict { get; } = [];
+	internal Dictionary<ulong, Rgb24> ProvinceToColorDict { get; } = [];
 
-	public void LoadDefinitions(string definitionsFilename, ModFilesystem modFS) {
+	internal void LoadDefinitions(string definitionsFilename, ModFilesystem modFS) {
 		var relativePath = Path.Combine("map_data", definitionsFilename);
-		var definitionsFilePath = modFS.GetActualFileLocation(relativePath);
+		string? definitionsFilePath = modFS.GetActualFileLocation(relativePath);
 		if (definitionsFilePath is null) {
 			Logger.Warn($"Province definitions file {definitionsFilename} not found!");
 			return;
@@ -36,14 +36,46 @@ public void LoadDefinitions(string definitionsFilename, ModFilesystem modFS) {
 			}
 
 			try {
-				var columns = line.Split(';');
+				var span = line.AsSpan();
+				int pos = 0;
 
-				var id = ulong.Parse(columns[0]);
+				// id
+				var idEnd = span.IndexOf(';');
+				if (idEnd < 0) throw new FormatException("Missing separators");
+				var idSpan = span[pos..idEnd];
+				pos = idEnd + 1;
+				if (!ulong.TryParse(idSpan, out var id)) {
+					throw new FormatException($"Invalid id: {idSpan}");
+				}
 				AddOrReplace(new ProvinceDefinition(id));
 
-				var r = byte.Parse(columns[1]);
-				var g = byte.Parse(columns[2]);
-				var b = byte.Parse(columns[3]);
+				// r
+				var rEnd = span[pos..].IndexOf(';');
+				if (rEnd < 0) throw new FormatException("Missing separators");
+				var rSpan = span[pos..(pos + rEnd)];
+				pos += rEnd + 1;
+				if (!byte.TryParse(rSpan, out var r)) {
+					throw new FormatException($"Invalid r: {rSpan}");
+				}
+
+				// g
+				var gEnd = span[pos..].IndexOf(';');
+				if (gEnd < 0) throw new FormatException("Missing separators");
+				var gSpan = span[pos..(pos + gEnd)];
+				pos += gEnd + 1;
+				if (!byte.TryParse(gSpan, out var g)) {
+					throw new FormatException($"Invalid g: {gSpan}");
+				}
+
+				// b
+				var bEnd = span[pos..].IndexOf(';');
+				if (bEnd < 0) throw new FormatException("Missing separators");
+				var bSpan = span[pos..(pos + bEnd)];
+				pos += bEnd + 1;
+				if (!byte.TryParse(bSpan, out var b)) {
+					throw new FormatException($"Invalid b: {bSpan}");
+				}
+
 				var color = new Rgb24(r, g, b);
 				ProvinceToColorDict.Add(id, color);
 				ColorToProvinceDict[color] = id;

ImperatorToCK3/Configuration.cs

@@ -461,7 +461,8 @@ internal OrderedDictionary<string, bool> GetCK3ModFlags() {
 			flags[definition.Flag] = activeCK3ModFlags.Contains(definition.Flag);
 		}
 
-		flags["vanilla_ck3"] = !flags.Any(f => f.Value);
+		// If no CK3 mod flags are set, treat it as vanilla CK3.
+		flags["vanilla_ck3"] = activeCK3ModFlags.Count == 0;
 		return flags;
 	}
 
@@ -479,7 +480,8 @@ internal OrderedDictionary<string, bool> GetImperatorModFlags() {
 			flags[definition.Flag] = activeImperatorModFlags.Contains(definition.Flag);
 		}
 
-		flags["vanilla_ir"] = !flags.Any(f => f.Value);
+		// If no Imperator mod flags are set, treat it as vanilla Imperator.
+		flags["vanilla_ir"] = activeImperatorModFlags.Count == 0;
 		return flags;
 	}