Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix parsing and ToString not using invariant culture #13

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/netcore/EigenCore/Core/Dense/MatrixDenseBase.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
Expand Down Expand Up @@ -203,7 +204,7 @@ public override string ToString()
{
for (int col = 0; col < Cols; col++)
{
stringBuilder.AppendFormat("{0:G3} ", Get(row, col));
stringBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0:G3} ", Get(row, col));
}
stringBuilder.Append('\n');
}
Expand Down
5 changes: 3 additions & 2 deletions src/netcore/EigenCore/Core/Dense/MatrixXD.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using EigenCore.Core.Dense.LinearAlgebra;
using EigenCore.Core.Shared;
using EigenCore.Eigen;
using System.Globalization;
using System.Linq;

namespace EigenCore.Core.Dense
Expand Down Expand Up @@ -628,7 +629,7 @@ public FullPivLUResult FullPivLU()

}

public override MatrixXD Clone()
public override MatrixDenseBase<double> Clone()
{
return new MatrixXD(_values.ToArray(), Rows, Cols);
}
Expand Down Expand Up @@ -685,7 +686,7 @@ public MatrixXD(MatrixXD matrixXD)
}

public MatrixXD(string valuesString)
: base(valuesString, (string value) => double.Parse(value))
: base(valuesString, (string value) => double.Parse(value, CultureInfo.InvariantCulture))
{

}
Expand Down
5 changes: 5 additions & 0 deletions src/netcore/EigenCore/Core/Dense/VBufferDense.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ public abstract class VBufferDense<T>
{
protected readonly T[] _values;

/// <summary>
/// Use only for reading raw data efficiently.
/// </summary>
public T[] Values => _values;

public readonly int Length;

public ReadOnlySpan<T> GetValues() => _values.AsSpan(0, Length);
Expand Down
3 changes: 2 additions & 1 deletion src/netcore/EigenCore/Core/Dense/VectorDenseBase.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
Expand Down Expand Up @@ -80,7 +81,7 @@ public override string ToString()
return stringBuilder.ToString().Trim();
}

stringBuilder.AppendFormat("{0:G3} ", _values[i]);
stringBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0:G3} ", _values[i]);
}

return stringBuilder.ToString().Trim();
Expand Down
3 changes: 2 additions & 1 deletion src/netcore/EigenCore/Core/Dense/VectorXD.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using EigenCore.Core.Shared;
using EigenCore.Eigen;
using System;
using System.Globalization;
using System.Linq;

namespace EigenCore.Core.Dense
Expand Down Expand Up @@ -149,7 +150,7 @@ public override int GetHashCode()
}

public VectorXD(string valuesString)
: base(valuesString, (string value) => double.Parse(value))
: base(valuesString, (string value) => double.Parse(value, CultureInfo.InvariantCulture))
{
}

Expand Down
3 changes: 2 additions & 1 deletion src/netcore/EigenCore/Core/Sparse/MatrixSparseBase.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;

Expand Down Expand Up @@ -143,7 +144,7 @@ public override string ToString()
{
for (int col = 0; col < Cols; col++)
{
stringBuilder.AppendFormat("{0:G3} ", Get(row, col));
stringBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0:G3} ", Get(row, col));
}
stringBuilder.Append('\n');
}
Expand Down
3 changes: 2 additions & 1 deletion src/netcore/EigenCore/Core/Sparse/VectorSparseBase.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Globalization;
using System.Linq;
using System.Text;

Expand Down Expand Up @@ -79,7 +80,7 @@ public override string ToString()
return stringBuilder.ToString().Trim();
}

stringBuilder.AppendFormat("{0:G3} ", Get(i));
stringBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0:G3} ", Get(i));
}

return stringBuilder.ToString().Trim();
Expand Down
4 changes: 2 additions & 2 deletions src/netcore/EigenCore/EigenCore.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<Product />
<Company />
<Authors>modios</Authors>
<Version>1.0.0-alpha</Version>
<Version>1.0.2-alpha</Version>
<Description>.Net wrapper for the Eigen C++ library</Description>
<Copyright>modios</Copyright>
<RepositoryUrl>https://github.com/modios/EigenCore</RepositoryUrl>
Expand Down