From 17efeb959ae036f192fb4f440eee3206245b4bca Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Sun, 28 Jul 2013 15:58:07 +0200 Subject: [PATCH] Simplify root files slightly --- src/Numerics/IPrecisionSupport.cs | 54 ------------------- src/Numerics/Numerics.csproj | 7 +-- ...tOutAttribute.cs => PortableAttributes.cs} | 7 +++ src/Numerics/Precision.cs | 22 ++++++++ src/Numerics/SerializableAttribute.cs | 12 ----- 5 files changed, 31 insertions(+), 71 deletions(-) delete mode 100644 src/Numerics/IPrecisionSupport.cs rename src/Numerics/{TargetedPatchingOptOutAttribute.cs => PortableAttributes.cs} (75%) delete mode 100644 src/Numerics/SerializableAttribute.cs diff --git a/src/Numerics/IPrecisionSupport.cs b/src/Numerics/IPrecisionSupport.cs deleted file mode 100644 index d4787394..00000000 --- a/src/Numerics/IPrecisionSupport.cs +++ /dev/null @@ -1,54 +0,0 @@ -// -// Math.NET Numerics, part of the Math.NET Project -// http://numerics.mathdotnet.com -// http://github.com/mathnet/mathnet-numerics -// http://mathnetnumerics.codeplex.com -// -// Copyright (c) 2009-2010 Math.NET -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// - -namespace MathNet.Numerics -{ - /// - /// Support Interface for Precision Operations (like AlmostEquals). - /// - /// Type of the implementing class. - public interface IPrecisionSupport - { - /// - /// Returns a Norm of a value of this type, which is appropriate for measuring how - /// close this value is to zero. - /// - /// A norm of this value. - double Norm(); - - /// - /// Returns a Norm of the difference of two values of this type, which is - /// appropriate for measuring how close together these two values are. - /// - /// The value to compare with. - /// A norm of the difference between this and the other value. - double NormOfDifference(T otherValue); - } -} diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index 44711a7a..38373921 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -126,7 +126,6 @@ - @@ -386,6 +385,7 @@ + @@ -429,7 +429,7 @@ - + @@ -489,9 +489,6 @@ true - - - diff --git a/src/Numerics/TargetedPatchingOptOutAttribute.cs b/src/Numerics/PortableAttributes.cs similarity index 75% rename from src/Numerics/TargetedPatchingOptOutAttribute.cs rename to src/Numerics/PortableAttributes.cs index 0408687b..c95bc8db 100644 --- a/src/Numerics/TargetedPatchingOptOutAttribute.cs +++ b/src/Numerics/PortableAttributes.cs @@ -1,8 +1,14 @@ #if PORTABLE + using System; namespace MathNet.Numerics { + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)] + public class SerializableAttribute : Attribute + { + } + [AttributeUsage(AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple = false, Inherited = false)] public class TargetedPatchingOptOutAttribute : Attribute { @@ -13,4 +19,5 @@ namespace MathNet.Numerics } } } + #endif diff --git a/src/Numerics/Precision.cs b/src/Numerics/Precision.cs index 3f430f9a..52f894e2 100644 --- a/src/Numerics/Precision.cs +++ b/src/Numerics/Precision.cs @@ -41,6 +41,28 @@ namespace MathNet.Numerics using Complex = System.Numerics.Complex; #endif + /// + /// Support Interface for Precision Operations (like AlmostEquals). + /// + /// Type of the implementing class. + public interface IPrecisionSupport + { + /// + /// Returns a Norm of a value of this type, which is appropriate for measuring how + /// close this value is to zero. + /// + /// A norm of this value. + double Norm(); + + /// + /// Returns a Norm of the difference of two values of this type, which is + /// appropriate for measuring how close together these two values are. + /// + /// The value to compare with. + /// A norm of the difference between this and the other value. + double NormOfDifference(T otherValue); + } + /// /// Utilities for working with floating point numbers. /// diff --git a/src/Numerics/SerializableAttribute.cs b/src/Numerics/SerializableAttribute.cs deleted file mode 100644 index ac1e0402..00000000 --- a/src/Numerics/SerializableAttribute.cs +++ /dev/null @@ -1,12 +0,0 @@ -#if PORTABLE -using System; - -namespace MathNet.Numerics -{ - - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)] - public class SerializableAttribute : Attribute - { - } -} -#endif