From 451841401a158fd2ef18fd7f89283c6b74f41465 Mon Sep 17 00:00:00 2001 From: AJ Isaacs Date: Mon, 21 Sep 2026 13:18:34 -0400 Subject: [PATCH] refactor(engine): align namespaces with directory layout under OpenNest.Engine All 132 OpenNest.Engine source files now declare namespaces matching their nested directories: Jobs/, Jobs/Placement/, Jobs/Adapters/, Fill/, RectanglePacking/, CirclePacking/, and engine-root types moved from 'OpenNest' to 'OpenNest.Engine'. RootNamespace updated accordingly. Consumers (Api, Console, Mcp, Benchmark, Training, desktop app, tests) gained the explicit usings the move requires; CLAUDE.md updated. --- CLAUDE.md | 6 +++--- OpenNest.Api/NestResponse.cs | 1 + OpenNest.Api/NestRunner.cs | 3 +++ OpenNest.Benchmark/BenchmarkJob.cs | 2 ++ OpenNest.Benchmark/BenchmarkRunner.cs | 2 ++ OpenNest.Benchmark/Program.cs | 1 + OpenNest.Console/Program.cs | 1 + OpenNest.Engine.Tests/Jobs/FiniteStockJobTests.cs | 1 + .../Jobs/FixedStrategyNestingEngineTests.cs | 1 + OpenNest.Engine.Tests/Jobs/GoldenLayoutTests.cs | 1 + OpenNest.Engine.Tests/Jobs/JobAdapterTests.cs | 2 ++ OpenNest.Engine.Tests/Jobs/NestJobCancellationTests.cs | 2 ++ OpenNest.Engine.Tests/Jobs/NestJobEngineSelectionTests.cs | 2 ++ OpenNest.Engine.Tests/Jobs/NestJobExampleTests.cs | 1 + OpenNest.Engine.Tests/Jobs/NestJobGeometryTests.cs | 2 ++ OpenNest.Engine.Tests/Jobs/NestJobIdentityTests.cs | 2 ++ OpenNest.Engine.Tests/Jobs/NestJobRunnerTests.cs | 1 + OpenNest.Engine.Tests/Jobs/NestJobStockSelectionTests.cs | 1 + OpenNest.Engine.Tests/Jobs/NestJobValidationTests.cs | 1 + OpenNest.Engine.Tests/Jobs/NestingEngineRegistryTests.cs | 1 + OpenNest.Engine.Tests/Jobs/PlateNesterParityTests.cs | 3 +++ OpenNest.Engine.Tests/Jobs/StockLadderTests.cs | 1 + OpenNest.Engine/CirclePacking/Bin.cs | 2 +- OpenNest.Engine/CirclePacking/FillEndEven.cs | 2 +- OpenNest.Engine/CirclePacking/FillEndOdd.cs | 2 +- OpenNest.Engine/CirclePacking/FillEngine.cs | 2 +- OpenNest.Engine/CirclePacking/Item.cs | 2 +- OpenNest.Engine/DefaultNestEngine.cs | 4 ++-- OpenNest.Engine/Fill/BestCombination.cs | 2 +- OpenNest.Engine/Fill/ShrinkFiller.cs | 2 +- OpenNest.Engine/HorizontalRemnantEngine.cs | 2 +- OpenNest.Engine/Jobs/Adapters/DrawingJobMapper.cs | 2 +- OpenNest.Engine/Jobs/Adapters/LegacyPlateNesterAdapter.cs | 2 +- OpenNest.Engine/Jobs/Adapters/NestResultMaterializer.cs | 2 +- OpenNest.Engine/Jobs/CandidateProgressBridge.cs | 2 +- OpenNest.Engine/Jobs/FixedStrategyNestingEngine.cs | 2 +- OpenNest.Engine/Jobs/INestingEngine.cs | 2 +- OpenNest.Engine/Jobs/IPlateNester.cs | 2 +- OpenNest.Engine/Jobs/NestJob.cs | 2 +- OpenNest.Engine/Jobs/NestJobCandidateComparer.cs | 2 +- OpenNest.Engine/Jobs/NestJobOptions.cs | 2 +- OpenNest.Engine/Jobs/NestJobPart.cs | 2 +- OpenNest.Engine/Jobs/NestJobPlacementValidator.cs | 4 +++- OpenNest.Engine/Jobs/NestJobProgress.cs | 2 +- OpenNest.Engine/Jobs/NestJobResult.cs | 2 +- OpenNest.Engine/Jobs/NestJobRunner.cs | 2 +- OpenNest.Engine/Jobs/NestJobValidator.cs | 2 +- OpenNest.Engine/Jobs/NestPlateStock.cs | 2 +- OpenNest.Engine/Jobs/NestingEngineInfo.cs | 2 +- OpenNest.Engine/Jobs/NestingEngineRegistry.cs | 2 +- OpenNest.Engine/Jobs/PartGeometrySnapshot.cs | 2 +- OpenNest.Engine/Jobs/Placement/DefaultPlateNester.cs | 3 ++- OpenNest.Engine/Jobs/Placement/OrderedPlateNester.cs | 3 ++- OpenNest.Engine/Jobs/Placement/StripPlateNester.cs | 3 ++- OpenNest.Engine/Jobs/PlateCandidate.cs | 2 +- OpenNest.Engine/Jobs/PlateNesterFactory.cs | 4 +++- OpenNest.Engine/Jobs/PlatePlacementRequest.cs | 2 +- OpenNest.Engine/Jobs/RotationPolicy.cs | 2 +- OpenNest.Engine/Jobs/StockLadderNestingEngine.cs | 4 +++- OpenNest.Engine/MultiPlateNester.cs | 2 +- OpenNest.Engine/MultiPlateResult.cs | 2 +- OpenNest.Engine/NestDirection.cs | 2 +- OpenNest.Engine/NestEngineBase.cs | 2 +- OpenNest.Engine/NestEngineInfo.cs | 2 +- OpenNest.Engine/NestEngineRegistry.cs | 2 +- OpenNest.Engine/NestItem.cs | 2 +- OpenNest.Engine/NestProgress.cs | 2 +- OpenNest.Engine/OpenNest.Engine.csproj | 2 +- OpenNest.Engine/PartSortOrder.cs | 2 +- OpenNest.Engine/PlateOptimizer.cs | 2 +- OpenNest.Engine/RectanglePacking/Bin.cs | 2 +- OpenNest.Engine/RectanglePacking/BinConverter.cs | 2 +- OpenNest.Engine/RectanglePacking/FillBestFit.cs | 3 ++- OpenNest.Engine/RectanglePacking/FillEngine.cs | 2 +- OpenNest.Engine/RectanglePacking/FillNoRotation.cs | 2 +- OpenNest.Engine/RectanglePacking/FillSameRotation.cs | 2 +- OpenNest.Engine/RectanglePacking/FillSpiral.cs | 3 ++- OpenNest.Engine/RectanglePacking/Item.cs | 2 +- OpenNest.Engine/RectanglePacking/PackBottomLeft.cs | 2 +- OpenNest.Engine/RectanglePacking/PackEngine.cs | 2 +- OpenNest.Engine/RectanglePacking/PackFirstFitDecreasing.cs | 2 +- OpenNest.Engine/RectanglePacking/RectFill.cs | 2 +- OpenNest.Engine/Strategies/RectBestFitStrategy.cs | 2 +- OpenNest.Engine/StripNestEngine.cs | 2 +- OpenNest.Engine/VerticalRemnantEngine.cs | 2 +- OpenNest.IO.Tests/CutOnlyImportTests.cs | 2 ++ OpenNest.Mcp/Tools/NestingTools.cs | 1 + OpenNest.Tests/Api/NestResponsePersistenceTests.cs | 1 + OpenNest.Tests/Api/NestRunnerTests.cs | 1 + OpenNest.Tests/Benchmark/BenchmarkRunnerTests.cs | 1 + OpenNest.Tests/Benchmark/JobLoaderManifestTests.cs | 1 + OpenNest.Tests/Engine/EngineOverlapTests.cs | 1 + OpenNest.Tests/Engine/EngineRefactorSmokeTests.cs | 1 + OpenNest.Tests/Engine/MultiPlateNesterTests.cs | 1 + OpenNest.Tests/Engine/NestPhaseExtensionsTests.cs | 1 + OpenNest.Tests/Engine/NestProgressTests.cs | 1 + OpenNest.Tests/Engine/PlateOptimizerTests.cs | 1 + OpenNest.Tests/Fill/AccumulatingProgressTests.cs | 1 + OpenNest.Tests/Fill/BestCombinationTests.cs | 1 + OpenNest.Tests/Fill/FillLinearCircleTests.cs | 1 + OpenNest.Tests/Fill/IterativeShrinkFillerTests.cs | 1 + OpenNest.Tests/Fill/PairFillerTests.cs | 1 + OpenNest.Tests/Fill/PairOverlapDiagnosticTests.cs | 1 + OpenNest.Tests/Fill/RemnantFillerTests2.cs | 1 + OpenNest.Tests/Fill/ShrinkFillerTests.cs | 1 + OpenNest.Tests/Strategies/FillPipelineTests.cs | 1 + OpenNest.Tests/Strategies/StripeFillerTests.cs | 1 + OpenNest.Training/TrainingDatabase.cs | 1 + OpenNest/Actions/ActionFillArea.cs | 1 + OpenNest/Controls/PhaseStepperControl.cs | 1 + OpenNest/Controls/PlateView.cs | 3 ++- OpenNest/Forms/MainForm.cs | 3 ++- OpenNest/Forms/NestProgressForm.cs | 1 + OpenNest/Forms/PatternTileForm.cs | 1 + 114 files changed, 142 insertions(+), 69 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index ce66236..6eca997 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -51,8 +51,8 @@ Nesting algorithms provide both a legacy single-plate API and a whole-job API. T - **Fill/** (`namespace OpenNest.Engine.Fill`): Fill algorithms — `FillLinear` (grid-based), `FillExtents` (extents-based pair tiling), `PairFiller` (interlocking pairs), `ShrinkFiller`, `RemnantFiller`/`RemnantFinder`, `Compactor` (post-fill gravity compaction), `FillScore` (lexicographic comparison: count > utilization > compactness), `Pattern`/`PatternTiler`, `PartBoundary`, `RotationAnalysis`, `AngleCandidateBuilder`, `BestCombination`, `AccumulatingProgress`. - **Strategies/** (`namespace OpenNest.Engine.Strategies`): Pluggable fill strategy layer — `IFillStrategy` interface, `FillContext`, `FillStrategyRegistry` (auto-discovers strategies via reflection, supports plugin DLLs), `FillHelpers`. Built-in strategies: `LinearFillStrategy`, `PairsFillStrategy`, `RectBestFitStrategy`, `ExtentsFillStrategy`. - **BestFit/** (`namespace OpenNest.Engine.BestFit`): NFP-based pair evaluation pipeline — `BestFitFinder` orchestrates angle sweeps, `PairEvaluator`/`IPairEvaluator` scores part pairs, `RotationSlideStrategy`/`ISlideComputer` computes slide distances. `BestFitCache` and `BestFitFilter` optimize repeated lookups. -- **RectanglePacking/** (`namespace OpenNest.RectanglePacking`): `FillBestFit` (single-item fill, tries horizontal and vertical orientations), `PackBottomLeft` (multi-item bin packing, sorts by area descending). Both operate on `Bin`/`Item` abstractions. -- **CirclePacking/** (`namespace OpenNest.CirclePacking`): Alternative packing for circular parts. +- **RectanglePacking/** (`namespace OpenNest.Engine.RectanglePacking`): `FillBestFit` (single-item fill, tries horizontal and vertical orientations), `PackBottomLeft` (multi-item bin packing, sorts by area descending). Both operate on `Bin`/`Item` abstractions. +- **CirclePacking/** (`namespace OpenNest.Engine.CirclePacking`): Alternative packing for circular parts. - **ML/** (`namespace OpenNest.Engine.ML`): `AnglePredictor` (ONNX model for predicting good rotation angles), `FeatureExtractor` (part geometry features), `BruteForceRunner` (full angle sweep for training data). - `NestItem`: Input to the engine — wraps a `Drawing` with quantity, priority, and rotation constraints. - `NestProgress`: Progress reporting model with `NestPhase` enum for UI feedback. @@ -129,7 +129,7 @@ Always keep `README.md` and `CLAUDE.md` up to date when making changes that affe ## Key Patterns - OpenNest.Core uses multiple namespaces: `OpenNest` (root domain), `OpenNest.CNC`, `OpenNest.Geometry`, `OpenNest.Converters`, `OpenNest.Math`, `OpenNest.Collections`. -- OpenNest.Engine uses sub-namespaces: `OpenNest.Engine.Fill` (fill algorithms), `OpenNest.Engine.Strategies` (pluggable strategy layer), `OpenNest.Engine.BestFit`, `OpenNest.Engine.ML`, `OpenNest.Engine.RapidPlanning`, `OpenNest.Engine.Sequencing`. +- OpenNest.Engine uses sub-namespaces: `OpenNest.Engine.Fill` (fill algorithms), `OpenNest.Engine.Strategies` (pluggable strategy layer), `OpenNest.Engine.BestFit`, `OpenNest.Engine.Jobs` (whole-job API, with `.Placement` and `.Adapters`), `OpenNest.Engine.ML`, `OpenNest.Engine.RapidPlanning`, `OpenNest.Engine.Sequencing`, `OpenNest.Engine.RectanglePacking`, `OpenNest.Engine.CirclePacking`. All Engine types live in namespaces matching their directory under `OpenNest.Engine/` (project files use `namespace X;` file-scoped or block style); consumers reference them via explicit `using OpenNest.Engine[.Sub];` directives. - `ObservableList` provides ItemAdded/ItemRemoved/ItemChanged events used for automatic quantity tracking between plates and drawings. - Angles throughout the codebase are in **radians** (use `Angle.ToRadians()`/`Angle.ToDegrees()` for conversion). - `Tolerance.Epsilon` is used for floating-point comparisons across geometry operations. diff --git a/OpenNest.Api/NestResponse.cs b/OpenNest.Api/NestResponse.cs index 7b6f47a..4f98380 100644 --- a/OpenNest.Api/NestResponse.cs +++ b/OpenNest.Api/NestResponse.cs @@ -6,6 +6,7 @@ using System.Text.Json; using System.Text.Json.Serialization; using System.Threading.Tasks; using OpenNest.IO; +using OpenNest.Engine.Jobs; namespace OpenNest.Api; diff --git a/OpenNest.Api/NestRunner.cs b/OpenNest.Api/NestRunner.cs index 2166277..74b2fae 100644 --- a/OpenNest.Api/NestRunner.cs +++ b/OpenNest.Api/NestRunner.cs @@ -6,6 +6,9 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using OpenNest.IO; +using OpenNest.Engine; +using OpenNest.Engine.Jobs; +using OpenNest.Engine.Jobs.Adapters; namespace OpenNest.Api; diff --git a/OpenNest.Benchmark/BenchmarkJob.cs b/OpenNest.Benchmark/BenchmarkJob.cs index 7d4db2a..9496610 100644 --- a/OpenNest.Benchmark/BenchmarkJob.cs +++ b/OpenNest.Benchmark/BenchmarkJob.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; using OpenNest.Geometry; +using OpenNest.Engine.Jobs; +using OpenNest.Engine.Jobs.Adapters; namespace OpenNest.Benchmark { diff --git a/OpenNest.Benchmark/BenchmarkRunner.cs b/OpenNest.Benchmark/BenchmarkRunner.cs index 4b06a3a..c6d4d7f 100644 --- a/OpenNest.Benchmark/BenchmarkRunner.cs +++ b/OpenNest.Benchmark/BenchmarkRunner.cs @@ -5,6 +5,8 @@ using System.Diagnostics; using System.Linq; using System.Threading; using System.Threading.Tasks; +using OpenNest.Engine.Jobs; +using OpenNest.Engine.Jobs.Adapters; namespace OpenNest.Benchmark { diff --git a/OpenNest.Benchmark/Program.cs b/OpenNest.Benchmark/Program.cs index 00fafff..a48266e 100644 --- a/OpenNest.Benchmark/Program.cs +++ b/OpenNest.Benchmark/Program.cs @@ -5,6 +5,7 @@ using System.Linq; using OpenNest; using OpenNest.Benchmark; using OpenNest.Geometry; +using OpenNest.Engine.Jobs; return BenchmarkConsole.Run(args); diff --git a/OpenNest.Console/Program.cs b/OpenNest.Console/Program.cs index ed123c8..12fbbcb 100644 --- a/OpenNest.Console/Program.cs +++ b/OpenNest.Console/Program.cs @@ -10,6 +10,7 @@ using OpenNest; using OpenNest.Geometry; using OpenNest.IO; using OpenNest.IO.Bending; +using OpenNest.Engine; return NestConsole.Run(args); diff --git a/OpenNest.Engine.Tests/Jobs/FiniteStockJobTests.cs b/OpenNest.Engine.Tests/Jobs/FiniteStockJobTests.cs index 959b569..f0e0d33 100644 --- a/OpenNest.Engine.Tests/Jobs/FiniteStockJobTests.cs +++ b/OpenNest.Engine.Tests/Jobs/FiniteStockJobTests.cs @@ -1,4 +1,5 @@ using OpenNest.Geometry; +using OpenNest.Engine.Jobs; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/FixedStrategyNestingEngineTests.cs b/OpenNest.Engine.Tests/Jobs/FixedStrategyNestingEngineTests.cs index 4083a44..f109227 100644 --- a/OpenNest.Engine.Tests/Jobs/FixedStrategyNestingEngineTests.cs +++ b/OpenNest.Engine.Tests/Jobs/FixedStrategyNestingEngineTests.cs @@ -1,5 +1,6 @@ using OpenNest.Geometry; using Xunit; +using OpenNest.Engine.Jobs; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/GoldenLayoutTests.cs b/OpenNest.Engine.Tests/Jobs/GoldenLayoutTests.cs index 75cd647..0b80950 100644 --- a/OpenNest.Engine.Tests/Jobs/GoldenLayoutTests.cs +++ b/OpenNest.Engine.Tests/Jobs/GoldenLayoutTests.cs @@ -2,6 +2,7 @@ using System.Globalization; using OpenNest.CNC; using OpenNest.Geometry; using Xunit; +using OpenNest.Engine.Jobs; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/JobAdapterTests.cs b/OpenNest.Engine.Tests/Jobs/JobAdapterTests.cs index 3dc3ed6..548f4eb 100644 --- a/OpenNest.Engine.Tests/Jobs/JobAdapterTests.cs +++ b/OpenNest.Engine.Tests/Jobs/JobAdapterTests.cs @@ -1,5 +1,7 @@ using OpenNest.CNC; using OpenNest.Geometry; +using OpenNest.Engine.Jobs; +using OpenNest.Engine.Jobs.Adapters; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/NestJobCancellationTests.cs b/OpenNest.Engine.Tests/Jobs/NestJobCancellationTests.cs index f33462e..ce60085 100644 --- a/OpenNest.Engine.Tests/Jobs/NestJobCancellationTests.cs +++ b/OpenNest.Engine.Tests/Jobs/NestJobCancellationTests.cs @@ -1,5 +1,7 @@ using OpenNest.CNC; using OpenNest.Geometry; +using OpenNest.Engine.Jobs; +using OpenNest.Engine.Jobs.Adapters; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/NestJobEngineSelectionTests.cs b/OpenNest.Engine.Tests/Jobs/NestJobEngineSelectionTests.cs index daa8441..655769a 100644 --- a/OpenNest.Engine.Tests/Jobs/NestJobEngineSelectionTests.cs +++ b/OpenNest.Engine.Tests/Jobs/NestJobEngineSelectionTests.cs @@ -1,5 +1,7 @@ using OpenNest.CNC; using OpenNest.Geometry; +using OpenNest.Engine.Jobs; +using OpenNest.Engine.Jobs.Adapters; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/NestJobExampleTests.cs b/OpenNest.Engine.Tests/Jobs/NestJobExampleTests.cs index 078fbb2..fec83f4 100644 --- a/OpenNest.Engine.Tests/Jobs/NestJobExampleTests.cs +++ b/OpenNest.Engine.Tests/Jobs/NestJobExampleTests.cs @@ -1,6 +1,7 @@ using OpenNest.CNC; using OpenNest.Geometry; using Xunit; +using OpenNest.Engine.Jobs; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/NestJobGeometryTests.cs b/OpenNest.Engine.Tests/Jobs/NestJobGeometryTests.cs index 0e38063..ebff149 100644 --- a/OpenNest.Engine.Tests/Jobs/NestJobGeometryTests.cs +++ b/OpenNest.Engine.Tests/Jobs/NestJobGeometryTests.cs @@ -1,4 +1,6 @@ using OpenNest.Geometry; +using OpenNest.Engine.Jobs; +using OpenNest.Engine.Jobs.Adapters; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/NestJobIdentityTests.cs b/OpenNest.Engine.Tests/Jobs/NestJobIdentityTests.cs index d37e7b2..71c11d9 100644 --- a/OpenNest.Engine.Tests/Jobs/NestJobIdentityTests.cs +++ b/OpenNest.Engine.Tests/Jobs/NestJobIdentityTests.cs @@ -1,6 +1,8 @@ using OpenNest.CNC; using OpenNest.Engine.Fill; using OpenNest.Geometry; +using OpenNest.Engine.Jobs; +using OpenNest.Engine.Jobs.Adapters; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/NestJobRunnerTests.cs b/OpenNest.Engine.Tests/Jobs/NestJobRunnerTests.cs index 44eea9e..5b4c2fc 100644 --- a/OpenNest.Engine.Tests/Jobs/NestJobRunnerTests.cs +++ b/OpenNest.Engine.Tests/Jobs/NestJobRunnerTests.cs @@ -1,5 +1,6 @@ using OpenNest.CNC; using OpenNest.Geometry; +using OpenNest.Engine.Jobs; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/NestJobStockSelectionTests.cs b/OpenNest.Engine.Tests/Jobs/NestJobStockSelectionTests.cs index 81526d6..4883f4d 100644 --- a/OpenNest.Engine.Tests/Jobs/NestJobStockSelectionTests.cs +++ b/OpenNest.Engine.Tests/Jobs/NestJobStockSelectionTests.cs @@ -1,4 +1,5 @@ using OpenNest.Geometry; +using OpenNest.Engine.Jobs; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/NestJobValidationTests.cs b/OpenNest.Engine.Tests/Jobs/NestJobValidationTests.cs index 336e905..c0651e9 100644 --- a/OpenNest.Engine.Tests/Jobs/NestJobValidationTests.cs +++ b/OpenNest.Engine.Tests/Jobs/NestJobValidationTests.cs @@ -1,5 +1,6 @@ using OpenNest.CNC; using OpenNest.Geometry; +using OpenNest.Engine.Jobs; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/NestingEngineRegistryTests.cs b/OpenNest.Engine.Tests/Jobs/NestingEngineRegistryTests.cs index 6dc6386..7505ec1 100644 --- a/OpenNest.Engine.Tests/Jobs/NestingEngineRegistryTests.cs +++ b/OpenNest.Engine.Tests/Jobs/NestingEngineRegistryTests.cs @@ -1,4 +1,5 @@ using Xunit; +using OpenNest.Engine.Jobs; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/PlateNesterParityTests.cs b/OpenNest.Engine.Tests/Jobs/PlateNesterParityTests.cs index b127b6a..f75f2cd 100644 --- a/OpenNest.Engine.Tests/Jobs/PlateNesterParityTests.cs +++ b/OpenNest.Engine.Tests/Jobs/PlateNesterParityTests.cs @@ -1,6 +1,9 @@ using OpenNest.CNC; using OpenNest.Geometry; using Xunit; +using OpenNest.Engine.Jobs; +using OpenNest.Engine.Jobs.Adapters; +using OpenNest.Engine.Jobs.Placement; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine.Tests/Jobs/StockLadderTests.cs b/OpenNest.Engine.Tests/Jobs/StockLadderTests.cs index 09a0c98..0da3bff 100644 --- a/OpenNest.Engine.Tests/Jobs/StockLadderTests.cs +++ b/OpenNest.Engine.Tests/Jobs/StockLadderTests.cs @@ -1,4 +1,5 @@ using OpenNest.Geometry; +using OpenNest.Engine.Jobs; namespace OpenNest.Engine.Tests.Jobs; diff --git a/OpenNest.Engine/CirclePacking/Bin.cs b/OpenNest.Engine/CirclePacking/Bin.cs index 1e05bbd..063840f 100644 --- a/OpenNest.Engine/CirclePacking/Bin.cs +++ b/OpenNest.Engine/CirclePacking/Bin.cs @@ -2,7 +2,7 @@ using System.Linq; using OpenNest.Geometry; -namespace OpenNest.CirclePacking +namespace OpenNest.Engine.CirclePacking { internal class Bin : Box { diff --git a/OpenNest.Engine/CirclePacking/FillEndEven.cs b/OpenNest.Engine/CirclePacking/FillEndEven.cs index 9275273..3f566a8 100644 --- a/OpenNest.Engine/CirclePacking/FillEndEven.cs +++ b/OpenNest.Engine/CirclePacking/FillEndEven.cs @@ -2,7 +2,7 @@ using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest.CirclePacking +namespace OpenNest.Engine.CirclePacking { internal class FillEndEven : FillEngine { diff --git a/OpenNest.Engine/CirclePacking/FillEndOdd.cs b/OpenNest.Engine/CirclePacking/FillEndOdd.cs index d9a637b..de57db8 100644 --- a/OpenNest.Engine/CirclePacking/FillEndOdd.cs +++ b/OpenNest.Engine/CirclePacking/FillEndOdd.cs @@ -2,7 +2,7 @@ using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest.CirclePacking +namespace OpenNest.Engine.CirclePacking { internal class FillEndOdd : FillEngine { diff --git a/OpenNest.Engine/CirclePacking/FillEngine.cs b/OpenNest.Engine/CirclePacking/FillEngine.cs index 3814caf..530c72b 100644 --- a/OpenNest.Engine/CirclePacking/FillEngine.cs +++ b/OpenNest.Engine/CirclePacking/FillEngine.cs @@ -1,4 +1,4 @@ -namespace OpenNest.CirclePacking +namespace OpenNest.Engine.CirclePacking { internal abstract class FillEngine { diff --git a/OpenNest.Engine/CirclePacking/Item.cs b/OpenNest.Engine/CirclePacking/Item.cs index f68fee5..54bbb7a 100644 --- a/OpenNest.Engine/CirclePacking/Item.cs +++ b/OpenNest.Engine/CirclePacking/Item.cs @@ -1,6 +1,6 @@ using OpenNest.Geometry; -namespace OpenNest.CirclePacking +namespace OpenNest.Engine.CirclePacking { internal class Item : Circle { diff --git a/OpenNest.Engine/DefaultNestEngine.cs b/OpenNest.Engine/DefaultNestEngine.cs index af0b512..8a2388c 100644 --- a/OpenNest.Engine/DefaultNestEngine.cs +++ b/OpenNest.Engine/DefaultNestEngine.cs @@ -9,9 +9,9 @@ using OpenNest.Engine.Fill; using OpenNest.Engine.Strategies; using OpenNest.Geometry; using OpenNest.Math; -using OpenNest.RectanglePacking; +using OpenNest.Engine.RectanglePacking; -namespace OpenNest +namespace OpenNest.Engine { public class DefaultNestEngine : NestEngineBase { diff --git a/OpenNest.Engine/Fill/BestCombination.cs b/OpenNest.Engine/Fill/BestCombination.cs index e43058e..68a9e69 100644 --- a/OpenNest.Engine/Fill/BestCombination.cs +++ b/OpenNest.Engine/Fill/BestCombination.cs @@ -1,6 +1,6 @@ using OpenNest.Math; -namespace OpenNest +namespace OpenNest.Engine.Fill { internal record CombinationResult(bool Found, int Count1, int Count2); diff --git a/OpenNest.Engine/Fill/ShrinkFiller.cs b/OpenNest.Engine/Fill/ShrinkFiller.cs index 2f7a8e6..30e91d4 100644 --- a/OpenNest.Engine/Fill/ShrinkFiller.cs +++ b/OpenNest.Engine/Fill/ShrinkFiller.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using OpenNest.Geometry; -using OpenNest.RectanglePacking; +using OpenNest.Engine.RectanglePacking; namespace OpenNest.Engine.Fill { diff --git a/OpenNest.Engine/HorizontalRemnantEngine.cs b/OpenNest.Engine/HorizontalRemnantEngine.cs index 7045882..4b8c1ca 100644 --- a/OpenNest.Engine/HorizontalRemnantEngine.cs +++ b/OpenNest.Engine/HorizontalRemnantEngine.cs @@ -5,7 +5,7 @@ using OpenNest.Engine.Fill; using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest +namespace OpenNest.Engine { /// /// Optimizes for the largest top-side horizontal drop. diff --git a/OpenNest.Engine/Jobs/Adapters/DrawingJobMapper.cs b/OpenNest.Engine/Jobs/Adapters/DrawingJobMapper.cs index 9e9f1b8..ca91470 100644 --- a/OpenNest.Engine/Jobs/Adapters/DrawingJobMapper.cs +++ b/OpenNest.Engine/Jobs/Adapters/DrawingJobMapper.cs @@ -1,7 +1,7 @@ using System; using OpenNest.CNC; -namespace OpenNest; +namespace OpenNest.Engine.Jobs.Adapters; /// Explicit-ID input mapping and exact supported-geometry reconstruction. Never retains caller objects. public static class DrawingJobMapper diff --git a/OpenNest.Engine/Jobs/Adapters/LegacyPlateNesterAdapter.cs b/OpenNest.Engine/Jobs/Adapters/LegacyPlateNesterAdapter.cs index 45a8c88..320f3b3 100644 --- a/OpenNest.Engine/Jobs/Adapters/LegacyPlateNesterAdapter.cs +++ b/OpenNest.Engine/Jobs/Adapters/LegacyPlateNesterAdapter.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Threading; -namespace OpenNest; +namespace OpenNest.Engine.Jobs.Adapters; /// /// A fresh private legacy plate/drawing/item graph for each call. Only returned poses cross the boundary; diff --git a/OpenNest.Engine/Jobs/Adapters/NestResultMaterializer.cs b/OpenNest.Engine/Jobs/Adapters/NestResultMaterializer.cs index c632f84..4a38a8e 100644 --- a/OpenNest.Engine/Jobs/Adapters/NestResultMaterializer.cs +++ b/OpenNest.Engine/Jobs/Adapters/NestResultMaterializer.cs @@ -4,7 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using OpenNest.Geometry; -namespace OpenNest; +namespace OpenNest.Engine.Jobs.Adapters; /// A detached mutable domain nest plus explicit requirement identity (never inferred from names). public sealed class MaterializedNestResult diff --git a/OpenNest.Engine/Jobs/CandidateProgressBridge.cs b/OpenNest.Engine/Jobs/CandidateProgressBridge.cs index 02cd577..e457bc5 100644 --- a/OpenNest.Engine/Jobs/CandidateProgressBridge.cs +++ b/OpenNest.Engine/Jobs/CandidateProgressBridge.cs @@ -1,6 +1,6 @@ using System; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// /// Bridges legacy reporting into job progress while a candidate diff --git a/OpenNest.Engine/Jobs/FixedStrategyNestingEngine.cs b/OpenNest.Engine/Jobs/FixedStrategyNestingEngine.cs index 8ec65a9..e64f93a 100644 --- a/OpenNest.Engine/Jobs/FixedStrategyNestingEngine.cs +++ b/OpenNest.Engine/Jobs/FixedStrategyNestingEngine.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// /// Adapts one fixed IPlateNester strategy to the whole-job INestingEngine contract, so it can compete diff --git a/OpenNest.Engine/Jobs/INestingEngine.cs b/OpenNest.Engine/Jobs/INestingEngine.cs index 4867e85..934c543 100644 --- a/OpenNest.Engine/Jobs/INestingEngine.cs +++ b/OpenNest.Engine/Jobs/INestingEngine.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// Synchronous whole-job solver. Cancellation throws, rather than returning partial success. public interface INestingEngine diff --git a/OpenNest.Engine/Jobs/IPlateNester.cs b/OpenNest.Engine/Jobs/IPlateNester.cs index 29453fa..6029e48 100644 --- a/OpenNest.Engine/Jobs/IPlateNester.cs +++ b/OpenNest.Engine/Jobs/IPlateNester.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// Places on one sheet only. Must not change stock, demand, or caller-owned domain objects. public interface IPlateNester diff --git a/OpenNest.Engine/Jobs/NestJob.cs b/OpenNest.Engine/Jobs/NestJob.cs index 9436eb3..667ad36 100644 --- a/OpenNest.Engine/Jobs/NestJob.cs +++ b/OpenNest.Engine/Jobs/NestJob.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// One material/unit system's requirements. Collections are copied; all nested values are immutable. public sealed class NestJob diff --git a/OpenNest.Engine/Jobs/NestJobCandidateComparer.cs b/OpenNest.Engine/Jobs/NestJobCandidateComparer.cs index 06907c9..353b65e 100644 --- a/OpenNest.Engine/Jobs/NestJobCandidateComparer.cs +++ b/OpenNest.Engine/Jobs/NestJobCandidateComparer.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// Ranks independent plate trials: priority fulfillment, sheet area, placement envelope, then input order. public sealed class NestJobCandidateComparer diff --git a/OpenNest.Engine/Jobs/NestJobOptions.cs b/OpenNest.Engine/Jobs/NestJobOptions.cs index 8b6396c..0cf82c6 100644 --- a/OpenNest.Engine/Jobs/NestJobOptions.cs +++ b/OpenNest.Engine/Jobs/NestJobOptions.cs @@ -1,6 +1,6 @@ using System; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// Immutable per-job options; selection never changes the legacy global registry. public sealed class NestJobOptions diff --git a/OpenNest.Engine/Jobs/NestJobPart.cs b/OpenNest.Engine/Jobs/NestJobPart.cs index fceb42b..15e8d75 100644 --- a/OpenNest.Engine/Jobs/NestJobPart.cs +++ b/OpenNest.Engine/Jobs/NestJobPart.cs @@ -1,6 +1,6 @@ using System; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// An immutable requirement, independent of drawing names, UI state, and drawing quantity counters. public sealed class NestJobPart diff --git a/OpenNest.Engine/Jobs/NestJobPlacementValidator.cs b/OpenNest.Engine/Jobs/NestJobPlacementValidator.cs index e14d35d..34080e9 100644 --- a/OpenNest.Engine/Jobs/NestJobPlacementValidator.cs +++ b/OpenNest.Engine/Jobs/NestJobPlacementValidator.cs @@ -4,7 +4,9 @@ using OpenNest.Converters; using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest; +using OpenNest.Engine.Jobs.Adapters; +using OpenNest.Engine.Jobs.Placement; +namespace OpenNest.Engine.Jobs; /// Validates a trial against immutable job geometry before the runner commits accounting. internal static class NestJobPlacementValidator diff --git a/OpenNest.Engine/Jobs/NestJobProgress.cs b/OpenNest.Engine/Jobs/NestJobProgress.cs index 15a5c4e..7d7a5fa 100644 --- a/OpenNest.Engine/Jobs/NestJobProgress.cs +++ b/OpenNest.Engine/Jobs/NestJobProgress.cs @@ -1,4 +1,4 @@ -namespace OpenNest; +namespace OpenNest.Engine.Jobs; public enum NestJobStage { diff --git a/OpenNest.Engine/Jobs/NestJobResult.cs b/OpenNest.Engine/Jobs/NestJobResult.cs index c0356bc..31e6c31 100644 --- a/OpenNest.Engine/Jobs/NestJobResult.cs +++ b/OpenNest.Engine/Jobs/NestJobResult.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; public enum NestJobStatus { diff --git a/OpenNest.Engine/Jobs/NestJobRunner.cs b/OpenNest.Engine/Jobs/NestJobRunner.cs index 7ea3483..0ac155d 100644 --- a/OpenNest.Engine/Jobs/NestJobRunner.cs +++ b/OpenNest.Engine/Jobs/NestJobRunner.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// /// Physical-sheet allocation. Every available stock entry is tried independently and only the selected diff --git a/OpenNest.Engine/Jobs/NestJobValidator.cs b/OpenNest.Engine/Jobs/NestJobValidator.cs index 09278fc..694d518 100644 --- a/OpenNest.Engine/Jobs/NestJobValidator.cs +++ b/OpenNest.Engine/Jobs/NestJobValidator.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// Basic input and candidate accounting checks, NOT a geometry/clearance safety gate. public static class NestJobValidator diff --git a/OpenNest.Engine/Jobs/NestPlateStock.cs b/OpenNest.Engine/Jobs/NestPlateStock.cs index f7fcbf8..61b2e94 100644 --- a/OpenNest.Engine/Jobs/NestPlateStock.cs +++ b/OpenNest.Engine/Jobs/NestPlateStock.cs @@ -1,7 +1,7 @@ using System; using OpenNest.Geometry; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// Immutable stock settings. Size and spacing are copied value types, not caller-owned settings. public sealed class NestPlateStock diff --git a/OpenNest.Engine/Jobs/NestingEngineInfo.cs b/OpenNest.Engine/Jobs/NestingEngineInfo.cs index 532893c..77d9a70 100644 --- a/OpenNest.Engine/Jobs/NestingEngineInfo.cs +++ b/OpenNest.Engine/Jobs/NestingEngineInfo.cs @@ -1,6 +1,6 @@ using System; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// Display metadata plus a fresh-instance factory for one registered whole-job engine. public class NestingEngineInfo diff --git a/OpenNest.Engine/Jobs/NestingEngineRegistry.cs b/OpenNest.Engine/Jobs/NestingEngineRegistry.cs index 66166dc..14f174d 100644 --- a/OpenNest.Engine/Jobs/NestingEngineRegistry.cs +++ b/OpenNest.Engine/Jobs/NestingEngineRegistry.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using System.Reflection; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// /// Registry of whole-job INestingEngine implementations, parallel to NestEngineRegistry (which is for diff --git a/OpenNest.Engine/Jobs/PartGeometrySnapshot.cs b/OpenNest.Engine/Jobs/PartGeometrySnapshot.cs index 88414fd..fd4e5b1 100644 --- a/OpenNest.Engine/Jobs/PartGeometrySnapshot.cs +++ b/OpenNest.Engine/Jobs/PartGeometrySnapshot.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using OpenNest.CNC; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// Exact immutable CNC motion values. Rapid moves retain contour/hole boundaries; arcs are not tessellated. public sealed record PartGeometryMotion( diff --git a/OpenNest.Engine/Jobs/Placement/DefaultPlateNester.cs b/OpenNest.Engine/Jobs/Placement/DefaultPlateNester.cs index 1b884b6..b5d0650 100644 --- a/OpenNest.Engine/Jobs/Placement/DefaultPlateNester.cs +++ b/OpenNest.Engine/Jobs/Placement/DefaultPlateNester.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading; -namespace OpenNest; +using OpenNest.Engine.Jobs.Adapters; +namespace OpenNest.Engine.Jobs.Placement; /// /// Migrated built-in placement strategy for the whole-job runner. Reuses diff --git a/OpenNest.Engine/Jobs/Placement/OrderedPlateNester.cs b/OpenNest.Engine/Jobs/Placement/OrderedPlateNester.cs index 37b3738..632cfd0 100644 --- a/OpenNest.Engine/Jobs/Placement/OrderedPlateNester.cs +++ b/OpenNest.Engine/Jobs/Placement/OrderedPlateNester.cs @@ -5,7 +5,8 @@ using System.Threading; using OpenNest.Engine.Fill; using OpenNest.Geometry; -namespace OpenNest; +using OpenNest.Engine.Jobs.Adapters; +namespace OpenNest.Engine.Jobs.Placement; /// Constrained-order linear fills in conservative rectangular free regions. /// Regions are only search hints; every accepted pose passes the job geometry validator. diff --git a/OpenNest.Engine/Jobs/Placement/StripPlateNester.cs b/OpenNest.Engine/Jobs/Placement/StripPlateNester.cs index 6e46b80..5794da5 100644 --- a/OpenNest.Engine/Jobs/Placement/StripPlateNester.cs +++ b/OpenNest.Engine/Jobs/Placement/StripPlateNester.cs @@ -2,7 +2,8 @@ using System; using System.Collections.Generic; using System.Threading; -namespace OpenNest; +using OpenNest.Engine.Jobs.Adapters; +namespace OpenNest.Engine.Jobs.Placement; /// /// Migrated built-in placement strategy for the whole-job runner. Reuses diff --git a/OpenNest.Engine/Jobs/PlateCandidate.cs b/OpenNest.Engine/Jobs/PlateCandidate.cs index 58a9f0c..3d0718f 100644 --- a/OpenNest.Engine/Jobs/PlateCandidate.cs +++ b/OpenNest.Engine/Jobs/PlateCandidate.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// Owned candidate poses only; not committed fulfillment or inventory accounting. public sealed class PlateCandidate diff --git a/OpenNest.Engine/Jobs/PlateNesterFactory.cs b/OpenNest.Engine/Jobs/PlateNesterFactory.cs index 66dc6f3..841204a 100644 --- a/OpenNest.Engine/Jobs/PlateNesterFactory.cs +++ b/OpenNest.Engine/Jobs/PlateNesterFactory.cs @@ -1,6 +1,8 @@ using System; -namespace OpenNest; +using OpenNest.Engine.Jobs.Adapters; +using OpenNest.Engine.Jobs.Placement; +namespace OpenNest.Engine.Jobs; /// /// Instance-scoped strategy resolution for the whole-job runner. Default and Strip resolve to the diff --git a/OpenNest.Engine/Jobs/PlatePlacementRequest.cs b/OpenNest.Engine/Jobs/PlatePlacementRequest.cs index 558273a..6413a78 100644 --- a/OpenNest.Engine/Jobs/PlatePlacementRequest.cs +++ b/OpenNest.Engine/Jobs/PlatePlacementRequest.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; /// Read-only stock settings and remaining requirements for a single candidate trial. public sealed class PlatePlacementRequest diff --git a/OpenNest.Engine/Jobs/RotationPolicy.cs b/OpenNest.Engine/Jobs/RotationPolicy.cs index 3b4844c..de91872 100644 --- a/OpenNest.Engine/Jobs/RotationPolicy.cs +++ b/OpenNest.Engine/Jobs/RotationPolicy.cs @@ -1,6 +1,6 @@ using System; -namespace OpenNest; +namespace OpenNest.Engine.Jobs; public enum RotationPolicyKind { diff --git a/OpenNest.Engine/Jobs/StockLadderNestingEngine.cs b/OpenNest.Engine/Jobs/StockLadderNestingEngine.cs index 2d6e5c7..feb1a0c 100644 --- a/OpenNest.Engine/Jobs/StockLadderNestingEngine.cs +++ b/OpenNest.Engine/Jobs/StockLadderNestingEngine.cs @@ -3,7 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading; -namespace OpenNest; +using OpenNest.Engine.Jobs.Adapters; +using OpenNest.Engine.Jobs.Placement; +namespace OpenNest.Engine.Jobs; /// /// Caller-stock-only allocation followed by bounded adjacent-sheet repacking. All replacements diff --git a/OpenNest.Engine/MultiPlateNester.cs b/OpenNest.Engine/MultiPlateNester.cs index 48b78d1..01dc266 100644 --- a/OpenNest.Engine/MultiPlateNester.cs +++ b/OpenNest.Engine/MultiPlateNester.cs @@ -6,7 +6,7 @@ using OpenNest.Engine.Fill; using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest +namespace OpenNest.Engine { public enum PartClass { diff --git a/OpenNest.Engine/MultiPlateResult.cs b/OpenNest.Engine/MultiPlateResult.cs index b4d2ca0..f1086a2 100644 --- a/OpenNest.Engine/MultiPlateResult.cs +++ b/OpenNest.Engine/MultiPlateResult.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace OpenNest +namespace OpenNest.Engine { public class MultiPlateNestOptions { diff --git a/OpenNest.Engine/NestDirection.cs b/OpenNest.Engine/NestDirection.cs index 17ea779..db1e224 100644 --- a/OpenNest.Engine/NestDirection.cs +++ b/OpenNest.Engine/NestDirection.cs @@ -1,4 +1,4 @@ -namespace OpenNest +namespace OpenNest.Engine { public enum NestDirection { diff --git a/OpenNest.Engine/NestEngineBase.cs b/OpenNest.Engine/NestEngineBase.cs index a911161..101992b 100644 --- a/OpenNest.Engine/NestEngineBase.cs +++ b/OpenNest.Engine/NestEngineBase.cs @@ -10,7 +10,7 @@ using OpenNest.Engine.Strategies; using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest +namespace OpenNest.Engine { public abstract class NestEngineBase { diff --git a/OpenNest.Engine/NestEngineInfo.cs b/OpenNest.Engine/NestEngineInfo.cs index a18a93d..209e7a0 100644 --- a/OpenNest.Engine/NestEngineInfo.cs +++ b/OpenNest.Engine/NestEngineInfo.cs @@ -1,6 +1,6 @@ using System; -namespace OpenNest +namespace OpenNest.Engine { public class NestEngineInfo { diff --git a/OpenNest.Engine/NestEngineRegistry.cs b/OpenNest.Engine/NestEngineRegistry.cs index b6b1b40..212afd4 100644 --- a/OpenNest.Engine/NestEngineRegistry.cs +++ b/OpenNest.Engine/NestEngineRegistry.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using System.Reflection; -namespace OpenNest +namespace OpenNest.Engine { public static class NestEngineRegistry { diff --git a/OpenNest.Engine/NestItem.cs b/OpenNest.Engine/NestItem.cs index af7437c..782807c 100644 --- a/OpenNest.Engine/NestItem.cs +++ b/OpenNest.Engine/NestItem.cs @@ -1,4 +1,4 @@ -namespace OpenNest +namespace OpenNest.Engine { public class NestItem { diff --git a/OpenNest.Engine/NestProgress.cs b/OpenNest.Engine/NestProgress.cs index 82163ac..68418d0 100644 --- a/OpenNest.Engine/NestProgress.cs +++ b/OpenNest.Engine/NestProgress.cs @@ -5,7 +5,7 @@ using System.ComponentModel; using System.Reflection; using OpenNest.Geometry; -namespace OpenNest +namespace OpenNest.Engine { [AttributeUsage(AttributeTargets.Field)] internal class ShortNameAttribute(string name) : Attribute diff --git a/OpenNest.Engine/OpenNest.Engine.csproj b/OpenNest.Engine/OpenNest.Engine.csproj index f9ac952..82981bb 100644 --- a/OpenNest.Engine/OpenNest.Engine.csproj +++ b/OpenNest.Engine/OpenNest.Engine.csproj @@ -1,7 +1,7 @@ net8.0 - OpenNest + OpenNest.Engine OpenNest.Engine diff --git a/OpenNest.Engine/PartSortOrder.cs b/OpenNest.Engine/PartSortOrder.cs index 61d4826..b0e0581 100644 --- a/OpenNest.Engine/PartSortOrder.cs +++ b/OpenNest.Engine/PartSortOrder.cs @@ -1,4 +1,4 @@ -namespace OpenNest +namespace OpenNest.Engine { public enum PartSortOrder { diff --git a/OpenNest.Engine/PlateOptimizer.cs b/OpenNest.Engine/PlateOptimizer.cs index 5983818..4796b09 100644 --- a/OpenNest.Engine/PlateOptimizer.cs +++ b/OpenNest.Engine/PlateOptimizer.cs @@ -8,7 +8,7 @@ using OpenNest.Engine.BestFit; using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest +namespace OpenNest.Engine { public static class PlateOptimizer { diff --git a/OpenNest.Engine/RectanglePacking/Bin.cs b/OpenNest.Engine/RectanglePacking/Bin.cs index 8688277..04f53c0 100644 --- a/OpenNest.Engine/RectanglePacking/Bin.cs +++ b/OpenNest.Engine/RectanglePacking/Bin.cs @@ -2,7 +2,7 @@ using System.Linq; using OpenNest.Geometry; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal class Bin : Box { diff --git a/OpenNest.Engine/RectanglePacking/BinConverter.cs b/OpenNest.Engine/RectanglePacking/BinConverter.cs index cf2c6fc..7fd82ca 100644 --- a/OpenNest.Engine/RectanglePacking/BinConverter.cs +++ b/OpenNest.Engine/RectanglePacking/BinConverter.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal static class BinConverter { diff --git a/OpenNest.Engine/RectanglePacking/FillBestFit.cs b/OpenNest.Engine/RectanglePacking/FillBestFit.cs index fc851e2..8479c20 100644 --- a/OpenNest.Engine/RectanglePacking/FillBestFit.cs +++ b/OpenNest.Engine/RectanglePacking/FillBestFit.cs @@ -1,7 +1,8 @@ using System; +using OpenNest.Engine.Fill; using OpenNest.Math; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal class FillBestFit : FillEngine { diff --git a/OpenNest.Engine/RectanglePacking/FillEngine.cs b/OpenNest.Engine/RectanglePacking/FillEngine.cs index 27900dd..502488a 100644 --- a/OpenNest.Engine/RectanglePacking/FillEngine.cs +++ b/OpenNest.Engine/RectanglePacking/FillEngine.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using OpenNest.Geometry; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal abstract class FillEngine { diff --git a/OpenNest.Engine/RectanglePacking/FillNoRotation.cs b/OpenNest.Engine/RectanglePacking/FillNoRotation.cs index c76d60a..8410e70 100644 --- a/OpenNest.Engine/RectanglePacking/FillNoRotation.cs +++ b/OpenNest.Engine/RectanglePacking/FillNoRotation.cs @@ -1,7 +1,7 @@ using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal class FillNoRotation : FillEngine { diff --git a/OpenNest.Engine/RectanglePacking/FillSameRotation.cs b/OpenNest.Engine/RectanglePacking/FillSameRotation.cs index c933b94..f58ab25 100644 --- a/OpenNest.Engine/RectanglePacking/FillSameRotation.cs +++ b/OpenNest.Engine/RectanglePacking/FillSameRotation.cs @@ -1,6 +1,6 @@ using OpenNest.Math; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal class FillSameRotation : FillEngine { diff --git a/OpenNest.Engine/RectanglePacking/FillSpiral.cs b/OpenNest.Engine/RectanglePacking/FillSpiral.cs index 7f13b34..1e37db2 100644 --- a/OpenNest.Engine/RectanglePacking/FillSpiral.cs +++ b/OpenNest.Engine/RectanglePacking/FillSpiral.cs @@ -1,7 +1,8 @@ using OpenNest.Geometry; +using OpenNest.Engine.Fill; using OpenNest.Math; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal class FillSpiral : FillEngine { diff --git a/OpenNest.Engine/RectanglePacking/Item.cs b/OpenNest.Engine/RectanglePacking/Item.cs index 4d1a94e..d22b4cc 100644 --- a/OpenNest.Engine/RectanglePacking/Item.cs +++ b/OpenNest.Engine/RectanglePacking/Item.cs @@ -2,7 +2,7 @@ using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal class Item : Box { diff --git a/OpenNest.Engine/RectanglePacking/PackBottomLeft.cs b/OpenNest.Engine/RectanglePacking/PackBottomLeft.cs index bb05614..ef4c6d8 100644 --- a/OpenNest.Engine/RectanglePacking/PackBottomLeft.cs +++ b/OpenNest.Engine/RectanglePacking/PackBottomLeft.cs @@ -3,7 +3,7 @@ using System.Linq; using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal class PackBottomLeft : PackEngine { diff --git a/OpenNest.Engine/RectanglePacking/PackEngine.cs b/OpenNest.Engine/RectanglePacking/PackEngine.cs index 9c4f7b3..6fea89f 100644 --- a/OpenNest.Engine/RectanglePacking/PackEngine.cs +++ b/OpenNest.Engine/RectanglePacking/PackEngine.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal abstract class PackEngine { diff --git a/OpenNest.Engine/RectanglePacking/PackFirstFitDecreasing.cs b/OpenNest.Engine/RectanglePacking/PackFirstFitDecreasing.cs index 25fe8ab..94f9f71 100644 --- a/OpenNest.Engine/RectanglePacking/PackFirstFitDecreasing.cs +++ b/OpenNest.Engine/RectanglePacking/PackFirstFitDecreasing.cs @@ -2,7 +2,7 @@ using System.Linq; using OpenNest.Geometry; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal class FirstFitDecreasing : PackEngine { diff --git a/OpenNest.Engine/RectanglePacking/RectFill.cs b/OpenNest.Engine/RectanglePacking/RectFill.cs index ef539eb..1766465 100644 --- a/OpenNest.Engine/RectanglePacking/RectFill.cs +++ b/OpenNest.Engine/RectanglePacking/RectFill.cs @@ -1,6 +1,6 @@ using OpenNest.Geometry; -namespace OpenNest.RectanglePacking +namespace OpenNest.Engine.RectanglePacking { internal static class RectFill { diff --git a/OpenNest.Engine/Strategies/RectBestFitStrategy.cs b/OpenNest.Engine/Strategies/RectBestFitStrategy.cs index 36de1b0..3b5cdfb 100644 --- a/OpenNest.Engine/Strategies/RectBestFitStrategy.cs +++ b/OpenNest.Engine/Strategies/RectBestFitStrategy.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using OpenNest.RectanglePacking; +using OpenNest.Engine.RectanglePacking; namespace OpenNest.Engine.Strategies { diff --git a/OpenNest.Engine/StripNestEngine.cs b/OpenNest.Engine/StripNestEngine.cs index e4bc097..5a86917 100644 --- a/OpenNest.Engine/StripNestEngine.cs +++ b/OpenNest.Engine/StripNestEngine.cs @@ -5,7 +5,7 @@ using System.Threading; using OpenNest.Engine.Fill; using OpenNest.Geometry; -namespace OpenNest +namespace OpenNest.Engine { public class StripNestEngine : NestEngineBase { diff --git a/OpenNest.Engine/VerticalRemnantEngine.cs b/OpenNest.Engine/VerticalRemnantEngine.cs index c50c550..8d419ad 100644 --- a/OpenNest.Engine/VerticalRemnantEngine.cs +++ b/OpenNest.Engine/VerticalRemnantEngine.cs @@ -5,7 +5,7 @@ using OpenNest.Engine.Fill; using OpenNest.Geometry; using OpenNest.Math; -namespace OpenNest +namespace OpenNest.Engine { /// /// Optimizes for the largest right-side vertical drop. diff --git a/OpenNest.IO.Tests/CutOnlyImportTests.cs b/OpenNest.IO.Tests/CutOnlyImportTests.cs index 97dccbb..3509ca1 100644 --- a/OpenNest.IO.Tests/CutOnlyImportTests.cs +++ b/OpenNest.IO.Tests/CutOnlyImportTests.cs @@ -4,6 +4,8 @@ using CSMath; using OpenNest.CNC; using CadLayer = ACadSharp.Tables.Layer; using CadLine = ACadSharp.Entities.Line; +using OpenNest.Engine.Jobs; +using OpenNest.Engine.Jobs.Adapters; namespace OpenNest.IO.Tests; diff --git a/OpenNest.Mcp/Tools/NestingTools.cs b/OpenNest.Mcp/Tools/NestingTools.cs index a603bbd..859d7f7 100644 --- a/OpenNest.Mcp/Tools/NestingTools.cs +++ b/OpenNest.Mcp/Tools/NestingTools.cs @@ -6,6 +6,7 @@ using System.Threading; using ModelContextProtocol.Server; using OpenNest.Engine.Fill; using OpenNest.Geometry; +using OpenNest.Engine; namespace OpenNest.Mcp.Tools { diff --git a/OpenNest.Tests/Api/NestResponsePersistenceTests.cs b/OpenNest.Tests/Api/NestResponsePersistenceTests.cs index 29ba92f..871b087 100644 --- a/OpenNest.Tests/Api/NestResponsePersistenceTests.cs +++ b/OpenNest.Tests/Api/NestResponsePersistenceTests.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using OpenNest.Api; using OpenNest.Geometry; using OpenNest.IO; +using OpenNest.Engine.Jobs; namespace OpenNest.Tests.Api; diff --git a/OpenNest.Tests/Api/NestRunnerTests.cs b/OpenNest.Tests/Api/NestRunnerTests.cs index 84d6c2c..9076b06 100644 --- a/OpenNest.Tests/Api/NestRunnerTests.cs +++ b/OpenNest.Tests/Api/NestRunnerTests.cs @@ -6,6 +6,7 @@ using OpenNest.Api; using OpenNest.Converters; using OpenNest.Geometry; using OpenNest.IO; +using OpenNest.Engine.Jobs; namespace OpenNest.Tests.Api; diff --git a/OpenNest.Tests/Benchmark/BenchmarkRunnerTests.cs b/OpenNest.Tests/Benchmark/BenchmarkRunnerTests.cs index 1edcf7b..b4a8080 100644 --- a/OpenNest.Tests/Benchmark/BenchmarkRunnerTests.cs +++ b/OpenNest.Tests/Benchmark/BenchmarkRunnerTests.cs @@ -1,4 +1,5 @@ using OpenNest.Benchmark; +using OpenNest.Engine.Jobs; namespace OpenNest.Tests.Benchmark; diff --git a/OpenNest.Tests/Benchmark/JobLoaderManifestTests.cs b/OpenNest.Tests/Benchmark/JobLoaderManifestTests.cs index ed4e86e..643f4a6 100644 --- a/OpenNest.Tests/Benchmark/JobLoaderManifestTests.cs +++ b/OpenNest.Tests/Benchmark/JobLoaderManifestTests.cs @@ -1,5 +1,6 @@ using OpenNest.Benchmark; using OpenNest.Geometry; +using OpenNest.Engine.Jobs; namespace OpenNest.Tests.Benchmark; diff --git a/OpenNest.Tests/Engine/EngineOverlapTests.cs b/OpenNest.Tests/Engine/EngineOverlapTests.cs index c420e3f..a6d77c3 100644 --- a/OpenNest.Tests/Engine/EngineOverlapTests.cs +++ b/OpenNest.Tests/Engine/EngineOverlapTests.cs @@ -2,6 +2,7 @@ using OpenNest.Converters; using OpenNest.Geometry; using OpenNest.IO; using Xunit.Abstractions; +using OpenNest.Engine; namespace OpenNest.Tests.Engine; diff --git a/OpenNest.Tests/Engine/EngineRefactorSmokeTests.cs b/OpenNest.Tests/Engine/EngineRefactorSmokeTests.cs index e3e2fc3..ac49035 100644 --- a/OpenNest.Tests/Engine/EngineRefactorSmokeTests.cs +++ b/OpenNest.Tests/Engine/EngineRefactorSmokeTests.cs @@ -1,4 +1,5 @@ using OpenNest.Geometry; +using OpenNest.Engine; namespace OpenNest.Tests.Engine; diff --git a/OpenNest.Tests/Engine/MultiPlateNesterTests.cs b/OpenNest.Tests/Engine/MultiPlateNesterTests.cs index 97db238..720abd5 100644 --- a/OpenNest.Tests/Engine/MultiPlateNesterTests.cs +++ b/OpenNest.Tests/Engine/MultiPlateNesterTests.cs @@ -7,6 +7,7 @@ using OpenNest.Geometry; using OpenNest.IO; using Xunit; using Xunit.Abstractions; +using OpenNest.Engine; namespace OpenNest.Tests.Engine; diff --git a/OpenNest.Tests/Engine/NestPhaseExtensionsTests.cs b/OpenNest.Tests/Engine/NestPhaseExtensionsTests.cs index 729afab..6012fab 100644 --- a/OpenNest.Tests/Engine/NestPhaseExtensionsTests.cs +++ b/OpenNest.Tests/Engine/NestPhaseExtensionsTests.cs @@ -1,3 +1,4 @@ +using OpenNest.Engine; namespace OpenNest.Tests.Engine; public class NestPhaseExtensionsTests diff --git a/OpenNest.Tests/Engine/NestProgressTests.cs b/OpenNest.Tests/Engine/NestProgressTests.cs index f94a5af..4d0a169 100644 --- a/OpenNest.Tests/Engine/NestProgressTests.cs +++ b/OpenNest.Tests/Engine/NestProgressTests.cs @@ -1,4 +1,5 @@ using OpenNest.Geometry; +using OpenNest.Engine; namespace OpenNest.Tests.Engine; diff --git a/OpenNest.Tests/Engine/PlateOptimizerTests.cs b/OpenNest.Tests/Engine/PlateOptimizerTests.cs index 55164aa..425f6fc 100644 --- a/OpenNest.Tests/Engine/PlateOptimizerTests.cs +++ b/OpenNest.Tests/Engine/PlateOptimizerTests.cs @@ -1,4 +1,5 @@ using OpenNest.Geometry; +using OpenNest.Engine; namespace OpenNest.Tests.Engine; diff --git a/OpenNest.Tests/Fill/AccumulatingProgressTests.cs b/OpenNest.Tests/Fill/AccumulatingProgressTests.cs index e2837e1..a76d317 100644 --- a/OpenNest.Tests/Fill/AccumulatingProgressTests.cs +++ b/OpenNest.Tests/Fill/AccumulatingProgressTests.cs @@ -1,4 +1,5 @@ using OpenNest.Engine.Fill; +using OpenNest.Engine; namespace OpenNest.Tests.Fill; diff --git a/OpenNest.Tests/Fill/BestCombinationTests.cs b/OpenNest.Tests/Fill/BestCombinationTests.cs index 54437d7..ef51b34 100644 --- a/OpenNest.Tests/Fill/BestCombinationTests.cs +++ b/OpenNest.Tests/Fill/BestCombinationTests.cs @@ -1,3 +1,4 @@ +using OpenNest.Engine.Fill; namespace OpenNest.Tests.Fill; public class BestCombinationTests diff --git a/OpenNest.Tests/Fill/FillLinearCircleTests.cs b/OpenNest.Tests/Fill/FillLinearCircleTests.cs index 3b984c3..29b8acc 100644 --- a/OpenNest.Tests/Fill/FillLinearCircleTests.cs +++ b/OpenNest.Tests/Fill/FillLinearCircleTests.cs @@ -8,6 +8,7 @@ using OpenNest.Geometry; using OpenNest.Math; using Xunit; using Xunit.Abstractions; +using OpenNest.Engine; namespace OpenNest.Tests.Fill { diff --git a/OpenNest.Tests/Fill/IterativeShrinkFillerTests.cs b/OpenNest.Tests/Fill/IterativeShrinkFillerTests.cs index c0dead3..3a581a4 100644 --- a/OpenNest.Tests/Fill/IterativeShrinkFillerTests.cs +++ b/OpenNest.Tests/Fill/IterativeShrinkFillerTests.cs @@ -1,5 +1,6 @@ using OpenNest.Engine.Fill; using OpenNest.Geometry; +using OpenNest.Engine; namespace OpenNest.Tests.Fill; diff --git a/OpenNest.Tests/Fill/PairFillerTests.cs b/OpenNest.Tests/Fill/PairFillerTests.cs index 00d5f82..72cc4e5 100644 --- a/OpenNest.Tests/Fill/PairFillerTests.cs +++ b/OpenNest.Tests/Fill/PairFillerTests.cs @@ -1,5 +1,6 @@ using OpenNest.Engine.Fill; using OpenNest.Geometry; +using OpenNest.Engine; namespace OpenNest.Tests.Fill; diff --git a/OpenNest.Tests/Fill/PairOverlapDiagnosticTests.cs b/OpenNest.Tests/Fill/PairOverlapDiagnosticTests.cs index f594d3e..a7ecd29 100644 --- a/OpenNest.Tests/Fill/PairOverlapDiagnosticTests.cs +++ b/OpenNest.Tests/Fill/PairOverlapDiagnosticTests.cs @@ -3,6 +3,7 @@ using OpenNest.Engine.Fill; using OpenNest.Geometry; using OpenNest.Math; using Xunit.Abstractions; +using OpenNest.Engine; namespace OpenNest.Tests.Fill; diff --git a/OpenNest.Tests/Fill/RemnantFillerTests2.cs b/OpenNest.Tests/Fill/RemnantFillerTests2.cs index 498570e..52b08dc 100644 --- a/OpenNest.Tests/Fill/RemnantFillerTests2.cs +++ b/OpenNest.Tests/Fill/RemnantFillerTests2.cs @@ -1,5 +1,6 @@ using OpenNest.Engine.Fill; using OpenNest.Geometry; +using OpenNest.Engine; namespace OpenNest.Tests.Fill; diff --git a/OpenNest.Tests/Fill/ShrinkFillerTests.cs b/OpenNest.Tests/Fill/ShrinkFillerTests.cs index 2eba14e..6998708 100644 --- a/OpenNest.Tests/Fill/ShrinkFillerTests.cs +++ b/OpenNest.Tests/Fill/ShrinkFillerTests.cs @@ -1,5 +1,6 @@ using OpenNest.Engine.Fill; using OpenNest.Geometry; +using OpenNest.Engine; namespace OpenNest.Tests.Fill; diff --git a/OpenNest.Tests/Strategies/FillPipelineTests.cs b/OpenNest.Tests/Strategies/FillPipelineTests.cs index 2c11ae8..feadf77 100644 --- a/OpenNest.Tests/Strategies/FillPipelineTests.cs +++ b/OpenNest.Tests/Strategies/FillPipelineTests.cs @@ -1,5 +1,6 @@ using OpenNest.Engine.Strategies; using OpenNest.Geometry; +using OpenNest.Engine; namespace OpenNest.Tests.Strategies; diff --git a/OpenNest.Tests/Strategies/StripeFillerTests.cs b/OpenNest.Tests/Strategies/StripeFillerTests.cs index 63b933d..e0ca2d6 100644 --- a/OpenNest.Tests/Strategies/StripeFillerTests.cs +++ b/OpenNest.Tests/Strategies/StripeFillerTests.cs @@ -3,6 +3,7 @@ using OpenNest.Engine.BestFit; using OpenNest.Engine.Fill; using OpenNest.Engine.Strategies; using OpenNest.Geometry; +using OpenNest.Engine; namespace OpenNest.Tests.Strategies; diff --git a/OpenNest.Training/TrainingDatabase.cs b/OpenNest.Training/TrainingDatabase.cs index 837aa3d..a8b7acc 100644 --- a/OpenNest.Training/TrainingDatabase.cs +++ b/OpenNest.Training/TrainingDatabase.cs @@ -7,6 +7,7 @@ using Microsoft.EntityFrameworkCore; using OpenNest.Engine.ML; using OpenNest.IO; using OpenNest.Training.Data; +using OpenNest.Engine; namespace OpenNest.Training { diff --git a/OpenNest/Actions/ActionFillArea.cs b/OpenNest/Actions/ActionFillArea.cs index ec9fcf1..6818e5e 100644 --- a/OpenNest/Actions/ActionFillArea.cs +++ b/OpenNest/Actions/ActionFillArea.cs @@ -5,6 +5,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; using OpenNest.Controls; +using OpenNest.Engine; namespace OpenNest.Actions { diff --git a/OpenNest/Controls/PhaseStepperControl.cs b/OpenNest/Controls/PhaseStepperControl.cs index a3478f9..508b98c 100644 --- a/OpenNest/Controls/PhaseStepperControl.cs +++ b/OpenNest/Controls/PhaseStepperControl.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Drawing; using System.Drawing.Drawing2D; using System.Windows.Forms; +using OpenNest.Engine; namespace OpenNest.Controls { diff --git a/OpenNest/Controls/PlateView.cs b/OpenNest/Controls/PlateView.cs index 12b40b8..6564711 100644 --- a/OpenNest/Controls/PlateView.cs +++ b/OpenNest/Controls/PlateView.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Diagnostics; @@ -15,6 +15,7 @@ using OpenNest.Forms; using OpenNest.Geometry; using OpenNest.Math; using Timer = System.Timers.Timer; +using OpenNest.Engine; namespace OpenNest.Controls { diff --git a/OpenNest/Forms/MainForm.cs b/OpenNest/Forms/MainForm.cs index 51aada3..0c4632b 100644 --- a/OpenNest/Forms/MainForm.cs +++ b/OpenNest/Forms/MainForm.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Drawing; using System.IO; @@ -16,6 +16,7 @@ using OpenNest.Geometry; using OpenNest.Gpu; using OpenNest.IO; using OpenNest.Properties; +using OpenNest.Engine; namespace OpenNest.Forms { diff --git a/OpenNest/Forms/NestProgressForm.cs b/OpenNest/Forms/NestProgressForm.cs index 96b7f3e..21abd6e 100644 --- a/OpenNest/Forms/NestProgressForm.cs +++ b/OpenNest/Forms/NestProgressForm.cs @@ -5,6 +5,7 @@ using System.Drawing; using System.Linq; using System.Threading; using System.Windows.Forms; +using OpenNest.Engine; namespace OpenNest.Forms { diff --git a/OpenNest/Forms/PatternTileForm.cs b/OpenNest/Forms/PatternTileForm.cs index b785d1b..46bdb35 100644 --- a/OpenNest/Forms/PatternTileForm.cs +++ b/OpenNest/Forms/PatternTileForm.cs @@ -5,6 +5,7 @@ using System.Windows.Forms; using OpenNest.Engine.Fill; using OpenNest.Geometry; using GeoSize = OpenNest.Geometry.Size; +using OpenNest.Engine; namespace OpenNest.Forms {