uo9xpb74
/
mathnet-numerics
forked from tsai/mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

matrix writer: simplified the matirxwriter interface

la-knuth
Marcus Cuda 16 years ago
parent
8b7a40fab6
commit
0c969aff7c
11 changed files with 57 additions and 401 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 70
      src/Numerics/LinearAlgebra/Complex/IO/DelimitedWriter.cs
  2. 70
      src/Numerics/LinearAlgebra/Complex32/IO/DelimitedWriter.cs
  3. 70
      src/Numerics/LinearAlgebra/Double/IO/DelimitedWriter.cs
  4. 43
      src/Numerics/LinearAlgebra/IO/DelimitedWriter.cs
  5. 123
      src/Numerics/LinearAlgebra/IO/MatrixWriter.cs
  6. 70
      src/Numerics/LinearAlgebra/Single/IO/DelimitedWriter.cs
  7. 4
      src/Numerics/Numerics.csproj
  8. 2
      src/UnitTests/LinearAlgebraTests/Complex/IO/DelimitedWriterTests.cs
  9. 2
      src/UnitTests/LinearAlgebraTests/Complex32/IO/DelimitedWriterTests.cs
  10. 2
      src/UnitTests/LinearAlgebraTests/Double/IO/DelimitedWriterTests.cs
  11. 2
      src/UnitTests/LinearAlgebraTests/Single/IO/DelimitedWriterTests.cs

70
src/Numerics/LinearAlgebra/Complex/IO/DelimitedWriter.cs
View File

@ -1,70 +0,0 @@
// <copyright file="DelimitedWriter.cs" company="Math.NET">
// 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.
// </copyright>
namespace MathNet.Numerics.LinearAlgebra.Complex.IO
{
using Generic;
using LinearAlgebra.IO;
/// <summary>
/// Writes an <see cref="Matrix{TDataType}"/> to delimited text file. If the user does not
/// specify a delimiter, a tab separator is used.
/// </summary>
public class DelimitedWriter : DelimitedWriter<System.Numerics.Complex>
{
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// a comma as the delimiter.
/// </summary>
public DelimitedWriter()
{
}
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// using the given delimiter.
/// </summary>
/// <param name="delimiter">
/// the delimiter to use.
/// </param>
public DelimitedWriter(char delimiter) : base(delimiter)
{
}
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// using the given delimiter.
/// </summary>
/// <param name="delimiter">
/// the delimiter to use.
/// </param>
public DelimitedWriter(string delimiter) : base(delimiter)
{
}
}
}

70
src/Numerics/LinearAlgebra/Complex32/IO/DelimitedWriter.cs
View File

@ -1,70 +0,0 @@
// <copyright file="DelimitedWriter.cs" company="Math.NET">
// 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.
// </copyright>
namespace MathNet.Numerics.LinearAlgebra.Complex32.IO
{
using Generic;
using LinearAlgebra.IO;
/// <summary>
/// Writes an <see cref="Matrix{TDataType}"/> to delimited text file. If the user does not
/// specify a delimiter, a tab separator is used.
/// </summary>
public class DelimitedWriter : DelimitedWriter<Numerics.Complex32>
{
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// a comma as the delimiter.
/// </summary>
public DelimitedWriter()
{
}
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// using the given delimiter.
/// </summary>
/// <param name="delimiter">
/// the delimiter to use.
/// </param>
public DelimitedWriter(char delimiter) : base(delimiter)
{
}
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// using the given delimiter.
/// </summary>
/// <param name="delimiter">
/// the delimiter to use.
/// </param>
public DelimitedWriter(string delimiter) : base(delimiter)
{
}
}
}

70
src/Numerics/LinearAlgebra/Double/IO/DelimitedWriter.cs
View File

@ -1,70 +0,0 @@
// <copyright file="DelimitedWriter.cs" company="Math.NET">
// 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.
// </copyright>
namespace MathNet.Numerics.LinearAlgebra.Double.IO
{
using Generic;
using LinearAlgebra.IO;
/// <summary>
/// Writes an <see cref="Matrix{TDataType}"/> to delimited text file. If the user does not
/// specify a delimiter, a tab separator is used.
/// </summary>
public class DelimitedWriter : DelimitedWriter<double>
{
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// a comma as the delimiter.
/// </summary>
public DelimitedWriter()
{
}
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// using the given delimiter.
/// </summary>
/// <param name="delimiter">
/// the delimiter to use.
/// </param>
public DelimitedWriter(char delimiter) : base(delimiter)
{
}
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// using the given delimiter.
/// </summary>
/// <param name="delimiter">
/// the delimiter to use.
/// </param>
public DelimitedWriter(string delimiter) : base(delimiter)
{
}
}
}

43
src/Numerics/LinearAlgebra/IO/DelimitedWriter.cs
View File

@ -38,8 +38,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO
/// Writes an <see cref="Matrix{TDataType}"/> to delimited text file. If the user does not /// Writes an <see cref="Matrix{TDataType}"/> to delimited text file. If the user does not
/// specify a delimiter, a tab separator is used. /// specify a delimiter, a tab separator is used.
/// </summary> /// </summary>
/// <typeparam name="TDataType">The data type of the matrix.</typeparam> public class DelimitedWriter : MatrixWriter
public class DelimitedWriter<TDataType> : MatrixWriter<TDataType> where TDataType : struct, IEquatable<TDataType>, IFormattable
{ {
/// <summary> /// <summary>
/// The delimiter to use. /// The delimiter to use.
@ -47,12 +46,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO
private readonly string _delimiter; private readonly string _delimiter;
/// <summary> /// <summary>
/// The <see cref="CultureInfo"/> to use. /// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// </summary>
private CultureInfo _cultureInfo = CultureInfo.CurrentCulture;
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter{TDataType}"/> class.
/// a comma as the delimiter. /// a comma as the delimiter.
/// </summary> /// </summary>
public DelimitedWriter() public DelimitedWriter()
@ -61,7 +55,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO
} }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter{TDataType}"/> class. /// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// using the given delimiter. /// using the given delimiter.
/// </summary> /// </summary>
/// <param name="delimiter"> /// <param name="delimiter">
@ -73,7 +67,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO
} }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter{TDataType}"/> class. /// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// using the given delimiter. /// using the given delimiter.
/// </summary> /// </summary>
/// <param name="delimiter"> /// <param name="delimiter">
@ -95,35 +89,16 @@ namespace MathNet.Numerics.LinearAlgebra.IO
set; set;
} }
/// <summary>
/// Gets or sets the <see cref="CultureInfo"/> to use when parsing the numbers.
/// </summary>
/// <value>The culture info.</value>
/// <remarks>Defaults to <c>CultureInfo.CurrentCulture</c>.</remarks>
public CultureInfo CultureInfo
{
get
{
return _cultureInfo;
}
set
{
if (value != null)
{
_cultureInfo = value;
}
}
}
/// <summary> /// <summary>
/// Writes the given <see cref="Matrix{TDataType}"/> to the given <see cref="TextWriter"/>. /// Writes the given <see cref="Matrix{TDataType}"/> to the given <see cref="TextWriter"/>.
/// </summary> /// </summary>
/// <typeparam name="TDataType">The data type of the Matrix. It can be either: double, float, Complex, or Complex32.</typeparam>
/// <param name="matrix">The matrix to write.</param> /// <param name="matrix">The matrix to write.</param>
/// <param name="writer">The <see cref="TextWriter"/> to write the matrix to.</param> /// <param name="writer">The <see cref="TextWriter"/> to write the matrix to.</param>
/// <param name="format">The format to use on each element.</param> /// <param name="format">The number format to use on each element.</param>
/// <param name="cultureInfo">The culture to use.</param>
/// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="writer"/> is <c>null</c>.</exception> /// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="writer"/> is <c>null</c>.</exception>
protected override void DoWriteMatrix(Matrix<TDataType> matrix, TextWriter writer, string format) protected override void DoWriteMatrix<TDataType>(Matrix<TDataType> matrix, TextWriter writer, string format, CultureInfo cultureInfo)
{ {
if (matrix == null) if (matrix == null)
{ {
@ -152,7 +127,7 @@ namespace MathNet.Numerics.LinearAlgebra.IO
{ {
for (var j = 0; j < matrix.ColumnCount; j++) for (var j = 0; j < matrix.ColumnCount; j++)
{ {
writer.Write(matrix[i, j].ToString(format, _cultureInfo)); writer.Write(matrix[i, j].ToString(format, cultureInfo));
if (j != cols) if (j != cols)
{ {
writer.Write(_delimiter); writer.Write(_delimiter);

123
src/Numerics/LinearAlgebra/IO/MatrixWriter.cs
View File

@ -31,48 +31,61 @@ using System.IO;
namespace MathNet.Numerics.LinearAlgebra.IO namespace MathNet.Numerics.LinearAlgebra.IO
{ {
using System.Globalization;
using Generic; using Generic;
/// <summary> /// <summary>
/// Base class to write a single <see cref="Matrix{DataType}"/> to a file or stream. /// Base class to write a single <see cref="Matrix{DataType}"/> to a file or stream.
/// </summary> /// </summary>
/// <typeparam name="TDataType">The data type of the matrix.</typeparam> public abstract class MatrixWriter
public abstract class MatrixWriter<TDataType> where TDataType : struct, IEquatable<TDataType>, IFormattable
{ {
/// <summary> /// <summary>
/// Writes the given <see cref="Matrix{DataType}"/> to the given file. If the file already exists, /// The <see cref="CultureInfo"/> to use.
/// the file will be overwritten.
/// </summary> /// </summary>
/// <param name="matrix">The matrix to write.</param> private CultureInfo _cultureInfo = CultureInfo.CurrentCulture;
/// <param name="file">The file to write the matrix to.</param>
/// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="file"/> is <c>null</c>.</exception>
public void WriteMatrix(Matrix<TDataType> matrix, string file)
{
if (matrix == null)
{
throw new ArgumentNullException("matrix");
}
if (file == null) /// <summary>
/// Gets or sets the <see cref="CultureInfo"/> to use when parsing the numbers.
/// </summary>
/// <value>The culture info.</value>
/// <remarks>Defaults to <c>CultureInfo.CurrentCulture</c>.</remarks>
/// <remarks>This property is only used for matrix writers that write out text files.</remarks>
public CultureInfo CultureInfo
{
get
{ {
throw new ArgumentNullException("file"); return _cultureInfo;
} }
using (var writer = new StreamWriter(file)) set
{ {
DoWriteMatrix(matrix, writer, null); if (value != null)
{
_cultureInfo = value;
}
} }
} }
/// <summary>
/// Gets or sets he number format to use.
/// </summary>
/// <value>The number format to use when writing out each element.</value>
/// <remarks>This property is only used for matrix writers that write out text files.</remarks>
public string Format
{
get;
set;
}
/// <summary> /// <summary>
/// Writes the given <see cref="Matrix{DataType}"/> to the given file. If the file already exists, /// Writes the given <see cref="Matrix{DataType}"/> to the given file. If the file already exists,
/// the file will be overwritten. /// the file will be overwritten.
/// </summary> /// </summary>
/// <param name="matrix">the matrix to write.</param> /// <param name="matrix">The matrix to write.</param>
/// <param name="file">The file to write the matrix to.</param> /// <param name="file">The file to write the matrix to.</param>
/// <param name="format">The format to use on each element.</param>
/// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="file"/> is <c>null</c>.</exception> /// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="file"/> is <c>null</c>.</exception>
public void WriteMatrix(Matrix<TDataType> matrix, string file, string format) /// <typeparam name="TDataType">The data type of the Matrix. It can be either: double, float, Complex, or Complex32.</typeparam>
public void WriteMatrix<TDataType>(Matrix<TDataType> matrix, string file) where TDataType : struct, IEquatable<TDataType>, IFormattable
{ {
if (matrix == null) if (matrix == null)
{ {
@ -84,14 +97,9 @@ namespace MathNet.Numerics.LinearAlgebra.IO
throw new ArgumentNullException("file"); throw new ArgumentNullException("file");
} }
if (File.Exists(file))
{
File.Delete(file);
}
using (var writer = new StreamWriter(file)) using (var writer = new StreamWriter(file))
{ {
DoWriteMatrix(matrix, writer, format); DoWriteMatrix(matrix, writer, Format, _cultureInfo);
} }
} }
@ -101,32 +109,8 @@ namespace MathNet.Numerics.LinearAlgebra.IO
/// <param name="matrix">The matrix to write.</param> /// <param name="matrix">The matrix to write.</param>
/// <param name="stream">The <see cref="Stream"/> to write the matrix to.</param> /// <param name="stream">The <see cref="Stream"/> to write the matrix to.</param>
/// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="stream"/> is <c>null</c>.</exception> /// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="stream"/> is <c>null</c>.</exception>
public void WriteMatrix(Matrix<TDataType> matrix, Stream stream) /// <typeparam name="TDataType">The data type of the Matrix. It can be either: double, float, Complex, or Complex32.</typeparam>
{ public void WriteMatrix<TDataType>(Matrix<TDataType> matrix, Stream stream) where TDataType : struct, IEquatable<TDataType>, IFormattable
if (matrix == null)
{
throw new ArgumentNullException("matrix");
}
if (stream == null)
{
throw new ArgumentNullException("stream");
}
using (var writer = new StreamWriter(stream))
{
DoWriteMatrix(matrix, writer, null);
}
}
/// <summary>
/// Writes the given <see cref="Matrix{DataType}"/> to the given stream.
/// </summary>
/// <param name="matrix">The <see cref="TextWriter"/> to write.</param>
/// <param name="stream">The <see cref="Stream"/> to write the matrix to.</param>
/// <param name="format">The format to use on each element.</param>
/// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="stream"/> is <c>null</c>.</exception>
public void WriteMatrix(Matrix<TDataType> matrix, Stream stream, string format)
{ {
if (matrix == null) if (matrix == null)
{ {
@ -140,29 +124,8 @@ namespace MathNet.Numerics.LinearAlgebra.IO
using (var writer = new StreamWriter(stream)) using (var writer = new StreamWriter(stream))
{ {
DoWriteMatrix(matrix, writer, format); DoWriteMatrix(matrix, writer, Format, _cultureInfo);
}
}
/// <summary>
/// Writes the given <see cref="Matrix{DataType}"/> to the given <see cref="TextWriter"/>.
/// </summary>
/// <param name="matrix">The matrix to write.</param>
/// <param name="writer">The <see cref="TextWriter"/> to write the matrix to.</param>
/// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="writer"/> is <c>null</c>.</exception>
public void WriteMatrix(Matrix<TDataType> matrix, TextWriter writer)
{
if (matrix == null)
{
throw new ArgumentNullException("matrix");
}
if (writer == null)
{
throw new ArgumentNullException("writer");
} }
DoWriteMatrix(matrix, writer, null);
} }
/// <summary> /// <summary>
@ -170,9 +133,9 @@ namespace MathNet.Numerics.LinearAlgebra.IO
/// </summary> /// </summary>
/// <param name="matrix">The matrix to write.</param> /// <param name="matrix">The matrix to write.</param>
/// <param name="writer">The <see cref="TextWriter"/> to write the matrix to.</param> /// <param name="writer">The <see cref="TextWriter"/> to write the matrix to.</param>
/// <param name="format">The format to use on each element.</param>
/// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="writer"/> is <c>null</c>.</exception> /// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="writer"/> is <c>null</c>.</exception>
public void WriteMatrix(Matrix<TDataType> matrix, TextWriter writer, string format) /// <typeparam name="TDataType">The data type of the Matrix. It can be either: double, float, Complex, or Complex32.</typeparam>
public void WriteMatrix<TDataType>(Matrix<TDataType> matrix, TextWriter writer) where TDataType : struct, IEquatable<TDataType>, IFormattable
{ {
if (matrix == null) if (matrix == null)
{ {
@ -184,15 +147,17 @@ namespace MathNet.Numerics.LinearAlgebra.IO
throw new ArgumentNullException("writer"); throw new ArgumentNullException("writer");
} }
DoWriteMatrix(matrix, writer, format); DoWriteMatrix(matrix, writer, Format, _cultureInfo);
} }
/// <summary> /// <summary>
/// Subclasses must implement this method to do the actually writing. /// Subclasses must implement this method to do the actually writing.
/// </summary> /// </summary>
/// <typeparam name="TDataType">The data type of the Matrix. It can be either: double, float, Complex, or Complex32.</typeparam>
/// <param name="matrix">The matrix to serialize.</param> /// <param name="matrix">The matrix to serialize.</param>
/// <param name="writer">The <see cref="TextWriter"/> to write the matrix to.</param> /// <param name="writer">The <see cref="TextWriter"/> to write the matrix to.</param>
/// <param name="format">The format for the new matrix.</param> /// <param name="format">The number format to use.</param>
protected abstract void DoWriteMatrix(Matrix<TDataType> matrix, TextWriter writer, string format); /// <param name="cultureInfo">The culture to use.</param>
protected abstract void DoWriteMatrix<TDataType>(Matrix<TDataType> matrix, TextWriter writer, string format, CultureInfo cultureInfo) where TDataType : struct, IEquatable<TDataType>, IFormattable;
} }
} }

70
src/Numerics/LinearAlgebra/Single/IO/DelimitedWriter.cs
View File

@ -1,70 +0,0 @@
// <copyright file="DelimitedWriter.cs" company="Math.NET">
// 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.
// </copyright>
namespace MathNet.Numerics.LinearAlgebra.Single.IO
{
using Generic;
using LinearAlgebra.IO;
/// <summary>
/// Writes an <see cref="Matrix{TDataType}"/> to delimited text file. If the user does not
/// specify a delimiter, a tab separator is used.
/// </summary>
public class DelimitedWriter : DelimitedWriter<float>
{
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// a comma as the delimiter.
/// </summary>
public DelimitedWriter()
{
}
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// using the given delimiter.
/// </summary>
/// <param name="delimiter">
/// the delimiter to use.
/// </param>
public DelimitedWriter(char delimiter) : base(delimiter)
{
}
/// <summary>
/// Initializes a new instance of the <see cref="DelimitedWriter"/> class.
/// using the given delimiter.
/// </summary>
/// <param name="delimiter">
/// the delimiter to use.
/// </param>
public DelimitedWriter(string delimiter) : base(delimiter)
{
}
}
}

4
src/Numerics/Numerics.csproj
View File

@ -107,7 +107,6 @@
<Compile Include="LinearAlgebra\Complex32\Factorization\LU.cs" /> <Compile Include="LinearAlgebra\Complex32\Factorization\LU.cs" />
<Compile Include="LinearAlgebra\Complex32\Factorization\QR.cs" /> <Compile Include="LinearAlgebra\Complex32\Factorization\QR.cs" />
<Compile Include="LinearAlgebra\Complex32\Factorization\Svd.cs" /> <Compile Include="LinearAlgebra\Complex32\Factorization\Svd.cs" />
<Compile Include="LinearAlgebra\Complex32\IO\DelimitedWriter.cs" />
<Compile Include="LinearAlgebra\Complex32\IO\MatlabReader.cs" /> <Compile Include="LinearAlgebra\Complex32\IO\MatlabReader.cs" />
<Compile Include="LinearAlgebra\Complex32\Matrix.cs" /> <Compile Include="LinearAlgebra\Complex32\Matrix.cs" />
<Compile Include="LinearAlgebra\Complex32\SparseMatrix.cs" /> <Compile Include="LinearAlgebra\Complex32\SparseMatrix.cs" />
@ -123,7 +122,6 @@
<Compile Include="LinearAlgebra\Complex\Factorization\LU.cs" /> <Compile Include="LinearAlgebra\Complex\Factorization\LU.cs" />
<Compile Include="LinearAlgebra\Complex\Factorization\QR.cs" /> <Compile Include="LinearAlgebra\Complex\Factorization\QR.cs" />
<Compile Include="LinearAlgebra\Complex\Factorization\Svd.cs" /> <Compile Include="LinearAlgebra\Complex\Factorization\Svd.cs" />
<Compile Include="LinearAlgebra\Complex\IO\DelimitedWriter.cs" />
<Compile Include="LinearAlgebra\Complex\IO\MatlabReader.cs" /> <Compile Include="LinearAlgebra\Complex\IO\MatlabReader.cs" />
<Compile Include="LinearAlgebra\Complex\Matrix.cs" /> <Compile Include="LinearAlgebra\Complex\Matrix.cs" />
<Compile Include="LinearAlgebra\Complex\SparseMatrix.cs" /> <Compile Include="LinearAlgebra\Complex\SparseMatrix.cs" />
@ -135,7 +133,6 @@
<Compile Include="LinearAlgebra\Double\Factorization\GramSchmidt.cs" /> <Compile Include="LinearAlgebra\Double\Factorization\GramSchmidt.cs" />
<Compile Include="LinearAlgebra\Double\Factorization\QR.cs" /> <Compile Include="LinearAlgebra\Double\Factorization\QR.cs" />
<Compile Include="LinearAlgebra\Double\Factorization\Svd.cs" /> <Compile Include="LinearAlgebra\Double\Factorization\Svd.cs" />
<Compile Include="LinearAlgebra\Double\IO\DelimitedWriter.cs" />
<Compile Include="LinearAlgebra\Double\Factorization\LU.cs" /> <Compile Include="LinearAlgebra\Double\Factorization\LU.cs" />
<Compile Include="LinearAlgebra\Double\Matrix.cs" /> <Compile Include="LinearAlgebra\Double\Matrix.cs" />
<Compile Include="LinearAlgebra\Double\SparseMatrix.cs" /> <Compile Include="LinearAlgebra\Double\SparseMatrix.cs" />
@ -238,7 +235,6 @@
<Compile Include="LinearAlgebra\Single\Factorization\UserQR.cs" /> <Compile Include="LinearAlgebra\Single\Factorization\UserQR.cs" />
<Compile Include="LinearAlgebra\Single\Factorization\UserSvd.cs" /> <Compile Include="LinearAlgebra\Single\Factorization\UserSvd.cs" />
<Compile Include="LinearAlgebra\Single\IO\DelimitedReader.cs" /> <Compile Include="LinearAlgebra\Single\IO\DelimitedReader.cs" />
<Compile Include="LinearAlgebra\Single\IO\DelimitedWriter.cs" />
<Compile Include="LinearAlgebra\Single\IO\MatlabReader.cs" /> <Compile Include="LinearAlgebra\Single\IO\MatlabReader.cs" />
<Compile Include="LinearAlgebra\Single\Matrix.cs" /> <Compile Include="LinearAlgebra\Single\Matrix.cs" />
<Compile Include="LinearAlgebra\Single\Solvers\Iterative\BiCgStab.cs" /> <Compile Include="LinearAlgebra\Single\Solvers\Iterative\BiCgStab.cs" />

2
src/UnitTests/LinearAlgebraTests/Complex/IO/DelimitedWriterTests.cs
View File

@ -5,7 +5,7 @@
using System.Numerics; using System.Numerics;
using System.IO; using System.IO;
using LinearAlgebra.Complex; using LinearAlgebra.Complex;
using LinearAlgebra.Complex.IO; using LinearAlgebra.IO;
using MbUnit.Framework; using MbUnit.Framework;
[TestFixture] [TestFixture]

2
src/UnitTests/LinearAlgebraTests/Complex32/IO/DelimitedWriterTests.cs
View File

@ -4,7 +4,7 @@
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using LinearAlgebra.Complex32; using LinearAlgebra.Complex32;
using LinearAlgebra.Complex32.IO; using LinearAlgebra.IO;
using Numerics; using Numerics;
using MbUnit.Framework; using MbUnit.Framework;

2
src/UnitTests/LinearAlgebraTests/Double/IO/DelimitedWriterTests.cs
View File

@ -4,7 +4,7 @@
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using LinearAlgebra.Double; using LinearAlgebra.Double;
using LinearAlgebra.Double.IO; using LinearAlgebra.IO;
using MbUnit.Framework; using MbUnit.Framework;
[TestFixture] [TestFixture]

2
src/UnitTests/LinearAlgebraTests/Single/IO/DelimitedWriterTests.cs
View File

@ -3,8 +3,8 @@
using System; using System;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using LinearAlgebra.IO;
using LinearAlgebra.Single; using LinearAlgebra.Single;
using LinearAlgebra.Single.IO;
using MbUnit.Framework; using MbUnit.Framework;
[TestFixture] [TestFixture]

Write Preview
Loading…
Cancel
Save