diff --git a/QWERTYkez.Mensura.Generator/ComplexUnitGenerator.cs b/QWERTYkez.Mensura.Generator/ComplexUnitGenerator.cs index 2795425..34d2f13 100644 --- a/QWERTYkez.Mensura.Generator/ComplexUnitGenerator.cs +++ b/QWERTYkez.Mensura.Generator/ComplexUnitGenerator.cs @@ -195,7 +195,7 @@ using System.Runtime.Serialization; namespace QWERTYkez.Mensura.Units; [JsonConverter(typeof(UnitJsonConverter<{typeNameZ}>))] -public readonly partial record struct {typeNameZ} : IMensuraUnit<{typeNameZ}>, IEquatable<{typeNameZ}>, IMensuraUnit +public readonly partial record struct {typeNameZ} : IEquatable<{typeNameZ}>, IMensuraUnit { [JsonInclude, DataMember, JsonPropertyName(""v""), Obsolete] // для JSON / EF на случай сбоев, если пробелма с _Value diff --git a/QWERTYkez.Mensura.Generator/UnitGenerator.cs b/QWERTYkez.Mensura.Generator/UnitGenerator.cs index 36a3d1a..31ae805 100644 --- a/QWERTYkez.Mensura.Generator/UnitGenerator.cs +++ b/QWERTYkez.Mensura.Generator/UnitGenerator.cs @@ -144,7 +144,7 @@ using System.Runtime.Serialization; namespace QWERTYkez.Mensura.Units; [JsonConverter(typeof(UnitJsonConverter<{typeName}>))] -public readonly partial record struct {typeName} : IMensuraUnit<{typeName}>, IEquatable<{typeName}>, IMensuraUnit +public readonly partial record struct {typeName} : IEquatable<{typeName}>, IMensuraUnit { [JsonInclude, DataMember, JsonPropertyName(""v""), Obsolete] // для JSON / EF на случай сбоев, если пробелма с _Value internal double Value { get => _Value; init => _Value = value; } diff --git a/QWERTYkez.Mensura/IMensuraUnit.cs b/QWERTYkez.Mensura/IMensuraUnit.cs index 9030238..e25e866 100644 --- a/QWERTYkez.Mensura/IMensuraUnit.cs +++ b/QWERTYkez.Mensura/IMensuraUnit.cs @@ -1,5 +1,3 @@ namespace QWERTYkez.Mensura; -internal interface IMensuraUnit { } - -internal interface IMensuraUnit where U : struct, IMensuraUnit, IEquatable { } \ No newline at end of file +public interface IMensuraUnit { } \ No newline at end of file diff --git a/QWERTYkez.Mensura/Operators.cs b/QWERTYkez.Mensura/Operators.cs index de8661e..33b3e4a 100644 --- a/QWERTYkez.Mensura/Operators.cs +++ b/QWERTYkez.Mensura/Operators.cs @@ -3,15 +3,15 @@ internal static class Coefficients { internal static double MultiplyCoefficient(T1 a, T2 b, TResult r) - where T1 : struct, IMensuraUnit, IEquatable, IMensuraUnit - where T2 : struct, IMensuraUnit, IEquatable, IMensuraUnit - where TResult : struct, IMensuraUnit, IEquatable, IMensuraUnit + where T1 : struct, IEquatable, IMensuraUnit + where T2 : struct, IEquatable, IMensuraUnit + where TResult : struct, IEquatable, IMensuraUnit => r.ToDouble() / (a.ToDouble() * b.ToDouble()); internal static double DivideCoefficient(T1 a, T2 b, TResult r) - where T1 : struct, IMensuraUnit, IEquatable, IMensuraUnit - where T2 : struct, IMensuraUnit, IEquatable, IMensuraUnit - where TResult : struct, IMensuraUnit, IEquatable, IMensuraUnit + where T1 : struct, IEquatable, IMensuraUnit + where T2 : struct, IEquatable, IMensuraUnit + where TResult : struct, IEquatable, IMensuraUnit => r.ToDouble() * b.ToDouble() / a.ToDouble(); } diff --git a/QWERTYkez.Mensura/Units/Complex/.LinearXXXXXXXX.Gen.cs b/QWERTYkez.Mensura/Units/Complex/.LinearXXXXXXXX.Gen.cs index 5b14c00..7a0cc82 100644 --- a/QWERTYkez.Mensura/Units/Complex/.LinearXXXXXXXX.Gen.cs +++ b/QWERTYkez.Mensura/Units/Complex/.LinearXXXXXXXX.Gen.cs @@ -258,7 +258,7 @@ //namespace QWERTYkez.Mensura.Units.Pogon //{ // [JsonConverter(typeof(PogonAAAAAAAAAAAAAAAAConverter))] -// public readonly partial record struct ZZZZZZZZZZZZZZZZ : IMensuraUnit, IEquatable, IMensuraUnit +// public readonly partial record struct ZZZZZZZZZZZZZZZZ : IEquatable, IMensuraUnit // { // [JsonInclude, DataMember, JsonPropertyName("v"), Obsolete] // для JSON / EF на случай сбоев, если пробелма с _Value diff --git a/QWERTYkez.Mensura/Units/XXXXXXXX.Gen.cs b/QWERTYkez.Mensura/Units/XXXXXXXX.Gen.cs index 796a758..4d34690 100644 --- a/QWERTYkez.Mensura/Units/XXXXXXXX.Gen.cs +++ b/QWERTYkez.Mensura/Units/XXXXXXXX.Gen.cs @@ -1,7 +1,7 @@ //namespace QWERTYkez.Mensura.Units; //[JsonConverter(typeof(UnitJsonConverter))] -//public readonly partial record struct XXXXXXXX : IMensuraUnit, IEquatable, IMensuraUnit +//public readonly partial record struct XXXXXXXX : IEquatable, IMensuraUnit //{ // [JsonInclude, DataMember, JsonPropertyName("v"), Obsolete] // для JSON / EF на случай сбоев, если пробелма с _Value // internal double Value { get => _Value; init => _Value = value; }