Browse Source

Merge pull request #743 from phihub/FixMathNetDataResources

Removed Dependency to Mathnet.Numerics.Properties Resources
v4
Christoph Ruegg 6 years ago
committed by GitHub
parent
commit
6604cff38a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      src/Data/Matlab/Formatter.cs
  2. 5
      src/Data/Matlab/Parser.cs

7
src/Data/Matlab/Formatter.cs

@ -36,7 +36,6 @@ using System.Numerics;
using System.Text; using System.Text;
using MathNet.Numerics.LinearAlgebra; using MathNet.Numerics.LinearAlgebra;
using MathNet.Numerics.LinearAlgebra.Storage; using MathNet.Numerics.LinearAlgebra.Storage;
using MathNet.Numerics.Properties;
namespace MathNet.Numerics.Data.Matlab namespace MathNet.Numerics.Data.Matlab
{ {
@ -73,7 +72,7 @@ namespace MathNet.Numerics.Data.Matlab
#endif #endif
{ {
// write header and subsystem data offset (116+8 bytes) // write header and subsystem data offset (116+8 bytes)
var header = Encoding.ASCII.GetBytes(HeaderText + DateTime.Now.ToString(Resources.MatlabDateHeaderFormat)); var header = Encoding.ASCII.GetBytes(HeaderText + DateTime.Now.ToString("ddd MMM dd HH: mm:ss yyyy"));
writer.Write(header); writer.Write(header);
Pad(writer, 116 - header.Length + 8, 32); Pad(writer, 116 - header.Length + 8, 32);
@ -117,12 +116,12 @@ namespace MathNet.Numerics.Data.Matlab
if (string.IsNullOrEmpty(name)) if (string.IsNullOrEmpty(name))
{ {
throw new ArgumentException(Resources.StringNullOrEmpty, "name"); throw new ArgumentException("String parameter cannot be empty or null.", "name");
} }
if (name.IndexOf(' ') > -1) if (name.IndexOf(' ') > -1)
{ {
throw new ArgumentException(string.Format(Resources.NameCannotContainASpace, name), "name"); throw new ArgumentException(string.Format("Name cannot contain a space.name: {0}", name), "name");
} }
var dataType = typeof(T); var dataType = typeof(T);

5
src/Data/Matlab/Parser.cs

@ -36,7 +36,6 @@ using System.Numerics;
using System.Text; using System.Text;
using MathNet.Numerics.LinearAlgebra; using MathNet.Numerics.LinearAlgebra;
using MathNet.Numerics.LinearAlgebra.Storage; using MathNet.Numerics.LinearAlgebra.Storage;
using MathNet.Numerics.Properties;
namespace MathNet.Numerics.Data.Matlab namespace MathNet.Numerics.Data.Matlab
{ {
@ -77,7 +76,7 @@ namespace MathNet.Numerics.Data.Matlab
// endian indicator (2 bytes) // endian indicator (2 bytes)
if (reader.ReadByte() != LittleEndianIndicator) if (reader.ReadByte() != LittleEndianIndicator)
{ {
throw new NotSupportedException(Resources.BigEndianNotSupported); throw new NotSupportedException("Big endian files are not supported.");
} }
// set position to first data element, right after full file header (128 bytes) // set position to first data element, right after full file header (128 bytes)
@ -162,7 +161,7 @@ namespace MathNet.Numerics.Data.Matlab
var numDimensions = reader.ReadInt32()/8; var numDimensions = reader.ReadInt32()/8;
if (numDimensions > 2) if (numDimensions > 2)
{ {
throw new NotSupportedException(Resources.MoreThan2D); throw new NotSupportedException("Only 1 and 2 dimensional arrays are supported.");
} }
// Dimensions Array data: row and column count (8 bytes) // Dimensions Array data: row and column count (8 bytes)

Loading…
Cancel
Save