Merge branch 'release/0.3.0'

9swampy · Aug 6, 2022 · fd1aac8 · fd1aac8
2 parents fe4e215 + 18af210
commit fd1aac8
Show file tree

Hide file tree

Showing 184 changed files with 20,105 additions and 3,838 deletions.
diff --git a/DeepNestLib.CiTests/CanBePlacedFixture.cs b/DeepNestLib.CiTests/CanBePlacedFixture.cs
@@ -1,6 +1,8 @@
 namespace DeepNestLib.CiTests
 {
   using System.Linq;
+  using DeepNestLib.CiTests.IO;
+  using DeepNestLib.Placement;
   using FakeItEasy;
   using FluentAssertions;
   using Xunit;

diff --git a/DeepNestLib.CiTests/ClipperIntersectFixture.cs b/DeepNestLib.CiTests/ClipperIntersectFixture.cs
@@ -1,6 +1,7 @@
 namespace DeepNestLib.CiTests
 {
   using System.Collections.Generic;
+  using DeepNestLib.CiTests.IO;
   using DeepNestLib.Geometry;
   using FluentAssertions;
   using IxMilia.Dxf.Entities;

diff --git a/DeepNestLib.CiTests/CompareMinkowskiImplementationsFixture.cs b/DeepNestLib.CiTests/CompareMinkowskiImplementationsFixture.cs
@@ -4,6 +4,9 @@
   using System.Collections.Generic;
   using System.Diagnostics;
   using System.Linq;
+  using DeepNestLib.CiTests.IO;
+  using DeepNestLib.IO;
+  using DeepNestLib.Placement;
   using FakeItEasy;
   using FluentAssertions;
   using IxMilia.Dxf.Entities;

diff --git a/DeepNestLib.CiTests/DeepNestLib.CiTests.csproj b/DeepNestLib.CiTests/DeepNestLib.CiTests.csproj
@@ -70,6 +70,7 @@
     <None Remove="ReadMe\ReadMeExampleSmall.dnest" />
     <None Remove="ReadMe\ReadMeExampleSmall.dnr" />
     <None Remove="ReadMe\ReadMeExampleSmall.dxf" />
+    <None Remove="ReadMe\ReadMeExampleSmallColoured.dxf" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="20x20outer10x10hole.dxf">
@@ -229,6 +230,7 @@
     <EmbeddedResource Include="ReadMe\ReadMeExampleSmall.dnest" />
     <EmbeddedResource Include="ReadMe\ReadMeExampleSmall.dnr" />
     <EmbeddedResource Include="ReadMe\ReadMeExampleSmall.dxf" />
+    <EmbeddedResource Include="ReadMe\ReadMeExampleSmallColoured.dxf" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Placement\PartPlacementScenarioNewMinkowski-MinkowskiOutNfp.dnpoly" />
@@ -243,6 +245,9 @@
     <EmbeddedResource Include="..\DeepNestPort\dxfs\_4.dxf" Link="Dxfs\_4.dxf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="..\DeepNestPort\dxfs\_3.dxf" Link="Dxfs\_3.dxf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
     <None Include="..\MinkowskiDlls\minkowski.dll" Link="minkowski.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -258,7 +263,7 @@
     <PackageReference Include="FluentAssertions" Version="6.7.0" />
     <PackageReference Include="IxMilia.Dxf" Version="0.8.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/DeepNestLib.CiTests/DummyFactories/DummyMinkowskiSumFactory.cs b/DeepNestLib.CiTests/DummyFactories/DummyMinkowskiSumFactory.cs
@@ -1,5 +1,6 @@
 namespace DeepNestLib.CiTests.DummyFactories
 {
+  using DeepNestLib.Placement;
   using FakeItEasy;
 
   internal class DummyMinkowskiSumFactory : DummyFactory<MinkowskiSum>

diff --git a/DeepNestLib.CiTests/DummyFactories/DummyNfpHelperFactory.cs b/DeepNestLib.CiTests/DummyFactories/DummyNfpHelperFactory.cs
@@ -1,5 +1,6 @@
 namespace DeepNestLib.CiTests.DummyFactories
 {
+  using DeepNestLib.Placement;
   using FakeItEasy;
 
   internal class DummyNfpHelperFactory : DummyFactory<NfpHelper>

diff --git a/DeepNestLib.CiTests/DummyFactories/DummyPartPlacementWorkerFactory.cs b/DeepNestLib.CiTests/DummyFactories/DummyPartPlacementWorkerFactory.cs
@@ -1,6 +1,7 @@
 namespace DeepNestLib.CiTests.DummyFactories
 {
   using System.Collections.Generic;
+  using DeepNestLib.Placement;
   using FakeItEasy;
 
   internal class DummyPartPlacementWorkerFactory : DummyFactory<PartPlacementWorker>

diff --git a/DeepNestLib.CiTests/DummyFactories/DummyPlacementWorkerFactory.cs b/DeepNestLib.CiTests/DummyFactories/DummyPlacementWorkerFactory.cs
@@ -2,13 +2,14 @@
 {
   using System.Collections.Generic;
   using System.Diagnostics;
+  using DeepNestLib.GeneticAlgorithm;
   using FakeItEasy;
 
   internal class DummyPlacementWorkerFactory : DummyFactory<PlacementWorker>
   {
     protected override PlacementWorker Create()
     {
-      return new PlacementWorker(A.Dummy<NfpHelper>(), new List<ISheet>(), new Chromosome[0], A.Fake<ISvgNestConfig>(), A.Dummy<Stopwatch>(), A.Fake<INestState>());
+      return new PlacementWorker(A.Dummy<NfpHelper>(), new List<ISheet>(), new DeepNestGene(new Chromosome[0]), A.Fake<ISvgNestConfig>(), A.Dummy<Stopwatch>(), A.Fake<INestState>());
     }
   }
 }
diff --git a/DeepNestLib.CiTests/DxfParserPart1Fixture.cs b/DeepNestLib.CiTests/DxfParserPart1Fixture.cs
diff --git a/DeepNestLib.CiTests/Dxfs/SquareWithHoleFixture.cs b/DeepNestLib.CiTests/Dxfs/SquareWithHoleFixture.cs
@@ -2,6 +2,8 @@
 {
   using System.IO;
   using System.Reflection;
+  using DeepNestLib.CiTests.IO;
+  using DeepNestLib.IO;
   using FluentAssertions;
   using Xunit;
 

diff --git a/DeepNestLib.CiTests/ExtensionsSpliceFixture.cs b/DeepNestLib.CiTests/ExtensionsSpliceFixture.cs
diff --git a/...ib.CiTests/FitFourSmallSquaresInOneLargerSquareSheetPerfectlyBoundingBoxFitnessFixture.cs b/...ib.CiTests/FitFourSmallSquaresInOneLargerSquareSheetPerfectlyBoundingBoxFitnessFixture.cs
@@ -3,6 +3,8 @@
   using System;
   using System.Diagnostics;
   using DeepNestLib.CiTests.GeneticAlgorithm;
+  using DeepNestLib.CiTests.IO;
+  using DeepNestLib.GeneticAlgorithm;
   using DeepNestLib.Placement;
   using FakeItEasy;
   using FluentAssertions;
@@ -32,7 +34,7 @@ public FitFourSmallSquaresInOneLargerSquareSheetPerfectlyBoundingBoxFitnessFixtu
       DxfGenerator.GenerateSquare("fourthPart", 11D, RectangleType.FitFour).TryConvertToNfp(fourthPartIdSrc, 180, out fourthPart).Should().BeTrue();
       var config = new TestSvgNestConfig();
       config.PlacementType = PlacementTypeEnum.BoundingBox;
-      this.nestResult = new PlacementWorker(A.Dummy<NfpHelper>(), new ISheet[] { firstSheet }, new Chromosome[] { firstPart, secondPart, thirdPart, fourthPart }.ApplyIndex(), config, A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts();
+      this.nestResult = new PlacementWorker(A.Dummy<NfpHelper>(), new ISheet[] { firstSheet }, new DeepNestGene(new Chromosome[] { firstPart, secondPart, thirdPart, fourthPart }.ApplyIndex()), config, A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts();
     }
 
     [Fact]

diff --git a/DeepNestLib.CiTests/FitFourSmallSquaresInOneLargerSquareSheetPerfectlyFixture.cs b/DeepNestLib.CiTests/FitFourSmallSquaresInOneLargerSquareSheetPerfectlyFixture.cs
@@ -2,6 +2,9 @@
 {
   using System;
   using System.Diagnostics;
+  using DeepNestLib.CiTests.GeneticAlgorithm;
+  using DeepNestLib.CiTests.IO;
+  using DeepNestLib.GeneticAlgorithm;
   using DeepNestLib.Placement;
   using FakeItEasy;
   using FluentAssertions;
@@ -31,7 +34,7 @@ public FitFourSmallSquaresInOneLargerSquareSheetPerfectlyFixture()
       DxfGenerator.GenerateSquare("fourthPart", 11D, RectangleType.FitFour).TryConvertToNfp(fourthPartIdSrc, 180, out fourthPart).Should().BeTrue();
       var config = new TestSvgNestConfig();
       config.PlacementType = PlacementTypeEnum.Gravity;
-      this.nestResult = new PlacementWorker(A.Dummy<NfpHelper>(), new ISheet[] { firstSheet }, new Chromosome[] { firstPart, secondPart, thirdPart, fourthPart }.ApplyIndex(), config, A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts();
+      this.nestResult = new PlacementWorker(A.Dummy<NfpHelper>(), new ISheet[] { firstSheet }, new DeepNestGene(new Chromosome[] { firstPart, secondPart, thirdPart, fourthPart }.ApplyIndex()), config, A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts();
     }
 
     [Fact]

diff --git a/DeepNestLib.CiTests/FitOnlyOneOfTwoSmallSquaresPartInOneLargerSquareSheetsFixture.cs b/DeepNestLib.CiTests/FitOnlyOneOfTwoSmallSquaresPartInOneLargerSquareSheetsFixture.cs
@@ -2,6 +2,9 @@
 {
   using System;
   using System.Diagnostics;
+  using DeepNestLib.CiTests.GeneticAlgorithm;
+  using DeepNestLib.CiTests.IO;
+  using DeepNestLib.GeneticAlgorithm;
   using DeepNestLib.Placement;
   using FakeItEasy;
   using FluentAssertions;
@@ -23,7 +26,7 @@ public FitOnlyOneOfTwoSmallSquaresPartInOneLargerSquareSheetsFixture()
       DxfGenerator.GenerateSquare("Part", 11D, RectangleType.FileLoad).TryConvertToNfp(firstPartIdSrc, out firstPart).Should().BeTrue();
       Chromosome secondPart;
       DxfGenerator.GenerateSquare("Part", 11D, RectangleType.FileLoad).TryConvertToNfp(secondPartIdSrc, out secondPart).Should().BeTrue();
-      this.nestResult = new PlacementWorker(A.Dummy<NfpHelper>(), new ISheet[] { firstSheet }, new Chromosome[] { firstPart, secondPart }.ApplyIndex(), new TestSvgNestConfig(), A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts();
+      this.nestResult = new PlacementWorker(A.Dummy<NfpHelper>(), new ISheet[] { firstSheet }, new DeepNestGene(new Chromosome[] { firstPart, secondPart }.ApplyIndex()), new TestSvgNestConfig(), A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts();
     }
 
     [Fact]

diff --git a/DeepNestLib.CiTests/FitSmallSquarePartInLargerSquareSheetFixture.cs b/DeepNestLib.CiTests/FitSmallSquarePartInLargerSquareSheetFixture.cs
@@ -1,6 +1,8 @@
 namespace DeepNestLib.CiTests
 {
   using System.Diagnostics;
+  using DeepNestLib.CiTests.IO;
+  using DeepNestLib.GeneticAlgorithm;
   using DeepNestLib.Placement;
   using FakeItEasy;
   using FluentAssertions;
@@ -17,13 +19,13 @@ public FitSmallSquarePartInLargerSquareSheetFixture()
       DxfGenerator.GenerateSquare("Sheet", 22D, RectangleType.FileLoad).TryConvertToSheet(0, out sheet).Should().BeTrue();
       Chromosome part;
       DxfGenerator.GenerateSquare("Part", 11D, RectangleType.FileLoad).TryConvertToNfp(0, out part).Should().BeTrue();
-      this.nestResult = new PlacementWorker(A.Dummy<NfpHelper>(), new ISheet[] { sheet }, new Chromosome[] { part }, new TestSvgNestConfig(), A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts();
+      this.nestResult = new PlacementWorker(A.Dummy<NfpHelper>(), new ISheet[] { sheet }, new DeepNestGene(new Chromosome[] { part }), new TestSvgNestConfig(), A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts();
     }
 
     [Fact]
     public void GivenNullSheetsPassedInThenNullReturned()
     {
-      new PlacementWorker(A.Dummy<NfpHelper>(), null, new Chromosome[] { new Chromosome(new NoFitPolygon(), 0) }, new TestSvgNestConfig(), A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts().Should().BeNull();
+      new PlacementWorker(A.Dummy<NfpHelper>(), null, new DeepNestGene(new Chromosome[] { new Chromosome(new NoFitPolygon(), 0) }), new TestSvgNestConfig(), A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts().Should().BeNull();
     }
 
     [Fact]

diff --git a/DeepNestLib.CiTests/FitTwoSmallSquaresPartInTwoLargerSquareSheetsFixture.cs b/DeepNestLib.CiTests/FitTwoSmallSquaresPartInTwoLargerSquareSheetsFixture.cs
@@ -3,6 +3,8 @@
   using System;
   using System.Diagnostics;
   using DeepNestLib.CiTests.GeneticAlgorithm;
+  using DeepNestLib.CiTests.IO;
+  using DeepNestLib.GeneticAlgorithm;
   using DeepNestLib.Placement;
   using FakeItEasy;
   using FluentAssertions;
@@ -32,7 +34,7 @@ public FitTwoSmallSquaresPartInTwoLargerSquareSheetsFixture()
       A.CallTo(() => config.UseDllImport).Returns(false);
       A.CallTo(() => config.Rotations).Returns(2);
       A.CallTo(() => config.ExportExecutions).Returns(false);
-      this.nestResult = new PlacementWorker(A.Dummy<NfpHelper>(), new ISheet[] { firstSheet, secondSheet }, new Chromosome[] { firstPart, secondPart }.ApplyIndex(), config, A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts();
+      this.nestResult = new PlacementWorker(A.Dummy<NfpHelper>(), new ISheet[] { firstSheet, secondSheet }, new DeepNestGene(new Chromosome[] { firstPart, secondPart }.ApplyIndex()), config, A.Dummy<Stopwatch>(), A.Fake<INestState>()).PlaceParts();
     }
 
     [Fact]

diff --git a/DeepNestLib.CiTests/GeneticAlgorithm/GravityBoundsFixture.cs b/DeepNestLib.CiTests/GeneticAlgorithm/GravityBoundsFixture.cs
@@ -21,7 +21,7 @@ public void Test()
       A.CallTo(() => sheetPlacementVertical.PlacementType).Returns(PlacementTypeEnum.Gravity);
       var sheetSquare = A.Fake<ISheet>();
       A.CallTo(() => sheetSquare.Area).Returns(Math.Pow(Math.Max(small, large), 2));
-      A.CallTo(() => sheetSquare.Width).Returns(Math.Max(small, large));
+      A.CallTo(() => sheetSquare.WidthCalculated).Returns(Math.Max(small, large));
       A.CallTo(() => sheetPlacementVertical.Sheet).Returns(sheetSquare);
       var hull = A.Fake<INfp>();
       A.CallTo(() => hull.Area).Returns(small * large);