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

Sparse Vectors: Equals now supports accidential zeros. Fixes gh-21. 

Equals previously returned always false in case of (asymmetric) accidential
zeros. Instead, Equals now expects accidential zeros and treats them
correctly (so we can allow arithmetic algorithms to generate accidential
zeros, avoiding a lot of zero checks).
la-knuth
Christoph Ruegg 15 years ago
parent
a8f21270b7
commit
7a34beed26
4 changed files with 100 additions and 40 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. 35
      src/Numerics/LinearAlgebra/Complex/SparseVector.cs
  2. 35
      src/Numerics/LinearAlgebra/Complex32/SparseVector.cs
  3. 35
      src/Numerics/LinearAlgebra/Double/SparseVector.cs
  4. 35
      src/Numerics/LinearAlgebra/Single/SparseVector.cs

35
src/Numerics/LinearAlgebra/Complex/SparseVector.cs
View File

@ -1446,25 +1446,40 @@ namespace MathNet.Numerics.LinearAlgebra.Complex
return true;
}
var sparseVector = other as SparseVector;
if (sparseVector == null)
var otherSparse = other as SparseVector;
if (otherSparse == null)
{
return base.Equals(other);
}
if (NonZerosCount != sparseVector.NonZerosCount)
int i = 0, j = 0;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{
return false;
}
if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] < otherSparse._nonZeroIndices[j])
{
if (_nonZeroValues[i++] != Complex.Zero)
{
return false;
}
continue;
}
// If all else fails, perform element wise comparison.
for (var index = 0; index < NonZerosCount; index++)
{
if (!_nonZeroValues[index].AlmostEqual(sparseVector._nonZeroValues[index]) || (_nonZeroIndices[index] != sparseVector._nonZeroIndices[index]))
if (i >= NonZerosCount || j < otherSparse.NonZerosCount && otherSparse._nonZeroIndices[j] < _nonZeroIndices[i])
{
if (otherSparse._nonZeroValues[j++] != Complex.Zero)
{
return false;
}
continue;
}
if (!_nonZeroValues[i].AlmostEqual(otherSparse._nonZeroValues[j]))
{
return false;
}
i++;
j++;
}
return true;

35
src/Numerics/LinearAlgebra/Complex32/SparseVector.cs
View File

@ -1476,25 +1476,40 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32
return true;
}
var sparseVector = other as SparseVector;
if (sparseVector == null)
var otherSparse = other as SparseVector;
if (otherSparse == null)
{
return base.Equals(other);
}
if (NonZerosCount != sparseVector.NonZerosCount)
int i = 0, j = 0;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{
return false;
}
if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] < otherSparse._nonZeroIndices[j])
{
if (_nonZeroValues[i++] != Complex32.Zero)
{
return false;
}
continue;
}
// If all else fails, perform element wise comparison.
for (var index = 0; index < NonZerosCount; index++)
{
if (!_nonZeroValues[index].AlmostEqual(sparseVector._nonZeroValues[index]) || (_nonZeroIndices[index] != sparseVector._nonZeroIndices[index]))
if (i >= NonZerosCount || j < otherSparse.NonZerosCount && otherSparse._nonZeroIndices[j] < _nonZeroIndices[i])
{
if (otherSparse._nonZeroValues[j++] != Complex32.Zero)
{
return false;
}
continue;
}
if (!_nonZeroValues[i].AlmostEqual(otherSparse._nonZeroValues[j]))
{
return false;
}
i++;
j++;
}
return true;

35
src/Numerics/LinearAlgebra/Double/SparseVector.cs
View File

@ -1506,25 +1506,40 @@ namespace MathNet.Numerics.LinearAlgebra.Double
return true;
}
var sparseVector = other as SparseVector;
if (sparseVector == null)
var otherSparse = other as SparseVector;
if (otherSparse == null)
{
return base.Equals(other);
}
if (NonZerosCount != sparseVector.NonZerosCount)
int i = 0, j = 0;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{
return false;
}
if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] < otherSparse._nonZeroIndices[j])
{
if (_nonZeroValues[i++] != 0d)
{
return false;
}
continue;
}
// If all else fails, perform element wise comparison.
for (var index = 0; index < NonZerosCount; index++)
{
if (!_nonZeroValues[index].AlmostEqual(sparseVector._nonZeroValues[index]) || (_nonZeroIndices[index] != sparseVector._nonZeroIndices[index]))
if (i >= NonZerosCount || j < otherSparse.NonZerosCount && otherSparse._nonZeroIndices[j] < _nonZeroIndices[i])
{
if (otherSparse._nonZeroValues[j++] != 0d)
{
return false;
}
continue;
}
if (!_nonZeroValues[i].AlmostEqual(otherSparse._nonZeroValues[j]))
{
return false;
}
i++;
j++;
}
return true;

35
src/Numerics/LinearAlgebra/Single/SparseVector.cs
View File

@ -1516,25 +1516,40 @@ namespace MathNet.Numerics.LinearAlgebra.Single
return true;
}
var sparseVector = other as SparseVector;
if (sparseVector == null)
var otherSparse = other as SparseVector;
if (otherSparse == null)
{
return base.Equals(other);
}
if (NonZerosCount != sparseVector.NonZerosCount)
int i = 0, j = 0;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{
return false;
}
if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] < otherSparse._nonZeroIndices[j])
{
if (_nonZeroValues[i++] != 0f)
{
return false;
}
continue;
}
// If all else fails, perform element wise comparison.
for (var index = 0; index < NonZerosCount; index++)
{
if (!_nonZeroValues[index].AlmostEqual(sparseVector._nonZeroValues[index]) || (_nonZeroIndices[index] != sparseVector._nonZeroIndices[index]))
if (i >= NonZerosCount || j < otherSparse.NonZerosCount && otherSparse._nonZeroIndices[j] < _nonZeroIndices[i])
{
if (otherSparse._nonZeroValues[j++] != 0f)
{
return false;
}
continue;
}
if (!_nonZeroValues[i].AlmostEqual(otherSparse._nonZeroValues[j]))
{
return false;
}
i++;
j++;
}
return true;

Write Preview
Loading…
Cancel
Save