More optimizations (#3030)

Author: IhateTrains

.gitignore

@@ -47,6 +47,5 @@ validate-with-ck3-tiger_wtwsms.ps1
 previous-problem-count.txt
 
 # Benchmark stuff
-/ImperatorToCK3.Benchmarks/
 /BenchmarkDotNet.Artifacts/
 /BenchmarkSuite1/

ImperatorToCK3.Benchmarks/.gitignore

@@ -0,0 +1,2 @@
+/bin/
+/obj/

ImperatorToCK3.Benchmarks/ImperatorToCK3.Benchmarks.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.6" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ImperatorToCK3\ImperatorToCK3.csproj" />
+  </ItemGroup>
+</Project>

ImperatorToCK3.Benchmarks/Program.cs

@@ -0,0 +1,3 @@
+using BenchmarkDotNet.Running;
+
+BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);

ImperatorToCK3/CK3/Characters/CharacterCollection.cs

@@ -284,24 +284,24 @@ private static Date GetEstimatedMarriageDate(Imperator.Characters.Character impe
 	}
 
 	private static Date? GetBirthDateOfFirstCommonChild(Imperator.Characters.Character father, Imperator.Characters.Character mother) {
-		var fatherChildren = father.Children.Values;
-		var motherChildren = mother.Children.Values;
-		var largerCollection = fatherChildren.Count >= motherChildren.Count ? fatherChildren : motherChildren;
-		var smallerCollection = fatherChildren.Count < motherChildren.Count ? fatherChildren : motherChildren;
-		var childSet = new HashSet<Imperator.Characters.Character>(largerCollection);
-
 		Date? firstChildBirthDate = null;
-		foreach (var child in smallerCollection) {
-			if (!childSet.Contains(child)) {
-				continue;
+
+		if (father.Children.Count > 0 && mother.Children.Count > 0) {
+			var smallerCollection = father.Children.Count <= mother.Children.Count ? father.Children : mother.Children;
+			var largerCollection = father.Children.Count > mother.Children.Count ? father.Children : mother.Children;
+
+			foreach (var (childId, child) in smallerCollection) {
+				if (!largerCollection.ContainsKey(childId)) {
+					continue;
+				}
+				if (firstChildBirthDate is null || child.BirthDate < firstChildBirthDate) {
+					firstChildBirthDate = child.BirthDate;
+				}
 			}
-			if (firstChildBirthDate is null || child.BirthDate < firstChildBirthDate) {
-				firstChildBirthDate = child.BirthDate;
+			if (firstChildBirthDate is not null) {
+				return firstChildBirthDate;
 			}
 		}
-		if (firstChildBirthDate is not null) {
-			return firstChildBirthDate;
-		}
 
 		foreach (var unborn in mother.Unborns) {
 			if (unborn.FatherId != father.Id) {

ImperatorToCK3/CK3/Characters/DNA.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 
@@ -19,21 +18,17 @@ internal PaletteCoordinates(ushort x, ushort y) {
 	}
 
 	public string Id { get; }
-	
+
 	private readonly Dictionary<string, DNAColorGeneValue> colorDNAValues;
 	private readonly Dictionary<string, DNAGeneValue> morphDNAValues;
 	private readonly Dictionary<string, DNAAccessoryGeneValue> accessoryDNAValues;
 	public IReadOnlyDictionary<string, DNAAccessoryGeneValue> AccessoryDNAValues => accessoryDNAValues;
 
 	public IEnumerable<string> DNALines {
 		get {
-			var colorLines = colorDNAValues
-				.Select(kvp => $"{kvp.Key}={{ {kvp.Value} }}");
-			var morphGeneLines = morphDNAValues
-				.Select(kvp => $"{kvp.Key}={{ {kvp.Value} }}");
-			var accessoryGeneLines = accessoryDNAValues
-				.Select(kvp => $"{kvp.Key}={{ {kvp.Value} }}");
-			return colorLines.Concat(morphGeneLines).Concat(accessoryGeneLines);
+			foreach (var kvp in colorDNAValues) yield return $"{kvp.Key}={{ {kvp.Value} }}";
+			foreach (var kvp in morphDNAValues) yield return $"{kvp.Key}={{ {kvp.Value} }}";
+			foreach (var kvp in accessoryDNAValues) yield return $"{kvp.Key}={{ {kvp.Value} }}";
 		}
 	}
 
@@ -52,9 +47,12 @@ Dictionary<string, DNAAccessoryGeneValue> accessoryDNAValues
 	public void WriteGenes(StringBuilder sb) {
 		sb.AppendLine("\t\tgenes={");
 
-		foreach (var dnaLine in DNALines) {
-			sb.AppendLine($"\t\t\t{dnaLine}");
-		}
+		foreach (var kvp in colorDNAValues)
+			sb.Append("\t\t\t").Append(kvp.Key).Append("={ ").Append(kvp.Value).AppendLine(" }");
+		foreach (var kvp in morphDNAValues)
+			sb.Append("\t\t\t").Append(kvp.Key).Append("={ ").Append(kvp.Value).AppendLine(" }");
+		foreach (var kvp in accessoryDNAValues)
+			sb.Append("\t\t\t").Append(kvp.Key).Append("={ ").Append(kvp.Value).AppendLine(" }");
 
 		sb.AppendLine("\t\t}");
 	}

ImperatorToCK3/CK3/Provinces/Province.cs

@@ -18,18 +18,13 @@ internal sealed partial class Province : IIdentifiable<ulong> {
 	public ulong? BaseProvinceId { get; private set; }
 
 	public ImperatorProvince? PrimaryImperatorProvince { get; set; } = null;
-	private readonly OrderedSet<ImperatorProvince> secondaryImperatorProvinces = new();
-	public IImmutableSet<ImperatorProvince> SecondaryImperatorProvinces => secondaryImperatorProvinces
-		.ToImmutableHashSet();
-	public IImmutableSet<ImperatorProvince> ImperatorProvinces {
-		get {
-			IEnumerable<ImperatorProvince> toReturn = secondaryImperatorProvinces;
-			if (PrimaryImperatorProvince is not null) {
-				toReturn = toReturn.Append(PrimaryImperatorProvince);
-			}
+	private readonly OrderedSet<ImperatorProvince> secondaryImperatorProvinces = [];
+	public IReadOnlySet<ImperatorProvince> SecondaryImperatorProvinces => secondaryImperatorProvinces;
 
-			return toReturn.ToImmutableHashSet();
-		}
+	public ImmutableHashSet<ImperatorProvince> ImperatorProvinces {
+		get => field ??= (PrimaryImperatorProvince is null
+			? [.. secondaryImperatorProvinces]
+			: [PrimaryImperatorProvince, .. secondaryImperatorProvinces]);
 	}
 
 	public Province(ulong id) {
@@ -330,9 +325,6 @@ private void SetHoldingFromImperator(Title.LandedTitles landedTitles) {
 	}
 
 	public bool IsCountyCapital(Title.LandedTitles landedTitles) {
-		var capitalProvIds = landedTitles
-			.Where(t => t.CapitalBaronyProvinceId is not null)
-			.Select(t => (ulong)t.CapitalBaronyProvinceId!);
-		return capitalProvIds.Contains(Id);
+		return landedTitles.CapitalBaronyProvinceIds.Contains(Id);
 	}
 }

ImperatorToCK3/CK3/Religions/ReligionCollection.cs

@@ -19,6 +19,7 @@ namespace ImperatorToCK3.CK3.Religions;
 
 internal sealed class ReligionCollection(Title.LandedTitles landedTitles) : IdObjectCollection<string, Religion> {
 	private readonly Dictionary<string, OrderedSet<string>> replaceableHolySitesByFaith = [];
+	private Dictionary<string, Faith>? faithCache;
 	public IReadOnlyDictionary<string, OrderedSet<string>> ReplaceableHolySitesByFaith => replaceableHolySitesByFaith;
 	public IdObjectCollection<string, HolySite> HolySites { get; } = [];
 	public IdObjectCollection<string, DoctrineCategory> DoctrineCategories { get; } = [];
@@ -30,6 +31,7 @@ public IEnumerable<Faith> Faiths {
 	}
 
 	public void LoadReligions(ModFilesystem ck3ModFS, ColorFactory colorFactory) {
+		faithCache = null;
 		var parser = new Parser();
 		parser.RegisterRegex(CommonRegexes.String, (religionReader, religionId) => {
 			var religion = new Religion(religionId, religionReader, this, colorFactory);
@@ -40,6 +42,7 @@ public void LoadReligions(ModFilesystem ck3ModFS, ColorFactory colorFactory) {
 	}
 
 	public void LoadConverterFaiths(string converterFaithsPath, ColorFactory colorFactory, Hash liquidVariables) {
+		faithCache = null;
 		OrderedSet<Faith> loadedConverterFaiths = [];
 
 		var parser = new Parser();
@@ -228,13 +231,16 @@ public void LoadDoctrines(ModFilesystem ck3ModFS) {
 	}
 
 	public Faith? GetFaith(string id) {
-		foreach (Religion religion in this) {
-			if (religion.Faiths.TryGetValue(id, out var faith)) {
-				return faith;
+		if (faithCache is null) {
+			faithCache = [];
+			foreach (var religion in this) {
+				foreach (var faith in religion.Faiths) {
+					faithCache[faith.Id] = faith;
+				}
 			}
 		}
 
-		return null;
+		return faithCache.TryGetValue(id, out var result) ? result : null;
 	}
 
 	private Title? GetHolySiteBarony(HolySite holySite) {

ImperatorToCK3/CK3/Titles/LandedTitles.cs

@@ -40,8 +40,12 @@ internal sealed partial class Title {
 	// Since titles are nested according to hierarchy we do this recursively.
 	internal sealed class LandedTitles : TitleCollection {
 		public Dictionary<string, object> Variables { get; } = [];
-	
+
 		public IEnumerable<Title> Counties => this.Where(t => t.Rank == TitleRank.county);
+		public FrozenSet<ulong> CapitalBaronyProvinceIds => field ??= this
+			.Where(t => t.CapitalBaronyProvinceId.HasValue)
+			.Select(t => t.CapitalBaronyProvinceId!.Value)
+			.ToFrozenSet();
 
 		public void LoadTitles(ModFilesystem ck3ModFS, CK3LocDB ck3LocDB, ColorFactory colorFactory) {
 			Logger.Info("Loading landed titles...");

ImperatorToCK3/ImperatorToCK3.csproj

@@ -114,6 +114,7 @@
 
     <ItemGroup>
         <InternalsVisibleTo Include="ImperatorToCK3.UnitTests" />
+        <InternalsVisibleTo Include="ImperatorToCK3.Benchmarks" />
     </ItemGroup>
 
     <ItemGroup>