Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #35 from Digital-Production-Aachen/fixOVFMergingBug
Bug fixes and stability improvements for ovf streaming merger
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| ---- Copyright Start ---- | ||
| This file is part of the OpenVectorFormatTools collection. This collection provides tools to facilitate the usage of the OpenVectorFormat. | ||
| Copyright (C) 2023 Digital-Production-Aachen | ||
| This library is free software; you can redistribute it and/or | ||
| modify it under the terms of the GNU Lesser General Public | ||
| License as published by the Free Software Foundation; either | ||
| version 2.1 of the License, or (at your option) any later version. | ||
| This library is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| Lesser General Public License for more details. | ||
| You should have received a copy of the GNU Lesser General Public | ||
| License along with this library; if not, write to the Free Software | ||
| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| ---- Copyright End ---- | ||
| */ | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text; | ||
|
|
||
| namespace OVFDefinition | ||
| { | ||
| public class Utils | ||
| { | ||
| public static bool ApproxEquals(float value1, float value2, float tolerance = 1e-6f) | ||
| { | ||
| return Math.Abs(value1 - value2) <= tolerance; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,159 @@ | ||
| /* | ||
| ---- Copyright Start ---- | ||
| This file is part of the OpenVectorFormatTools collection. This collection provides tools to facilitate the usage of the OpenVectorFormat. | ||
| Copyright (C) 2023 Digital-Production-Aachen | ||
| This library is free software; you can redistribute it and/or | ||
| modify it under the terms of the GNU Lesser General Public | ||
| License as published by the Free Software Foundation; either | ||
| version 2.1 of the License, or (at your option) any later version. | ||
| This library is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| Lesser General Public License for more details. | ||
| You should have received a copy of the GNU Lesser General Public | ||
| License along with this library; if not, write to the Free Software | ||
| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| ---- Copyright End ---- | ||
| */ | ||
|
|
||
| using FluentAssertions; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| using OpenVectorFormat; | ||
| using OpenVectorFormat.OVFReaderWriter; | ||
| using OpenVectorFormat.Plausibility; | ||
| using OpenVectorFormat.Streaming; | ||
| using System; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Numerics; | ||
|
|
||
|
|
||
| namespace UnitTests | ||
| { | ||
| [TestClass] | ||
| public class TestOVFStreaming | ||
| { | ||
|
|
||
| /// <summary> | ||
| /// Test OVFStreamingMerger by merging one part and support and applying the Plausibilitychecker. | ||
| /// </summary> | ||
| [TestMethod] | ||
| public void TestMergePartConfig() | ||
| { | ||
| string sourceDir = new[] {"..", "..", "..", "TestFiles"}.Aggregate(Path.Combine); | ||
| string partFile = "bunny"; | ||
| string supportFile = "bunny (solidsupport)"; | ||
|
|
||
| using (OVFFileReader partReader = new OVFFileReader()) | ||
| using (OVFFileReader supportReader = new OVFFileReader()) | ||
| { | ||
| // load part and support ovf | ||
| partReader.OpenJobAsync(Path.Combine(sourceDir, partFile) + ".ovf", null).GetAwaiter().GetResult(); | ||
| supportReader.OpenJobAsync(Path.Combine(sourceDir, supportFile) + ".ovf", null).GetAwaiter().GetResult(); | ||
|
|
||
| // run plausibility checks on input | ||
| PlausibilityChecker.CheckJob(partReader.CacheJobToMemoryAsync().GetAwaiter().GetResult(), new CheckerConfig()) | ||
| .GetAwaiter().GetResult(); | ||
| PlausibilityChecker.CheckJob(supportReader.CacheJobToMemoryAsync().GetAwaiter().GetResult(), new CheckerConfig()) | ||
| .GetAwaiter().GetResult(); | ||
|
|
||
| // merge part with supports | ||
| var merger = new OVFStreamingMerger(partReader); | ||
| merger.AddFileReaderToMerge(new FileReaderToMerge() { fr = supportReader, markAsSupport = true }); | ||
|
|
||
| // run plausibility checks on result | ||
| var job = merger.CacheJobToMemoryAsync().GetAwaiter().GetResult(); | ||
| PlausibilityChecker.CheckJob(job, new CheckerConfig()).GetAwaiter().GetResult(); | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Test OVFStreamingMerger by merging several instances of the same part together and | ||
| /// applying the Plausibilitychecker. | ||
| /// </summary> | ||
| [TestMethod] | ||
| public void TestMergeInstances() | ||
| { | ||
| string sourceDir = new[] { "..", "..", "..", "TestFiles" }.Aggregate(Path.Combine); | ||
| string partFile = "bunny"; | ||
| string supportFile = "bunny (solidsupport)"; | ||
| (float x, float y, float rot)[] positions = new (float, float, float)[] | ||
| { | ||
| (100, 0, 0), | ||
| (200, 100, (float)Math.PI/2), | ||
| (300, 0, 0), | ||
| }; | ||
|
|
||
| using (OVFFileReader partReader = new OVFFileReader()) | ||
| using (OVFFileReader supportReader = new OVFFileReader()) | ||
| { | ||
| // load part and support ovf | ||
| partReader.OpenJobAsync(Path.Combine(sourceDir, partFile) + ".ovf", null).GetAwaiter().GetResult(); | ||
| supportReader.OpenJobAsync(Path.Combine(sourceDir, supportFile) + ".ovf", null).GetAwaiter().GetResult(); | ||
|
|
||
| // run plausibility checks on input | ||
| PlausibilityChecker.CheckJob(partReader.CacheJobToMemoryAsync().GetAwaiter().GetResult(), new CheckerConfig()) | ||
| .GetAwaiter().GetResult(); | ||
| PlausibilityChecker.CheckJob(supportReader.CacheJobToMemoryAsync().GetAwaiter().GetResult(), new CheckerConfig()) | ||
| .GetAwaiter().GetResult(); | ||
|
|
||
| // merge part with supports | ||
| var partSupportReader = new OVFStreamingMerger(partReader); | ||
| partSupportReader.AddFileReaderToMerge(new FileReaderToMerge() { fr = supportReader, markAsSupport = true }); | ||
|
|
||
| // merge parts at different positions | ||
| OVFStreamingMerger jobMerger = null; | ||
| for (int i = 0; i < positions.Length; i++) | ||
| { | ||
| var pos = positions[i]; | ||
| var toMerge = new FileReaderToMerge() | ||
| { | ||
| fr = partSupportReader, | ||
| translationX = pos.x, | ||
| translationY = pos.y, | ||
| rotationInRad = pos.rot, | ||
| markAsSupport = false | ||
| }; | ||
| if (i == 0) jobMerger = new OVFStreamingMerger(toMerge); | ||
| else if (i > 0) jobMerger?.AddFileReaderToMerge(toMerge); | ||
| } | ||
|
|
||
| // run plausibility checks on result | ||
| var job = jobMerger.CacheJobToMemoryAsync().GetAwaiter().GetResult(); | ||
| PlausibilityChecker.CheckJob(job, new CheckerConfig()).GetAwaiter().GetResult(); | ||
|
|
||
| // check layer heights | ||
| jobMerger.JobShell.NumWorkPlanes.Should().Be(partSupportReader.JobShell.NumWorkPlanes); | ||
|
|
||
| // check bounding boxes | ||
| for (int wpnr = 0; wpnr < jobMerger.JobShell.NumWorkPlanes; wpnr++) | ||
| { | ||
| // aabb of full job should equal aggregated aabb of all instances | ||
| var jobAABB = jobMerger.GetWorkPlaneAsync(wpnr).GetAwaiter().GetResult().Bounds2D(); | ||
| AxisAlignedBox2D aggregateAABB = null; | ||
| for (int i = 0; i < positions.Length; i++) | ||
| { | ||
| var pos = positions[i]; | ||
| var wp = partSupportReader.GetWorkPlaneAsync(wpnr).GetAwaiter().GetResult(); | ||
| var wpCopy = wp.Clone(); | ||
| wpCopy.Rotate(pos.rot); | ||
| wpCopy.Translate(new Vector2(pos.x, pos.y)); | ||
| var aabb = wpCopy.Bounds2D(); | ||
| if (i == 0) aggregateAABB = aabb; | ||
| else aggregateAABB.Contain(aabb); | ||
| } | ||
| jobAABB.XMin.Should().BeApproximately(aggregateAABB.XMin, 1e-6f); | ||
| jobAABB.XMax.Should().BeApproximately(aggregateAABB.XMax, 1e-6f); | ||
| jobAABB.YMin.Should().BeApproximately(aggregateAABB.YMin, 1e-6f); | ||
| jobAABB.YMax.Should().BeApproximately(aggregateAABB.YMax, 1e-6f); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.