GetOneOnly
This commit is contained in:
@ -873,16 +873,26 @@ public partial class DlibDotNet : IDlibDotNet, IDisposable
|
|||||||
throw new NotSupportedException($"Switch {nameof(_Configuration.SaveSortingWithoutPerson)}!");
|
throw new NotSupportedException($"Switch {nameof(_Configuration.SaveSortingWithoutPerson)}!");
|
||||||
List<LocationContainer> preFiltered = E_Distance.GetPreFilterLocationContainer(_AppSettings.MaxDegreeOfParallelism, _MapConfiguration, _Configuration.FocusDirectory, _Configuration.FocusModel, _Configuration.SkipPersonWithMoreThen, ticks, mapLogic, jLinkResolvedPersonKeys, mapped, available);
|
List<LocationContainer> preFiltered = E_Distance.GetPreFilterLocationContainer(_AppSettings.MaxDegreeOfParallelism, _MapConfiguration, _Configuration.FocusDirectory, _Configuration.FocusModel, _Configuration.SkipPersonWithMoreThen, ticks, mapLogic, jLinkResolvedPersonKeys, mapped, available);
|
||||||
if (preFiltered.Count == 0)
|
if (preFiltered.Count == 0)
|
||||||
throw new NotSupportedException("Done?");
|
results = [];
|
||||||
DistanceLimits distanceLimits = new(_Configuration.FaceAreaPermyriad, _Configuration.FaceConfidencePercent, _Configuration.FaceDistancePermyriad, _Configuration.RangeDaysDeltaTolerance, _Configuration.RangeDistanceTolerance, _Configuration.RangeFaceAreaPermyriadTolerance, _Configuration.RangeFaceConfidence, _Configuration.SortingMaximumPerFaceShouldBeHigh);
|
else
|
||||||
List<LocationContainer> postFiltered = E_Distance.GetPostFilterLocationContainer(mapLogic, preFiltered, distanceLimits);
|
{
|
||||||
if (postFiltered.Count == 0)
|
DistanceLimits distanceLimits = new(_Configuration.FaceAreaPermyriad, _Configuration.FaceConfidencePercent, _Configuration.FaceDistancePermyriad, _Configuration.RangeDaysDeltaTolerance, _Configuration.RangeDistanceTolerance, _Configuration.RangeFaceAreaPermyriadTolerance, _Configuration.RangeFaceConfidence, _Configuration.SortingMaximumPerFaceShouldBeHigh);
|
||||||
throw new NotSupportedException("Done?");
|
List<LocationContainer> postFiltered = E_Distance.GetPostFilterLocationContainer(mapLogic, preFiltered, distanceLimits);
|
||||||
string message = $") Building Matrix - {(int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds)} total second(s)";
|
if (postFiltered.Count == 0)
|
||||||
_ProgressBar = new(postFiltered.Count, message, options);
|
results = [];
|
||||||
ReadOnlyCollection<LocationContainer> matrix = E_Distance.GetMatrixLocationContainers(this, _MapConfiguration, ticks, mapLogic, mappedWithEncoding, preFiltered, distanceLimits, postFiltered);
|
else
|
||||||
_ProgressBar.Dispose();
|
{
|
||||||
results = mapLogic.GetSaveContainers(cResultsFullGroupDirectory, dResultsFullGroupDirectory, d2ResultsFullGroupDirectory, distanceLimits, matrix);
|
string message = $") Building Matrix - {(int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds)} total second(s)";
|
||||||
|
_ProgressBar = new(postFiltered.Count, message, options);
|
||||||
|
ReadOnlyCollection<LocationContainer> matrix = E_Distance.GetMatrixLocationContainers(this, _MapConfiguration, ticks, mapLogic, mappedWithEncoding, preFiltered, distanceLimits, postFiltered);
|
||||||
|
_ProgressBar.Dispose();
|
||||||
|
ReadOnlyDictionary<string, LocationContainer> oneOnly = mapLogic.GetOneOnly(distanceLimits, matrix);
|
||||||
|
if (oneOnly.Count == 0)
|
||||||
|
results = [];
|
||||||
|
else
|
||||||
|
results = mapLogic.GetSaveContainers(cResultsFullGroupDirectory, dResultsFullGroupDirectory, d2ResultsFullGroupDirectory, distanceLimits, oneOnly);
|
||||||
|
}
|
||||||
|
}
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -838,7 +838,34 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<SaveContainer> GetSaveContainers(string cResultsFullGroupDirectory, string dResultsFullGroupDirectory, string d2ResultsFullGroupDirectory, Shared.Models.Methods.IDistanceLimits distanceLimits, ReadOnlyCollection<LocationContainer> matrix)
|
public ReadOnlyDictionary<string, LocationContainer> GetOneOnly(Shared.Models.Methods.IDistanceLimits distanceLimits, ReadOnlyCollection<LocationContainer> matrix)
|
||||||
|
{
|
||||||
|
if (_Configuration is null)
|
||||||
|
throw new NullReferenceException(nameof(_Configuration));
|
||||||
|
Dictionary<string, LocationContainer> results = [];
|
||||||
|
List<string> added = [];
|
||||||
|
LocationContainer? tryGetValue;
|
||||||
|
foreach (LocationContainer locationContainer in matrix)
|
||||||
|
{
|
||||||
|
if (_Configuration.SaveIndividually)
|
||||||
|
break;
|
||||||
|
if (locationContainer.LengthSource is null)
|
||||||
|
continue;
|
||||||
|
if (results.TryGetValue(locationContainer.LengthSource.Name, out tryGetValue))
|
||||||
|
{
|
||||||
|
if (locationContainer.PersonKey is not null && tryGetValue.PersonKey is not null && locationContainer.PersonKey.Value != tryGetValue.PersonKey)
|
||||||
|
_ = results.Remove(locationContainer.LengthSource.Name);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (added.Contains(locationContainer.LengthSource.Name))
|
||||||
|
continue;
|
||||||
|
added.Add(locationContainer.LengthSource.Name);
|
||||||
|
results.Add(locationContainer.LengthSource.Name, locationContainer);
|
||||||
|
}
|
||||||
|
return new(results);
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<SaveContainer> GetSaveContainers(string cResultsFullGroupDirectory, string dResultsFullGroupDirectory, string d2ResultsFullGroupDirectory, Shared.Models.Methods.IDistanceLimits distanceLimits, ReadOnlyDictionary<string, LocationContainer> oneOnly)
|
||||||
{
|
{
|
||||||
if (_Configuration is null)
|
if (_Configuration is null)
|
||||||
throw new NullReferenceException(nameof(_Configuration));
|
throw new NullReferenceException(nameof(_Configuration));
|
||||||
@ -862,17 +889,19 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
|
|||||||
string resizeContentDirectory;
|
string resizeContentDirectory;
|
||||||
FileHolder? facePartsFileHolder;
|
FileHolder? facePartsFileHolder;
|
||||||
FileHolder? hiddenFaceFileHolder;
|
FileHolder? hiddenFaceFileHolder;
|
||||||
bool sortingContainersAny = matrix.Count > 0;
|
LocationContainer locationContainer;
|
||||||
|
bool sortingContainersAny = oneOnly.Count > 0;
|
||||||
string cContentDirectory = Path.Combine(cResultsFullGroupDirectory, _Configuration.PropertyConfiguration.ResultContent);
|
string cContentDirectory = Path.Combine(cResultsFullGroupDirectory, _Configuration.PropertyConfiguration.ResultContent);
|
||||||
string forceSingleImageHumanized = nameof(Shared.Models.Stateless.IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title);
|
string forceSingleImageHumanized = nameof(Shared.Models.Stateless.IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title);
|
||||||
string d2FacePartsContentDirectory = Path.Combine(d2ResultsFullGroupDirectory, _Configuration.PropertyConfiguration.ResultContent);
|
string d2FacePartsContentDirectory = Path.Combine(d2ResultsFullGroupDirectory, _Configuration.PropertyConfiguration.ResultContent);
|
||||||
foreach (LocationContainer locationContainer in matrix)
|
foreach (KeyValuePair<string, LocationContainer> keyValuePair in oneOnly)
|
||||||
{
|
{
|
||||||
if (_Configuration.SaveIndividually)
|
if (_Configuration.SaveIndividually)
|
||||||
break;
|
break;
|
||||||
|
locationContainer = keyValuePair.Value;
|
||||||
if (locationContainer.LengthPermyriad is null || locationContainer.LengthSource is null)
|
if (locationContainer.LengthPermyriad is null || locationContainer.LengthSource is null)
|
||||||
continue;
|
continue;
|
||||||
if (added.Contains(locationContainer.LengthSource.Name))
|
if (added.Contains(keyValuePair.Key))
|
||||||
continue;
|
continue;
|
||||||
segmentB = locationContainer.LengthPermyriad.Value.ToString().PadLeft(2, '0')[..2];
|
segmentB = locationContainer.LengthPermyriad.Value.ToString().PadLeft(2, '0')[..2];
|
||||||
isCounterPersonYear = locationContainer.PersonKey is not null && IPersonBirthday.IsCounterPersonYear(locationContainer.PersonKey.Value);
|
isCounterPersonYear = locationContainer.PersonKey is not null && IPersonBirthday.IsCounterPersonYear(locationContainer.PersonKey.Value);
|
||||||
@ -903,7 +932,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
|
|||||||
resizedFileHolder = IFileHolder.Get(Path.Combine(resizeContentDirectory, $"{locationContainer.LengthSource.FileNameFirstSegment}{Path.GetExtension(locationContainer.LengthSource.NameWithoutExtension)}"));
|
resizedFileHolder = IFileHolder.Get(Path.Combine(resizeContentDirectory, $"{locationContainer.LengthSource.FileNameFirstSegment}{Path.GetExtension(locationContainer.LengthSource.NameWithoutExtension)}"));
|
||||||
saveContainer = new(checkFile, directory, faceFileHolder, hiddenFaceFileHolder, facePartsFileHolder, resizedFileHolder, shortcutFile);
|
saveContainer = new(checkFile, directory, faceFileHolder, hiddenFaceFileHolder, facePartsFileHolder, resizedFileHolder, shortcutFile);
|
||||||
results.Add(saveContainer);
|
results.Add(saveContainer);
|
||||||
added.Add(locationContainer.LengthSource.Name);
|
added.Add(keyValuePair.Key);
|
||||||
}
|
}
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user