Drag Drop Form and Copy Not Mapped Faces

2022-10-23 00:50:36 -07:00
parent c6757ad332
commit cfeeb0eb95
18 changed files with 175 additions and 81 deletions
--- a/TestsWithFaceRecognitionDotNet/Models/Binder/Configuration.cs
+++ b/TestsWithFaceRecognitionDotNet/Models/Binder/Configuration.cs
@ -36,8 +36,6 @@ public class Configuration
    [Display(Name = "Location Factor"), Required] public int? LocationFactor { get; set; }
    [Display(Name = "Mapped Max Index"), Required] public int? MappedMaxIndex { get; set; }
    [Display(Name = "Mapping Default Name"), Required] public string MappingDefaultName { get; set; }
-    [Display(Name = "Mapping Save Mapped"), Required] public bool? MappingSaveMapped { get; set; }
-    [Display(Name = "Mapping Save Not Mapped"), Required] public bool? MappingSaveNotMapped { get; set; }
    [Display(Name = "Mapping Use Deterministic Hash Code Unknown Face Key Value Pairs for Add to Mapping"), Required] public bool? MappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForAddToMapping { get; set; }
    [Display(Name = "Mapping Use Deterministic Hash Code Unknown Face Key Value Pairs for Save Mapping"), Required] public bool? MappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForSaveMapping { get; set; }
    [Display(Name = "Max Items In Distance Collection"), Required] public int? MaxItemsInDistanceCollection { get; set; }
@ -67,9 +65,11 @@ public class Configuration
    [Display(Name = "Reverse"), Required] public bool? Reverse { 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 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 Shortcuts"), Required] public string[] SaveShortcutsForOutputResolutions { 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; }
@ -137,10 +137,6 @@ public class Configuration
            throw new NullReferenceException(nameof(configuration.LocationFactor));
        if (configuration.MappingDefaultName is null)
            throw new NullReferenceException(nameof(configuration.MappingDefaultName));
-        if (configuration.MappingSaveMapped is null)
-            throw new NullReferenceException(nameof(configuration.MappingSaveMapped));
-        if (configuration.MappingSaveNotMapped is null)
-            throw new NullReferenceException(nameof(configuration.MappingSaveNotMapped));
        if (configuration.MappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForAddToMapping is null)
            throw new NullReferenceException(nameof(configuration.MappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForAddToMapping));
        if (configuration.MappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForSaveMapping is null)
@ -187,6 +183,10 @@ public class Configuration
            throw new NullReferenceException(nameof(configuration.Reverse));
        if (configuration.SaveFaceLandmarkForOutputResolutions is null)
            configuration.SaveFaceLandmarkForOutputResolutions = Array.Empty<string>();
+        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)
@ -237,8 +237,6 @@ public class Configuration
                     configuration.LocationFactor.Value,
                     configuration.MappedMaxIndex,
                     configuration.MappingDefaultName,
-                     configuration.MappingSaveNotMapped.Value,
-                     configuration.MappingSaveMapped.Value,
                     configuration.MappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForAddToMapping.Value,
                     configuration.MappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForSaveMapping.Value,
                     configuration.MaxItemsInDistanceCollection.Value,
@ -267,9 +265,11 @@ public class Configuration
                     configuration.Reverse.Value,
                     configuration.SaveFaceLandmarkForOutputResolutions,
                     configuration.SaveFullYearOfRandomFiles.Value,
+                     configuration.SaveMappedForOutputResolutions,
+                     configuration.SaveNotMappedForOutputResolutions,
                     configuration.SaveResizedImagesByPersonKeyFormattedForOutputResolutions,
-                     configuration.SaveShortcutsForOutputResolutions,
                     configuration.SaveResizedSubfiles.Value,
+                     configuration.SaveShortcutsForOutputResolutions,
                     configuration.SkipSearch.Value,
                     configuration.SortingDaysDeltaTolerance.Value,
                     configuration.SortingMaximumPerFaceShouldBeHigh.Value,
--- a/TestsWithFaceRecognitionDotNet/Models/Configuration.cs
+++ b/TestsWithFaceRecognitionDotNet/Models/Configuration.cs
@ -35,8 +35,6 @@ public class Configuration
    public int LocationFactor { init; get; }
    public int? MappedMaxIndex { init; get; }
    public string MappingDefaultName { init; get; }
-    public bool MappingSaveNotMapped { init; get; }
-    public bool MappingSaveMapped { init; get; }
    public bool MappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForAddToMapping { init; get; }
    public bool MappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForSaveMapping { init; get; }
    public int MaxItemsInDistanceCollection { init; get; }
@ -65,9 +63,11 @@ public class Configuration
    public bool Reverse { init; get; }
    public string[] SaveFaceLandmarkForOutputResolutions { init; get; }
    public bool SaveFullYearOfRandomFiles { init; get; }
+    public string[] SaveMappedForOutputResolutions { init; get; }
+    public string[] SaveNotMappedForOutputResolutions { init; get; }
    public string[] SaveResizedImagesByPersonKeyFormattedForOutputResolutions { init; get; }
-    public string[] SaveShortcutsForOutputResolutions { 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; }
@ -104,8 +104,6 @@ public class Configuration
                         int locationFactor,
                         int? mappedMaxIndex,
                         string mappingDefaultName,
-                         bool mappingSaveNotMapped,
-                         bool mappingSaveMapped,
                         bool mappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForAddToMapping,
                         bool mappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForSaveMapping,
                         int maxItemsInDistanceCollection,
@ -134,9 +132,11 @@ public class Configuration
                         bool reverse,
                         string[] saveFaceLandmarkForOutputResolutions,
                         bool saveFullYearOfRandomFiles,
+                         string[] saveMappedForOutputResolutions,
+                         string[] saveNotMappedForOutputResolutions,
                         string[] saveResizedImagesByPersonKeyFormattedForOutputResolutions,
-                         string[] saveShortcutsForOutputResolutions,
                         bool saveResizedSubfiles,
+                         string[] saveShortcutsForOutputResolutions,
                         bool skipSearch,
                         int sortingDaysDeltaTolerance,
                         int sortingMaximumPerFaceShouldBeHigh,
@ -172,8 +172,6 @@ public class Configuration
        LocationFactor = locationFactor;
        MappedMaxIndex = mappedMaxIndex;
        MappingDefaultName = mappingDefaultName;
-        MappingSaveNotMapped = mappingSaveNotMapped;
-        MappingSaveMapped = mappingSaveMapped;
        MappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForAddToMapping = mappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForAddToMapping;
        MappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForSaveMapping = mappingUseDeterministicHashCodeUnknownFaceKeyValuePairsForSaveMapping;
        MaxItemsInDistanceCollection = maxItemsInDistanceCollection;
@ -202,9 +200,11 @@ public class Configuration
        Reverse = reverse;
        SaveFaceLandmarkForOutputResolutions = saveFaceLandmarkForOutputResolutions;
        SaveFullYearOfRandomFiles = saveFullYearOfRandomFiles;
+        SaveMappedForOutputResolutions = saveMappedForOutputResolutions;
+        SaveNotMappedForOutputResolutions = saveNotMappedForOutputResolutions;
        SaveResizedImagesByPersonKeyFormattedForOutputResolutions = saveResizedImagesByPersonKeyFormattedForOutputResolutions;
-        SaveShortcutsForOutputResolutions = saveShortcutsForOutputResolutions;
        SaveResizedSubfiles = saveResizedSubfiles;
+        SaveShortcutsForOutputResolutions = saveShortcutsForOutputResolutions;
        SkipSearch = skipSearch;
        SortingDaysDeltaTolerance = sortingDaysDeltaTolerance;
        SortingMaximumPerFaceShouldBeHigh = sortingMaximumPerFaceShouldBeHigh;
--- a/TestsWithFaceRecognitionDotNet/UnitTestFace.cs
+++ b/TestsWithFaceRecognitionDotNet/UnitTestFace.cs
@ -145,10 +145,10 @@ public class UnitTestFace
        Assert.IsTrue(ToleranceAfterFactor == 600);
        double valueA = 0.00001d;
        int checkA = (int)(Math.Round(valueA, _Configuration.LocationDigits) * _Configuration.LocationFactor);
-        Assert.IsTrue(checkA == 10);
+        Assert.IsTrue(checkA == 0);
        double valueB = 0.01d;
        int checkB = (int)(Math.Round(valueB, _Configuration.LocationDigits) * _Configuration.LocationFactor);
-        Assert.IsTrue(checkB == 10000);
+        Assert.IsTrue(checkB == 100);
        Assert.IsTrue(checkB > checkA);
        int checkC = (int)(_Configuration.FaceDistanceTolerance * DistanceFactor);
        Assert.IsTrue(checkC == ToleranceAfterFactor);
@ -185,7 +185,6 @@ public class UnitTestFace
        string outputResolution = _Configuration.OutputResolutions[0];
        Property.Models.A_Property propertyLogic = GetPropertyLogic(reverse);
        string sourceDirectory = Path.Combine(_PropertyConfiguration.RootDirectory, sourceDirectoryName);
-        (Model model, PredictorModel predictorModel, ModelParameter modelParameter) = GetModel(_Configuration);
        _Logger.Information(_Configuration.ModelDirectory);
        aResultsFullGroupDirectory = Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(
            _PropertyConfiguration, nameof(Property.Models.A_Property), outputResolution, includeResizeGroup: false, includeModel: false, includePredictorModel: false);
@ -240,6 +239,7 @@ public class UnitTestFace
        resize.SaveResizedSubfile(outputResolution, cResultsFullGroupDirectory, subFileTuples, item, original, imageResizeKeyValuePairs);
        Image image = FaceRecognition.LoadImageFile(item.ResizedFileHolder.FullName);
        Assert.IsNotNull(image);
+        (Model model, PredictorModel predictorModel, ModelParameter modelParameter) = GetModel(_Configuration);
        FaceRecognition faceRecognition = new(_Configuration.NumberOfTimesToUpsample, _Configuration.NumberOfJitters, predictorModel, model, modelParameter);
        List<(Location Location, FaceRecognitionDotNet.FaceEncoding? FaceEncoding, Dictionary<FacePart, FacePoint[]>? FaceParts)> collection;
        collection = faceRecognition.GetCollection(image, includeFaceEncoding: true, includeFaceParts: true);