From ef992ef4fdaf4baecf061812438a4edd298ff85e Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Thu, 12 Sep 2024 17:55:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=20.NET=206.0=20=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DotNetCampus.Numerics.Geometry.csproj     |  2 +-
 .../IBezierCurve.cs                           |  5 ++-
 DotNetCampus.Numerics.Geometry/IPoint.cs      |  5 ++-
 .../DotNetCampus.Numerics.csproj              |  2 +-
 DotNetCampus.Numerics/IVector.cs              | 10 ++++-
 DotNetCampus.Numerics/Interval.cs             | 41 +++++++++++++++++--
 DotNetCampus.Numerics/Matrix/IMatrix.cs       | 25 ++++++++---
 7 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/DotNetCampus.Numerics.Geometry/DotNetCampus.Numerics.Geometry.csproj b/DotNetCampus.Numerics.Geometry/DotNetCampus.Numerics.Geometry.csproj
index 0be1b94..5f66025 100644
--- a/DotNetCampus.Numerics.Geometry/DotNetCampus.Numerics.Geometry.csproj
+++ b/DotNetCampus.Numerics.Geometry/DotNetCampus.Numerics.Geometry.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
diff --git a/DotNetCampus.Numerics.Geometry/IBezierCurve.cs b/DotNetCampus.Numerics.Geometry/IBezierCurve.cs
index df8d0cc..397db3e 100644
--- a/DotNetCampus.Numerics.Geometry/IBezierCurve.cs
+++ b/DotNetCampus.Numerics.Geometry/IBezierCurve.cs
@@ -8,7 +8,10 @@ namespace DotNetCampus.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, IFloatingPoint<TNum>
+    where TNum : unmanaged
+#if NET8_0_OR_GREATER
+    , IFloatingPoint<TNum>
+#endif
 {
     /// <summary>
     /// 获取曲线上的点。
diff --git a/DotNetCampus.Numerics.Geometry/IPoint.cs b/DotNetCampus.Numerics.Geometry/IPoint.cs
index dfe3168..5478c9c 100644
--- a/DotNetCampus.Numerics.Geometry/IPoint.cs
+++ b/DotNetCampus.Numerics.Geometry/IPoint.cs
@@ -13,7 +13,10 @@ namespace DotNetCampus.Numerics.Geometry;
 public interface IPoint<TSelf, TVector, TNum>
     where TSelf : unmanaged, IPoint<TSelf, TVector, TNum>
     where TVector : unmanaged, IVector<TVector, TNum>
-    where TNum : unmanaged, IFloatingPoint<TNum>
+    where TNum : unmanaged
+#if NET8_0_OR_GREATER
+    , IFloatingPoint<TNum>
+#endif
 {
     /// <summary>
     /// 获取两个点的中点。
diff --git a/DotNetCampus.Numerics/DotNetCampus.Numerics.csproj b/DotNetCampus.Numerics/DotNetCampus.Numerics.csproj
index 143c463..569d2fa 100644
--- a/DotNetCampus.Numerics/DotNetCampus.Numerics.csproj
+++ b/DotNetCampus.Numerics/DotNetCampus.Numerics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
diff --git a/DotNetCampus.Numerics/IVector.cs b/DotNetCampus.Numerics/IVector.cs
index c9a32b8..32c3370 100644
--- a/DotNetCampus.Numerics/IVector.cs
+++ b/DotNetCampus.Numerics/IVector.cs
@@ -9,9 +9,15 @@ namespace DotNetCampus.Numerics;
 /// </summary>
 /// <typeparam name="TSelf">实现此接口的类型。</typeparam>
 /// <typeparam name="TNum">向量元素的类型。</typeparam>
-public interface IVector<TSelf, TNum> : IEqualityOperators<TSelf, TSelf, bool>
+public interface IVector<TSelf, TNum>
+#if NET8_0_OR_GREATER
+    : IEqualityOperators<TSelf, TSelf, bool>
+#endif
     where TSelf : unmanaged, IVector<TSelf, TNum>
-    where TNum : unmanaged, IFloatingPoint<TNum>
+    where TNum : unmanaged
+#if NET8_0_OR_GREATER
+    , IFloatingPoint<TNum>
+#endif
 {
     #region 静态变量
 
diff --git a/DotNetCampus.Numerics/Interval.cs b/DotNetCampus.Numerics/Interval.cs
index cb591d0..c0122ac 100644
--- a/DotNetCampus.Numerics/Interval.cs
+++ b/DotNetCampus.Numerics/Interval.cs
@@ -11,7 +11,10 @@ namespace DotNetCampus.Numerics;
 /// <param name="Start">区间的左端点。</param>
 /// <param name="End">区间的右端点。</param>
 public readonly record struct Interval<TNum>(TNum Start, TNum End)
-    where TNum : unmanaged, IFloatingPoint<TNum>
+    where TNum : unmanaged
+#if NET8_0_OR_GREATER
+    , IFloatingPoint<TNum>
+#endif
 {
     #region 静态方法
 
@@ -23,7 +26,11 @@ public readonly record struct Interval<TNum>(TNum Start, TNum End)
     /// <returns></returns>
     public static Interval<TNum> Create(TNum a, TNum b)
     {
+#if NET8_0_OR_GREATER
         return a > b ? new Interval<TNum>(b, a) : new Interval<TNum>(a, b);
+#else
+        throw new NotSupportedException();
+#endif
     }
 
     #endregion
@@ -37,7 +44,12 @@ public static Interval<TNum> Create(TNum a, TNum b)
     /// 未使用构造函数创建的区间是空集。
     /// 区间起点大于等于终点的区间是空集。
     /// </remarks>
-    private readonly bool _isNotEmpty = Start <= End;
+    private readonly bool _isNotEmpty
+#if NET8_0_OR_GREATER
+        = Start <= End;
+#else
+     ;
+#endif
 
     #endregion
 
@@ -51,7 +63,12 @@ public static Interval<TNum> Create(TNum a, TNum b)
     /// <summary>
     /// 区间长度。
     /// </summary>
-    public TNum Length => Start >= End ? TNum.Zero : End - Start;
+    public TNum Length
+#if NET8_0_OR_GREATER
+        => Start >= End ? TNum.Zero : End - Start;
+#else
+        => throw new NotSupportedException();
+#endif
 
     #endregion
 
@@ -64,7 +81,11 @@ public static Interval<TNum> Create(TNum a, TNum b)
     /// <returns></returns>
     public bool Contains(TNum value)
     {
+#if NET8_0_OR_GREATER
         return Start <= value && value <= End;
+#else
+        throw new NotSupportedException();
+#endif
     }
 
     /// <inheritdoc />
@@ -90,6 +111,7 @@ public static class IntervalExtensions
     /// <param name="other"></param>
     /// <returns></returns>
     public static bool IsProperSubsetOf<TNum>(this Interval<TNum> interval, Interval<TNum> other)
+#if NET8_0_OR_GREATER
         where TNum : unmanaged, IFloatingPoint<TNum>
     {
         if (other.IsEmpty)
@@ -102,6 +124,10 @@ public static bool IsProperSubsetOf<TNum>(this Interval<TNum> interval, Interval
                && interval.End <= other.End
                && (!interval.Start.Equals(other.Start) || !interval.End.Equals(other.End));
     }
+#else
+        where TNum : unmanaged
+        => throw new NotSupportedException();
+#endif
 
     /// <summary>
     /// 是否是一个区间的子集。
@@ -110,6 +136,7 @@ public static bool IsProperSubsetOf<TNum>(this Interval<TNum> interval, Interval
     /// <param name="other"></param>
     /// <returns></returns>
     public static bool IsSubsetOf<TNum>(this Interval<TNum> interval, Interval<TNum> other)
+#if NET8_0_OR_GREATER
         where TNum : unmanaged, IFloatingPoint<TNum>
     {
         if (interval.IsEmpty)
@@ -120,7 +147,12 @@ public static bool IsSubsetOf<TNum>(this Interval<TNum> interval, Interval<TNum>
 
         return interval.Start >= other.Start && interval.End <= other.End;
     }
+#else
+        where TNum : unmanaged
+        => throw new NotSupportedException();
+#endif
 
+#if NET8_0_OR_GREATER
     /// <summary>
     /// 是否是一个区间的真超集。
     /// </summary>
@@ -144,6 +176,7 @@ public static bool IsSupersetOf<TNum>(this Interval<TNum> interval, Interval<TNu
     {
         return other.IsSubsetOf(interval);
     }
+#endif
 
     #endregion
-}
+}
\ No newline at end of file
diff --git a/DotNetCampus.Numerics/Matrix/IMatrix.cs b/DotNetCampus.Numerics/Matrix/IMatrix.cs
index ce52b7f..fac273f 100644
--- a/DotNetCampus.Numerics/Matrix/IMatrix.cs
+++ b/DotNetCampus.Numerics/Matrix/IMatrix.cs
@@ -13,7 +13,10 @@ namespace DotNetCampus.Numerics.Matrix;
 public interface IMatrix<TRow, TColumn, TNum>
     where TRow : unmanaged, IVector<TRow, TNum>
     where TColumn : unmanaged, IVector<TColumn, TNum>
-    where TNum : unmanaged, IFloatingPoint<TNum>
+    where TNum : unmanaged
+#if NET8_0_OR_GREATER
+    , IFloatingPoint<TNum>
+#endif
 {
     #region 静态变量
 
@@ -77,11 +80,17 @@ public interface IMatrix<TRow, TColumn, TNum>
 /// <typeparam name="TRow">每行的向量。</typeparam>
 /// <typeparam name="TColumn">每一列的向量。</typeparam>
 /// <typeparam name="TNum">矩阵元素的类型。</typeparam>
-public interface IMatrix<TSelf, TRow, TColumn, TNum> : IMatrix<TRow, TColumn, TNum>, IEqualityOperators<TSelf, TSelf, bool>
+public interface IMatrix<TSelf, TRow, TColumn, TNum> : IMatrix<TRow, TColumn, TNum>
+#if NET8_0_OR_GREATER
+    , IEqualityOperators<TSelf, TSelf, bool>
+#endif
     where TSelf : IMatrix<TSelf, TRow, TColumn, TNum>
     where TRow : unmanaged, IVector<TRow, TNum>
     where TColumn : unmanaged, IVector<TColumn, TNum>
-    where TNum : unmanaged, IFloatingPoint<TNum>
+    where TNum : unmanaged
+#if NET8_0_OR_GREATER
+    , IFloatingPoint<TNum>
+#endif
 {
     #region 静态变量
 
@@ -125,7 +134,10 @@ public interface IMatrix<TSelf, TRow, TColumn, TNum, TTranspose> : IMatrix<TSelf
     where TSelf : IMatrix<TSelf, TRow, TColumn, TNum, TTranspose>
     where TRow : unmanaged, IVector<TRow, TNum>
     where TColumn : unmanaged, IVector<TColumn, TNum>
-    where TNum : unmanaged, IFloatingPoint<TNum>
+    where TNum : unmanaged
+#if NET8_0_OR_GREATER
+    , IFloatingPoint<TNum>
+#endif
     where TTranspose : IMatrix<TTranspose, TColumn, TRow, TNum>
 {
     #region 属性
@@ -150,7 +162,10 @@ public interface IMatrix<TSelf, TRow, TColumn, TNum, TTranspose> : IMatrix<TSelf
 public interface ISquareMatrix<TSelf, TVector, TNum> : IMatrix<TSelf, TVector, TVector, TNum, TSelf>
     where TSelf : ISquareMatrix<TSelf, TVector, TNum>
     where TVector : unmanaged, IVector<TVector, TNum>
-    where TNum : unmanaged, IFloatingPoint<TNum>
+    where TNum : unmanaged
+#if NET8_0_OR_GREATER
+    , IFloatingPoint<TNum>
+#endif
 {
     #region 静态变量