fierke/logofclient
2
2
Fork 0
Code Issues 13 Pull Requests Releases 5 Wiki Activity

[chore:] speed improvements (address check finally using dictionaries)

Browse Source
This commit is contained in:
fierke
2026-08-03 08:56:21 +02:00
parent b3e7b64baf
commit 612a55a070
1 changed files with 73 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tasks/AddressCheck.cs
+73 -48
View File
@@ -58,6 +58,33 @@ public class AddressCheck
await Task.Run(async () => await Task.Run(async () =>
{ {
// Refsids, die mehrfach vorkommen
var doubledRefsids = adset.KasPersons
.Where(p => p.refsid > 0)
.GroupBy(p => p.refsid)
.Where(g => g.Count() > 1)
.ToDictionary(g => g.Key, g => true);
// Adressen, die mehrfach vorkommen
var doubledAddresses = adset.KasPersons
.GroupBy(p => (
p.name,
p.strasse,
p.vorname,
p.ort,
p.funktion,
p.funktion2,
p.funktionad,
p.abteilung,
p.name1,
p.name2,
p.name3,
p.name4,
p.name5))
.Where(g => g.Count() > 1)
.ToDictionary(g => g.Key, g => true);
foreach (var person in adset.KasPersons) foreach (var person in adset.KasPersons)
{ {
var errors = new List<ErrorTypes>(); var errors = new List<ErrorTypes>();
@@ -155,46 +182,34 @@ public class AddressCheck
} }
// Address-Component-Count // Address-Component-Count
if (!string.IsNullOrWhiteSpace(person.strasse2)) address_component_count++; // Double-Refsid
if (!string.IsNullOrWhiteSpace(person.land)) address_component_count++; if (person.refsid > 0 &&
if (!string.IsNullOrWhiteSpace(person.name1)) address_component_count++; doubledRefsids.ContainsKey(person.refsid))
if (!string.IsNullOrWhiteSpace(person.name2)) address_component_count++;
if (!string.IsNullOrWhiteSpace(person.name3)) address_component_count++;
if (!string.IsNullOrWhiteSpace(person.name4)) address_component_count++;
if (!string.IsNullOrWhiteSpace(person.name5)) address_component_count++;
if (!string.IsNullOrWhiteSpace(person.funktion)) address_component_count++;
if (!string.IsNullOrWhiteSpace(person.funktion2)) address_component_count++;
if (!string.IsNullOrWhiteSpace(person.funktionad)) address_component_count++;
if (!string.IsNullOrWhiteSpace(person.abteilung)) address_component_count++;
// Double-Refsid or DoubleAddresses
foreach (var person2 in adset.KasPersons)
{ {
if (adset.KasPersons.IndexOf(person) == adset.KasPersons.IndexOf(person2)) continue; hasFaults = true;
warnings.Add(WarningTypes.DoubledRefsid);
if (person.refsid == person2.refsid) // trifft auf Patch-Addressen nicht zu }
{
hasFaults = true; // Double-Address
warnings.Add(WarningTypes.DoubledRefsid); var addressKey = (
} person.name,
person.strasse,
if (person.name == person2.name && person.vorname,
person.strasse == person2.strasse && person.ort,
person.vorname == person2.vorname && person.funktion,
person.ort == person2.ort && person.funktion2,
person.funktion == person2.funktion && person.funktionad,
person.funktion2 == person2.funktion2 && person.abteilung,
person.funktionad == person2.funktionad && person.name1,
person.abteilung == person2.abteilung && person.name2,
person.name1 == person2.name1 && person.name3,
person.name2 == person2.name2 && person.name4,
person.name3 == person2.name3 && person.name5);
person.name4 == person2.name4 &&
person.name5 == person2.name5) if (doubledAddresses.ContainsKey(addressKey))
{ {
hasFaults = true; hasFaults = true;
errors.Add(ErrorTypes.MayBeSameAddress); errors.Add(ErrorTypes.MayBeSameAddress);
}
} }
// Adressen-Länge // Adressen-Länge
@@ -216,16 +231,26 @@ public class AddressCheck
} }
// Fortschritt aktualisieren // Fortschritt aktualisieren
Interlocked.Increment(ref current); // Interlocked.Increment(ref current);
var percent = current / (double)total * 100; // var percent = current / (double)total * 100;
await Dispatcher.UIThread.InvokeAsync(() => // await Dispatcher.UIThread.InvokeAsync(() =>
{ // {
if (hasFaults) // if (hasFaults)
_progress.AddToLog($"Person mit id {person.id} ist fehlerhaft", // _progress.AddToLog($"Person mit id {person.id} ist fehlerhaft",
Convert.ToInt32(percent).ToString()); // Convert.ToInt32(percent).ToString());
//
// _progress.ChangePercentage(percent);
// });
var cd = Interlocked.Increment(ref current);
_progress.ChangePercentage(percent); if (cd % 10 == 0)
}); {
var percent = cd / (double)total * 100;
await Dispatcher.UIThread.InvokeAsync(() =>
_progress.ChangePercentage(percent));
}
} }
}); });