From ff0e24fa1c8af9f206467759d3998c619e183fc2 Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Sun, 30 Jun 2013 21:30:25 +0200 Subject: [PATCH] Obsolete the complete MathNet.Numerics.IO library This library is replaced completely with separate libraries for various data formats and isolated in their own repository and NuGet package. Among other this allows us to add format-specific dependencies without any impact on the core library. Some of the new and already existing packages: - MathNet.Numerics.Data.Text - MathNet.Numerics.Data.Matlab --- src/Numerics.IO/LinearAlgebra/Complex/IO/DelimitedReader.cs | 1 + src/Numerics.IO/LinearAlgebra/Complex/IO/MatlabReader.cs | 3 +++ src/Numerics.IO/LinearAlgebra/Complex32/IO/DelimitedReader.cs | 1 + src/Numerics.IO/LinearAlgebra/Complex32/IO/MatlabReader.cs | 3 +++ src/Numerics.IO/LinearAlgebra/Double/IO/DelimitedReader.cs | 1 + src/Numerics.IO/LinearAlgebra/Double/IO/MatlabReader.cs | 3 +++ src/Numerics.IO/LinearAlgebra/IO/DelimitedReader.cs | 1 + src/Numerics.IO/LinearAlgebra/IO/DelimitedWriter.cs | 1 + src/Numerics.IO/LinearAlgebra/IO/Matlab/Adler32.cs | 3 +++ src/Numerics.IO/LinearAlgebra/IO/Matlab/ArrayClass.cs | 3 +++ src/Numerics.IO/LinearAlgebra/IO/Matlab/ArrayFlags.cs | 1 + src/Numerics.IO/LinearAlgebra/IO/Matlab/DataType.cs | 3 +++ src/Numerics.IO/LinearAlgebra/IO/Matlab/MatlabFile.cs | 1 + src/Numerics.IO/LinearAlgebra/IO/Matlab/MatlabParser.cs | 1 + src/Numerics.IO/LinearAlgebra/IO/MatlabReader.cs | 1 + src/Numerics.IO/LinearAlgebra/IO/MatlabWriter.cs | 1 + src/Numerics.IO/LinearAlgebra/IO/MatrixReader.cs | 1 + src/Numerics.IO/LinearAlgebra/IO/MatrixWriter.cs | 1 + src/Numerics.IO/LinearAlgebra/Single/IO/DelimitedReader.cs | 1 + src/Numerics.IO/LinearAlgebra/Single/IO/MatlabReader.cs | 3 +++ 20 files changed, 34 insertions(+) diff --git a/src/Numerics.IO/LinearAlgebra/Complex/IO/DelimitedReader.cs b/src/Numerics.IO/LinearAlgebra/Complex/IO/DelimitedReader.cs index 03f108d0..d38b33f5 100644 --- a/src/Numerics.IO/LinearAlgebra/Complex/IO/DelimitedReader.cs +++ b/src/Numerics.IO/LinearAlgebra/Complex/IO/DelimitedReader.cs @@ -36,6 +36,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex.IO /// specify a delimiter, then any whitespace is used. /// /// The type of the matrix to return. + [Obsolete("Use MathNet.Numerics.Data.Text instead (separate NuGet package). Scheduled for removal in v3.0.")] public class DelimitedReader : DelimitedReader where TMatrix : Matrix { diff --git a/src/Numerics.IO/LinearAlgebra/Complex/IO/MatlabReader.cs b/src/Numerics.IO/LinearAlgebra/Complex/IO/MatlabReader.cs index 1f838d96..5012ed14 100644 --- a/src/Numerics.IO/LinearAlgebra/Complex/IO/MatlabReader.cs +++ b/src/Numerics.IO/LinearAlgebra/Complex/IO/MatlabReader.cs @@ -24,6 +24,8 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.IO { using System.IO; @@ -32,6 +34,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex.IO /// /// Creates matrices from Matlab files. /// + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] public class MatlabMatrixReader : MatlabMatrixReader { /// diff --git a/src/Numerics.IO/LinearAlgebra/Complex32/IO/DelimitedReader.cs b/src/Numerics.IO/LinearAlgebra/Complex32/IO/DelimitedReader.cs index b29cc993..7e39cd9a 100644 --- a/src/Numerics.IO/LinearAlgebra/Complex32/IO/DelimitedReader.cs +++ b/src/Numerics.IO/LinearAlgebra/Complex32/IO/DelimitedReader.cs @@ -36,6 +36,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32.IO /// specify a delimiter, then any whitespace is used. /// /// The type of the matrix to return. + [Obsolete("Use MathNet.Numerics.Data.Text instead (separate NuGet package). Scheduled for removal in v3.0.")] public class DelimitedReader : DelimitedReader where TMatrix : Matrix { diff --git a/src/Numerics.IO/LinearAlgebra/Complex32/IO/MatlabReader.cs b/src/Numerics.IO/LinearAlgebra/Complex32/IO/MatlabReader.cs index 534f1eac..640e1aba 100644 --- a/src/Numerics.IO/LinearAlgebra/Complex32/IO/MatlabReader.cs +++ b/src/Numerics.IO/LinearAlgebra/Complex32/IO/MatlabReader.cs @@ -24,6 +24,8 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.IO { using System.IO; @@ -32,6 +34,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32.IO /// /// Creates matrices from Matlab files. /// + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] public class MatlabMatrixReader : MatlabMatrixReader { /// diff --git a/src/Numerics.IO/LinearAlgebra/Double/IO/DelimitedReader.cs b/src/Numerics.IO/LinearAlgebra/Double/IO/DelimitedReader.cs index 13cb5605..54b73f98 100644 --- a/src/Numerics.IO/LinearAlgebra/Double/IO/DelimitedReader.cs +++ b/src/Numerics.IO/LinearAlgebra/Double/IO/DelimitedReader.cs @@ -35,6 +35,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double.IO /// specify a delimiter, then any whitespace is used. /// /// The type of the matrix to return. + [Obsolete("Use MathNet.Numerics.Data.Text instead (separate NuGet package). Scheduled for removal in v3.0.")] public class DelimitedReader : DelimitedReader where TMatrix : Matrix { diff --git a/src/Numerics.IO/LinearAlgebra/Double/IO/MatlabReader.cs b/src/Numerics.IO/LinearAlgebra/Double/IO/MatlabReader.cs index b502929a..fd85a6e8 100644 --- a/src/Numerics.IO/LinearAlgebra/Double/IO/MatlabReader.cs +++ b/src/Numerics.IO/LinearAlgebra/Double/IO/MatlabReader.cs @@ -24,6 +24,8 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.IO { using System.IO; @@ -32,6 +34,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double.IO /// /// Creates matrices from Matlab files. /// + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] public class MatlabMatrixReader : MatlabMatrixReader { /// diff --git a/src/Numerics.IO/LinearAlgebra/IO/DelimitedReader.cs b/src/Numerics.IO/LinearAlgebra/IO/DelimitedReader.cs index 08106489..4fa808f9 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/DelimitedReader.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/DelimitedReader.cs @@ -43,6 +43,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO /// /// The type of the matrix to return. /// The data type of the Matrix. It can be either: double, float, Complex, or Complex32. + [Obsolete("Use MathNet.Numerics.Data.Text instead (separate NuGet package). Scheduled for removal in v3.0.")] public class DelimitedReader : MatrixReader where TMatrix : Matrix where TDataType : struct, IEquatable, IFormattable diff --git a/src/Numerics.IO/LinearAlgebra/IO/DelimitedWriter.cs b/src/Numerics.IO/LinearAlgebra/IO/DelimitedWriter.cs index b72cdd80..4ee0509e 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/DelimitedWriter.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/DelimitedWriter.cs @@ -38,6 +38,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO /// Writes an to delimited text file. If the user does not /// specify a delimiter, a tab separator is used. /// + [Obsolete("Use MathNet.Numerics.Data.Text instead (separate NuGet package). Scheduled for removal in v3.0.")] public class DelimitedWriter : MatrixWriter { /// diff --git a/src/Numerics.IO/LinearAlgebra/IO/Matlab/Adler32.cs b/src/Numerics.IO/LinearAlgebra/IO/Matlab/Adler32.cs index eac7721c..c09db775 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/Matlab/Adler32.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/Matlab/Adler32.cs @@ -53,8 +53,11 @@ */ +using System; + namespace MathNet.Numerics.LinearAlgebra.IO.Matlab { + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] internal static class Adler32 { /* largest prime smaller than 65536 */ diff --git a/src/Numerics.IO/LinearAlgebra/IO/Matlab/ArrayClass.cs b/src/Numerics.IO/LinearAlgebra/IO/Matlab/ArrayClass.cs index 174dcda0..fedf313a 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/Matlab/ArrayClass.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/Matlab/ArrayClass.cs @@ -26,11 +26,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; + namespace MathNet.Numerics.LinearAlgebra.IO.Matlab { /// /// Enumeration for the Matlab array types /// + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] internal enum ArrayClass : byte { /// diff --git a/src/Numerics.IO/LinearAlgebra/IO/Matlab/ArrayFlags.cs b/src/Numerics.IO/LinearAlgebra/IO/Matlab/ArrayFlags.cs index 621d6603..91366984 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/Matlab/ArrayFlags.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/Matlab/ArrayFlags.cs @@ -34,6 +34,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO.Matlab /// Matlab Array Flags /// [Flags] + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] internal enum ArrayFlags { /// diff --git a/src/Numerics.IO/LinearAlgebra/IO/Matlab/DataType.cs b/src/Numerics.IO/LinearAlgebra/IO/Matlab/DataType.cs index 2938e444..393ebcd2 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/Matlab/DataType.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/Matlab/DataType.cs @@ -26,11 +26,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; + namespace MathNet.Numerics.LinearAlgebra.IO.Matlab { /// /// Matlab data types /// + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] internal enum DataType { /// diff --git a/src/Numerics.IO/LinearAlgebra/IO/Matlab/MatlabFile.cs b/src/Numerics.IO/LinearAlgebra/IO/Matlab/MatlabFile.cs index 482395a7..75981099 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/Matlab/MatlabFile.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/Matlab/MatlabFile.cs @@ -36,6 +36,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO.Matlab /// Represents a Matlab file /// /// The data type of the matrix to return. + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] internal class MatlabFile where TDataType : struct, IEquatable, IFormattable { /// diff --git a/src/Numerics.IO/LinearAlgebra/IO/Matlab/MatlabParser.cs b/src/Numerics.IO/LinearAlgebra/IO/Matlab/MatlabParser.cs index 7c8cbdf6..3631a78d 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/Matlab/MatlabParser.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/Matlab/MatlabParser.cs @@ -42,6 +42,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO.Matlab /// Parse a Matlab file /// /// The data type of the matrix. + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] internal class MatlabParser where TDataType : struct, IEquatable, IFormattable { diff --git a/src/Numerics.IO/LinearAlgebra/IO/MatlabReader.cs b/src/Numerics.IO/LinearAlgebra/IO/MatlabReader.cs index 41aeb7e1..5a7a639e 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/MatlabReader.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/MatlabReader.cs @@ -40,6 +40,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO /// Creates matrices from Matlab files. /// /// The data type of the Matrix. It can be either: double, float, Complex, or Complex32. + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] public class MatlabMatrixReader where TDataType : struct, IEquatable, IFormattable { /// diff --git a/src/Numerics.IO/LinearAlgebra/IO/MatlabWriter.cs b/src/Numerics.IO/LinearAlgebra/IO/MatlabWriter.cs index 73eb9944..4824a7dc 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/MatlabWriter.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/MatlabWriter.cs @@ -42,6 +42,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO /// /// Writes matrices to a Matlab file. /// + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] public class MatlabMatrixWriter : IDisposable { /// diff --git a/src/Numerics.IO/LinearAlgebra/IO/MatrixReader.cs b/src/Numerics.IO/LinearAlgebra/IO/MatrixReader.cs index 25001bc2..e30e9485 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/MatrixReader.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/MatrixReader.cs @@ -36,6 +36,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO /// /// The type of Matrix to return. /// The data type of the Matrix. It can be either: double, float, Complex, or Complex32. + [Obsolete("Use MathNet.Numerics.Data.Text instead (separate NuGet package). Scheduled for removal in v3.0.")] public abstract class MatrixReader where TMatrix : Matrix where TDataType : struct, IEquatable, IFormattable diff --git a/src/Numerics.IO/LinearAlgebra/IO/MatrixWriter.cs b/src/Numerics.IO/LinearAlgebra/IO/MatrixWriter.cs index 3dd7f46a..214115e1 100644 --- a/src/Numerics.IO/LinearAlgebra/IO/MatrixWriter.cs +++ b/src/Numerics.IO/LinearAlgebra/IO/MatrixWriter.cs @@ -37,6 +37,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO /// /// Base class to write a single to a file or stream. /// + [Obsolete("Use MathNet.Numerics.Data.Text instead (separate NuGet package). Scheduled for removal in v3.0.")] public abstract class MatrixWriter { /// diff --git a/src/Numerics.IO/LinearAlgebra/Single/IO/DelimitedReader.cs b/src/Numerics.IO/LinearAlgebra/Single/IO/DelimitedReader.cs index 8f689c04..9b69faee 100644 --- a/src/Numerics.IO/LinearAlgebra/Single/IO/DelimitedReader.cs +++ b/src/Numerics.IO/LinearAlgebra/Single/IO/DelimitedReader.cs @@ -35,6 +35,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single.IO /// specify a delimiter, then any whitespace is used. /// /// The type of the matrix to return. + [Obsolete("Use MathNet.Numerics.Data.Text instead (separate NuGet package). Scheduled for removal in v3.0.")] public class DelimitedReader : DelimitedReader where TMatrix : Matrix { diff --git a/src/Numerics.IO/LinearAlgebra/Single/IO/MatlabReader.cs b/src/Numerics.IO/LinearAlgebra/Single/IO/MatlabReader.cs index 9544af0b..94bbcd4f 100644 --- a/src/Numerics.IO/LinearAlgebra/Single/IO/MatlabReader.cs +++ b/src/Numerics.IO/LinearAlgebra/Single/IO/MatlabReader.cs @@ -24,6 +24,8 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.IO { using System.IO; @@ -32,6 +34,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single.IO /// /// Creates matrices from Matlab files. /// + [Obsolete("Use MathNet.Numerics.Data.Matlab instead (separate NuGet package). Scheduled for removal in v3.0.")] public class MatlabMatrixReader : MatlabMatrixReader { ///