From e4140b61e30fdace23a4fc0f242d4379e15e9100 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Sat, 30 Jul 2022 19:10:37 -0700 Subject: [PATCH] Switch to by Output Resolution --- Instance/DlibDotNet.cs | 56 ++++++++-------- Instance/Models/Binder/Configuration.cs | 16 ++--- Instance/Models/Configuration.cs | 26 ++++---- Instance/Models/_E_Distance.cs | 14 ++-- Instance/appsettings.Development.json | 23 ++++--- Instance/appsettings.Staging.json | 7 +- Instance/appsettings.json | 74 ++++++++++++++++++++-- Shared/Models/Properties/IConfiguration.cs | 4 +- Tests/Models/Binder/Configuration.cs | 16 ++--- Tests/Models/Configuration.cs | 26 ++++---- Tests/appsettings.Development.json | 21 +++--- Tests/appsettings.json | 74 ++++++++++++++++++++-- 12 files changed, 248 insertions(+), 109 deletions(-) diff --git a/Instance/DlibDotNet.cs b/Instance/DlibDotNet.cs index f7cc1b1..2cc2c73 100644 --- a/Instance/DlibDotNet.cs +++ b/Instance/DlibDotNet.cs @@ -123,15 +123,13 @@ public class DlibDotNet _Log.Information(message); if (_Exceptions.Count != 0) throw new Exception(message); - if (configuration.LoadOrCreateThenSaveDirectoryDistanceResults is null) - throw new Exception($"{nameof(configuration.LoadOrCreateThenSaveDirectoryDistanceResults)} is null!"); - if (configuration.LoadOrCreateThenSaveDirectoryDistanceResults.Value) + if (configuration.LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions.Any()) { long ticks = DateTime.Now.Ticks; - foreach (string outputResolution in configuration.OutputResolutions) - _Distance.LoadOrCreateThenSaveDirectoryDistanceResults(propertyConfiguration, model, predictorModel, outputResolution); + foreach (string outputResolution in configuration.LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions) + _Distance.LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions(propertyConfiguration, model, predictorModel, outputResolution); if (appSettings.MaxDegreeOfParallelism.Value < 2) - ticks = LogDelta(ticks, nameof(E_Distance.LoadOrCreateThenSaveDirectoryDistanceResults)); + ticks = LogDelta(ticks, nameof(E_Distance.LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions)); } } @@ -214,6 +212,14 @@ public class DlibDotNet throw new Exception($"{nameof(configuration.OutputResolutions)} must be a valid outputResolution!"); if ((from l in configuration.OutputResolutions where !configuration.ValidResolutions.Contains(l) select false).Any()) throw new Exception($"One or more {nameof(configuration.OutputResolutions)} are not in the ValidResolutions list!"); + if ((from l in configuration.LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions where !configuration.ValidResolutions.Contains(l) select false).Any()) + throw new Exception($"One or more {nameof(configuration.LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions)} are not in the ValidResolutions list!"); + if ((from l in configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions where !configuration.ValidResolutions.Contains(l) select false).Any()) + throw new Exception($"One or more {nameof(configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions)} are not in the ValidResolutions list!"); + if ((from l in configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions where !configuration.ValidResolutions.Contains(l) select false).Any()) + throw new Exception($"One or more {nameof(configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions)} are not in the ValidResolutions list!"); + if ((from l in configuration.SaveShortcutsForOutputResolutions where !configuration.ValidResolutions.Contains(l) select false).Any()) + 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.CheckJsonForDistanceResults is null) @@ -230,12 +236,6 @@ public class DlibDotNet throw new Exception($"{nameof(configuration.IgnoreExtensions)} must be set!"); if (configuration.IgnoreRelativePaths is null) throw new Exception($"{nameof(configuration.IgnoreRelativePaths)} must be set!"); - if (configuration.LoadOrCreateThenSaveDirectoryDistanceResults is null) - throw new Exception($"{nameof(configuration.LoadOrCreateThenSaveDirectoryDistanceResults)} must be set!"); - if (configuration.LoadOrCreateThenSaveDistanceResults is null) - throw new Exception($"{nameof(configuration.LoadOrCreateThenSaveDistanceResults)} must be set!"); - if (configuration.LoadOrCreateThenSaveImageFacesResults is null) - throw new Exception($"{nameof(configuration.LoadOrCreateThenSaveImageFacesResults)} must be set!"); if (configuration.LoadOrCreateThenSaveIndex is null) throw new Exception($"{nameof(configuration.LoadOrCreateThenSaveIndex)} must be set!"); if (configuration.LocationConfidenceFactor is null) @@ -354,7 +354,7 @@ public class DlibDotNet string path = Path.Combine(resizedFileInfo.DirectoryName, Path.GetFileNameWithoutExtension(resizedFileInfo.Name)); File.WriteAllBytes(path, bytes); } - if (_Configuration.LoadOrCreateThenSaveImageFacesResults is null || !_Configuration.LoadOrCreateThenSaveImageFacesResults.Value) + if (!_Configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions.Contains(outputResolution)) faceCollection = new(); else { @@ -464,7 +464,7 @@ public class DlibDotNet } } - private void WriteGroup(Property.Models.Configuration configuration, PropertyLogic propertyLogic, List propertyCollection, List>> metadataCollection, List> faceCollections, List> resizeKeyValuePairs, string sourceDirectory, PropertyHolder[] filteredPropertyHolderCollection) + private void WriteGroup(Property.Models.Configuration configuration, PropertyLogic propertyLogic, List propertyCollection, List>> metadataCollection, List> faceCollections, List> resizeKeyValuePairs, string sourceDirectory, string outputResolution, PropertyHolder[] filteredPropertyHolderCollection) { if (_Configuration.PropertiesChangedForMetadata is null) throw new Exception($"{nameof(_Configuration.PropertiesChangedForMetadata)} is null!"); @@ -536,7 +536,7 @@ public class DlibDotNet json = JsonSerializer.Serialize(resizeKeyValuePairsCollections, writeIndentedJsonSerializerOptions); _ = Property.Models.Stateless.IPath.WriteAllText(checkFile, json, compareBeforeWrite: true); } - if (_Configuration.LoadOrCreateThenSaveImageFacesResults.HasValue && _Configuration.LoadOrCreateThenSaveImageFacesResults.Value && _Faces.AngleBracketCollection.Any()) + if (_Configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions.Contains(outputResolution) && _Faces.AngleBracketCollection.Any()) { checkDirectory = Property.Models.Stateless.IPath.GetDirectory(_Faces.AngleBracketCollection[0], level, "[{}]"); checkFile = Path.Combine(checkDirectory, fileName); @@ -555,12 +555,6 @@ public class DlibDotNet throw new Exception($"{nameof(_Log)} is null!"); if (_AppSettings.MaxDegreeOfParallelism is null) throw new Exception($"{nameof(_AppSettings.MaxDegreeOfParallelism)} is null!"); - if (_Configuration.LoadOrCreateThenSaveImageFacesResults is null) - throw new Exception($"{nameof(_Configuration.LoadOrCreateThenSaveImageFacesResults)} is null!"); - if (_Configuration.LoadOrCreateThenSaveDirectoryDistanceResults is null) - throw new Exception($"{nameof(_Configuration.LoadOrCreateThenSaveDirectoryDistanceResults)} is null!"); - if (_Configuration.LoadOrCreateThenSaveDistanceResults is null) - throw new Exception($"{nameof(_Configuration.LoadOrCreateThenSaveDistanceResults)} is null!"); int g; int r; int exceptionCount; @@ -641,7 +635,7 @@ public class DlibDotNet contentDescription: "Resized image", singletonDescription: "Resize dimensions for each resolution", collectionDescription: string.Empty)); - if (_Configuration.LoadOrCreateThenSaveImageFacesResults.HasValue && _Configuration.LoadOrCreateThenSaveImageFacesResults.Value) + if (_Configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions.Contains(outputResolution)) _Faces.AngleBracketCollection.AddRange(Property.Models.Stateless.IResult.GetDirectoryInfoCollection(configuration, model, predictorModel, @@ -672,14 +666,14 @@ public class DlibDotNet throw new Exception("Counts don't match!"); if (exceptionCount != 0) _Exceptions.Add(sourceDirectory); - if (exceptionCount == 0 && _ArgZeroIsConfigurationRootDirectory) - WriteGroup(configuration, propertyLogic, propertyCollection, metadataCollection, faceCollections, resizeKeyValuePairs, sourceDirectory, filteredPropertyHolderCollection); - if (exceptionCount == 0) + if (_ArgZeroIsConfigurationRootDirectory && exceptionCount == 0) + WriteGroup(configuration, propertyLogic, propertyCollection, metadataCollection, faceCollections, resizeKeyValuePairs, sourceDirectory, outputResolution, filteredPropertyHolderCollection); + if (_ArgZeroIsConfigurationRootDirectory && outputResolution == _Configuration.OutputResolutions[0] && exceptionCount == 0) propertyLogic.AddToPropertyLogicAllCollection(filteredPropertyHolderCollection); - if (exceptionCount == 0 && _Configuration.LoadOrCreateThenSaveImageFacesResults.Value && _Configuration.SaveShortcuts.HasValue && _Configuration.SaveShortcuts.Value && propertyLogic.NamedFaceInfoDeterministicHashCodeIndices.Any()) + if (exceptionCount == 0 && _Configuration.SaveShortcutsForOutputResolutions.Contains(outputResolution) && propertyLogic.NamedFaceInfoDeterministicHashCodeIndices.Any()) _Faces.SaveShortcuts(configuration, juliePhares, model, predictorModel, propertyLogic, peopleCollection, outputResolution, filteredPropertyHolderCollection, propertyCollection, faceCollections); - if (exceptionCount == 0 && _Configuration.LoadOrCreateThenSaveDistanceResults.HasValue && _Configuration.LoadOrCreateThenSaveDistanceResults.Value) - _Distance.LoadOrCreateThenSaveDistanceResults(configuration, model, predictorModel, sourceDirectory, outputResolution, sourceDirectoryChanges, filteredPropertyHolderCollection, faceCollections); + if (exceptionCount == 0 && _Configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions.Contains(outputResolution)) + _Distance.LoadOrCreateThenSaveDistanceResultsForOutputResolutions(configuration, model, predictorModel, sourceDirectory, outputResolution, sourceDirectoryChanges, filteredPropertyHolderCollection, faceCollections); if (_Resize.AngleBracketCollection.Any()) _ = Property.Models.Stateless.IPath.DeleteEmptyDirectories(_Resize.AngleBracketCollection[0].Replace("<>", "()")); if (_Faces.AngleBracketCollection.Any()) @@ -696,11 +690,15 @@ public class DlibDotNet } _Log.Information(". . ."); } + } + if (_ArgZeroIsConfigurationRootDirectory && _Configuration.SaveShortcutsForOutputResolutions.Contains(outputResolution)) + { + } if (_ArgZeroIsConfigurationRootDirectory && outputResolution == _Configuration.OutputResolutions[0]) { propertyLogic.SaveAllCollection(); - if (!_Configuration.LoadOrCreateThenSaveImageFacesResults.Value && !_Configuration.LoadOrCreateThenSaveDirectoryDistanceResults.Value && !_Configuration.LoadOrCreateThenSaveDistanceResults.Value) + if (!_Configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions.Any()) break; if (_Exceptions.Count == 0) { diff --git a/Instance/Models/Binder/Configuration.cs b/Instance/Models/Binder/Configuration.cs index f2f6f9b..d9f3daa 100644 --- a/Instance/Models/Binder/Configuration.cs +++ b/Instance/Models/Binder/Configuration.cs @@ -14,9 +14,9 @@ public class Configuration [Display(Name = "Ignore Extensions"), Required] public string[] IgnoreExtensions { get; set; } [Display(Name = "Ignore Relative Paths"), Required] public string[] IgnoreRelativePaths { get; set; } [Display(Name = "Julie Phares Copy Birthdays"), Required] public string[] JuliePhares { get; set; } - [Display(Name = "Load Or Create Then Save Directory Distance Results"), Required] public bool? LoadOrCreateThenSaveDirectoryDistanceResults { get; set; } - [Display(Name = "Load Or Create Then Save Distance Results"), Required] public bool? LoadOrCreateThenSaveDistanceResults { get; set; } - [Display(Name = "Load Or Create Then Save Image Faces Results"), Required] public bool? LoadOrCreateThenSaveImageFacesResults { get; set; } + [Display(Name = "Load Or Create Then Save Directory Distance Results"), Required] public string[] LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions { get; set; } + [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 = "Mapped Max Index"), Required] public int? MappedMaxIndex { get; set; } @@ -43,7 +43,7 @@ public class Configuration [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 Resized Subfiles"), Required] public bool? SaveResizedSubfiles { get; set; } - [Display(Name = "Save Shortcuts"), Required] public bool? SaveShortcuts { get; set; } + [Display(Name = "Save Shortcuts"), Required] public string[] SaveShortcutsForOutputResolutions { get; set; } [Display(Name = "Skip Search"), Required] public bool? SkipSearch { get; set; } [Display(Name = "Test Distance Results"), Required] public bool? TestDistanceResults { get; set; } [Display(Name = "Valid Resolutions"), Required] public string[] ValidResolutions { get; set; } @@ -58,9 +58,9 @@ public class Configuration IgnoreExtensions = Array.Empty(); IgnoreRelativePaths = Array.Empty(); JuliePhares = Array.Empty(); - LoadOrCreateThenSaveDirectoryDistanceResults = null; - LoadOrCreateThenSaveDistanceResults = null; - LoadOrCreateThenSaveImageFacesResults = null; + LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions = Array.Empty(); + LoadOrCreateThenSaveDistanceResultsForOutputResolutions = Array.Empty(); + LoadOrCreateThenSaveImageFacesResultsForOutputResolutions = Array.Empty(); LoadOrCreateThenSaveIndex = null; LocationConfidenceFactor = null; MappedMaxIndex = null; @@ -86,7 +86,7 @@ public class Configuration SaveFaceLandmarkForOutputResolutions = Array.Empty(); SaveFullYearOfRandomFiles = null; SaveResizedSubfiles = null; - SaveShortcuts = null; + SaveShortcutsForOutputResolutions = Array.Empty(); SkipSearch = null; TestDistanceResults = null; ValidResolutions = Array.Empty(); diff --git a/Instance/Models/Configuration.cs b/Instance/Models/Configuration.cs index 4337c1e..bd7d4d0 100644 --- a/Instance/Models/Configuration.cs +++ b/Instance/Models/Configuration.cs @@ -14,9 +14,9 @@ public class Configuration protected readonly string[] _IgnoreExtensions; protected readonly string[] _IgnoreRelativePaths; protected readonly string[] _JuliePhares; - protected readonly bool? _LoadOrCreateThenSaveDirectoryDistanceResults; - protected readonly bool? _LoadOrCreateThenSaveDistanceResults; - protected readonly bool? _LoadOrCreateThenSaveImageFacesResults; + protected readonly string[] _LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions; + protected readonly string[] _LoadOrCreateThenSaveDistanceResultsForOutputResolutions; + protected readonly string[] _LoadOrCreateThenSaveImageFacesResultsForOutputResolutions; protected readonly bool? _LoadOrCreateThenSaveIndex; protected readonly int? _LocationConfidenceFactor; protected readonly int? _MappedMaxIndex; @@ -43,7 +43,7 @@ public class Configuration protected readonly string[] _SaveFaceLandmarkForOutputResolutions; protected readonly bool? _SaveFullYearOfRandomFiles; protected readonly bool? _SaveResizedSubfiles; - protected readonly bool? _SaveShortcuts; + protected readonly string[] _SaveShortcutsForOutputResolutions; protected readonly bool? _SkipSearch; protected readonly bool? _TestDistanceResults; protected readonly string[] _ValidResolutions; @@ -55,9 +55,9 @@ public class Configuration public string[] IgnoreExtensions => _IgnoreExtensions; public string[] IgnoreRelativePaths => _IgnoreRelativePaths; public string[] JuliePhares => _JuliePhares; - public bool? LoadOrCreateThenSaveDirectoryDistanceResults => _LoadOrCreateThenSaveDirectoryDistanceResults; - public bool? LoadOrCreateThenSaveDistanceResults => _LoadOrCreateThenSaveDistanceResults; - public bool? LoadOrCreateThenSaveImageFacesResults => _LoadOrCreateThenSaveImageFacesResults; + public string[] LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions => _LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions; + public string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions => _LoadOrCreateThenSaveDistanceResultsForOutputResolutions; + public string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions => _LoadOrCreateThenSaveImageFacesResultsForOutputResolutions; public bool? LoadOrCreateThenSaveIndex => _LoadOrCreateThenSaveIndex; public int? LocationConfidenceFactor => _LocationConfidenceFactor; public int? MappedMaxIndex => _MappedMaxIndex; @@ -84,13 +84,13 @@ public class Configuration public string[] SaveFaceLandmarkForOutputResolutions => _SaveFaceLandmarkForOutputResolutions; public bool? SaveFullYearOfRandomFiles => _SaveFullYearOfRandomFiles; public bool? SaveResizedSubfiles => _SaveResizedSubfiles; - public bool? SaveShortcuts => _SaveShortcuts; + public string[] SaveShortcutsForOutputResolutions => _SaveShortcutsForOutputResolutions; public bool? SkipSearch => _SkipSearch; public bool? TestDistanceResults => _TestDistanceResults; public string[] ValidResolutions => _ValidResolutions; [JsonConstructor] - public Configuration(bool? checkJsonForDistanceResults, int? crossDirectoryMaxItemsInDistanceCollection, int? distanceFactor, bool? forceMetadataLastWriteTimeToCreationTime, bool? forceResizeLastWriteTimeToCreationTime, string[] ignoreExtensions, string[] ignoreRelativePaths, string[] juliePhares, bool? loadOrCreateThenSaveDirectoryDistanceResults, bool? loadOrCreateThenSaveDistanceResults, bool? loadOrCreateThenSaveImageFacesResults, bool? loadOrCreateThenSaveIndex, int? locationConfidenceFactor, int? mappedMaxIndex, int? maxItemsInDistanceCollection, string[] mixedYearRelativePaths, string modelDirectory, string modelName, int? numJitters, string outputExtension, int? outputQuality, string[] outputResolutions, bool? overrideForFaceImages, bool? overrideForFaceLandmarkImages, bool? overrideForResizeImages, int? paddingLoops, string predictorModelName, bool? propertiesChangedForDistance, bool? propertiesChangedForFaces, bool? propertiesChangedForIndex, bool? propertiesChangedForMetadata, bool? propertiesChangedForResize, Property.Models.Configuration? propertyConfiguration, bool? reverse, string[] saveFaceLandmarkForOutputResolutions, bool? saveFullYearOfRandomFiles, bool? saveResizedSubfiles, bool? saveShortcuts, bool? skipSearch, bool? testDistanceResults, string[] validResolutions) + public Configuration(bool? checkJsonForDistanceResults, int? crossDirectoryMaxItemsInDistanceCollection, int? distanceFactor, bool? forceMetadataLastWriteTimeToCreationTime, bool? forceResizeLastWriteTimeToCreationTime, string[] ignoreExtensions, string[] ignoreRelativePaths, string[] juliePhares, string[] loadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions, string[] loadOrCreateThenSaveDistanceResultsForOutputResolutions, string[] loadOrCreateThenSaveImageFacesResultsForOutputResolutions, bool? loadOrCreateThenSaveIndex, int? locationConfidenceFactor, int? mappedMaxIndex, int? maxItemsInDistanceCollection, string[] mixedYearRelativePaths, string modelDirectory, string modelName, int? numJitters, string outputExtension, int? outputQuality, string[] outputResolutions, bool? overrideForFaceImages, bool? overrideForFaceLandmarkImages, bool? overrideForResizeImages, int? paddingLoops, string predictorModelName, bool? propertiesChangedForDistance, bool? propertiesChangedForFaces, bool? propertiesChangedForIndex, bool? propertiesChangedForMetadata, bool? propertiesChangedForResize, Property.Models.Configuration? propertyConfiguration, bool? reverse, string[] saveFaceLandmarkForOutputResolutions, bool? saveFullYearOfRandomFiles, bool? saveResizedSubfiles, string[] saveShortcutsForOutputResolutions, bool? skipSearch, bool? testDistanceResults, string[] validResolutions) { _CheckJsonForDistanceResults = checkJsonForDistanceResults; _CrossDirectoryMaxItemsInDistanceCollection = crossDirectoryMaxItemsInDistanceCollection; @@ -100,9 +100,9 @@ public class Configuration _IgnoreExtensions = ignoreExtensions; _IgnoreRelativePaths = ignoreRelativePaths; _JuliePhares = juliePhares; - _LoadOrCreateThenSaveDirectoryDistanceResults = loadOrCreateThenSaveDirectoryDistanceResults; - _LoadOrCreateThenSaveDistanceResults = loadOrCreateThenSaveDistanceResults; - _LoadOrCreateThenSaveImageFacesResults = loadOrCreateThenSaveImageFacesResults; + _LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions = loadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions; + _LoadOrCreateThenSaveDistanceResultsForOutputResolutions = loadOrCreateThenSaveDistanceResultsForOutputResolutions; + _LoadOrCreateThenSaveImageFacesResultsForOutputResolutions = loadOrCreateThenSaveImageFacesResultsForOutputResolutions; _LoadOrCreateThenSaveIndex = loadOrCreateThenSaveIndex; _LocationConfidenceFactor = locationConfidenceFactor; _MappedMaxIndex = mappedMaxIndex; @@ -129,7 +129,7 @@ public class Configuration _SaveFaceLandmarkForOutputResolutions = saveFaceLandmarkForOutputResolutions; _SaveFullYearOfRandomFiles = saveFullYearOfRandomFiles; _SaveResizedSubfiles = saveResizedSubfiles; - _SaveShortcuts = saveShortcuts; + _SaveShortcutsForOutputResolutions = saveShortcutsForOutputResolutions; _SkipSearch = skipSearch; _TestDistanceResults = testDistanceResults; _ValidResolutions = validResolutions; diff --git a/Instance/Models/_E_Distance.cs b/Instance/Models/_E_Distance.cs index c7de784..e893fd7 100644 --- a/Instance/Models/_E_Distance.cs +++ b/Instance/Models/_E_Distance.cs @@ -127,7 +127,7 @@ internal class E_Distance return result; } - private void LoadOrCreateThenSaveDistanceResultsLoop(Property.Models.Configuration configuration, List> faceCollections, int subFilesCount, int i, List faceCollection, List locationIndicesCollection, List> subFileTuples, List faceEncodingCollection, List faceEncodingCollections, string fileNameWithoutExtension, string jsonDirectory, string tvsDirectory) + private void LoadOrCreateThenSaveDistanceResultsForOutputResolutionsLoop(Property.Models.Configuration configuration, List> faceCollections, int subFilesCount, int i, List faceCollection, List locationIndicesCollection, List> subFileTuples, List faceEncodingCollection, List faceEncodingCollections, string fileNameWithoutExtension, string jsonDirectory, string tvsDirectory) { string text; string json; @@ -170,7 +170,7 @@ internal class E_Distance } } - private void LoadOrCreateThenSaveDistanceResults(Property.Models.Configuration configuration, PropertyHolder[] filteredPropertyHolderCollection, List> faceCollections, List directories) + private void LoadOrCreateThenSaveDistanceResultsForOutputResolutions(Property.Models.Configuration configuration, PropertyHolder[] filteredPropertyHolderCollection, List> faceCollections, List directories) { FileInfo? fileInfo; string fileNameWithoutExtension; @@ -189,11 +189,11 @@ internal class E_Distance if (fileInfo is null) continue; fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileInfo.FullName); - LoadOrCreateThenSaveDistanceResultsLoop(configuration, faceCollections, filteredPropertyHolderCollection.Length, i, faceCollections[i], locationIndicesCollection, subFileTuples, faceEncodingCollection, faceEncodingCollections[i], fileNameWithoutExtension, directories[i][0], directories[i][1]); + LoadOrCreateThenSaveDistanceResultsForOutputResolutionsLoop(configuration, faceCollections, filteredPropertyHolderCollection.Length, i, faceCollections[i], locationIndicesCollection, subFileTuples, faceEncodingCollection, faceEncodingCollections[i], fileNameWithoutExtension, directories[i][0], directories[i][1]); } } - internal void LoadOrCreateThenSaveDistanceResults(Property.Models.Configuration configuration, Model model, PredictorModel predictorModel, string sourceDirectory, string outputResolution, List> sourceDirectoryChanges, PropertyHolder[] filteredPropertyHolderCollection, List> faceCollections) + internal void LoadOrCreateThenSaveDistanceResultsForOutputResolutions(Property.Models.Configuration configuration, Model model, PredictorModel predictorModel, string sourceDirectory, string outputResolution, List> sourceDirectoryChanges, PropertyHolder[] filteredPropertyHolderCollection, List> faceCollections) { if (_Configuration.CheckJsonForDistanceResults is null) throw new Exception(); @@ -265,7 +265,7 @@ internal class E_Distance check = true; } if (check) - LoadOrCreateThenSaveDistanceResults(configuration, filteredPropertyHolderCollection, faceCollections, directories); + LoadOrCreateThenSaveDistanceResultsForOutputResolutions(configuration, filteredPropertyHolderCollection, faceCollections, directories); _ = Property.Models.Stateless.IPath.DeleteEmptyDirectories(directoryInfoCollection[0].Replace("<>", "()")); } @@ -346,7 +346,7 @@ internal class E_Distance return result; } - internal void LoadOrCreateThenSaveDirectoryDistanceResults(Property.Models.Configuration configuration, Model model, PredictorModel predictorModel, string outputResolution) + internal void LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions(Property.Models.Configuration configuration, Model model, PredictorModel predictorModel, string outputResolution) { if (_Log is null) throw new Exception($"{nameof(_Log)} is null!"); @@ -366,7 +366,7 @@ internal class E_Distance { if (_Configuration.CrossDirectoryMaxItemsInDistanceCollection is null) continue; - _Log.Debug(string.Concat("LoadOrCreateThenSaveDirectoryDistanceResults - ", nameof(outputResolution), ' ', outputResolution, " - ", i, " of ", filesCount)); + _Log.Debug(string.Concat("LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions - ", nameof(outputResolution), ' ', outputResolution, " - ", i, " of ", filesCount)); for (int j = 0; j < files[i].Item2.Count; j++) { if (!matches[i].Item2.Any()) diff --git a/Instance/appsettings.Development.json b/Instance/appsettings.Development.json index 14a5b3f..dbec7cd 100644 --- a/Instance/appsettings.Development.json +++ b/Instance/appsettings.Development.json @@ -58,9 +58,6 @@ "ForceMetadataLastWriteTimeToCreationTime": false, "ForcePropertyLastWriteTimeToCreationTime": false, "ForceResizeLastWriteTimeToCreationTime": false, - "LoadOrCreateThenSaveDirectoryDistanceResults": false, - "LoadOrCreateThenSaveDistanceResults": false, - "LoadOrCreateThenSaveImageFacesResults": true, "LoadOrCreateThenSaveIndex": false, "LocationConfidenceFactor": 2, "MappedMaxIndex": 1034720, @@ -76,8 +73,8 @@ "OverrideForResizeImages": false, "PaddingLoops": 5, "Pattern": "[^ABCDEFGHIJKLMNOPQRSTUVWXYZbcdfghjklmnpqrstvwxyz0-9]", - "PredictorModelName": "Large", "PopulatePropertyId": true, + "PredictorModelName": "Large", "PropertiesChangedForDistance": false, "PropertiesChangedForFaces": false, "PropertiesChangedForIndex": false, @@ -89,7 +86,6 @@ "RootDirectory": "C:/Tmp/Phares/Compare/Images 2022-07-27 - f642c5669a1d89d598a2efd70da9dc7129d02c15 - III", "SaveFullYearOfRandomFiles": true, "SaveResizedSubFiles": true, - "SaveShortcuts": true, "SkipSearch": false, "TestDistanceResults": true, "WriteBitmapDataBytes": false, @@ -155,21 +151,30 @@ "1976-01-05_00", "1982-05-02_00" ], - "xOutputResolutions": [ + "LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions": [ + "1920 x 1080" + ], + "LoadOrCreateThenSaveDistanceResultsForOutputResolutions": [ + "1920 x 1080" + ], + "LoadOrCreateThenSaveImageFacesResultsForOutputResolutions": [ + "1920 x 1080" + ], + "OutputResolutions": [ "176 x 176", "256 x 256", "353 x 353", "1024 x 768", "1920 x 1080" ], - "OutputResolutions": [ - "1920 x 1080" - ], "PropertyContentCollectionFiles": [], "SaveFaceLandmarkForOutputResolutions": [ "176 x 176", "256 x 256" ], + "SaveShortcutsForOutputResolutions": [ + "1920 x 1080" + ], "ValidImageFormatExtensions": [ ".bmp", ".BMP", diff --git a/Instance/appsettings.Staging.json b/Instance/appsettings.Staging.json index 5e5852d..b22caa3 100644 --- a/Instance/appsettings.Staging.json +++ b/Instance/appsettings.Staging.json @@ -58,9 +58,6 @@ "ForceMetadataLastWriteTimeToCreationTime": false, "ForcePropertyLastWriteTimeToCreationTime": false, "ForceResizeLastWriteTimeToCreationTime": false, - "LoadOrCreateThenSaveDirectoryDistanceResults": false, - "LoadOrCreateThenSaveDistanceResults": false, - "LoadOrCreateThenSaveImageFacesResults": false, "LoadOrCreateThenSaveIndex": false, "LocationConfidenceFactor": 2, "MappedMaxIndex": 1034720, @@ -88,7 +85,6 @@ "RootDirectory": "E:/Images", "SaveFullYearOfRandomFiles": true, "SaveResizedSubFiles": true, - "SaveShortcuts": true, "SkipSearch": false, "TestDistanceResults": true, "WriteBitmapDataBytes": false, @@ -108,6 +104,9 @@ "176 x 176", "256 x 256" ], + "SaveShortcutsForOutputResolutions": [ + "1920 x 1080" + ], "ValidImageFormatExtensions": [ ".bmp", ".BMP", diff --git a/Instance/appsettings.json b/Instance/appsettings.json index 3ab1a4c..907c362 100644 --- a/Instance/appsettings.json +++ b/Instance/appsettings.json @@ -58,9 +58,6 @@ "ForceMetadataLastWriteTimeToCreationTime": false, "ForcePropertyLastWriteTimeToCreationTime": false, "ForceResizeLastWriteTimeToCreationTime": false, - "LoadOrCreateThenSaveDirectoryDistanceResults": true, - "LoadOrCreateThenSaveDistanceResults": true, - "LoadOrCreateThenSaveImageFacesResults": true, "LoadOrCreateThenSaveIndex": false, "LocationConfidenceFactor": 2, "MappedMaxIndex": 1034720, @@ -88,7 +85,6 @@ "RootDirectory": "D:/Images", "SaveFullYearOfRandomFiles": true, "SaveResizedSubFiles": true, - "SaveShortcuts": true, "SkipSearch": false, "TestDistanceResults": true, "WriteBitmapDataBytes": false, @@ -96,6 +92,73 @@ ".gif", ".GIF" ], + "JuliePhares": [ + "1500-01-16_00", + "1500-01-19_00", + "1500-01-20_00", + "1500-01-21_00", + "1500-01-25_00", + "1500-01-26_00", + "1500-01-27_00", + "1500-02-13_00", + "1500-02-17_00", + "1500-02-24_00", + "1500-02-25_00", + "1500-04-03_00", + "1500-04-06_00", + "1500-04-19_00", + "1500-05-03_00", + "1500-05-18_00", + "1500-05-28_00", + "1500-06-16_00", + "1500-06-26_00", + "1500-06-27_00", + "1500-07-07_00", + "1500-07-16_00", + "1720-09-30_05", + "1500-07-26_00", + "1500-08-03_00", + "1500-08-23_00", + "1500-08-24_00", + "1500-09-16_00", + "1500-09-21_00", + "1500-09-28_00", + "1500-10-14_00", + "1500-11-07_00", + "1500-11-09_00", + "1720-09-28_20", + "1501-01-08_00", + "1501-01-12_00", + "1501-01-13_00", + "1501-01-30_00", + "1501-03-09_00", + "1501-03-14_00", + "1501-03-22_00", + "1501-04-07_00", + "1501-04-10_00", + "1501-04-19_00", + "1501-05-06_00", + "1956-09-19_00", + "2012-09-17_00", + "1998-05-21_00", + "1960-03-01_00", + "1976-03-08_00", + "2007-09-07_00", + "2000-04-07_00", + "1980-01-17_00", + "1958-01-30_00", + "1976-01-05_00", + "1982-05-02_00" + ], + "LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions": [ + "1920 x 1080" + ], + "LoadOrCreateThenSaveDistanceResultsForOutputResolutions": [ + "1920 x 1080" + ], + "LoadOrCreateThenSaveImageFacesResultsForOutputResolutions": [ + "1920 x 1080" + ], "OutputResolutions": [ "176 x 176", "256 x 256", @@ -108,6 +171,9 @@ "176 x 176", "256 x 256" ], + "SaveShortcutsForOutputResolutions": [ + "1920 x 1080" + ], "ValidImageFormatExtensions": [ ".bmp", ".BMP", diff --git a/Shared/Models/Properties/IConfiguration.cs b/Shared/Models/Properties/IConfiguration.cs index 1e7acfc..a1ac3b2 100644 --- a/Shared/Models/Properties/IConfiguration.cs +++ b/Shared/Models/Properties/IConfiguration.cs @@ -6,8 +6,8 @@ // { // public bool? checkJsonForDistanceResults; -// public bool? loadOrCreateThenSaveDistanceResults; -// public bool? loadOrCreateThenSaveImageFacesResults; +// public string[] loadOrCreateThenSaveDistanceResultsForOutputResolutions; +// public string[] loadOrCreateThenSaveImageFacesResultsForOutputResolutions; // public bool? loadOrCreateThenSaveIndex; // public bool? overrideForFaceImages; // public bool? overrideForFaceLandmarkImages; diff --git a/Tests/Models/Binder/Configuration.cs b/Tests/Models/Binder/Configuration.cs index 42226c1..9ecc447 100644 --- a/Tests/Models/Binder/Configuration.cs +++ b/Tests/Models/Binder/Configuration.cs @@ -14,9 +14,9 @@ public class Configuration [Display(Name = "Ignore Extensions"), Required] public string[] IgnoreExtensions { get; set; } [Display(Name = "Ignore Relative Paths"), Required] public string[] IgnoreRelativePaths { get; set; } [Display(Name = "Julie Phares Copy Birthdays"), Required] public string[] JuliePhares { get; set; } - [Display(Name = "Load Or Create Then Save Directory Distance Results"), Required] public bool? LoadOrCreateThenSaveDirectoryDistanceResults { get; set; } - [Display(Name = "Load Or Create Then Save Distance Results"), Required] public bool? LoadOrCreateThenSaveDistanceResults { get; set; } - [Display(Name = "Load Or Create Then Save Image Faces Results"), Required] public bool? LoadOrCreateThenSaveImageFacesResults { get; set; } + [Display(Name = "Load Or Create Then Save Directory Distance Results"), Required] public string[] LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions { get; set; } + [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 = "Mapped Max Index"), Required] public int? MappedMaxIndex { get; set; } @@ -43,7 +43,7 @@ public class Configuration [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 Resized Subfiles"), Required] public bool? SaveResizedSubfiles { get; set; } - [Display(Name = "Save Shortcuts"), Required] public bool? SaveShortcuts { get; set; } + [Display(Name = "Save Shortcuts"), Required] public string[] SaveShortcutsForOutputResolutions { get; set; } [Display(Name = "Skip Search"), Required] public bool? SkipSearch { get; set; } [Display(Name = "Test Distance Results"), Required] public bool? TestDistanceResults { get; set; } [Display(Name = "Valid Resolutions"), Required] public string[] ValidResolutions { get; set; } @@ -58,9 +58,9 @@ public class Configuration IgnoreExtensions = Array.Empty(); IgnoreRelativePaths = Array.Empty(); JuliePhares = Array.Empty(); - LoadOrCreateThenSaveDirectoryDistanceResults = null; - LoadOrCreateThenSaveDistanceResults = null; - LoadOrCreateThenSaveImageFacesResults = null; + LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions = Array.Empty(); + LoadOrCreateThenSaveDistanceResultsForOutputResolutions = Array.Empty(); + LoadOrCreateThenSaveImageFacesResultsForOutputResolutions = Array.Empty(); LoadOrCreateThenSaveIndex = null; LocationConfidenceFactor = null; MappedMaxIndex = null; @@ -86,7 +86,7 @@ public class Configuration SaveFaceLandmarkForOutputResolutions = Array.Empty(); SaveFullYearOfRandomFiles = null; SaveResizedSubfiles = null; - SaveShortcuts = null; + SaveShortcutsForOutputResolutions = Array.Empty(); SkipSearch = null; TestDistanceResults = null; ValidResolutions = Array.Empty(); diff --git a/Tests/Models/Configuration.cs b/Tests/Models/Configuration.cs index 652f22a..7963e6c 100644 --- a/Tests/Models/Configuration.cs +++ b/Tests/Models/Configuration.cs @@ -14,9 +14,9 @@ public class Configuration protected readonly string[] _IgnoreExtensions; protected readonly string[] _IgnoreRelativePaths; protected readonly string[] _JuliePhares; - protected readonly bool? _LoadOrCreateThenSaveDirectoryDistanceResults; - protected readonly bool? _LoadOrCreateThenSaveDistanceResults; - protected readonly bool? _LoadOrCreateThenSaveImageFacesResults; + protected readonly string[] _LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions; + protected readonly string[] _LoadOrCreateThenSaveDistanceResultsForOutputResolutions; + protected readonly string[] _LoadOrCreateThenSaveImageFacesResultsForOutputResolutions; protected readonly bool? _LoadOrCreateThenSaveIndex; protected readonly int? _LocationConfidenceFactor; protected readonly int? _MappedMaxIndex; @@ -43,7 +43,7 @@ public class Configuration protected readonly string[] _SaveFaceLandmarkForOutputResolutions; protected readonly bool? _SaveFullYearOfRandomFiles; protected readonly bool? _SaveResizedSubfiles; - protected readonly bool? _SaveShortcuts; + protected readonly string _SaveShortcutsForOutputResolutions; protected readonly bool? _SkipSearch; protected readonly bool? _TestDistanceResults; protected readonly string[] _ValidResolutions; @@ -55,9 +55,9 @@ public class Configuration public string[] IgnoreExtensions => _IgnoreExtensions; public string[] IgnoreRelativePaths => _IgnoreRelativePaths; public string[] JuliePhares => _JuliePhares; - public bool? LoadOrCreateThenSaveDirectoryDistanceResults => _LoadOrCreateThenSaveDirectoryDistanceResults; - public bool? LoadOrCreateThenSaveDistanceResults => _LoadOrCreateThenSaveDistanceResults; - public bool? LoadOrCreateThenSaveImageFacesResults => _LoadOrCreateThenSaveImageFacesResults; + public string[] LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions => _LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions; + public string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions => _LoadOrCreateThenSaveDistanceResultsForOutputResolutions; + public string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions => _LoadOrCreateThenSaveImageFacesResultsForOutputResolutions; public bool? LoadOrCreateThenSaveIndex => _LoadOrCreateThenSaveIndex; public int? LocationConfidenceFactor => _LocationConfidenceFactor; public int? MappedMaxIndex => _MappedMaxIndex; @@ -84,13 +84,13 @@ public class Configuration public string[] SaveFaceLandmarkForOutputResolutions => _SaveFaceLandmarkForOutputResolutions; public bool? SaveFullYearOfRandomFiles => _SaveFullYearOfRandomFiles; public bool? SaveResizedSubfiles => _SaveResizedSubfiles; - public bool? SaveShortcuts => _SaveShortcuts; + public string SaveShortcutsForOutputResolutions => _SaveShortcutsForOutputResolutions; public bool? SkipSearch => _SkipSearch; public bool? TestDistanceResults => _TestDistanceResults; public string[] ValidResolutions => _ValidResolutions; [JsonConstructor] - public Configuration(bool? checkJsonForDistanceResults, int? crossDirectoryMaxItemsInDistanceCollection, int? distanceFactor, bool? forceMetadataLastWriteTimeToCreationTime, bool? forceResizeLastWriteTimeToCreationTime, string[] ignoreExtensions, string[] ignoreRelativePaths, string[] juliePhares, bool? loadOrCreateThenSaveDirectoryDistanceResults, bool? loadOrCreateThenSaveDistanceResults, bool? loadOrCreateThenSaveImageFacesResults, bool? loadOrCreateThenSaveIndex, int? locationConfidenceFactor, int? mappedMaxIndex, int? maxItemsInDistanceCollection, string[] mixedYearRelativePaths, string modelDirectory, string modelName, int? numJitters, string outputExtension, int? outputQuality, string[] outputResolutions, bool? overrideForFaceImages, bool? overrideForFaceLandmarkImages, bool? overrideForResizeImages, int? paddingLoops, string predictorModelName, bool? propertiesChangedForDistance, bool? propertiesChangedForFaces, bool? propertiesChangedForIndex, bool? propertiesChangedForMetadata, bool? propertiesChangedForResize, Property.Models.Configuration? propertyConfiguration, bool? reverse, string[] saveFaceLandmarkForOutputResolutions, bool? saveFullYearOfRandomFiles, bool? saveResizedSubfiles, bool? saveShortcuts, bool? skipSearch, bool? testDistanceResults, string[] validResolutions) + public Configuration(bool? checkJsonForDistanceResults, int? crossDirectoryMaxItemsInDistanceCollection, int? distanceFactor, bool? forceMetadataLastWriteTimeToCreationTime, bool? forceResizeLastWriteTimeToCreationTime, string[] ignoreExtensions, string[] ignoreRelativePaths, string[] juliePhares, string[] loadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions, string[] loadOrCreateThenSaveDistanceResultsForOutputResolutions, string[] loadOrCreateThenSaveImageFacesResultsForOutputResolutions, bool? loadOrCreateThenSaveIndex, int? locationConfidenceFactor, int? mappedMaxIndex, int? maxItemsInDistanceCollection, string[] mixedYearRelativePaths, string modelDirectory, string modelName, int? numJitters, string outputExtension, int? outputQuality, string[] outputResolutions, bool? overrideForFaceImages, bool? overrideForFaceLandmarkImages, bool? overrideForResizeImages, int? paddingLoops, string predictorModelName, bool? propertiesChangedForDistance, bool? propertiesChangedForFaces, bool? propertiesChangedForIndex, bool? propertiesChangedForMetadata, bool? propertiesChangedForResize, Property.Models.Configuration? propertyConfiguration, bool? reverse, string[] saveFaceLandmarkForOutputResolutions, bool? saveFullYearOfRandomFiles, bool? saveResizedSubfiles, string saveShortcutsForOutputResolutions, bool? skipSearch, bool? testDistanceResults, string[] validResolutions) { _CheckJsonForDistanceResults = checkJsonForDistanceResults; _CrossDirectoryMaxItemsInDistanceCollection = crossDirectoryMaxItemsInDistanceCollection; @@ -100,9 +100,9 @@ public class Configuration _IgnoreExtensions = ignoreExtensions; _IgnoreRelativePaths = ignoreRelativePaths; _JuliePhares = juliePhares; - _LoadOrCreateThenSaveDirectoryDistanceResults = loadOrCreateThenSaveDirectoryDistanceResults; - _LoadOrCreateThenSaveDistanceResults = loadOrCreateThenSaveDistanceResults; - _LoadOrCreateThenSaveImageFacesResults = loadOrCreateThenSaveImageFacesResults; + _LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions = loadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions; + _LoadOrCreateThenSaveDistanceResultsForOutputResolutions = loadOrCreateThenSaveDistanceResultsForOutputResolutions; + _LoadOrCreateThenSaveImageFacesResultsForOutputResolutions = loadOrCreateThenSaveImageFacesResultsForOutputResolutions; _LoadOrCreateThenSaveIndex = loadOrCreateThenSaveIndex; _LocationConfidenceFactor = locationConfidenceFactor; _MappedMaxIndex = mappedMaxIndex; @@ -129,7 +129,7 @@ public class Configuration _SaveFaceLandmarkForOutputResolutions = saveFaceLandmarkForOutputResolutions; _SaveFullYearOfRandomFiles = saveFullYearOfRandomFiles; _SaveResizedSubfiles = saveResizedSubfiles; - _SaveShortcuts = saveShortcuts; + _SaveShortcutsForOutputResolutions = saveShortcutsForOutputResolutions; _SkipSearch = skipSearch; _TestDistanceResults = testDistanceResults; _ValidResolutions = validResolutions; diff --git a/Tests/appsettings.Development.json b/Tests/appsettings.Development.json index 59afabe..5c3d965 100644 --- a/Tests/appsettings.Development.json +++ b/Tests/appsettings.Development.json @@ -58,9 +58,6 @@ "ForceMetadataLastWriteTimeToCreationTime": true, "ForcePropertyLastWriteTimeToCreationTime": false, "ForceResizeLastWriteTimeToCreationTime": true, - "LoadOrCreateThenSaveDirectoryDistanceResults": false, - "LoadOrCreateThenSaveDistanceResults": false, - "LoadOrCreateThenSaveImageFacesResults": true, "LoadOrCreateThenSaveIndex": false, "LocationConfidenceFactor": 2, "MappedMaxIndex": 1034720, @@ -89,7 +86,6 @@ "RootDirectory": "F:/Tmp/Phares/Compare/Images 2022-07-27 - f642c5669a1d89d598a2efd70da9dc7129d02c15 - III", "SaveFullYearOfRandomFiles": true, "SaveResizedSubFiles": true, - "SaveShortcuts": true, "SkipSearch": false, "TestDistanceResults": true, "WriteBitmapDataBytes": false, @@ -155,21 +151,30 @@ "1976-01-05_00", "1982-05-02_00" ], - "xOutputResolutions": [ + "LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions": [ + "1920 x 1080" + ], + "LoadOrCreateThenSaveDistanceResultsForOutputResolutions": [ + "1920 x 1080" + ], + "LoadOrCreateThenSaveImageFacesResultsForOutputResolutions": [ + "1920 x 1080" + ], + "OutputResolutions": [ "176 x 176", "256 x 256", "353 x 353", "1024 x 768", "1920 x 1080" ], - "OutputResolutions": [ - "1920 x 1080" - ], "PropertyContentCollectionFiles": [], "SaveFaceLandmarkForOutputResolutions": [ "176 x 176", "256 x 256" ], + "SaveShortcutsForOutputResolutions": [ + "1920 x 1080" + ], "ValidImageFormatExtensions": [ ".bmp", ".BMP", diff --git a/Tests/appsettings.json b/Tests/appsettings.json index 3ab1a4c..907c362 100644 --- a/Tests/appsettings.json +++ b/Tests/appsettings.json @@ -58,9 +58,6 @@ "ForceMetadataLastWriteTimeToCreationTime": false, "ForcePropertyLastWriteTimeToCreationTime": false, "ForceResizeLastWriteTimeToCreationTime": false, - "LoadOrCreateThenSaveDirectoryDistanceResults": true, - "LoadOrCreateThenSaveDistanceResults": true, - "LoadOrCreateThenSaveImageFacesResults": true, "LoadOrCreateThenSaveIndex": false, "LocationConfidenceFactor": 2, "MappedMaxIndex": 1034720, @@ -88,7 +85,6 @@ "RootDirectory": "D:/Images", "SaveFullYearOfRandomFiles": true, "SaveResizedSubFiles": true, - "SaveShortcuts": true, "SkipSearch": false, "TestDistanceResults": true, "WriteBitmapDataBytes": false, @@ -96,6 +92,73 @@ ".gif", ".GIF" ], + "JuliePhares": [ + "1500-01-16_00", + "1500-01-19_00", + "1500-01-20_00", + "1500-01-21_00", + "1500-01-25_00", + "1500-01-26_00", + "1500-01-27_00", + "1500-02-13_00", + "1500-02-17_00", + "1500-02-24_00", + "1500-02-25_00", + "1500-04-03_00", + "1500-04-06_00", + "1500-04-19_00", + "1500-05-03_00", + "1500-05-18_00", + "1500-05-28_00", + "1500-06-16_00", + "1500-06-26_00", + "1500-06-27_00", + "1500-07-07_00", + "1500-07-16_00", + "1720-09-30_05", + "1500-07-26_00", + "1500-08-03_00", + "1500-08-23_00", + "1500-08-24_00", + "1500-09-16_00", + "1500-09-21_00", + "1500-09-28_00", + "1500-10-14_00", + "1500-11-07_00", + "1500-11-09_00", + "1720-09-28_20", + "1501-01-08_00", + "1501-01-12_00", + "1501-01-13_00", + "1501-01-30_00", + "1501-03-09_00", + "1501-03-14_00", + "1501-03-22_00", + "1501-04-07_00", + "1501-04-10_00", + "1501-04-19_00", + "1501-05-06_00", + "1956-09-19_00", + "2012-09-17_00", + "1998-05-21_00", + "1960-03-01_00", + "1976-03-08_00", + "2007-09-07_00", + "2000-04-07_00", + "1980-01-17_00", + "1958-01-30_00", + "1976-01-05_00", + "1982-05-02_00" + ], + "LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions": [ + "1920 x 1080" + ], + "LoadOrCreateThenSaveDistanceResultsForOutputResolutions": [ + "1920 x 1080" + ], + "LoadOrCreateThenSaveImageFacesResultsForOutputResolutions": [ + "1920 x 1080" + ], "OutputResolutions": [ "176 x 176", "256 x 256", @@ -108,6 +171,9 @@ "176 x 176", "256 x 256" ], + "SaveShortcutsForOutputResolutions": [ + "1920 x 1080" + ], "ValidImageFormatExtensions": [ ".bmp", ".BMP",