diff --git a/OpenNest.Console/Program.cs b/OpenNest.Console/Program.cs index 06dd798..4b51d02 100644 --- a/OpenNest.Console/Program.cs +++ b/OpenNest.Console/Program.cs @@ -7,13 +7,13 @@ using System.Linq; using System.Reflection; using System.Threading; using OpenNest; -using OpenNest.Geometry; -using OpenNest.IO; -using OpenNest.IO.Bending; using OpenNest.Engine; using OpenNest.Engine.Jobs; using OpenNest.Engine.Jobs.Adapters; using OpenNest.Engine.Jobs.Placement; +using OpenNest.Geometry; +using OpenNest.IO; +using OpenNest.IO.Bending; return NestConsole.Run(args); @@ -392,13 +392,16 @@ static class NestConsole Console.WriteLine( $"Plate: {options.PlateIndex} ({plate.Size.Width:F1} x {plate.Size.Length:F1}), spacing={plate.PartSpacing:F2}, edge=({plate.EdgeSpacing.Left},{plate.EdgeSpacing.Bottom},{plate.EdgeSpacing.Right},{plate.EdgeSpacing.Top}), workArea={wa.Width:F1}x{wa.Length:F1}" ); - Console.WriteLine($"Drawing: {drawing.Name}"); + var existingPartsMessage = options.KeepParts + ? $"Keeping {existingCount} existing parts" + : $"Cleared {existingCount} existing parts"; Console.WriteLine( - options.KeepParts - ? $"Keeping {existingCount} existing parts" - : $"Cleared {existingCount} existing parts" + $""" + Drawing: {drawing.Name} + {existingPartsMessage} + --- + """ ); - Console.WriteLine("---"); } static (bool success, long elapsedMs) Fill( @@ -539,10 +542,14 @@ static class NestConsole static void PrintResults(bool success, Plate plate, long elapsedMs) { - Console.WriteLine($"Result: {(success ? "success" : "failed")}"); - Console.WriteLine($"Parts placed: {plate.Parts.Count}"); - Console.WriteLine($"Utilization: {plate.Utilization():P1}"); - Console.WriteLine($"Time: {elapsedMs}ms"); + Console.WriteLine( + $""" + Result: {(success ? "success" : "failed")} + Parts placed: {plate.Parts.Count} + Utilization: {plate.Utilization():P1} + Time: {elapsedMs}ms + """ + ); } static void Save(Nest nest, Options options) @@ -623,7 +630,7 @@ static class NestConsole Console.WriteLine($"Post processors ({postsDir}):"); foreach (var p in processors) - Console.WriteLine($" {p.Name, -30} {p.Description}"); + Console.WriteLine($" {p.Name,-30} {p.Description}"); } static void PostProcess(Nest nest, Options options) diff --git a/OpenNest.Training/Program.cs b/OpenNest.Training/Program.cs index 6005726..b8032ca 100644 --- a/OpenNest.Training/Program.cs +++ b/OpenNest.Training/Program.cs @@ -104,9 +104,13 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin var resolvedDb = dbPath.EndsWith(".db", StringComparison.OrdinalIgnoreCase) ? dbPath : dbPath + ".db"; - Console.WriteLine($"Database: {Path.GetFullPath(resolvedDb)}"); - Console.WriteLine($"Sheet sizes: {sheetSuite.Length} configurations"); - Console.WriteLine($"Spacing: {s:F2}"); + Console.WriteLine( + $""" + Database: {Path.GetFullPath(resolvedDb)} + Sheet sizes: {sheetSuite.Length} configurations + Spacing: {s:F2} + """ + ); if (saveDir != null) Console.WriteLine($"Saving nests to: {saveDir}"); Console.WriteLine("---"); @@ -317,13 +321,15 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin } totalSw.Stop(); - Console.WriteLine("---"); - Console.WriteLine($"Processed: {processed} parts, {totalRuns} total runs"); Console.WriteLine( - $"Skipped: {skippedExisting} (existing) + {skippedGeometry} (no geometry) + {skippedFeatures} (no features)" + $""" + --- + Processed: {processed} parts, {totalRuns} total runs + Skipped: {skippedExisting} (existing) + {skippedGeometry} (no geometry) + {skippedFeatures} (no features) + Time: {totalSw.Elapsed:h\:mm\:ss} + Database: {Path.GetFullPath(resolvedDb)} + """ ); - Console.WriteLine($"Time: {totalSw.Elapsed:h\\:mm\\:ss}"); - Console.WriteLine($"Database: {Path.GetFullPath(resolvedDb)}"); return 0; }