Range

2022-10-23 22:45:55 -07:00
parent ff2fa4e474
commit 239acf2699
32 changed files with 398 additions and 252 deletions
--- a/Instance/DlibDotNet.cs
+++ b/Instance/DlibDotNet.cs
@ -80,7 +80,6 @@ public partial class DlibDotNet
                configuration.CheckDFaceAndUpWriteDates,
                configuration.PropertyConfiguration,
                encoderParameters,
-                configuration.FaceDistanceAreaPermilleTolerance,
                configuration.FaceDistanceHiddenImageFactor,
                filenameExtension,
                configuration.ForceFaceLastWriteTimeToCreationTime,
@ -103,7 +102,7 @@ public partial class DlibDotNet
        }
        _Metadata = new(configuration.ForceMetadataLastWriteTimeToCreationTime, configuration.PropertiesChangedForMetadata);
        _MapConfiguration = Get(configuration, _Faces.FileNameExtension, _Faces.HiddenFileNameExtension, _FaceParts.FileNameExtension);
-        _Distance = new(configuration.DistanceMoveUnableToMatch, configuration.DistancePixelDistanceTolerance, configuration.DistanceRenameToMatch, configuration.FaceDistanceTolerance);
+        _Distance = new(configuration.DistanceMoveUnableToMatch, configuration.DistancePixelDistanceTolerance, configuration.DistanceRenameToMatch, _Configuration.FaceConfidencePercent, configuration.RangeDistanceTolerance, configuration.RangeFaceConfidence);
        if (_FirstRun || !_ArgZeroIsConfigurationRootDirectory)
            personContainers = Array.Empty<PersonContainer>();
        else
@ -217,8 +216,6 @@ public partial class DlibDotNet
            throw new Exception($"One or more {nameof(configuration.SaveShortcutsForOutputResolutions)} are not in the ValidResolutions list!");
        if ((from l in configuration.SaveFaceLandmarkForOutputResolutions where !configuration.ValidResolutions.Contains(l) select false).Any())
            throw new Exception($"One or more {nameof(configuration.SaveFaceLandmarkForOutputResolutions)} are not in the ValidResolutions list!");
-        if (configuration.DistanceFactor + configuration.LocationConfidenceFactor != 10)
-            throw new NullReferenceException(nameof(configuration.DistanceFactor));
        if (string.IsNullOrEmpty(configuration.ModelName))
            throw new NullReferenceException(nameof(configuration.ModelName));
        if (string.IsNullOrEmpty(configuration.OutputExtension))
@ -266,12 +263,13 @@ public partial class DlibDotNet
    private static Map.Models.Configuration Get(Models.Configuration configuration, string facesFileNameExtension, string facesHiddenFileNameExtension, string facePartsFileNameExtension)
    {
        Map.Models.Configuration result = new(
+            configuration.FaceConfidencePercent,
            configuration.FaceDistancePermyriad,
-            configuration.FaceDistanceTolerance,
            configuration.MappingDefaultName,
            configuration.PersonBirthdayFirstYear,
            configuration.PersonBirthdayFormat,
-            configuration.SortingDaysDeltaTolerance,
+            configuration.RangeDaysDeltaTolerance,
+            configuration.RangeDistanceTolerance,
            configuration.SortingMaximumPerKey,
            configuration.SortingMinimumToUseSigma,
            facesFileNameExtension,
@ -782,9 +780,10 @@ public partial class DlibDotNet
        List<Item> items = new();
        Shared.Models.Face[] faces;
        Mapping mapping;
-        int areaPermille;
+        int faceAreaPermille;
        bool? isWrongYear;
        Item[] filteredItems;
+        int confidencePercent;
        DateTime minimumDateTime;
        int normalizedPixelPercentage;
        string deterministicHashCodeKey;
@ -820,10 +819,11 @@ public partial class DlibDotNet
                        break;
                    if (face.FaceEncoding is null || face.Location is null || face.OutputResolution is null)
                        continue;
-                    areaPermille = Shared.Models.Stateless.Methods.IMapping.GetAreaPermille(face.Location, face.OutputResolution);
+                    confidencePercent = Shared.Models.Stateless.Methods.ILocation.GetConfidencePercent(_Configuration.FaceConfidencePercent, _Configuration.RangeFaceConfidence, face.Location.Confidence);
+                    faceAreaPermille = Shared.Models.Stateless.Methods.IMapping.GetAreaPermille(_Configuration.FaceAreaPermille, face.Location, face.OutputResolution);
                    normalizedPixelPercentage = Shared.Models.Stateless.Methods.ILocation.GetNormalizedPixelPercentage(face.Location, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, face.OutputResolution);
                    deterministicHashCodeKey = Shared.Models.Stateless.Methods.IMapping.GetDeterministicHashCodeKey(item.Property.Id.Value, face.Location, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, face.OutputResolution);
-                    mappingFromLocation = new(areaPermille, face.Location.Confidence, deterministicHashCodeKey, normalizedPixelPercentage);
+                    mappingFromLocation = new(faceAreaPermille, confidencePercent, deterministicHashCodeKey, normalizedPixelPercentage);
                    mapping = new(mappingFromItem, mappingFromLocation);
                    face.SetMapping(mapping);
                    collection.Add(face);
@ -842,10 +842,10 @@ public partial class DlibDotNet
        (List<Item> filteredItems, Shared.Models.Face[] distinctFilteredFaces) = SetMappingThenGetDistinctFilteredFacesWithMapping(argZero, containers);
        Mapping[] mappingCollection = MapLogicSupport.GetSelectedMappingCollection(distinctFilteredFaces);
        MapLogicSupport mapLogicSupport = new(
-            _Configuration.FaceDistanceAreaPermilleTolerance,
-            _Configuration.FaceDistanceMinimumConfidence,
+            _Configuration.FaceConfidencePercent,
            _Configuration.FaceDistancePermyriad,
-            _Configuration.SortingDaysDeltaTolerance,
+            _Configuration.RangeDaysDeltaTolerance,
+            _Configuration.RangeFaceAreaPermilleTolerance,
            _Configuration.SortingMaximumPerFaceShouldBeHigh);
        MapLogic mapLogic = new(
            _AppSettings.MaxDegreeOfParallelism,
@ -859,13 +859,11 @@ public partial class DlibDotNet
            mapLogicSupport);
        Dictionary<int, Dictionary<int, Mapping>> idToNormalizedPixelPercentageToMapping = MapLogicSupport.GetIdToNormalizedPixelPercentageToFace(mappingCollection);
        mapLogic.CopyManualFiles(dFacesContentDirectory, idToNormalizedPixelPercentageToMapping);
-        if (!_Configuration.SaveFaceDistancesForOutputResolutions.Contains(outputResolution))
-            mapLogic.CopyNotMappedFaces(_Configuration.FaceDistanceAreaPermilleTolerance, dFacesContentDirectory, idToNormalizedPixelPercentageToMapping);
+        if (_Configuration.SaveNotMappedForOutputResolutions.Contains(outputResolution))
+            mapLogic.CopyNotMappedFaces(_Configuration.RangeFaceAreaPermilleTolerance, dFacesContentDirectory, idToNormalizedPixelPercentageToMapping);
        (Dictionary<long, int> personKeyToCount, int totalNotMapped) = mapLogic.AddToMapping(mappingCollection);
        if (_Configuration.SaveMappedForOutputResolutions.Contains(outputResolution))
            mapLogic.SaveMapped(dFacesContentDirectory, d2FacePartsContentDirectory, mappingCollection, idToNormalizedPixelPercentageToMapping, personKeyToCount, totalNotMapped);
-        if (_Configuration.SaveNotMappedForOutputResolutions.Contains(outputResolution))
-            mapLogic.SaveNotMappedTicks();
        if (_Configuration.SaveShortcutsForOutputResolutions.Contains(outputResolution))
            mapLogic.SaveShortcuts(a2PeopleSingletonDirectory, personContainers, filteredItems, mappingCollection, personKeyToCount);
        if (_Configuration.SaveResizedImagesByPersonKeyFormattedForOutputResolutions.Contains(outputResolution))
@ -887,6 +885,8 @@ public partial class DlibDotNet
            if (totalNotMapped > 0)
                mapLogic.UpdateFromSortingContainersThenSaveContainers(dFacesContentDirectory, d2FacePartsContentDirectory, mappingCollection, idToNormalizedPixelPercentageToMapping, useFiltersCounter, sortingContainers, totalNotMapped);
        }
+        if (_Configuration.SaveNotMappedForOutputResolutions.Contains(outputResolution))
+            mapLogic.SaveNotMappedTicks();
    }

    private static Container? AreAllSameEndsWith(string argZero, Container[] containers)
--- a/Instance/Models/Binder/Configuration.cs
+++ b/Instance/Models/Binder/Configuration.cs
@ -17,11 +17,10 @@ public class Configuration
    [Display(Name = "Distance Move Unable to Match by 1 Tick"), Required] public bool? DistanceMoveUnableToMatch { get; set; }
    [Display(Name = "Distance Pixel Distance Tolerance"), Required] public int? DistancePixelDistanceTolerance { get; set; }
    [Display(Name = "Distance Rename to Match"), Required] public bool? DistanceRenameToMatch { get; set; }
-    [Display(Name = "Face Area Permille Tolerance"), Required] public int? FaceDistanceAreaPermilleTolerance { get; set; }
+    [Display(Name = "Face Area Permille"), Required] public int? FaceAreaPermille { get; set; }
    [Display(Name = "Face Distance Hidden Image Factor"), Required] public int? FaceDistanceHiddenImageFactor { get; set; }
-    [Display(Name = "Location Minimum Confidence"), Required] public double? FaceDistanceMinimumConfidence { get; set; }
+    [Display(Name = "Face Confidence Percent"), Required] public int? FaceConfidencePercent { get; set; }
    [Display(Name = "Face Distance Permyriad"), Required] public int? FaceDistancePermyriad { get; set; }
-    [Display(Name = "Face Distance Tolerance"), Required] public double? FaceDistanceTolerance { get; set; }
    [Display(Name = "Force Face Last Write Time to Creation Time"), Required] public bool? ForceFaceLastWriteTimeToCreationTime { get; set; }
    [Display(Name = "Force Metadata Last Write Time to Creation Time"), Required] public bool? ForceMetadataLastWriteTimeToCreationTime { get; set; }
    [Display(Name = "Force Resize Last Write Time to Creation Time"), Required] public bool? ForceResizeLastWriteTimeToCreationTime { get; set; }
@ -31,7 +30,6 @@ public class Configuration
    [Display(Name = "Load Or Create Then Save Distance Results"), Required] public string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions { get; set; }
    [Display(Name = "Load Or Create Then Save Image Faces Results"), Required] public string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions { get; set; }
    [Display(Name = "Load Or Create Then Save Index"), Required] public bool? LoadOrCreateThenSaveIndex { get; set; }
-    [Display(Name = "Location Confidence Factor"), Required] public int? LocationConfidenceFactor { get; set; }
    [Display(Name = "Location Digits"), Required] public int? LocationDigits { get; set; }
    [Display(Name = "Location Factor"), Required] public int? LocationFactor { get; set; }
    [Display(Name = "Mapped Max Index"), Required] public int? MappedMaxIndex { get; set; }
@ -59,18 +57,21 @@ public class Configuration
    [Display(Name = "Properties Changed For Metadata"), Required] public bool? PropertiesChangedForMetadata { get; set; }
    [Display(Name = "Properties Changed For Resize"), Required] public bool? PropertiesChangedForResize { get; set; }
    [Display(Name = "Property Configuration"), Required] public Property.Models.Configuration PropertyConfiguration { get; set; }
+    [Display(Name = "Sorting Days Delta Tolerance"), Required] public int[] RangeDaysDeltaTolerance { get; set; }
+    [Display(Name = "Face Area Permille Tolerance"), Required] public int[] RangeFaceAreaPermilleTolerance { get; set; }
+    [Display(Name = "Location Minimum Confidence"), Required] public double[] RangeFaceConfidence { get; set; }
+    [Display(Name = "Face Distance Tolerance"), Required] public double[] RangeDistanceTolerance { get; set; }
    [Display(Name = "Retry Images Without a Face"), Required] public bool? RetryImagesWithoutAFace { get; set; }
    [Display(Name = "Reverse"), Required] public bool? Reverse { get; set; }
+    [Display(Name = "Save Face Distances"), Required] public string[] SaveFaceDistancesForOutputResolutions { get; set; }
    [Display(Name = "Save Face Landmark For Output Resolutions"), Required] public string[] SaveFaceLandmarkForOutputResolutions { get; set; }
    [Display(Name = "Save Full Year Of Random Files"), Required] public bool? SaveFullYearOfRandomFiles { get; set; }
-    [Display(Name = "Save Face Distances"), Required] public string[] SaveFaceDistancesForOutputResolutions { get; set; }
    [Display(Name = "Save Mapped"), Required] public string[] SaveMappedForOutputResolutions { get; set; }
    [Display(Name = "Save Not Mapped"), Required] public string[] SaveNotMappedForOutputResolutions { get; set; }
    [Display(Name = "Save Resized Images by Person Key Formatted"), Required] public string[] SaveResizedImagesByPersonKeyFormattedForOutputResolutions { get; set; }
    [Display(Name = "Save Resized Subfiles"), Required] public bool? SaveResizedSubfiles { get; set; }
    [Display(Name = "Save Shortcuts"), Required] public string[] SaveShortcutsForOutputResolutions { get; set; }
    [Display(Name = "Skip Search"), Required] public bool? SkipSearch { get; set; }
-    [Display(Name = "Sorting Days Delta Tolerance"), Required] public int? SortingDaysDeltaTolerance { get; set; }
    [Display(Name = "SortingMaximumPerFaceShould be High"), Required] public int? SortingMaximumPerFaceShouldBeHigh { get; set; }
    [Display(Name = "Sorting Maximum Per Key"), Required] public int? SortingMaximumPerKey { get; set; }
    [Display(Name = "Sorting Minimum to use Sigma"), Required] public int? SortingMinimumToUseSigma { get; set; }
@ -102,16 +103,14 @@ public class Configuration
            throw new NullReferenceException(nameof(configuration.DistancePixelDistanceTolerance));
        if (configuration.DistanceRenameToMatch is null)
            throw new NullReferenceException(nameof(configuration.DistanceRenameToMatch));
-        if (configuration.FaceDistanceAreaPermilleTolerance is null)
-            throw new NullReferenceException(nameof(configuration.FaceDistanceAreaPermilleTolerance));
+        if (configuration.FaceAreaPermille is null)
+            throw new NullReferenceException(nameof(configuration.FaceAreaPermille));
        if (configuration.FaceDistanceHiddenImageFactor is null)
            throw new NullReferenceException(nameof(configuration.FaceDistanceHiddenImageFactor));
-        if (configuration.FaceDistanceMinimumConfidence is null)
-            throw new NullReferenceException(nameof(configuration.FaceDistanceMinimumConfidence));
+        if (configuration.FaceConfidencePercent is null)
+            throw new NullReferenceException(nameof(configuration.FaceConfidencePercent));
        if (configuration.FaceDistancePermyriad is null)
            throw new NullReferenceException(nameof(configuration.FaceDistancePermyriad));
-        if (configuration.FaceDistanceTolerance is null)
-            throw new NullReferenceException(nameof(configuration.FaceDistanceTolerance));
        if (configuration.ForceFaceLastWriteTimeToCreationTime is null)
            throw new NullReferenceException(nameof(configuration.ForceFaceLastWriteTimeToCreationTime));
        if (configuration.ForceMetadataLastWriteTimeToCreationTime is null)
@ -128,8 +127,6 @@ public class Configuration
            configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions = Array.Empty<string>();
        if (configuration.LoadOrCreateThenSaveIndex is null)
            throw new NullReferenceException(nameof(configuration.LoadOrCreateThenSaveIndex));
-        if (configuration.LocationConfidenceFactor is null)
-            throw new NullReferenceException(nameof(configuration.LocationConfidenceFactor));
        if (configuration.LocationDigits is null)
            throw new NullReferenceException(nameof(configuration.LocationDigits));
        if (configuration.LocationFactor is null)
@ -172,20 +169,28 @@ public class Configuration
            throw new NullReferenceException(nameof(configuration.PropertiesChangedForMetadata));
        if (configuration.PropertiesChangedForResize is null)
            throw new NullReferenceException(nameof(configuration.PropertiesChangedForResize));
+        if (configuration.RangeDaysDeltaTolerance is null || configuration.RangeDaysDeltaTolerance.Length != 3)
+            throw new NullReferenceException(nameof(configuration.RangeDaysDeltaTolerance));
+        if (configuration.RangeFaceAreaPermilleTolerance is null || configuration.RangeFaceAreaPermilleTolerance.Length != 3)
+            throw new NullReferenceException(nameof(configuration.RangeFaceAreaPermilleTolerance));
+        if (configuration.RangeFaceConfidence is null || configuration.RangeFaceConfidence.Length != 3)
+            throw new NullReferenceException(nameof(configuration.RangeFaceConfidence));
+        if (configuration.RangeDistanceTolerance is null || configuration.RangeDistanceTolerance.Length != 3)
+            throw new NullReferenceException(nameof(configuration.RangeDistanceTolerance));
        if (configuration.RetryImagesWithoutAFace is null)
            throw new NullReferenceException(nameof(configuration.RetryImagesWithoutAFace));
        if (configuration.Reverse is null)
            throw new NullReferenceException(nameof(configuration.Reverse));
-        if (configuration.SaveFaceLandmarkForOutputResolutions is null)
-            configuration.SaveFaceLandmarkForOutputResolutions = Array.Empty<string>();
        if (configuration.SaveFaceDistancesForOutputResolutions is null)
            configuration.SaveFaceDistancesForOutputResolutions = Array.Empty<string>();
+        if (configuration.SaveFaceLandmarkForOutputResolutions is null)
+            configuration.SaveFaceLandmarkForOutputResolutions = Array.Empty<string>();
+        if (configuration.SaveFullYearOfRandomFiles is null)
+            throw new NullReferenceException(nameof(configuration.SaveFullYearOfRandomFiles));
        if (configuration.SaveMappedForOutputResolutions is null)
            configuration.SaveMappedForOutputResolutions = Array.Empty<string>();
        if (configuration.SaveNotMappedForOutputResolutions is null)
            configuration.SaveNotMappedForOutputResolutions = Array.Empty<string>();
-        if (configuration.SaveFullYearOfRandomFiles is null)
-            throw new NullReferenceException(nameof(configuration.SaveFullYearOfRandomFiles));
        if (configuration.SaveResizedImagesByPersonKeyFormattedForOutputResolutions is null)
            configuration.SaveResizedImagesByPersonKeyFormattedForOutputResolutions = Array.Empty<string>();
        if (configuration.SaveResizedSubfiles is null)
@ -196,8 +201,6 @@ public class Configuration
            configuration.SaveShortcutsForOutputResolutions = Array.Empty<string>();
        if (configuration.SkipSearch is null)
            throw new NullReferenceException(nameof(configuration.SkipSearch));
-        if (configuration.SortingDaysDeltaTolerance is null)
-            throw new NullReferenceException(nameof(configuration.SortingDaysDeltaTolerance));
        if (configuration.SortingMaximumPerFaceShouldBeHigh is null)
            throw new NullReferenceException(nameof(configuration.SortingMaximumPerFaceShouldBeHigh));
        if (configuration.SortingMaximumPerKey is null)
@ -208,7 +211,7 @@ public class Configuration
            throw new NullReferenceException(nameof(configuration.TestDistanceResults));
        if (configuration.ValidResolutions is null)
            throw new NullReferenceException(nameof(configuration.ValidResolutions));
-        _ = DateTime.Now.AddDays(-configuration.SortingDaysDeltaTolerance.Value);
+        _ = DateTime.Now.AddDays(-configuration.RangeDaysDeltaTolerance[1]);
        result = new(configuration.PropertyConfiguration,
                     configuration.CheckDFaceAndUpWriteDates.Value,
                     configuration.CheckJsonForDistanceResults.Value,
@ -217,11 +220,10 @@ public class Configuration
                     configuration.DistanceMoveUnableToMatch.Value,
                     configuration.DistancePixelDistanceTolerance.Value,
                     configuration.DistanceRenameToMatch.Value,
-                     configuration.FaceDistanceAreaPermilleTolerance.Value,
+                     configuration.FaceAreaPermille.Value,
                     configuration.FaceDistanceHiddenImageFactor.Value,
-                     configuration.FaceDistanceMinimumConfidence.Value,
+                     configuration.FaceConfidencePercent.Value,
                     configuration.FaceDistancePermyriad.Value,
-                     configuration.FaceDistanceTolerance.Value,
                     configuration.ForceFaceLastWriteTimeToCreationTime.Value,
                     configuration.ForceMetadataLastWriteTimeToCreationTime.Value,
                     configuration.ForceResizeLastWriteTimeToCreationTime.Value,
@ -231,7 +233,6 @@ public class Configuration
                     configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions,
                     configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions,
                     configuration.LoadOrCreateThenSaveIndex.Value,
-                     configuration.LocationConfidenceFactor.Value,
                     configuration.LocationDigits.Value,
                     configuration.LocationFactor.Value,
                     configuration.MappedMaxIndex,
@ -258,18 +259,21 @@ public class Configuration
                     configuration.PropertiesChangedForIndex.Value,
                     configuration.PropertiesChangedForMetadata.Value,
                     configuration.PropertiesChangedForResize.Value,
+                     configuration.RangeDaysDeltaTolerance,
+                     configuration.RangeFaceAreaPermilleTolerance,
+                     configuration.RangeFaceConfidence,
+                     configuration.RangeDistanceTolerance,
                     configuration.RetryImagesWithoutAFace.Value,
                     configuration.Reverse.Value,
+                     configuration.SaveFaceDistancesForOutputResolutions,
                     configuration.SaveFaceLandmarkForOutputResolutions,
                     configuration.SaveFullYearOfRandomFiles.Value,
-                     configuration.SaveFaceDistancesForOutputResolutions,
                     configuration.SaveMappedForOutputResolutions,
                     configuration.SaveNotMappedForOutputResolutions,
                     configuration.SaveResizedImagesByPersonKeyFormattedForOutputResolutions,
                     configuration.SaveResizedSubfiles.Value,
                     configuration.SaveShortcutsForOutputResolutions,
                     configuration.SkipSearch.Value,
-                     configuration.SortingDaysDeltaTolerance.Value,
                     configuration.SortingMaximumPerFaceShouldBeHigh.Value,
                     configuration.SortingMaximumPerKey.Value,
                     configuration.SortingMinimumToUseSigma.Value,
--- a/Instance/Models/Configuration.cs
+++ b/Instance/Models/Configuration.cs
@ -16,11 +16,10 @@ public class Configuration
    public bool DistanceMoveUnableToMatch { init; get; }
    public int DistancePixelDistanceTolerance { init; get; }
    public bool DistanceRenameToMatch { init; get; }
-    public int FaceDistanceAreaPermilleTolerance { init; get; }
+    public int FaceAreaPermille { init; get; }
    public int FaceDistanceHiddenImageFactor { init; get; }
-    public double FaceDistanceMinimumConfidence { init; get; }
+    public int FaceConfidencePercent { init; get; }
    public int FaceDistancePermyriad { init; get; }
-    public double FaceDistanceTolerance { init; get; }
    public bool ForceFaceLastWriteTimeToCreationTime { init; get; }
    public bool ForceMetadataLastWriteTimeToCreationTime { init; get; }
    public bool ForceResizeLastWriteTimeToCreationTime { init; get; }
@ -30,7 +29,6 @@ public class Configuration
    public string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions { init; get; }
    public string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions { init; get; }
    public bool LoadOrCreateThenSaveIndex { init; get; }
-    public int LocationConfidenceFactor { init; get; }
    public int LocationDigits { init; get; }
    public int LocationFactor { init; get; }
    public int? MappedMaxIndex { init; get; }
@ -57,18 +55,21 @@ public class Configuration
    public bool PropertiesChangedForIndex { init; get; }
    public bool PropertiesChangedForMetadata { init; get; }
    public bool PropertiesChangedForResize { init; get; }
+    public int[] RangeDaysDeltaTolerance { init; get; }
+    public int[] RangeFaceAreaPermilleTolerance { init; get; }
+    public double[] RangeFaceConfidence { init; get; }
+    public double[] RangeDistanceTolerance { init; get; }
    public bool RetryImagesWithoutAFace { init; get; }
    public bool Reverse { init; get; }
+    public string[] SaveFaceDistancesForOutputResolutions { init; get; }
    public string[] SaveFaceLandmarkForOutputResolutions { init; get; }
    public bool SaveFullYearOfRandomFiles { init; get; }
-    public string[] SaveFaceDistancesForOutputResolutions { init; get; }
    public string[] SaveMappedForOutputResolutions { init; get; }
    public string[] SaveNotMappedForOutputResolutions { init; get; }
    public string[] SaveResizedImagesByPersonKeyFormattedForOutputResolutions { init; get; }
    public bool SaveResizedSubfiles { init; get; }
    public string[] SaveShortcutsForOutputResolutions { init; get; }
    public bool SkipSearch { init; get; }
-    public int SortingDaysDeltaTolerance { init; get; }
    public int SortingMaximumPerFaceShouldBeHigh { init; get; }
    public int SortingMaximumPerKey { init; get; }
    public int SortingMinimumToUseSigma { init; get; }
@ -84,11 +85,10 @@ public class Configuration
                         bool distanceMoveUnableToMatch,
                         int distancePixelDistanceTolerance,
                         bool distanceRenameToMatch,
-                         int faceDistanceAreaPermilleTolerance,
+                         int faceAreaPermille,
                         int faceDistanceHiddenImageFactor,
-                         double faceDistanceMinimumConfidence,
+                         int faceConfidencePercent,
                         int faceDistancePermyriad,
-                         double faceDistanceTolerance,
                         bool forceFaceLastWriteTimeToCreationTime,
                         bool forceMetadataLastWriteTimeToCreationTime,
                         bool forceResizeLastWriteTimeToCreationTime,
@ -98,7 +98,6 @@ public class Configuration
                         string[] loadOrCreateThenSaveDistanceResultsForOutputResolutions,
                         string[] loadOrCreateThenSaveImageFacesResultsForOutputResolutions,
                         bool loadOrCreateThenSaveIndex,
-                         int locationConfidenceFactor,
                         int locationDigits,
                         int locationFactor,
                         int? mappedMaxIndex,
@ -125,18 +124,21 @@ public class Configuration
                         bool propertiesChangedForIndex,
                         bool propertiesChangedForMetadata,
                         bool propertiesChangedForResize,
+                         int[] rangeDaysDeltaTolerance,
+                         int[] rangeFaceAreaPermilleTolerance,
+                         double[] rangeFaceConfidence,
+                         double[] rangeDistanceTolerance,
                         bool retryImagesWithoutAFace,
                         bool reverse,
+                         string[] saveFaceDistancesForOutputResolutions,
                         string[] saveFaceLandmarkForOutputResolutions,
                         bool saveFullYearOfRandomFiles,
-                         string[] saveFaceDistancesForOutputResolutions,
                         string[] saveMappedForOutputResolutions,
                         string[] saveNotMappedForOutputResolutions,
                         string[] saveResizedImagesByPersonKeyFormattedForOutputResolutions,
                         bool saveResizedSubfiles,
                         string[] saveShortcutsForOutputResolutions,
                         bool skipSearch,
-                         int sortingDaysDeltaTolerance,
                         int sortingMaximumPerFaceShouldBeHigh,
                         int sortingMaximumPerKey,
                         int sortingSigma,
@ -151,11 +153,10 @@ public class Configuration
        DistanceMoveUnableToMatch = distanceMoveUnableToMatch;
        DistancePixelDistanceTolerance = distancePixelDistanceTolerance;
        DistanceRenameToMatch = distanceRenameToMatch;
-        FaceDistanceAreaPermilleTolerance = faceDistanceAreaPermilleTolerance;
+        FaceAreaPermille = faceAreaPermille;
        FaceDistanceHiddenImageFactor = faceDistanceHiddenImageFactor;
-        FaceDistanceMinimumConfidence = faceDistanceMinimumConfidence;
+        FaceConfidencePercent = faceConfidencePercent;
        FaceDistancePermyriad = faceDistancePermyriad;
-        FaceDistanceTolerance = faceDistanceTolerance;
        ForceFaceLastWriteTimeToCreationTime = forceFaceLastWriteTimeToCreationTime;
        ForceMetadataLastWriteTimeToCreationTime = forceMetadataLastWriteTimeToCreationTime;
        ForceResizeLastWriteTimeToCreationTime = forceResizeLastWriteTimeToCreationTime;
@ -165,7 +166,6 @@ public class Configuration
        LoadOrCreateThenSaveDistanceResultsForOutputResolutions = loadOrCreateThenSaveDistanceResultsForOutputResolutions;
        LoadOrCreateThenSaveImageFacesResultsForOutputResolutions = loadOrCreateThenSaveImageFacesResultsForOutputResolutions;
        LoadOrCreateThenSaveIndex = loadOrCreateThenSaveIndex;
-        LocationConfidenceFactor = locationConfidenceFactor;
        LocationDigits = locationDigits;
        LocationFactor = locationFactor;
        MappedMaxIndex = mappedMaxIndex;
@ -192,18 +192,21 @@ public class Configuration
        PropertiesChangedForIndex = propertiesChangedForIndex;
        PropertiesChangedForMetadata = propertiesChangedForMetadata;
        PropertiesChangedForResize = propertiesChangedForResize;
+        RangeDaysDeltaTolerance = rangeDaysDeltaTolerance;
+        RangeFaceAreaPermilleTolerance = rangeFaceAreaPermilleTolerance;
+        RangeFaceConfidence = rangeFaceConfidence;
+        RangeDistanceTolerance = rangeDistanceTolerance;
        RetryImagesWithoutAFace = retryImagesWithoutAFace;
        Reverse = reverse;
+        SaveFaceDistancesForOutputResolutions = saveFaceDistancesForOutputResolutions;
        SaveFaceLandmarkForOutputResolutions = saveFaceLandmarkForOutputResolutions;
        SaveFullYearOfRandomFiles = saveFullYearOfRandomFiles;
-        SaveFaceDistancesForOutputResolutions = saveFaceDistancesForOutputResolutions;
        SaveMappedForOutputResolutions = saveMappedForOutputResolutions;
        SaveNotMappedForOutputResolutions = saveNotMappedForOutputResolutions;
        SaveResizedImagesByPersonKeyFormattedForOutputResolutions = saveResizedImagesByPersonKeyFormattedForOutputResolutions;
        SaveResizedSubfiles = saveResizedSubfiles;
        SaveShortcutsForOutputResolutions = saveShortcutsForOutputResolutions;
        SkipSearch = skipSearch;
-        SortingDaysDeltaTolerance = sortingDaysDeltaTolerance;
        SortingMaximumPerFaceShouldBeHigh = sortingMaximumPerFaceShouldBeHigh;
        SortingMaximumPerKey = sortingMaximumPerKey;
        SortingMinimumToUseSigma = sortingSigma;
--- a/Instance/appsettings.Development.json
+++ b/Instance/appsettings.Development.json
@ -58,18 +58,16 @@
      "DistanceMoveUnableToMatch": false,
      "DistancePixelDistanceTolerance": 1,
      "DistanceRenameToMatch": false,
-      "FaceDistanceAreaPermilleTolerance": 7,
+      "FaceAreaPermille": 1000,
      "FaceDistanceHiddenImageFactor": 2,
-      "FaceDistanceMinimumConfidence": 0.8,
+      "FaceConfidencePercent": 100,
      "FaceDistancePermyriad": 10000,
-      "FaceDistanceTolerance": 0.25,
      "FileNameDirectorySeparator": ".Z.",
      "ForceFaceLastWriteTimeToCreationTime": false,
      "ForceMetadataLastWriteTimeToCreationTime": false,
      "ForcePropertyLastWriteTimeToCreationTime": false,
      "ForceResizeLastWriteTimeToCreationTime": false,
      "LoadOrCreateThenSaveIndex": false,
-      "LocationConfidenceFactor": 2,
      "LocationDigits": 9,
      "LocationFactor": 10000,
      "MappedMaxIndex": 1034720,
@ -111,8 +109,7 @@
      "SaveFullYearOfRandomFiles": true,
      "SaveResizedSubFiles": true,
      "SkipSearch": false,
-      "SortingDaysDeltaTolerance": 700,
-      "SortingMaximumPerFaceShouldBeHigh": 1000,
+      "SortingMaximumPerFaceShouldBeHigh": 3000,
      "SortingMaximumPerKey": 7,
      "SortingMinimumToUseSigma": 10,
      "TestDistanceResults": true,
@ -137,6 +134,26 @@
        "7680 x 4320"
      ],
      "PropertyContentCollectionFiles": [],
+      "RangeDaysDeltaTolerance": [
+        0,
+        700,
+        123456
+      ],
+      "RangeDistanceTolerance": [
+        0,
+        0.4,
+        0.6
+      ],
+      "RangeFaceAreaPermilleTolerance": [
+        0,
+        10,
+        1000
+      ],
+      "RangeFaceConfidence": [
+        0.8,
+        0.2,
+        100
+      ],
      "SaveFaceLandmarkForOutputResolutions": [
        "176 x 176",
        "256 x 256"
--- a/Instance/appsettings.Staging.json
+++ b/Instance/appsettings.Staging.json
@ -58,18 +58,16 @@
      "DistanceMoveUnableToMatch": false,
      "DistancePixelDistanceTolerance": 1,
      "DistanceRenameToMatch": false,
-      "FaceDistanceAreaPermilleTolerance": 250,
+      "FaceAreaPermille": 1000,
      "FaceDistanceHiddenImageFactor": 2,
-      "FaceDistanceMinimumConfidence": 0.8,
+      "FaceConfidencePercent": 100,
      "FaceDistancePermyriad": 10000,
-      "FaceDistanceTolerance": 0.25,
      "FileNameDirectorySeparator": ".Z.",
      "ForceFaceLastWriteTimeToCreationTime": false,
      "ForceMetadataLastWriteTimeToCreationTime": false,
      "ForcePropertyLastWriteTimeToCreationTime": false,
      "ForceResizeLastWriteTimeToCreationTime": false,
      "LoadOrCreateThenSaveIndex": false,
-      "LocationConfidenceFactor": 2,
      "LocationDigits": 9,
      "LocationFactor": 10000,
      "MappedMaxIndex": 1034720,
@ -109,8 +107,7 @@
      "SaveFullYearOfRandomFiles": true,
      "SaveResizedSubFiles": true,
      "SkipSearch": false,
-      "SortingDaysDeltaTolerance": 700,
-      "SortingMaximumPerFaceShouldBeHigh": 1000,
+      "SortingMaximumPerFaceShouldBeHigh": 3000,
      "SortingMaximumPerKey": 7,
      "SortingMinimumToUseSigma": 10,
      "TestDistanceResults": true,
@ -127,11 +124,31 @@
        "1920 x 1080"
      ],
      "PropertyContentCollectionFiles": [],
+      "RangeDaysDeltaTolerance": [
+        0,
+        700,
+        123456
+      ],
+      "RangeDistanceTolerance": [
+        0,
+        0.4,
+        0.6
+      ],
+      "RangeFaceAreaPermilleTolerance": [
+        0,
+        10,
+        1000
+      ],
+      "RangeFaceConfidence": [
+        0.8,
+        0.2,
+        100
+      ],
+      "SaveFaceDistancesForOutputResolutions": [],
      "SaveFaceLandmarkForOutputResolutions": [
        "176 x 176",
        "256 x 256"
      ],
-      "SaveFaceDistancesForOutputResolutions": [],
      "SaveMappedForOutputResolutions": [],
      "SaveNotMappedForOutputResolutions": [],
      "SaveResizedImagesByPersonKeyFormattedForOutputResolutions": [
--- a/Instance/appsettings.json
+++ b/Instance/appsettings.json
@ -58,18 +58,16 @@
      "DistanceMoveUnableToMatch": false,
      "DistancePixelDistanceTolerance": 1,
      "DistanceRenameToMatch": false,
-      "FaceDistanceAreaPermilleTolerance": 250,
+      "FaceAreaPermille": 1000,
      "FaceDistanceHiddenImageFactor": 2,
-      "FaceDistanceMinimumConfidence": 0.8,
+      "FaceConfidencePercent": 100,
      "FaceDistancePermyriad": 10000,
-      "FaceDistanceTolerance": 0.25,
      "FileNameDirectorySeparator": ".Z.",
      "ForceFaceLastWriteTimeToCreationTime": false,
      "ForceMetadataLastWriteTimeToCreationTime": false,
      "ForcePropertyLastWriteTimeToCreationTime": false,
      "ForceResizeLastWriteTimeToCreationTime": false,
      "LoadOrCreateThenSaveIndex": false,
-      "LocationConfidenceFactor": 2,
      "LocationDigits": 9,
      "LocationFactor": 10000,
      "MappedMaxIndex": 1034720,
@ -109,8 +107,7 @@
      "SaveFullYearOfRandomFiles": true,
      "SaveResizedSubFiles": true,
      "SkipSearch": false,
-      "SortingDaysDeltaTolerance": 700,
-      "SortingMaximumPerFaceShouldBeHigh": 1000,
+      "SortingMaximumPerFaceShouldBeHigh": 3000,
      "SortingMaximumPerKey": 7,
      "SortingMinimumToUseSigma": 10,
      "TestDistanceResults": true,
@ -136,11 +133,31 @@
        "1920 x 1080"
      ],
      "PropertyContentCollectionFiles": [],
+      "RangeDaysDeltaTolerance": [
+        0,
+        700,
+        123456
+      ],
+      "RangeDistanceTolerance": [
+        0,
+        0.4,
+        0.6
+      ],
+      "RangeFaceAreaPermilleTolerance": [
+        0,
+        10,
+        1000
+      ],
+      "RangeFaceConfidence": [
+        0.8,
+        0.2,
+        100
+      ],
+      "SaveFaceDistancesForOutputResolutions": [],
      "SaveFaceLandmarkForOutputResolutions": [
        "176 x 176",
        "256 x 256"
      ],
-      "SaveFaceDistancesForOutputResolutions": [],
      "SaveMappedForOutputResolutions": [],
      "SaveNotMappedForOutputResolutions": [],
      "SaveResizedImagesByPersonKeyFormattedForOutputResolutions": [