aj/OpenNest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(math): normalize degree interval checks in degrees

Browse Source
This commit is contained in:
aj
2026-09-29 19:27:23 -04:00
parent 314ca2f2a6
commit 00ede7c5d0
2 changed files with 86 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest.Core/Math/Angle.cs
+4 -4
View File
@@ -1,4 +1,4 @@
namespace OpenNest.Math namespace OpenNest.Math
{ {
public static class Angle public static class Angle
{ {
@@ -106,14 +106,14 @@
if (reversed) if (reversed)
Generic.Swap(ref a1, ref a2); Generic.Swap(ref a1, ref a2);
var diff = Angle.NormalizeRad(a2 - a1); var diff = Angle.NormalizeDeg(a2 - a1);
// full circle // full circle
if (a2.IsEqualTo(a1)) if (a2.IsEqualTo(a1))
return true; return true;
a1 = Angle.NormalizeRad(angle - a1); a1 = Angle.NormalizeDeg(angle - a1);
a2 = Angle.NormalizeRad(a2 - angle); a2 = Angle.NormalizeDeg(a2 - angle);
return diff >= a1 - Tolerance.Epsilon || diff >= a2 - Tolerance.Epsilon; return diff >= a1 - Tolerance.Epsilon || diff >= a2 - Tolerance.Epsilon;
} }
OpenNest.Tests/Math/AngleTests.cs
+82
View File
@@ -0,0 +1,82 @@
using Xunit;
namespace OpenNest.Tests.Math;
public class AngleTests
{
[Theory]
[InlineData(10, 0, 90, true)]
[InlineData(180, 0, 90, false)]
[InlineData(0, 0, 90, true)]
[InlineData(90, 0, 90, true)]
[InlineData(350, 340, 10, true)]
[InlineData(20, 340, 10, false)]
[InlineData(-10, 340, 10, true)]
[InlineData(370, 0, 90, true)]
[InlineData(123, 45, 45, true)]
public void IsBetweenDeg_ReturnsExpected(double angle, double a1, double a2, bool expected)
{
Assert.Equal(expected, OpenNest.Math.Angle.IsBetweenDeg(angle, a1, a2));
}
[Theory]
[InlineData(45, 90, 0, true)]
[InlineData(45, 0, 90, false)]
public void IsBetweenDeg_Reversed_SwapsEndpoints(double angle, double a1, double a2, bool expected)
{
Assert.Equal(expected, OpenNest.Math.Angle.IsBetweenDeg(angle, a1, a2, reversed: true));
}
[Theory]
[InlineData(10, 0, 90, false)]
[InlineData(45, 0, 90, false)]
[InlineData(180, 0, 90, false)]
[InlineData(0, 0, 90, false)]
[InlineData(90, 0, 90, false)]
[InlineData(350, 340, 10, false)]
[InlineData(20, 340, 10, false)]
[InlineData(-10, 340, 10, false)]
[InlineData(370, 0, 90, false)]
[InlineData(123, 45, 45, false)]
[InlineData(45, 90, 0, true)]
[InlineData(45, 0, 90, true)]
public void IsBetweenDeg_OrdinaryCases_MatchesRadians(
double angle, double a1, double a2, bool reversed)
{
var radianResult = OpenNest.Math.Angle.IsBetweenRad(
angle * System.Math.PI / 180,
a1 * System.Math.PI / 180,
a2 * System.Math.PI / 180,
reversed);
Assert.Equal(radianResult, OpenNest.Math.Angle.IsBetweenDeg(angle, a1, a2, reversed));
}
[Theory]
[InlineData(-0.000005, 0, 90, true)]
[InlineData(-0.00002, 0, 90, false)]
[InlineData(90.000005, 0, 90, true)]
[InlineData(90.00002, 0, 90, false)]
[InlineData(123, 45, 45.000005, true)]
[InlineData(123, 45, 45.00002, false)]
[InlineData(123, 45, 405, false)]
public void IsBetweenDeg_UsesDegreeToleranceBeforeNormalizingEndpoints(
double angle, double a1, double a2, bool expected)
{
Assert.Equal(expected, OpenNest.Math.Angle.IsBetweenDeg(angle, a1, a2));
}
[Theory]
[InlineData(-0.000005, 0, 1, true)]
[InlineData(-0.00002, 0, 1, false)]
[InlineData(1.000005, 0, 1, true)]
[InlineData(1.00002, 0, 1, false)]
[InlineData(2, 0.5, 0.500005, true)]
[InlineData(2, 0.5, 0.50002, false)]
[InlineData(2, 0.5, 0.5 + 2 * System.Math.PI, false)]
public void IsBetweenRad_UsesRadianToleranceBeforeNormalizingEndpoints(
double angle, double a1, double a2, bool expected)
{
Assert.Equal(expected, OpenNest.Math.Angle.IsBetweenRad(angle, a1, a2));
}
}