Removed some verbose logging

Added inputinformation to remove duplicated code
Apparently parallel for over y is faster then over x
Added stopwatches

Author: devedse

Devedse.DeveImagePyramid/Devedse.DeveImagePyramid.csproj

@@ -69,6 +69,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FileExtensionHelper.cs" />
+    <Compile Include="InputInformation.cs" />
     <Compile Include="Logging\Appenders\DateTimeLoggerAppender.cs" />
     <Compile Include="Logging\Appenders\LoggingLevelLoggerAppender.cs" />
     <Compile Include="Logging\ConsoleLogger.cs" />

Devedse.DeveImagePyramid/ImageWriter.cs

@@ -106,7 +106,7 @@ private void WriteImageTiff(string path, PretzelImage pretzelImage)
 
         private void WriteImagePng(string path, PretzelImage pretzelImage)
         {
-            _logger.Write($"{System.Threading.Thread.CurrentThread.ManagedThreadId} - Writing image Png: {path}, PretzelImage.Width: {pretzelImage.Width} PretzelImage.Height: {pretzelImage.Height} PretzelImage.Data.Length: {pretzelImage.Data.Length}", LogLevel.Verbose);
+            //_logger.Write($"{System.Threading.Thread.CurrentThread.ManagedThreadId} - Writing image Png: {path}, PretzelImage.Width: {pretzelImage.Width} PretzelImage.Height: {pretzelImage.Height} PretzelImage.Data.Length: {pretzelImage.Data.Length}", LogLevel.Verbose);
 
             using (var image = new Bitmap(pretzelImage.Width, pretzelImage.Height, PixelFormat.Format24bppRgb))
             {

Devedse.DeveImagePyramid/InputInformation.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Devedse.DeveImagePyramid
+{
+    class InputInformation
+    {
+        public int AmountOfFiles { get; set; }
+        public string FoundExtension { get; set; }
+    }
+}

Devedse.DeveImagePyramid/Program.cs

@@ -29,18 +29,23 @@ private static void ExecuteImagePyramidGeneration(bool useDifferentFileNamesForL
         {
             using (var logger = CreateLogger(useDifferentFileNamesForLogs))
             {
+                var w = Stopwatch.StartNew();
+
                 var retryHandler = new RetryHandler(logger);
                 var imageReader = new ImageReader(logger);
                 var imageWriter = new ImageWriter(retryHandler, logger);
                 var pyramidCreator = new PyramidCreator(imageWriter, imageReader, logger);
 
 
                 logger.Write($"Starting generation of lowest level folder (+ conversion to {desiredExtension})", color: ConsoleColor.Yellow);
+                var wMoveInput = Stopwatch.StartNew();
                 int deepestFolderNumber = pyramidCreator.MoveInputToOutputAndConvert(inputFolder, outputFolder, desiredExtension, useParallel);
+                wMoveInput.Stop();
                 logger.Write("Done with generation of lowest level.", color: ConsoleColor.Green);
                 logger.EmptyLine();
 
                 logger.Write("Starting the scaling process...");
+                var wPyramid = Stopwatch.StartNew();
                 for (int i = deepestFolderNumber - 1; i >= 1; i--)
                 {
                     var destFolder = Path.Combine(outputFolder, i.ToString());
@@ -51,7 +56,12 @@ private static void ExecuteImagePyramidGeneration(bool useDifferentFileNamesForL
                     logger.Write($"Done with scale {i}", color: ConsoleColor.Green);
                     logger.EmptyLine();
                 }
+                wPyramid.Stop();
 
+                logger.Write("Time taken for moving and converting input: " + wMoveInput.Elapsed);
+                logger.Write("Time taken for creating pyramid: " + wPyramid.Elapsed);
+                logger.Write("Total time taken: " + w.Elapsed);
+                logger.EmptyLine();
                 logger.Write("Completed, press any key to continue...");
                 Console.ReadKey();
             }

Devedse.DeveImagePyramid/PyramidCreator.cs

@@ -25,37 +25,13 @@ public int MoveInputToOutputAndConvert(string inputFolder, string outputFolder,
         {
             _logger.Write("Counting all files from input directory...");
 
-            var filesInDirectoryEnumerable = Directory.EnumerateFiles(inputFolder).Where(t => FileExtensionHelper.IsValidImageFileExtension(Path.GetExtension(t)));
-
-            var filesInInputCount = 0;
-            var foundExtensions = new HashSet<string>();
-
-            foreach (var foundFile in filesInDirectoryEnumerable)
-            {
-                filesInInputCount++;
-
-                var extension = Path.GetExtension(foundFile);
-                foundExtensions.Add(extension);
-            }
+            var inputInformation = GetInputInformation(inputFolder);
 
-            _logger.Write($"Found {filesInInputCount} files in {inputFolder}");
-
-            if (foundExtensions.Count != 1)
-            {
-                var exceptionString = $"Did not find exactly 1 file extension. Found '{foundExtensions.Count}' extensions instead. Extensions: {string.Join(",", foundExtensions)}.";
-                _logger.WriteError(exceptionString, LogLevel.Exception);
-                throw new InvalidOperationException(exceptionString);
-            }
-
-            var foundExtension = foundExtensions.Single();
-
-            _logger.Write($"Found extension: '{foundExtension}'");
-
-            var firstImageFileName = $"0_0{foundExtension}";
+            var firstImageFileName = $"0_0{inputInformation.FoundExtension}";
             var firstImagePath = Path.Combine(inputFolder, firstImageFileName);
             var firstImage = _imageReader.ReadImage(firstImagePath);
 
-            int filesInWidthAndHeight = (int)Math.Sqrt(filesInInputCount);
+            int filesInWidthAndHeight = (int)Math.Sqrt(inputInformation.AmountOfFiles);
             int sizeInWidthAndHeight = filesInWidthAndHeight * firstImage.Width;
 
             int deepestFolderNumber = (int)Math.Log(sizeInWidthAndHeight, 2);
@@ -65,7 +41,7 @@ public int MoveInputToOutputAndConvert(string inputFolder, string outputFolder,
             Directory.CreateDirectory(outputForThis);
             var fileConversionAction = new Action<int, int>((x, y) =>
             {
-                var justFileName = $"{x}_{y}{foundExtension}";
+                var justFileName = $"{x}_{y}{inputInformation.FoundExtension}";
                 var filePath = Path.Combine(inputFolder, justFileName);
 
                 var readImage = _imageReader.ReadImage(filePath);
@@ -80,17 +56,18 @@ public int MoveInputToOutputAndConvert(string inputFolder, string outputFolder,
 
             _logger.Write("Starting conversion/copy of images...", color: ConsoleColor.Yellow);
 
-            var expectedFilesInOutput = filesInInputCount;
+            var expectedFilesInOutput = inputInformation.AmountOfFiles;
             var filesInWidth = (int)Math.Sqrt(expectedFilesInOutput);
             var filesInHeight = (int)Math.Sqrt(expectedFilesInOutput);
 
             if (useParallel)
             {
-
-                for (int y = 0; y < filesInHeight; y++)
+                //In some quick tests it seemed to be faster to do the parallel loop on the y then on the x.
+                //Either way the inner loop should be parallelized, not the outer loop. This is to work around strange threading errors.
+                for (int x = 0; x < filesInWidth; x++)
                 {
-                    int localY = y;
-                    Parallel.For(0, filesInWidth, (x) => fileConversionAction(x, localY));
+                    int localX = x;
+                    Parallel.For(0, filesInHeight, (y) => fileConversionAction(localX, y));
                 }
             }
             else
@@ -113,38 +90,7 @@ public void CreatePyramid(string inputFolder, string outputFolder, string desire
         {
             _logger.Write("Counting all files from input directory...");
 
-            var allFilesInInputEnumerable = Directory.EnumerateFiles(inputFolder).Where(t => FileExtensionHelper.IsValidImageFileExtension(Path.GetExtension(t)));
-
-            var filesInInputCount = 0;
-            var foundExtensions = new HashSet<string>();
-
-            foreach (var foundFile in allFilesInInputEnumerable)
-            {
-                filesInInputCount++;
-
-                var extension = Path.GetExtension(foundFile);
-                foundExtensions.Add(extension);
-            }
-
-            _logger.Write($"Found {filesInInputCount} files in {inputFolder}");
-
-            if (foundExtensions.Count != 1)
-            {
-                var exceptionString = $"Did not find exactly 1 file extension. Found '{foundExtensions.Count}' extensions instead. Extensions: {string.Join(",", foundExtensions)}.";
-                _logger.WriteError(exceptionString, LogLevel.Exception);
-                throw new InvalidOperationException(exceptionString);
-            }
-
-            var foundExtension = foundExtensions.Single();
-
-            _logger.Write($"Found extension: '{foundExtension}'");
-
-            if (!MathHelper.IsPowerOfTwo(filesInInputCount))
-            {
-                var exceptionString = "Amount of files in input directory is not a power of 2";
-                _logger.WriteError(exceptionString, LogLevel.Exception);
-                throw new InvalidOperationException(exceptionString);
-            }
+            var inputInformation = GetInputInformation(inputFolder);
 
             _logger.Write($"Creating output directory: '{outputFolder}'");
             Directory.CreateDirectory(outputFolder);
@@ -153,24 +99,24 @@ public void CreatePyramid(string inputFolder, string outputFolder, string desire
 
             _logger.Write("Starting scaling of images...", color: ConsoleColor.Yellow);
 
-            if (filesInInputCount == 1)
+            if (inputInformation.AmountOfFiles == 1)
             {
-                var inputFileName = $"0_0{foundExtension}";
+                var inputFileName = $"0_0{inputInformation.FoundExtension}";
                 var inputTotalPath = Path.Combine(inputFolder, inputFileName);
                 var singleImage = _imageReader.ReadImage(inputTotalPath);
 
                 var combinedImage = new PretzelImageCombined(singleImage);
                 var scaledCombinedImage = ImageZoomOuter.ScaleV2(combinedImage);
 
-                var outputFileName = $"0_0{foundExtension}";
+                var outputFileName = $"0_0{inputInformation.FoundExtension}";
                 var outputTotalPath = Path.Combine(outputFolder, outputFileName);
 
                 _logger.Write($"Writing scaled: {Path.Combine(folderName, outputFileName)}", LogLevel.Verbose);
                 _imageWriter.WriteImage(outputTotalPath, scaledCombinedImage);
             }
             else
             {
-                var expectedFilesInOutput = filesInInputCount / 4;
+                var expectedFilesInOutput = inputInformation.AmountOfFiles / 4;
                 //var filesInWidth = (int)Math.Sqrt(expectedFilesInOutput);
                 var filesInHeight = (int)Math.Sqrt(expectedFilesInOutput);
 
@@ -179,10 +125,10 @@ public void CreatePyramid(string inputFolder, string outputFolder, string desire
                     int xStart = (i % filesInHeight) * 2;
                     int yStart = (i / filesInHeight) * 2;
 
-                    var topLeftFileName = $"{xStart}_{yStart}{foundExtension}";
-                    var bottomLeftFileName = $"{xStart}_{yStart + 1}{foundExtension}";
-                    var topRightFileName = $"{xStart + 1}_{yStart}{foundExtension}";
-                    var bottomRightFileName = $"{xStart + 1}_{yStart + 1}{foundExtension}";
+                    var topLeftFileName = $"{xStart}_{yStart}{inputInformation.FoundExtension}";
+                    var bottomLeftFileName = $"{xStart}_{yStart + 1}{inputInformation.FoundExtension}";
+                    var topRightFileName = $"{xStart + 1}_{yStart}{inputInformation.FoundExtension}";
+                    var bottomRightFileName = $"{xStart + 1}_{yStart + 1}{inputInformation.FoundExtension}";
 
                     var topLeftTotalPath = Path.Combine(inputFolder, topLeftFileName);
                     var bottomLeftTotalPath = Path.Combine(inputFolder, bottomLeftFileName);
@@ -219,5 +165,43 @@ public void CreatePyramid(string inputFolder, string outputFolder, string desire
 
             _logger.Write("Completed scaling of images.", color: ConsoleColor.Green);
         }
+
+        private InputInformation GetInputInformation(string inputFolder)
+        {
+            var filesInDirectoryEnumerable = Directory.EnumerateFiles(inputFolder).Where(t => FileExtensionHelper.IsValidImageFileExtension(Path.GetExtension(t)));
+
+            var filesInInputCount = 0;
+            var foundExtensions = new HashSet<string>();
+
+            foreach (var foundFile in filesInDirectoryEnumerable)
+            {
+                filesInInputCount++;
+
+                var extension = Path.GetExtension(foundFile);
+                foundExtensions.Add(extension);
+            }
+
+            _logger.Write($"Found {filesInInputCount} files in {inputFolder}");
+
+            if (foundExtensions.Count != 1)
+            {
+                var exceptionString = $"Did not find exactly 1 file extension. Found '{foundExtensions.Count}' extensions instead. Extensions: {string.Join(",", foundExtensions)}.";
+                _logger.WriteError(exceptionString, LogLevel.Exception);
+                throw new InvalidOperationException(exceptionString);
+            }
+
+            var foundExtension = foundExtensions.Single();
+
+            _logger.Write($"Found extension: '{foundExtension}'");
+
+            if (!MathHelper.IsPowerOfTwo(filesInInputCount))
+            {
+                var exceptionString = "Amount of files in input directory is not a power of 2";
+                _logger.WriteError(exceptionString, LogLevel.Exception);
+                throw new InvalidOperationException(exceptionString);
+            }
+
+            return new InputInformation { AmountOfFiles = filesInInputCount, FoundExtension = foundExtension };
+        }
     }
 }