From e6991089e02781d17a9db3c7190d69e0ac3ab0b5 Mon Sep 17 00:00:00 2001 From: tibel Date: Wed, 30 Jan 2013 19:15:22 +0100 Subject: [PATCH] Fix some IO tests on non-english OS --- .../Complex/IO/DelimitedWriterTests.cs | 13 ++++++++++--- .../Complex32/IO/DelimitedWriterTests.cs | 13 ++++++++++--- .../Double/IO/DelimitedWriterTests.cs | 13 ++++++++++--- .../Single/IO/DelimitedWriterTests.cs | 13 ++++++++++--- 4 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/UnitTests/LinearAlgebraTests/Complex/IO/DelimitedWriterTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/IO/DelimitedWriterTests.cs index 2cb0d5f0..0e29a8c8 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/IO/DelimitedWriterTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/IO/DelimitedWriterTests.cs @@ -47,7 +47,10 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.IO public void CanWriteCommaDelimitedData() { var matrix = new DenseMatrix(new[,] { { new Complex(1.1, 1.1), new Complex(2.2, 2.2), new Complex(3.3, 3.3) }, { new Complex(4.4, 4.4), new Complex(5.5, 5.5), new Complex(6.6, 6.6) }, { new Complex(7.7, 7.7), new Complex(8.8, 8.8), new Complex(9.9, 9.9) } }); - var writer = new DelimitedWriter(','); + var writer = new DelimitedWriter(',') + { + CultureInfo = CultureInfo.InvariantCulture + }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream); var data = stream.ToArray(); @@ -89,7 +92,10 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.IO public void CanWriteSpaceDelimitedData() { var matrix = new DenseMatrix(new[,] { { new Complex(1.1, 1.1), new Complex(2.2, 2.2), new Complex(3.3, 3.3) }, { new Complex(4.4, 4.4), new Complex(5.5, 5.5), new Complex(6.6, 6.6) }, { new Complex(7.7, 7.7), new Complex(8.8, 8.8), new Complex(9.9, 9.9) } }); - var writer = new DelimitedWriter(' '); + var writer = new DelimitedWriter(' ') + { + CultureInfo = CultureInfo.InvariantCulture + }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream); var data = stream.ToArray(); @@ -111,7 +117,8 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.IO var headers = new[] { "a", "b", "c" }; var writer = new DelimitedWriter('\t') { - ColumnHeaders = headers + ColumnHeaders = headers, + CultureInfo = CultureInfo.InvariantCulture }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream); diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/IO/DelimitedWriterTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/IO/DelimitedWriterTests.cs index b1657140..45f28027 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/IO/DelimitedWriterTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/IO/DelimitedWriterTests.cs @@ -47,7 +47,10 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.IO public void CanWriteCommaDelimitedData() { var matrix = new DenseMatrix(new[,] { { new Complex32(1.1f, 1.1f), new Complex32(2.2f, 2.2f), new Complex32(3.3f, 3.3f) }, { new Complex32(4.4f, 4.4f), new Complex32(5.5f, 5.5f), new Complex32(6.6f, 6.6f) }, { new Complex32(7.7f, 7.7f), new Complex32(8.8f, 8.8f), new Complex32(9.9f, 9.9f) } }); - var writer = new DelimitedWriter(','); + var writer = new DelimitedWriter(',') + { + CultureInfo = CultureInfo.InvariantCulture + }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream); var data = stream.ToArray(); @@ -89,7 +92,10 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.IO public void CanWriteSpaceDelimitedData() { var matrix = new DenseMatrix(new[,] { { new Complex32(1.1f, 1.1f), new Complex32(2.2f, 2.2f), new Complex32(3.3f, 3.3f) }, { new Complex32(4.4f, 4.4f), new Complex32(5.5f, 5.5f), new Complex32(6.6f, 6.6f) }, { new Complex32(7.7f, 7.7f), new Complex32(8.8f, 8.8f), new Complex32(9.9f, 9.9f) } }); - var writer = new DelimitedWriter(' '); + var writer = new DelimitedWriter(' ') + { + CultureInfo = CultureInfo.InvariantCulture + }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream); var data = stream.ToArray(); @@ -111,7 +117,8 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.IO var headers = new[] { "a", "b", "c" }; var writer = new DelimitedWriter('\t') { - ColumnHeaders = headers + ColumnHeaders = headers, + CultureInfo = CultureInfo.InvariantCulture }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream); diff --git a/src/UnitTests/LinearAlgebraTests/Double/IO/DelimitedWriterTests.cs b/src/UnitTests/LinearAlgebraTests/Double/IO/DelimitedWriterTests.cs index 0bc905c4..b41611ff 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/IO/DelimitedWriterTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/IO/DelimitedWriterTests.cs @@ -46,7 +46,10 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.IO public void CanWriteCommaDelimitedData() { var matrix = new DenseMatrix(new[,] { { 1.1, 2.2, 3.3 }, { 4.4, 5.5, 6.6 }, { 7.7, 8.8, 9.9 } }); - var writer = new DelimitedWriter(','); + var writer = new DelimitedWriter(',') + { + CultureInfo = CultureInfo.InvariantCulture + }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream); var data = stream.ToArray(); @@ -88,7 +91,10 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.IO public void CanWriteSpaceDelimitedData() { var matrix = new SparseMatrix(new[,] { { 1.1, 0, 0 }, { 0, 5.5, 0 }, { 0, 0, 9.9 } }); - var writer = new DelimitedWriter(' '); + var writer = new DelimitedWriter(' ') + { + CultureInfo = CultureInfo.InvariantCulture + }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream); var data = stream.ToArray(); @@ -110,7 +116,8 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.IO var headers = new[] { "a", "b", "c" }; var writer = new DelimitedWriter('\t') { - ColumnHeaders = headers + ColumnHeaders = headers, + CultureInfo = CultureInfo.InvariantCulture }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream); diff --git a/src/UnitTests/LinearAlgebraTests/Single/IO/DelimitedWriterTests.cs b/src/UnitTests/LinearAlgebraTests/Single/IO/DelimitedWriterTests.cs index f818232b..9bce2dca 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/IO/DelimitedWriterTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/IO/DelimitedWriterTests.cs @@ -45,7 +45,10 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.IO public void CanWriteCommaDelimitedData() { var matrix = new DenseMatrix(new[,] { { 1.1f, 2.2f, 3.3f }, { 4.4f, 5.5f, 6.6f }, { 7.7f, 8.8f, 9.9f } }); - var writer = new DelimitedWriter(','); + var writer = new DelimitedWriter(',') + { + CultureInfo = CultureInfo.InvariantCulture + }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream); var data = stream.ToArray(); @@ -87,7 +90,10 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.IO public void CanWriteSpaceDelimitedData() { var matrix = new SparseMatrix(new[,] { { 1.1f, 0, 0 }, { 0, 5.5f, 0 }, { 0, 0, 9.9f } }); - var writer = new DelimitedWriter(' '); + var writer = new DelimitedWriter(' ') + { + CultureInfo = CultureInfo.InvariantCulture + }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream); var data = stream.ToArray(); @@ -109,7 +115,8 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.IO var headers = new[] { "a", "b", "c" }; var writer = new DelimitedWriter('\t') { - ColumnHeaders = headers + ColumnHeaders = headers, + CultureInfo = CultureInfo.InvariantCulture }; var stream = new MemoryStream(); writer.WriteMatrix(matrix, stream);