Rename NumberOfElements to Count

This commit is contained in:
Alexander Luzgarev 2017-11-17 18:48:54 +01:00
parent 6cd9ffac47
commit 404096bc8a
5 changed files with 8 additions and 8 deletions

View File

@ -241,7 +241,7 @@ namespace MatFileHandler.Tests
Assert.That(expected.FieldNames, Is.EquivalentTo(actual.FieldNames)); Assert.That(expected.FieldNames, Is.EquivalentTo(actual.FieldNames));
foreach (var name in expected.FieldNames) foreach (var name in expected.FieldNames)
{ {
for (var i = 0; i < expected.NumberOfElements; i++) for (var i = 0; i < expected.Count; i++)
{ {
CompareMatArrays(expected[name, i], actual[name, i]); CompareMatArrays(expected[name, i], actual[name, i]);
} }
@ -252,7 +252,7 @@ namespace MatFileHandler.Tests
{ {
Assert.That(actual, Is.Not.Null); Assert.That(actual, Is.Not.Null);
Assert.That(expected.Dimensions, Is.EqualTo(actual.Dimensions)); Assert.That(expected.Dimensions, Is.EqualTo(actual.Dimensions));
for (var i = 0; i < expected.NumberOfElements; i++) for (var i = 0; i < expected.Count; i++)
{ {
CompareMatArrays(expected[i], actual[i]); CompareMatArrays(expected[i], actual[i]);
} }

View File

@ -20,9 +20,9 @@ namespace MatFileHandler
int[] Dimensions { get; } int[] Dimensions { get; }
/// <summary> /// <summary>
/// Gets the number of elements in the array. /// Gets the total number of elements in the array.
/// </summary> /// </summary>
int NumberOfElements { get; } int Count { get; }
/// <summary> /// <summary>
/// Tries to convert the array to an array of Double values. /// Tries to convert the array to an array of Double values.

View File

@ -34,7 +34,7 @@ namespace MatFileHandler
public string Name { get; } public string Name { get; }
/// <inheritdoc /> /// <inheritdoc />
public int NumberOfElements => Dimensions.NumberOfElements(); public int Count => Dimensions.NumberOfElements();
/// <inheritdoc /> /// <inheritdoc />
public bool IsEmpty => Dimensions.Length == 0; public bool IsEmpty => Dimensions.Length == 0;

View File

@ -524,7 +524,7 @@ namespace MatFileHandler
private void WriteStructureArrayValues(BinaryWriter writer, IStructureArray array) private void WriteStructureArrayValues(BinaryWriter writer, IStructureArray array)
{ {
for (var i = 0; i < array.NumberOfElements; i++) for (var i = 0; i < array.Count; i++)
{ {
foreach (var name in array.FieldNames) foreach (var name in array.FieldNames)
{ {
@ -556,7 +556,7 @@ namespace MatFileHandler
private void WriteCellArrayValues(BinaryWriter writer, ICellArray array) private void WriteCellArrayValues(BinaryWriter writer, ICellArray array)
{ {
for (var i = 0; i < array.NumberOfElements; i++) for (var i = 0; i < array.Count; i++)
{ {
WriteArray(writer, array[i]); WriteArray(writer, array[i]);
} }

View File

@ -40,7 +40,7 @@ public interface IArray
{ {
bool IsEmpty { get; } bool IsEmpty { get; }
int[] Dimensions { get; } int[] Dimensions { get; }
int NumberOfElements { get; } int Count { get; }
double[] ConvertToDoubleArray(); double[] ConvertToDoubleArray();
System.Numerics.Complex[] ConvertToDoubleArray(); System.Numerics.Complex[] ConvertToDoubleArray();
} }