adjusted namespaces and made separate data dir

Examples/CLI/Properties/launchSettings.json

@@ -6,7 +6,8 @@
     },
     "Test all img": {
       "commandName": "Project",
-      "commandLineArgs": "\"img/*.png\""
+      "commandLineArgs": "\"img/*.png\"",
+      "workingDirectory": "D:\\git\\BA\\Examples\\testdata"
     },
     "Test single img": {
       "commandName": "Project",

Examples/Common/ScreenshotScanner.cs

@@ -3,14 +3,14 @@ using Lookup.Memory;
 using Ocr.Tesseract.Models;
 using Process.Interface;
 
-namespace Common
+namespace Common;
+
+/// <summary>
+/// Scanner class, scanning <see cref="MagickImage"/>s for <see cref="Word"/>s
+/// via optical character recognition. Optimized for digital Screenshots.
+/// </summary>
+public class ScreenshotScanner
 {
-  /// <summary>
-  /// Scanner class, scanning <see cref="MagickImage"/>s for <see cref="Word"/>s
-  /// via optical character recognition. Optimized for digital Screenshots.
-  /// </summary>
-  public class ScreenshotScanner
-  {
   /// <summary>
   /// The screenshot processor
   /// </summary>
@@ -47,5 +47,4 @@ namespace Common
   {
     Lookup.Clear();
   }
-  }
 }

Examples/GUI/App.xaml.cs

@@ -3,13 +3,13 @@ using GUI.Views;
 using Serilog;
 using System.Windows;
 
-namespace GUI
+namespace GUI;
+
+/// <summary>
+/// Interaction logic for App.xaml
+/// </summary>
+public partial class App : Application
 {
-  /// <summary>
-  /// Interaction logic for App.xaml
-  /// </summary>
-  public partial class App : Application
-  {
   /// <inheritdoc />
   protected override void OnStartup(StartupEventArgs e)
   {
@@ -23,5 +23,4 @@ namespace GUI
     new LogView(loggingCollection).Show();
     new ImageView().Show();
   }
-  }
 }

Examples/GUI/Controls/ImageControl.xaml.cs

@@ -2,13 +2,13 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace GUI.Controls
+namespace GUI.Controls;
+
+/// <summary>
+/// Interaction logic for ImageControl.xaml
+/// </summary>
+public partial class ImageControl : UserControl
 {
-  /// <summary>
-  /// Interaction logic for ImageControl.xaml
-  /// </summary>
-  public partial class ImageControl : UserControl
-  {
   /// <inheritdoc cref="Image"/>
   public static readonly DependencyProperty ImageProperty = DependencyProperty.Register(
     nameof(Image), typeof(MagickImage), typeof(ImageControl), new PropertyMetadata(default(MagickImage)));
@@ -41,5 +41,4 @@ namespace GUI.Controls
   {
     InitializeComponent();
   }
-  }
 }

Examples/GUI/Converters/ImageConverter.cs

@@ -6,10 +6,10 @@ using System.IO;
 using System.Windows.Data;
 using System.Windows.Media.Imaging;
 
-namespace GUI.Converters
+namespace GUI.Converters;
+
+internal class ImageConverter : IValueConverter
 {
-  internal class ImageConverter : IValueConverter
-  {
   #region Implementation of IValueConverter
 
   /// <inheritdoc />
@@ -50,5 +50,4 @@ namespace GUI.Converters
   }
 
   #endregion
-  }
 }

Examples/GUI/ViewModels/LogViewModel.cs

@@ -1,12 +1,11 @@
-namespace GUI.ViewModels
+namespace GUI.ViewModels;
+
+public class LogViewModel
 {
-  public class LogViewModel
-  {
   public LoggingCollection LoggingCollection { get; }
 
   public LogViewModel(LoggingCollection loggingCollection)
   {
     LoggingCollection = loggingCollection;
   }
-  }
 }

Examples/GUI/Views/ImageView.xaml.cs

@@ -5,13 +5,13 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 
-namespace GUI.Views
+namespace GUI.Views;
+
+/// <summary>
+/// Interaction logic for MainWindow.xaml
+/// </summary>
+public partial class ImageView : Window
 {
-  /// <summary>
-  /// Interaction logic for MainWindow.xaml
-  /// </summary>
-  public partial class ImageView : Window
-  {
   private ImageViewModel ViewModel => (ImageViewModel)DataContext;
 
   public ImageView()
@@ -44,5 +44,4 @@ namespace GUI.Views
     var vm = ViewModel;
     vm.ProcessorConfig.Border = (int)Math.Round(((Slider)sender).Value);
   }
-  }
 }

Examples/GUI/Views/LogView.xaml.cs

@@ -1,17 +1,16 @@
 using GUI.ViewModels;
 using System.Windows;
 
-namespace GUI.Views
+namespace GUI.Views;
+
+/// <summary>
+/// Interaction logic for LogView.xaml
+/// </summary>
+public partial class LogView : Window
 {
-  /// <summary>
-  /// Interaction logic for LogView.xaml
-  /// </summary>
-  public partial class LogView : Window
-  {
   public LogView(LoggingCollection loggingCollection)
   {
     InitializeComponent();
     DataContext = new LogViewModel(loggingCollection);
   }
-  }
 }

Examples/ReportGenerator/Program.cs

@@ -1,5 +1,4 @@
 using ReportGenerator.Models;
-using System.Text;
 
 namespace ReportGenerator;
 
@@ -15,19 +14,15 @@ internal static class Program
 
     // Parse
 
-    Console.WriteLine("Evaluating");
+    Console.WriteLine("Generating report");
     var scans = Scan(tagFileInfos, scanFileInfos);
-    var report = Table.ReportGenerator
+    var report = ReportGenerator
       .FromData(scans)
       .WithTitle("OCR Report")
       .WithBestOf("Best of")
-      .WithFullStatistic("Statistic")
-      .ToString();
+      .WithFullStatistic("Statistic");
 
-    // Generate output file
-
-    Console.WriteLine("Generating report");
-    File.WriteAllText("Report.md", report, Encoding.UTF8);
+    report.ToFile("Report.md");
 
     Console.WriteLine("Completed");
   }
@@ -48,7 +43,6 @@ internal static class Program
     }
   }
 
-
   private static IEnumerable<TagFileInfo> GetTagFileInfos(string dir)
   {
     if (!Directory.Exists(dir))

Examples/ReportGenerator/Properties/launchSettings.json

@@ -3,7 +3,7 @@
     "ReportGenerator": {
       "commandName": "Project",
       "commandLineArgs": "\"img\" \"results\"",
-      "workingDirectory": "D:\\git\\BA\\Examples\\CLI\\bin\\Debug\\net6.0"
+      "workingDirectory": "D:\\git\\BA\\Examples\\testdata"
     }
   }
 }

Examples/ReportGenerator/ReportGenerator.cs

@@ -0,0 +1,174 @@
+using Common.Extensions;
+using ReportGenerator.Models;
+using System.Text;
+
+namespace ReportGenerator;
+
+public class ReportGenerator
+{
+  private ICollection<ImageStats> Images { get; }
+
+  private readonly StringBuilder _sb = new();
+
+  private ReportGenerator(IEnumerable<ImageStats> stats) => Images = stats.ToArray();
+
+  public void ToFile(string path) =>
+    File.WriteAllText(path, ToString(), Encoding.UTF8);
+
+  /// <inheritdoc />
+  public override string ToString() =>
+    _sb.ToString();
+
+  #region Fluent definition
+
+  public ReportGenerator WithTitle(string text)
+  {
+    _sb.AppendHeading(1, text);
+    return this;
+  }
+
+  public ReportGenerator WithFullStatistic(string title)
+  {
+    _sb.AppendHeading(2, title);
+
+    foreach (var stat in Images)
+    {
+      _sb.AppendHeading(3, stat.ImageName);
+      _sb.AppendParagraph(HtmlImage(Path.Combine("img", stat.ImageName), 350, 350));
+
+      AppendRow(stat
+        .Reference
+        .Prepend("Image")
+        .Prepend("CER (avg)")
+        .Prepend("WER")
+        .Prepend("Elapsed")
+        .Prepend("Processor")
+      );
+
+      AppendRowSeparator(stat.Reference.Count + 5);
+
+      var processors = stat.Processors
+        .OrderBy(s => s.Distance)
+        .ThenBy(s => s.ProcessingTime);
+
+      foreach (var processor in processors)
+      {
+        var imgPath = Path.Combine("results", $"{processor.Name}.00.{stat.ImageName}.png");
+
+        AppendRow(processor.Words
+          .Select(s => s.ToString() ?? string.Empty)
+          .Prepend(HtmlImage(imgPath, 150, 150))
+          .Prepend(processor.Words.Average(s => s.Distance).ToString("F2"))
+          .Prepend($"{processor.Distance * 100:F1}%")
+          .Prepend($"{processor.ProcessingTime * 1000:F1}ms")
+          .Prepend(processor.Name)
+        );
+      }
+
+      _sb.AppendLine();
+      _sb.AppendParagraph(
+        $"*Comparison data generated based on {stat.Reference.Count} tagged words.*"
+      );
+    }
+
+    return this;
+  }
+
+
+  public ReportGenerator WithBestOf(string title, int context = 5)
+  {
+    _sb.AppendHeading(2, title);
+
+    var lookup = Images
+      .SelectMany(s => s.Processors)
+      .ToLookup(p => p.Name);
+
+    // Compare time across all images
+    var byTime = lookup
+      .Select(g => (Name: g.Key, Value: g.Average(p => p.ProcessingTime) * 1000))
+      .OrderBy(g => g.Value);
+
+    // Compare WER across all images
+    var byWer = lookup
+      .Select(g => (Name: g.Key, Value: g.Average(p => p.Distance) * 100))
+      .OrderBy(g => g.Value);
+
+    // Compare CER across all images
+    var byCer = lookup
+      .Select(g => (Name: g.Key, Value: g.Average(p => p.Words.Average(w => w.Distance))))
+      .OrderBy(g => g.Value);
+
+    // Print
+    AppendComparison(3, "Time", byTime, " ms");
+    AppendComparison(3, "WER", byWer, " %");
+    AppendComparison(3, "CER", byCer, " changes");
+
+    return this;
+
+    void AppendComparison(
+      int level,
+      string tableTitle,
+      IEnumerable<(string, double)> values,
+      string valueUnit = ""
+    )
+    {
+      var tValues = values.ToArray();
+      var tContext = Math.Min(tValues.Length / 2, context);
+
+      _sb.AppendHeading(level, tableTitle);
+
+      AppendRow(new[] { "Processor", "Average" });
+      AppendRowSeparator(2);
+      AppendRows(tValues.Take(tContext).Select(v => new[]
+      {
+        v.Item1,
+        v.Item2.ToString("F2") + valueUnit
+      }));
+      AppendRowSeparator(2, "...");
+      AppendRows(tValues.TakeLast(tContext).Select(v => new[]
+      {
+        v.Item1,
+        v.Item2.ToString("F2") + valueUnit
+      }));
+    }
+  }
+
+  #endregion
+
+  #region Helpers
+
+  private void AppendRow(IEnumerable<string> row)
+  {
+    const string separator = " | ";
+    _sb.AppendLine(separator + string.Join(" | ", row) + separator);
+  }
+
+  private void AppendRows(IEnumerable<IEnumerable<string>> rows)
+  {
+    foreach (var row in rows)
+    {
+      AppendRow(row);
+    }
+  }
+
+  private static string HtmlImage(string path, int maxWidth, int maxHeight)
+  {
+    if (!path.EndsWith(".png"))
+    {
+      path += ".png";
+    }
+
+    return $"<img src=\"{path}\" style=\"max-width:{maxWidth}px;max-height:{maxHeight}px;\" />";
+  }
+
+  private void AppendRowSeparator(int columns, string content = "---") =>
+    AppendRow(Enumerable.Range(0, columns).Select(_ => content));
+
+  #endregion
+
+  #region Factory Methods
+
+  public static ReportGenerator FromData(IEnumerable<ImageStats> stats) => new(stats);
+
+  #endregion
+}

Examples/ReportGenerator/ReportGenerator.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

Examples/ReportGenerator/Table/ReportGenerator.cs

@@ -1,171 +0,0 @@
-using Common.Extensions;
-using ReportGenerator.Models;
-using System.Text;
-
-namespace ReportGenerator.Table
-{
-  public class ReportGenerator
-  {
-    private ICollection<ImageStats> Images { get; }
-
-    private readonly StringBuilder _sb = new();
-
-    private ReportGenerator(IEnumerable<ImageStats> stats) => Images = stats.ToArray();
-
-    /// <inheritdoc />
-    public override string ToString() => _sb.ToString();
-
-    #region Fluent definition
-
-    public ReportGenerator WithTitle(string text)
-    {
-      _sb.AppendHeading(1, text);
-      return this;
-    }
-
-    public ReportGenerator WithFullStatistic(string title)
-    {
-      _sb.AppendHeading(2, title);
-
-      foreach (var stat in Images)
-      {
-        _sb.AppendHeading(3, stat.ImageName);
-        _sb.AppendParagraph(HtmlImage(Path.Combine("img", stat.ImageName), 350, 350));
-
-        AppendRow(stat
-          .Reference
-          .Prepend("Image")
-          .Prepend("CER (avg)")
-          .Prepend("WER")
-          .Prepend("Elapsed")
-          .Prepend("Processor")
-        );
-
-        AppendRowSeparator(stat.Reference.Count + 5);
-
-        var processors = stat.Processors
-          .OrderBy(s => s.Distance)
-          .ThenBy(s => s.ProcessingTime);
-
-        foreach (var processor in processors)
-        {
-          var imgPath = Path.Combine("results", $"{processor.Name}.00.{stat.ImageName}.png");
-
-          AppendRow(processor.Words
-            .Select(s => s.ToString() ?? string.Empty)
-            .Prepend(HtmlImage(imgPath, 150, 150))
-            .Prepend(processor.Words.Average(s => s.Distance).ToString("F2"))
-            .Prepend($"{processor.Distance * 100:F1}%")
-            .Prepend($"{processor.ProcessingTime * 1000:F1}ms")
-            .Prepend(processor.Name)
-          );
-        }
-
-        _sb.AppendLine();
-        _sb.AppendParagraph(
-          $"*Comparison data generated based on {stat.Reference.Count} tagged words.*"
-        );
-      }
-
-      return this;
-    }
-
-
-    public ReportGenerator WithBestOf(string title, int context = 5)
-    {
-      _sb.AppendHeading(2, title);
-
-      var lookup = Images
-        .SelectMany(s => s.Processors)
-        .ToLookup(p => p.Name);
-
-      // Compare time across all images
-      var byTime = lookup
-        .Select(g => (Name: g.Key, Value: g.Average(p => p.ProcessingTime) * 1000))
-        .OrderBy(g => g.Value);
-
-      // Compare WER across all images
-      var byWer = lookup
-        .Select(g => (Name: g.Key, Value: g.Average(p => p.Distance) * 100))
-        .OrderBy(g => g.Value);
-
-      // Compare CER across all images
-      var byCer = lookup
-        .Select(g => (Name: g.Key, Value: g.Average(p => p.Words.Average(w => w.Distance))))
-        .OrderBy(g => g.Value);
-
-      // Print
-      AppendComparison(3, "Time", byTime, " ms");
-      AppendComparison(3, "WER", byWer, " %");
-      AppendComparison(3, "CER", byCer, " changes");
-
-      return this;
-
-      void AppendComparison(
-        int level,
-        string tableTitle,
-        IEnumerable<(string, double)> values,
-        string valueUnit = ""
-      )
-      {
-        var tValues = values.ToArray();
-        var tContext = Math.Min(tValues.Length / 2, context);
-
-        _sb.AppendHeading(level, tableTitle);
-
-        AppendRow(new[] { "Processor", "Average" });
-        AppendRowSeparator(2);
-        AppendRows(tValues.Take(tContext).Select(v => new[]
-        {
-          v.Item1,
-          v.Item2.ToString("F2") + valueUnit
-        }));
-        AppendRowSeparator(2, "...");
-        AppendRows(tValues.TakeLast(tContext).Select(v => new[]
-        {
-          v.Item1,
-          v.Item2.ToString("F2") + valueUnit
-        }));
-      }
-    }
-
-    #endregion
-
-    #region Helpers
-
-    private void AppendRow(IEnumerable<string> row)
-    {
-      const string separator = " | ";
-      _sb.AppendLine(separator + string.Join(" | ", row) + separator);
-    }
-
-    private void AppendRows(IEnumerable<IEnumerable<string>> rows)
-    {
-      foreach (var row in rows)
-      {
-        AppendRow(row);
-      }
-    }
-
-    private static string HtmlImage(string path, int maxWidth, int maxHeight)
-    {
-      if (!path.EndsWith(".png"))
-      {
-        path += ".png";
-      }
-
-      return $"<img src=\"{path}\" style=\"max-width:{maxWidth}px;max-height:{maxHeight}px;\" />";
-    }
-
-    private void AppendRowSeparator(int columns, string content = "---") =>
-      AppendRow(Enumerable.Range(0, columns).Select(_ => content));
-
-    #endregion
-
-    #region Factory Methods
-
-    public static ReportGenerator FromData(IEnumerable<ImageStats> stats) => new(stats);
-
-    #endregion
-  }
-}