diff --git a/Instance/DlibDotNet.cs b/Instance/DlibDotNet.cs index 6c4701d..a1302d0 100644 --- a/Instance/DlibDotNet.cs +++ b/Instance/DlibDotNet.cs @@ -865,7 +865,7 @@ public partial class DlibDotNet : IDlibDotNet, IDisposable if (mapped.Count == 0 && !_Configuration.SaveSortingWithoutPerson) throw new NotSupportedException($"Switch {nameof(_Configuration.SaveSortingWithoutPerson)}!"); ReadOnlyCollection filePaths = GetFilePath(ticks, dFacesContentDirectory); - List available = Map.Models.Stateless.Methods.IMapLogic.GetAvailable(_AppSettings.MaxDegreeOfParallelism, _Configuration.PropertyConfiguration, _MapConfiguration, _Faces, ticks, dFacesContentDirectory, filePaths); + List available = Map.Models.Stateless.Methods.IMapLogic.GetAvailable(_AppSettings.MaxDegreeOfParallelism, _MapConfiguration, _Faces, ticks, filePaths); if (!string.IsNullOrEmpty(_Configuration.FocusDirectory) && _Configuration.FocusDirectory.Length != 2) throw new NotSupportedException($"{nameof(_Configuration.FocusDirectory)} currently only works with output directory! Example 00."); ReadOnlyDictionary> mappedWithEncoding = E_Distance.GetMappedWithEncoding(mapped); diff --git a/Map/Models/Stateless/FaceFileLogic.cs b/Map/Models/Stateless/FaceFileLogic.cs index db06a67..4b9bbee 100644 --- a/Map/Models/Stateless/FaceFileLogic.cs +++ b/Map/Models/Stateless/FaceFileLogic.cs @@ -144,7 +144,7 @@ internal abstract class FaceFileLogic File.Move(filePath.FullName, checkFile); } - private static void AvailableParallelFor(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, IFaceD dFace, List locationContainers, FilePath filePath) + private static void AvailableParallelFor(Configuration configuration, IFaceD dFace, List locationContainers, FilePath filePath) { string? json; const bool fromDistanceContent = false; @@ -193,7 +193,7 @@ internal abstract class FaceFileLogic wholePercentages.Value)); } - internal static List GetAvailable(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, IFaceD dFace, long ticks, string dFacesContentDirectory, ReadOnlyCollection filePaths) + internal static List GetAvailable(int maxDegreeOfParallelism, Configuration configuration, IFaceD dFace, long ticks, ReadOnlyCollection filePaths) { List results = []; int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds); @@ -204,7 +204,7 @@ internal abstract class FaceFileLogic _ = Parallel.For(0, filePaths.Count, parallelOptions, (i, state) => { progressBar.Tick(); - AvailableParallelFor(propertyConfiguration, configuration, dFace, results, filePaths[i]); + AvailableParallelFor(configuration, dFace, results, filePaths[i]); }); return results; } diff --git a/Map/Models/Stateless/Methods/IMapLogic.cs b/Map/Models/Stateless/Methods/IMapLogic.cs index ab363b0..6c8cc2e 100644 --- a/Map/Models/Stateless/Methods/IMapLogic.cs +++ b/Map/Models/Stateless/Methods/IMapLogic.cs @@ -67,9 +67,9 @@ public interface IMapLogic static ReadOnlyDictionary> GetMapped(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, long ticks, ReadOnlyCollection personContainers, string a2PeopleSingletonDirectory, string eDistanceContentDirectory) => FaceFileLogic.GetMapped(maxDegreeOfParallelism, propertyConfiguration, configuration, ticks, personContainers, a2PeopleSingletonDirectory, eDistanceContentDirectory); - List TestStatic_GetAvailable(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, IFaceD dFace, long ticks, string dFacesContentDirectory, ReadOnlyCollection filePaths) => - GetAvailable(maxDegreeOfParallelism, propertyConfiguration, configuration, dFace, ticks, dFacesContentDirectory, filePaths); - static List GetAvailable(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, IFaceD dFace, long ticks, string dFacesContentDirectory, ReadOnlyCollection filePaths) => - FaceFileLogic.GetAvailable(maxDegreeOfParallelism, propertyConfiguration, configuration, dFace, ticks, dFacesContentDirectory, filePaths); + List TestStatic_GetAvailable(int maxDegreeOfParallelism, Configuration configuration, IFaceD dFace, long ticks, ReadOnlyCollection filePaths) => + GetAvailable(maxDegreeOfParallelism, configuration, dFace, ticks, filePaths); + static List GetAvailable(int maxDegreeOfParallelism, Configuration configuration, IFaceD dFace, long ticks, ReadOnlyCollection filePaths) => + FaceFileLogic.GetAvailable(maxDegreeOfParallelism, configuration, dFace, ticks, filePaths); } \ No newline at end of file