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

Data: DelimitedReader: format missing value with chosen culture/provider (test fix)

cuda
Christoph Ruegg 12 years ago
parent
b8c145adfb
commit
e6857bf938
2 changed files with 20 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      src/Data/Text/DelimitedReader.cs
  2. 8
      src/Data/Text/DelimitedWriter.cs

32
src/Data/Text/DelimitedReader.cs
View File

@ -45,7 +45,7 @@ namespace MathNet.Numerics.Data.Text
/// specify a delimiter, then any whitespace is used.
/// </summary>
public static class DelimitedReader
{
{
/// <summary>
/// The base regular expression.
/// </summary>
@ -77,10 +77,10 @@ namespace MathNet.Numerics.Data.Text
{
delimiter = CleanDelimiter(delimiter);
var mv = missingValue ?? NaN<T>();
var mvStr = mv.ToString();
var regex = delimiter == @"\s" ?
RegexCache.GetOrAdd(delimiter, d => new Regex(WhiteSpaceRegexTemplate, RegexOptions.Compiled)) :
var mvStr = mv.ToString("G", formatProvider);
var regex = delimiter == @"\s" ?
RegexCache.GetOrAdd(delimiter, d => new Regex(WhiteSpaceRegexTemplate, RegexOptions.Compiled)) :
RegexCache.GetOrAdd(delimiter, d => new Regex(string.Format(RegexTemplate, d), RegexOptions.Compiled));
var data = new List<string[]>();
@ -117,9 +117,9 @@ namespace MathNet.Numerics.Data.Text
}
else
{
var offset = 0;
var row = new List<string>();
var offset = 0;
var row = new List<string>();
foreach (var value in (from Match match in matches where match.Length > 0 select match.Value))
{
var delimterCount = value.StartsWith(delimiter) ? value.CountDelimiters(delimiter) : 0;
@ -197,7 +197,7 @@ namespace MathNet.Numerics.Data.Text
/// <param name="missingValue">The value to represent missing values. Default: NaN.</param>
/// <returns>A matrix containing the data from the <see cref="TextReader"/>.</returns>
/// <typeparam name="T">The data type of the Matrix. It can be either: double, float, Complex, or Complex32.</typeparam>
public static Matrix<T> Read<T>(Stream stream, bool sparse = false, string delimiter = @"\s", bool hasHeaders = false, IFormatProvider formatProvider = null, T? missingValue=null)
public static Matrix<T> Read<T>(Stream stream, bool sparse = false, string delimiter = @"\s", bool hasHeaders = false, IFormatProvider formatProvider = null, T? missingValue = null)
where T : struct, IEquatable<T>, IFormattable
{
using (var reader = new StreamReader(stream))
@ -209,7 +209,7 @@ namespace MathNet.Numerics.Data.Text
/// <summary>
/// NaN for the given numeric type.
/// </summary>
private static T NaN<T>()
static T NaN<T>()
{
if (typeof (T) == typeof (double))
{
@ -262,7 +262,7 @@ namespace MathNet.Numerics.Data.Text
/// <summary>
/// Counts the number of delimiters in a row.
/// </summary>
private static int CountDelimiters(this string obj, string demlimiter)
static int CountDelimiters(this string obj, string demlimiter)
{
var pos = 0;
var count = 0;
@ -274,12 +274,12 @@ namespace MathNet.Numerics.Data.Text
}
return count;
}
}
/// <summary>
/// Returns a regex friendly delimter.
/// Returns a regex friendly delimiter.
/// </summary>
private static string CleanDelimiter(string delimiter)
static string CleanDelimiter(string delimiter)
{
if (string.IsNullOrEmpty(delimiter))
{
@ -287,9 +287,9 @@ namespace MathNet.Numerics.Data.Text
}
switch (delimiter)
{
case "." :
case ".":
return "\\.";
case "\\" :
case "\\":
return "\\\\";
default:
return delimiter;

8
src/Data/Text/DelimitedWriter.cs
View File

@ -50,7 +50,7 @@ namespace MathNet.Numerics.Data.Text
/// <param name="columnHeaders">Custom column header. Headers are only written if non-null and non-empty headers are provided. Default: null.</param>
/// <param name="format">The number format to use on each element. Default: null.</param>
/// <param name="formatProvider">The culture to use. Default: null.</param>
/// <param name="missingValue">A value that represents a missing value. If not null, then elemements of the matrix that have this value
/// <param name="missingValue">A value that represents a missing value. If not null, then elements of the matrix that have this value
/// are not written to the output file.</param>
/// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="writer"/> is <c>null</c>.</exception>
/// <typeparam name="T">The data type of the Matrix. It can be either: Double, Single, Complex, or Complex32.</typeparam>
@ -103,7 +103,7 @@ namespace MathNet.Numerics.Data.Text
else
{
var missing = missingValue.Value;
for (var i = 0; i < matrix.RowCount; i++)
{
for (var j = 0; j < matrix.ColumnCount; j++)
@ -136,7 +136,7 @@ namespace MathNet.Numerics.Data.Text
/// <param name="columnHeaders">Custom column header. Headers are only written if non-null and non-empty headers are provided. Default: null.</param>
/// <param name="format">The number format to use on each element. Default: null.</param>
/// <param name="formatProvider">The culture to use. Default: null.</param>
/// <param name="missingValue">A value that represents a missing value. If not null, then elemements of the matrix that have this value
/// <param name="missingValue">A value that represents a missing value. If not null, then elements of the matrix that have this value
/// are not written to the output file.</param>
/// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="filePath"/> is <c>null</c>.</exception>
/// <typeparam name="T">The data type of the Matrix. It can be either: Double, Single, Complex, or Complex32.</typeparam>
@ -158,7 +158,7 @@ namespace MathNet.Numerics.Data.Text
/// <param name="columnHeaders">Custom column header. Headers are only written if non-null and non-empty headers are provided. Default: null.</param>
/// <param name="format">The number format to use on each element. Default: null.</param>
/// <param name="formatProvider">The culture to use. Default: null.</param>
/// <param name="missingValue">A value that represents a missing value. If not null, then elemements of the matrix that have this value
/// <param name="missingValue">A value that represents a missing value. If not null, then elements of the matrix that have this value
/// are not written to the output file.</param>
/// <exception cref="ArgumentNullException">If either <paramref name="matrix"/> or <paramref name="stream"/> is <c>null</c>.</exception>
/// <typeparam name="T">The data type of the Matrix. It can be either: Double, Single, Complex, or Complex32.</typeparam>

Write Preview
Loading…
Cancel
Save