使用 IFloatingPoint 替换 INumber 接口；将 Interval 变成泛型类型

dotnet-campus · Aug 13, 2024 · 2225f4b · 2225f4b
1 parent 494ebd3
commit 2225f4b
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 59 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,4 +1,5 @@
 [*.cs]
 
 # CA2225: 运算符重载具有命名的备用项
-dotnet_diagnostic.CA2225.severity = silent
+dotnet_diagnostic.CA2225.severity = silent
+dotnet_diagnostic.CA1000.severity = none
diff --git a/SeWzc.Numerics.Geometry/IBezierCurve.cs b/SeWzc.Numerics.Geometry/IBezierCurve.cs
@@ -8,7 +8,7 @@ namespace SeWzc.Numerics.Geometry;
 public interface IBezierCurve<TPoint, TVector, TNum> : ICurve
     where TPoint :unmanaged, IPoint<TPoint, TVector, TNum>
     where TVector : unmanaged, IVector<TVector, TNum>
-    where TNum : unmanaged, INumber<TNum>
+    where TNum : unmanaged, IFloatingPoint<TNum>
 {
     /// <summary>
     /// 获取曲线上的点。

diff --git a/SeWzc.Numerics.Geometry/IPoint.cs b/SeWzc.Numerics.Geometry/IPoint.cs
@@ -13,7 +13,7 @@ namespace SeWzc.Numerics.Geometry;
 public interface IPoint<TSelf, TVector, TNum>
     where TSelf : unmanaged, IPoint<TSelf, TVector, TNum>
     where TVector : unmanaged, IVector<TVector, TNum>
-    where TNum : unmanaged, INumber<TNum>
+    where TNum : unmanaged, IFloatingPoint<TNum>
 {
     /// <summary>
     /// 获取两个点的中点。

diff --git a/SeWzc.Numerics.Tests/IntervalTest.cs b/SeWzc.Numerics.Tests/IntervalTest.cs
@@ -3,7 +3,7 @@
 
 namespace SeWzc.Numerics.Tests;
 
-[TestSubject(typeof(Interval))]
+[TestSubject(typeof(Interval<>))]
 public class IntervalTest
 {
     #region 成员方法
@@ -15,7 +15,7 @@ public class IntervalTest
     [InlineData(1, 1, 0)]
     public void LengthTest(double start, double end, double expected)
     {
-        var interval = new Interval(start, end);
+        var interval = new Interval<double>(start, end);
         Assert.Equal(expected, interval.Length);
     }
 
@@ -27,7 +27,7 @@ public void LengthTest(double start, double end, double expected)
     [InlineData(0, 1, 2, false)]
     public void ContainsTest(double start, double end, double value, bool expected)
     {
-        var interval = new Interval(start, end);
+        var interval = new Interval<double>(start, end);
         Assert.Equal(expected, interval.Contains(value));
     }
 
@@ -39,7 +39,7 @@ public void ContainsTest(double start, double end, double value, bool expected)
     [InlineData(1, 0.99, true)]
     public void IsEmptyTest(double start, double end, bool expected)
     {
-        var interval = new Interval(start, end);
+        var interval = new Interval<double>(start, end);
         Assert.Equal(expected, interval.IsEmpty);
     }
 
@@ -50,7 +50,7 @@ public void IsEmptyTest(double start, double end, bool expected)
     [InlineData(1, 1, 1, 1)]
     public void CreateTest(double a, double b, double start, double end)
     {
-        var interval = Interval.Create(a, b);
+        var interval = Interval<double>.Create(a, b);
         Assert.Equal(start, interval.Start);
         Assert.Equal(end, interval.End);
     }
@@ -71,8 +71,8 @@ public void CreateTest(double a, double b, double start, double end)
     [InlineData(0, 0, 1, 0, true)]
     public void SubsetTest(double start, double end, double start2, double end2, bool expected)
     {
-        var interval = new Interval(start, end);
-        var interval2 = new Interval(start2, end2);
+        var interval = new Interval<double>(start, end);
+        var interval2 = new Interval<double>(start2, end2);
         Assert.Equal(expected, interval2.IsSubsetOf(interval));
         Assert.Equal(expected, interval.IsSupersetOf(interval2));
     }
@@ -88,11 +88,11 @@ public void SubsetTest(double start, double end, double start2, double end2, boo
     [InlineData(0, 1, 0, 1.1, false)]
     public void ProperSubsetTest(double start, double end, double start2, double end2, bool expected)
     {
-        var interval = new Interval(start, end);
-        var interval2 = new Interval(start2, end2);
+        var interval = new Interval<double>(start, end);
+        var interval2 = new Interval<double>(start2, end2);
         Assert.Equal(expected, interval2.IsProperSubsetOf(interval));
         Assert.Equal(expected, interval.IsProperSupersetOf(interval2));
     }
 
     #endregion
-}
+}
diff --git a/SeWzc.Numerics.Tests/MatrixFactory.cs b/SeWzc.Numerics.Tests/MatrixFactory.cs
@@ -10,7 +10,7 @@ internal static class MatrixFactory<TMatrix, TRow, TColumn, TNum, TTranspose>
     where TMatrix : IMatrix<TMatrix, TRow, TColumn, TNum, TTranspose>
     where TRow : unmanaged, IVector<TRow, TNum>
     where TColumn : unmanaged, IVector<TColumn, TNum>
-    where TNum : unmanaged, INumber<TNum>
+    where TNum : unmanaged, IFloatingPoint<TNum>
     where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum, TMatrix>
 {
     #region 静态变量
@@ -74,4 +74,4 @@ private static TMatrix CreateRandomMatrix(Random random)
     }
 
     #endregion
-}
+}
diff --git a/SeWzc.Numerics.Tests/MatrixTest.cs b/SeWzc.Numerics.Tests/MatrixTest.cs
@@ -65,7 +65,7 @@ private static void AddTestGeneric<TMatrix, TRow, TColumn, TNum, TTranspose>()
         where TMatrix : IMatrix<TMatrix, TRow, TColumn, TNum, TTranspose>
         where TRow : unmanaged, IVector<TRow, TNum>
         where TColumn : unmanaged, IVector<TColumn, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
         where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum, TMatrix>
     {
         MatrixFactory<TMatrix, TRow, TColumn, TNum, TTranspose>.Test((a, b) =>
@@ -89,7 +89,7 @@ private static void SubtractTestGeneric<TMatrix, TRow, TColumn, TNum, TTranspose
         where TMatrix : IMatrix<TMatrix, TRow, TColumn, TNum, TTranspose>
         where TRow : unmanaged, IVector<TRow, TNum>
         where TColumn : unmanaged, IVector<TColumn, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
         where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum, TMatrix>
     {
         MatrixFactory<TMatrix, TRow, TColumn, TNum, TTranspose>.Test((a, b) =>
@@ -113,7 +113,7 @@ private static void RightMultiplyVectorTestGeneric<TMatrix, TRow, TColumn, TNum,
         where TMatrix : IMatrix<TMatrix, TRow, TColumn, TNum, TTranspose>
         where TRow : unmanaged, IVector<TRow, TNum>
         where TColumn : unmanaged, IVector<TColumn, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
         where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum, TMatrix>
     {
         MatrixFactory<TMatrix, TRow, TColumn, TNum, TTranspose>.Test((a, b) =>
@@ -144,7 +144,7 @@ private static void LeftMultiplyVectorTestGeneric<TMatrix, TRow, TColumn, TNum,
         where TMatrix : IMatrix<TMatrix, TRow, TColumn, TNum, TTranspose>
         where TRow : unmanaged, IVector<TRow, TNum>
         where TColumn : unmanaged, IVector<TColumn, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
         where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum, TMatrix>
     {
         MatrixFactory<TMatrix, TRow, TColumn, TNum, TTranspose>.Test((a, b) =>
@@ -175,7 +175,7 @@ private static void MultiplyNumberTestGeneric<TMatrix, TRow, TColumn, TNum, TTra
         where TMatrix : IMatrix<TMatrix, TRow, TColumn, TNum, TTranspose>
         where TRow : unmanaged, IVector<TRow, TNum>
         where TColumn : unmanaged, IVector<TColumn, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
         where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum, TMatrix>
     {
         MatrixFactory<TMatrix, TRow, TColumn, TNum, TTranspose>.Test((a, b) =>
@@ -206,7 +206,7 @@ private static void DivideNumberTestGeneric<TMatrix, TRow, TColumn, TNum, TTrans
         where TMatrix : IMatrix<TMatrix, TRow, TColumn, TNum, TTranspose>
         where TRow : unmanaged, IVector<TRow, TNum>
         where TColumn : unmanaged, IVector<TColumn, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
         where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum, TMatrix>
     {
         MatrixFactory<TMatrix, TRow, TColumn, TNum, TTranspose>.Test((a, b) =>
@@ -230,7 +230,7 @@ private static void TransposeTestGeneric<TMatrix, TRow, TColumn, TNum, TTranspos
         where TMatrix : IMatrix<TMatrix, TRow, TColumn, TNum, TTranspose>
         where TRow : unmanaged, IVector<TRow, TNum>
         where TColumn : unmanaged, IVector<TColumn, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
         where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum, TMatrix>
     {
         MatrixFactory<TMatrix, TRow, TColumn, TNum, TTranspose>.Test(a =>
@@ -254,7 +254,7 @@ private static void FrobeniusNormTestGeneric<TMatrix, TRow, TColumn, TNum, TTran
         where TMatrix : IMatrix<TMatrix, TRow, TColumn, TNum, TTranspose>
         where TRow : unmanaged, IVector<TRow, TNum>
         where TColumn : unmanaged, IVector<TColumn, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
         where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum, TMatrix>
     {
         MatrixFactory<TMatrix, TRow, TColumn, TNum, TTranspose>.Test(m =>
@@ -281,7 +281,7 @@ private static void UnaryMinusTestGeneric<TMatrix, TRow, TColumn, TNum, TTranspo
         where TMatrix : IMatrix<TMatrix, TRow, TColumn, TNum, TTranspose>
         where TRow : unmanaged, IVector<TRow, TNum>
         where TColumn : unmanaged, IVector<TColumn, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
         where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum, TMatrix>
     {
         MatrixFactory<TMatrix, TRow, TColumn, TNum, TTranspose>.Test(m =>
@@ -305,7 +305,7 @@ private static void IndexOutOfRangeTestGeneric<TMatrix, TRow, TColumn, TNum, TTr
         where TMatrix : IMatrix<TMatrix, TRow, TColumn, TNum, TTranspose>
         where TRow : unmanaged, IVector<TRow, TNum>
         where TColumn : unmanaged, IVector<TColumn, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
         where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum, TMatrix>
     {
         MatrixFactory<TMatrix, TRow, TColumn, TNum, TTranspose>.Test(m =>
@@ -324,4 +324,4 @@ private static void IndexOutOfRangeTestGeneric<TMatrix, TRow, TColumn, TNum, TTr
     }
 
     #endregion
-}
+}
diff --git a/SeWzc.Numerics.Tests/NumAssert.cs b/SeWzc.Numerics.Tests/NumAssert.cs
@@ -10,7 +10,7 @@ internal static class NumAssert
     #region 静态方法
 
     public static void CloseEqual<TNum>(TNum expected, TNum actual)
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
         if (typeof(TNum) == typeof(double))
         {
@@ -59,10 +59,10 @@ public static void NotCloseZero<TNum>(TNum actual)
     }
 
     public static void Equal<TNum>(TNum expected, TNum actual)
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
         Assert.Equal(expected, actual);
     }
 
     #endregion
-}
+}
diff --git a/SeWzc.Numerics.Tests/NumFactory.cs b/SeWzc.Numerics.Tests/NumFactory.cs
@@ -37,7 +37,7 @@ public static ImmutableArray<T> RandomCreateRange<T>(IEnumerable<T> other, Func<
 }
 
 internal static class NumFactory<TNum>
-    where TNum : unmanaged, INumber<TNum>
+    where TNum : unmanaged, IFloatingPoint<TNum>
 {
     #region 静态变量
 
@@ -70,4 +70,4 @@ static NumFactory()
     }
 
     #endregion
-}
+}
diff --git a/SeWzc.Numerics.Tests/VectorFactory.cs b/SeWzc.Numerics.Tests/VectorFactory.cs
@@ -7,7 +7,7 @@ namespace SeWzc.Numerics.Tests;
 
 internal static class VectorFactory<TVector, TNum>
     where TVector : unmanaged, IVector<TVector, TNum>
-    where TNum : unmanaged, INumber<TNum>
+    where TNum : unmanaged, IFloatingPoint<TNum>
 {
     #region 静态变量
 
@@ -51,4 +51,4 @@ private static TVector CreateRandomVector(Random random)
     }
 
     #endregion
-}
+}
diff --git a/SeWzc.Numerics.Tests/VectorTest.cs b/SeWzc.Numerics.Tests/VectorTest.cs
@@ -50,7 +50,7 @@ public void AddTest()
 
     private static void AddTestGeneric<TVector, TNum>()
         where TVector : unmanaged, IVector<TVector, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
         VectorFactory<TVector, TNum>.Test((a, b) =>
         {
@@ -68,7 +68,7 @@ public void SubtractTest()
 
     private static void SubtractTestGeneric<TVector, TNum>()
         where TVector : unmanaged, IVector<TVector, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
         VectorFactory<TVector, TNum>.Test((a, b) =>
         {
@@ -86,7 +86,7 @@ public void DotTest()
 
     private static void DotTestGeneric<TVector, TNum>()
         where TVector : unmanaged, IVector<TVector, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
         VectorFactory<TVector, TNum>.Test((a, b) =>
         {
@@ -106,7 +106,7 @@ public void MultiplyTest()
 
     private static void MultiplyTestGeneric<TVector, TNum>()
         where TVector : unmanaged, IVector<TVector, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
         VectorFactory<TVector, TNum>.Test((v, n) =>
         {
@@ -127,7 +127,7 @@ public void DivideTest()
 
     private static void DivideTestGeneric<TVector, TNum>()
         where TVector : unmanaged, IVector<TVector, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
         VectorFactory<TVector, TNum>.Test((v, n) =>
         {
@@ -145,7 +145,7 @@ public void LengthTest()
 
     private static void LengthTestGeneric<TVector, TNum>()
         where TVector : unmanaged, IVector<TVector, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
         VectorFactory<TVector, TNum>.Test(v =>
         {
@@ -179,7 +179,7 @@ public void EqualsTest()
 
     private static void EqualsTestGeneric<TVector, TNum>()
         where TVector : unmanaged, IVector<TVector, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
 #pragma warning disable CS1718
         // ReSharper disable ParameterOnlyUsedForPreconditionCheck.Local
@@ -208,7 +208,7 @@ public void NormalizeTest()
 
     private static void NormalizeTestGeneric<TVector, TNum>()
         where TVector : unmanaged, IVector<TVector, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
         VectorFactory<TVector, TNum>.Test(v =>
         {
@@ -235,7 +235,7 @@ public void UnaryNegationTest()
 
     private static void UnaryNegationTestGeneric<TVector, TNum>()
         where TVector : unmanaged, IVector<TVector, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
         VectorFactory<TVector, TNum>.Test(v =>
         {
@@ -253,12 +253,12 @@ public void IndexOutRangeTest()
 
     private static void IndexOutRangeTestGeneric<TVector, TNum>()
         where TVector : unmanaged, IVector<TVector, TNum>
-        where TNum : unmanaged, INumber<TNum>
+        where TNum : unmanaged, IFloatingPoint<TNum>
     {
         var v = new TVector();
         Assert.Throws<ArgumentOutOfRangeException>(() => v[-1]);
         Assert.Throws<ArgumentOutOfRangeException>(() => v[TVector.Dimension]);
     }
 
     #endregion
-}
+}
diff --git a/SeWzc.Numerics/IVector.cs b/SeWzc.Numerics/IVector.cs
@@ -11,7 +11,7 @@ namespace SeWzc.Numerics;
 /// <typeparam name="TNum">向量元素的类型。</typeparam>
 public interface IVector<TSelf, TNum> : IEqualityOperators<TSelf, TSelf, bool>
     where TSelf : unmanaged, IVector<TSelf, TNum>
-    where TNum : unmanaged, INumber<TNum>
+    where TNum : unmanaged, IFloatingPoint<TNum>
 {
     #region 静态变量