Skip to content

Ensure that all paths of double.Hypot use the absolute value where required #75776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tannergooding merged 3 commits into from
Sep 17, 2022
Merged

Ensure that all paths of double.Hypot use the absolute value where required #75776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9a8579
Adding a regression test covering dotnet/runtime#75651
tannergooding Sep 16, 2022
e79e9c8
Ensure that all paths of double.Hypot use the absolute value where re…
tannergooding Sep 16, 2022
3ef01c8
Change were the regression tests for Hypot are exposed
tannergooding Sep 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/Double.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,7 @@ public static double Hypot(double x, double y)
else
{
// x or y is insignificant compared to the other
result = x + y;
result = ax + ay;

@tannergooding tannergooding Sep 16, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original C algorithm uses 'x' and 'y', but does so after having reassigned them to be the absolute value.

That is, it effectively does x = abs(x), y = abs(y).

I double checked other usages of x/y and they are all fine/correct.

}
}
}
Expand Down
12 changes: 7 additions & 5 deletions src/libraries/System.Runtime/tests/System/DoubleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ public static void GetTypeCode_Invoke_ReturnsDouble()
[InlineData(0.0, 3.0, 3.0, 0.0)]
[InlineData(0.0, 10.0, 10.0, 0.0)]
[InlineData(1.0, 1.0, 1.4142135623730950, CrossPlatformMachineEpsilon * 10)]
[InlineData(1.0, 1e+10, 1e+10, 0.0)] // dotnet/runtime#75651
[InlineData(1.0, 1e+20, 1e+20, 0.0)] // dotnet/runtime#75651
[InlineData(2.7182818284590452, 0.31830988618379067, 2.7368553638387594, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (1 / pi)
[InlineData(2.7182818284590452, 0.43429448190325183, 2.7527563996732919, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (log10(e))
[InlineData(2.7182818284590452, 0.63661977236758134, 2.7918346715914253, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (2 / pi)
Expand All @@ -191,7 +193,7 @@ public static void GetTypeCode_Invoke_ReturnsDouble()
[InlineData(10.0, 0.69314718055994531, 10.023993865417028, CrossPlatformMachineEpsilon * 100)] // y: (ln(2))
[InlineData(10.0, 0.70710678118654752, 10.024968827881711, CrossPlatformMachineEpsilon * 100)] // y: (1 / sqrt(2))
[InlineData(10.0, 0.78539816339744831, 10.030795096853892, CrossPlatformMachineEpsilon * 100)] // y: (pi / 4)
[InlineData(10.0, 1.0, 10.049875621120890, CrossPlatformMachineEpsilon * 100)] //
[InlineData(10.0, 1.0, 10.049875621120890, CrossPlatformMachineEpsilon * 100)] //
[InlineData(10.0, 1.1283791670955126, 10.063460614755501, CrossPlatformMachineEpsilon * 100)] // y: (2 / sqrt(pi))
[InlineData(10.0, 1.4142135623730950, 10.099504938362078, CrossPlatformMachineEpsilon * 100)] // y: (sqrt(2))
[InlineData(10.0, 1.4426950408889634, 10.103532500121213, CrossPlatformMachineEpsilon * 100)] // y: (log2(e))
Expand Down Expand Up @@ -664,7 +666,7 @@ public static void PositiveInfinity()
[InlineData(-0.0, 2, 0.0, 0.0)]
[InlineData(-0.0, 3, -0.0, 0.0)]
[InlineData(-0.0, 4, 0.0, 0.0)]
[InlineData(-0.0, 5, -0.0, 0.0)]
[InlineData(-0.0, 5, -0.0, 0.0)]
[InlineData( double.NaN, -5, double.NaN, 0.0)]
[InlineData( double.NaN, -4, double.NaN, 0.0)]
[InlineData( double.NaN, -3, double.NaN, 0.0)]
Expand Down Expand Up @@ -1470,7 +1472,7 @@ public static void AsinPiTest(double value, double expectedResult, double allowe
AssertExtensions.Equal(+expectedResult, double.AsinPi(+value), allowedVariance);
}

[Theory]
[Theory]
[InlineData( double.NaN, double.NaN, double.NaN, 0.0)]
[InlineData( 0.0, -1.0, 1.0, CrossPlatformMachineEpsilon)] // y: sinpi(0) x: cospi(1) ; This should be exact, but has an issue on WASM/Unix
[InlineData( 0.0, -0.0, 1.0, CrossPlatformMachineEpsilon)] // y: sinpi(0) x: -cospi(0.5) ; This should be exact, but has an issue on WASM/Unix
Expand Down Expand Up @@ -1512,8 +1514,8 @@ public static void Atan2PiTest(double y, double x, double expectedResult, double
[InlineData(-2.1850398632615190, -0.36338022763241866, CrossPlatformMachineEpsilon)]
[InlineData(-1.4406084404920341, -0.30685281944005469, CrossPlatformMachineEpsilon)]
[InlineData(-1.3136757077477542, -0.29289321881345248, CrossPlatformMachineEpsilon)]
[InlineData(-0.79909939792801821, -0.21460183660255169, CrossPlatformMachineEpsilon)]
[InlineData( 0.42670634433261806, 0.12837916709551257, CrossPlatformMachineEpsilon)]
[InlineData(-0.79909939792801821, -0.21460183660255169, CrossPlatformMachineEpsilon)]
[InlineData( 0.42670634433261806, 0.12837916709551257, CrossPlatformMachineEpsilon)]
[InlineData( 3.6202185671074506, 0.41421356237309505, CrossPlatformMachineEpsilon)]
[InlineData( 5.4945259425167300, 0.44269504088896341, CrossPlatformMachineEpsilon)]
[InlineData(-4.4217522209161288, -0.42920367320510338, CrossPlatformMachineEpsilon)]
Expand Down
12 changes: 7 additions & 5 deletions src/libraries/System.Runtime/tests/System/SingleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ public static void GetTypeCode_Invoke_ReturnsSingle()
[InlineData(0.0f, 3.0f, 3.0f, 0.0f)]
[InlineData(0.0f, 10.0f, 10.0f, 0.0f)]
[InlineData(1.0f, 1.0f, 1.41421356f, CrossPlatformMachineEpsilon * 10)]
[InlineData(1.0f, 1e+10f, 1e+10f, 0.0)] // dotnet/runtime#75651
[InlineData(1.0f, 1e+20f, 1e+20f, 0.0)] // dotnet/runtime#75651
[InlineData(2.71828183f, 0.318309886f, 2.73685536f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (1 / pi)
[InlineData(2.71828183f, 0.434294482f, 2.75275640f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (log10(e))
[InlineData(2.71828183f, 0.636619772f, 2.79183467f, CrossPlatformMachineEpsilon * 10)] // x: (e) y: (2 / pi)
Expand All @@ -188,7 +190,7 @@ public static void GetTypeCode_Invoke_ReturnsSingle()
[InlineData(10.0f, 0.693147181f, 10.0239939f, CrossPlatformMachineEpsilon * 100)] // y: (ln(2))
[InlineData(10.0f, 0.707106781f, 10.0249688f, CrossPlatformMachineEpsilon * 100)] // y: (1 / sqrt(2))
[InlineData(10.0f, 0.785398163f, 10.0307951f, CrossPlatformMachineEpsilon * 100)] // y: (pi / 4)
[InlineData(10.0f, 1.0f, 10.0498756f, CrossPlatformMachineEpsilon * 100)] //
[InlineData(10.0f, 1.0f, 10.0498756f, CrossPlatformMachineEpsilon * 100)] //
[InlineData(10.0f, 1.12837917f, 10.0634606f, CrossPlatformMachineEpsilon * 100)] // y: (2 / sqrt(pi))
[InlineData(10.0f, 1.41421356f, 10.0995049f, CrossPlatformMachineEpsilon * 100)] // y: (sqrt(2))
[InlineData(10.0f, 1.44269504f, 10.1035325f, CrossPlatformMachineEpsilon * 100)] // y: (log2(e))
Expand Down Expand Up @@ -603,7 +605,7 @@ public static void PositiveInfinity()
[InlineData(-0.0f, 2, 0.0f, 0.0f)]
[InlineData(-0.0f, 3, -0.0f, 0.0f)]
[InlineData(-0.0f, 4, 0.0f, 0.0f)]
[InlineData(-0.0f, 5, -0.0f, 0.0f)]
[InlineData(-0.0f, 5, -0.0f, 0.0f)]
[InlineData( float.NaN, -5, float.NaN, 0.0f)]
[InlineData( float.NaN, -4, float.NaN, 0.0f)]
[InlineData( float.NaN, -3, float.NaN, 0.0f)]
Expand Down Expand Up @@ -1383,7 +1385,7 @@ public static void AsinPiTest(float value, float expectedResult, float allowedVa
AssertExtensions.Equal(+expectedResult, float.AsinPi(+value), allowedVariance);
}

[Theory]
[Theory]
[InlineData( float.NaN, float.NaN, float.NaN, 0.0f)]
[InlineData( 0.0f, -1.0f, 1.0f, CrossPlatformMachineEpsilon)] // y: sinpi(0) x: cospi(1) ; This should be exact, but has an issue on WASM/Unix
[InlineData( 0.0f, -0.0f, 1.0f, CrossPlatformMachineEpsilon)] // y: sinpi(0) x: -cospi(0.5) ; This should be exact, but has an issue on WASM/Unix
Expand Down Expand Up @@ -1425,8 +1427,8 @@ public static void Atan2PiTest(float y, float x, float expectedResult, float all
[InlineData(-2.18503986f, -0.363380228f, CrossPlatformMachineEpsilon)]
[InlineData(-1.44060844f, -0.306852819f, CrossPlatformMachineEpsilon)]
[InlineData(-1.31367571f, -0.292893219f, CrossPlatformMachineEpsilon)]
[InlineData(-0.79909940f, -0.214601837f, CrossPlatformMachineEpsilon)]
[InlineData( 0.42670634f, 0.128379167f, CrossPlatformMachineEpsilon)]
[InlineData(-0.79909940f, -0.214601837f, CrossPlatformMachineEpsilon)]
[InlineData( 0.42670634f, 0.128379167f, CrossPlatformMachineEpsilon)]
[InlineData( 3.62021857f, 0.414213562f, CrossPlatformMachineEpsilon)]
[InlineData( 5.49452594f, 0.442695041f, CrossPlatformMachineEpsilon)]
[InlineData(-4.42175222f, -0.429203673f, CrossPlatformMachineEpsilon)]
Expand Down