Optimize AccessoryGeneMapper and MorphGeneTemplateMapper and MapData

Author: IhateTrains

ImperatorToCK3/CommonUtils/Map/MapData.cs

@@ -473,31 +473,39 @@ public bool AreProvinceGroupsAdjacentByLand(FrozenSet<ulong> group1, FrozenSet<u
 
 	// Function for checking if two land provinces are connected to the same water body.
 	public bool AreProvinceGroupsConnectedByWaterBody(FrozenSet<ulong> group1, FrozenSet<ulong> group2) {
-		var group1WaterNeighbors = new HashSet<ulong>();
+		var group1WaterBodies = new HashSet<ulong>();
 		foreach (var provId in group1) {
 			if (!NeighborsDict.TryGetValue(provId, out var neighbors)) {
 				continue;
 			}
-			foreach (ulong neighbor in neighbors.Where(IsStaticWater)) {
-				group1WaterNeighbors.Add(neighbor);
+			foreach (var neighbor in neighbors) {
+				if (!IsStaticWater(neighbor)) {
+					continue;
+				}
+				if (waterBodiesDict.TryGetValue(neighbor, out var waterBodyId)) {
+					group1WaterBodies.Add(waterBodyId);
+				}
 			}
 		}
-		if (group1WaterNeighbors.Count == 0) {
+		if (group1WaterBodies.Count == 0) {
 			return false;
 		}
 
-		var group2WaterNeighbors = group2
-			.SelectMany(provId => NeighborsDict.TryGetValue(provId, out var neighbors) ? neighbors : [])
-			.Where(IsStaticWater)
-			.ToFrozenSet();
-		if (group2WaterNeighbors.Count == 0) {
-			return false;
+		foreach (var provId in group2) {
+			if (!NeighborsDict.TryGetValue(provId, out var neighbors)) {
+				continue;
+			}
+			foreach (var neighbor in neighbors) {
+				if (!IsStaticWater(neighbor)) {
+					continue;
+				}
+				if (waterBodiesDict.TryGetValue(neighbor, out var waterBodyId) && group1WaterBodies.Contains(waterBodyId)) {
+					return true;
+				}
+			}
 		}
 
-		var group1WaterBodies = group1WaterNeighbors.Select(id => waterBodiesDict[id]).ToFrozenSet();
-
-		return group2WaterNeighbors
-			.Any(group2ProvId => group1WaterBodies.Contains(waterBodiesDict[group2ProvId]));
+		return false;
 	}
 
 	private void LoadAdjacencies(string adjacenciesFilename, ModFilesystem modFS) {

ImperatorToCK3/Mappers/Gene/AccessoryGeneMapper.cs

@@ -1,6 +1,6 @@
 using commonItems;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using Assignment = System.Collections.Generic.KeyValuePair<string, string>;
 
 namespace ImperatorToCK3.Mappers.Gene;
@@ -33,10 +33,14 @@ public AccessoryGeneMapper(string mappingsFilePath) {
 			return null;
 		}
 
-		return mappings
-			.Where(mapping => mapping.Key == irObjectName)
-			.Select(mapping => mapping.Value)
-			.FirstOrDefault();
+		for (int i = 0; i < mappings.Count; ++i) {
+			var mapping = mappings[i];
+			if (mapping.Key == irObjectName) {
+				return mapping.Value;
+			}
+		}
+
+		return null;
 	}
 
 	internal string? GetTemplateFromTemplate(string irGeneName, string irTemplateName, string[] validCK3TemplateIds) {
@@ -45,21 +49,31 @@ public AccessoryGeneMapper(string mappingsFilePath) {
 			return null;
 		}
 
-		return mappings
-			.Where(mapping => mapping.Key == irTemplateName)
-			.Select(mapping => mapping.Value)
-			.Intersect(validCK3TemplateIds)
-			.FirstOrDefault();
+		for (int i = 0; i < mappings.Count; ++i) {
+			var mapping = mappings[i];
+			if (mapping.Key != irTemplateName) {
+				continue;
+			}
+			if (Array.IndexOf(validCK3TemplateIds, mapping.Value) >= 0) {
+				return mapping.Value;
+			}
+		}
+
+		return null;
 	}
 
 	internal string? GetFallbackTemplateForGene(string irGeneName, string[] validCK3TemplateIds) {
 		if (!TemplateToTemplateMappings.TryGetValue(irGeneName, out var mappings)) {
 			return null;
 		}
 
-		return mappings
-			.Select(mapping => mapping.Value)
-			.Intersect(validCK3TemplateIds)
-			.FirstOrDefault();
+		for (int i = 0; i < mappings.Count; ++i) {
+			var template = mappings[i].Value;
+			if (Array.IndexOf(validCK3TemplateIds, template) >= 0) {
+				return template;
+			}
+		}
+
+		return null;
 	}
 }

ImperatorToCK3/Mappers/Gene/MorphGeneTemplateMapper.cs

@@ -1,6 +1,5 @@
 using commonItems;
 using System.Collections.Generic;
-using System.Linq;
 using Assignment = System.Collections.Generic.KeyValuePair<string, string>;
 
 namespace ImperatorToCK3.Mappers.Gene;
@@ -23,10 +22,14 @@ public MorphGeneTemplateMapper(string mappingsFilePath) {
 			return null;
 		}
 
-		var ck3TemplateName = templateMappingsForGene
-			.Where(mapping => mapping.Key == irTemplateName)
-			.Select(mapping => mapping.Value)
-			.FirstOrDefault();
+		string? ck3TemplateName = null;
+		for (int i = 0; i < templateMappingsForGene.Count; ++i) {
+			var mapping = templateMappingsForGene[i];
+			if (mapping.Key == irTemplateName) {
+				ck3TemplateName = mapping.Value;
+				break;
+			}
+		}
 		if (ck3TemplateName is null) {
 			Logger.Warn($"I:R template {irTemplateName} not found in morph gene template mappings!");
 		}