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

Sparse Linear Algebra: fix addition bug gh-20 gh-18.

la-knuth
Christoph Ruegg 15 years ago
parent
101864e798
commit
68c0417368
4 changed files with 248 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 69
      src/Numerics/LinearAlgebra/Complex/SparseVector.cs
  2. 69
      src/Numerics/LinearAlgebra/Complex32/SparseVector.cs
  3. 69
      src/Numerics/LinearAlgebra/Double/SparseVector.cs
  4. 69
      src/Numerics/LinearAlgebra/Single/SparseVector.cs

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

@ -403,18 +403,73 @@ namespace MathNet.Numerics.LinearAlgebra.Complex
/// </param> /// </param>
protected override void DoAdd(Vector<Complex> other, Vector<Complex> result) protected override void DoAdd(Vector<Complex> other, Vector<Complex> result)
{ {
if (ReferenceEquals(this, result)) var otherSparse = other as SparseVector;
if (otherSparse == null)
{ {
CommonParallel.For( base.DoAdd(other, result);
0, return;
NonZerosCount, }
index => _nonZeroValues[index] += _nonZeroValues[index]);
var resultSparse = result as SparseVector;
if (resultSparse == null)
{
base.DoAdd(other, result);
return;
}
// TODO (ruegg, 2011-10-11): Options to optimize?
if (ReferenceEquals(this, resultSparse))
{
int i = 0, j = 0;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{
if (i < NonZerosCount && j < otherSparse.NonZerosCount && _nonZeroIndices[i] == otherSparse._nonZeroIndices[j])
{
_nonZeroValues[i++] += otherSparse._nonZeroValues[j++];
}
else if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] < otherSparse._nonZeroIndices[j])
{
_nonZeroValues[i] += otherSparse.At(_nonZeroIndices[i]);
i++;
}
else
{
var otherValue = otherSparse._nonZeroValues[j];
if (otherValue != Complex.Zero)
{
InsertAtUnchecked(i++, otherSparse._nonZeroIndices[j], otherValue);
}
j++;
}
}
} }
else else
{ {
for (var index = 0; index < Count; index++) result.Clear();
int i = 0, j = 0, last = -1;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{ {
result.At(index, At(index) + other.At(index)); if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] <= otherSparse._nonZeroIndices[j])
{
var next = _nonZeroIndices[i];
if (next != last)
{
last = next;
result.At(next, _nonZeroValues[i] + otherSparse.At(next));
}
i++;
}
else
{
var next = otherSparse._nonZeroIndices[j];
if (next != last)
{
last = next;
result.At(next, At(next) + otherSparse._nonZeroValues[j]);
}
j++;
}
} }
} }
} }

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

@ -433,18 +433,73 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32
/// </param> /// </param>
protected override void DoAdd(Vector<Complex32> other, Vector<Complex32> result) protected override void DoAdd(Vector<Complex32> other, Vector<Complex32> result)
{ {
if (ReferenceEquals(this, result)) var otherSparse = other as SparseVector;
if (otherSparse == null)
{ {
CommonParallel.For( base.DoAdd(other, result);
0, return;
NonZerosCount, }
index => _nonZeroValues[index] += _nonZeroValues[index]);
var resultSparse = result as SparseVector;
if (resultSparse == null)
{
base.DoAdd(other, result);
return;
}
// TODO (ruegg, 2011-10-11): Options to optimize?
if (ReferenceEquals(this, resultSparse))
{
int i = 0, j = 0;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{
if (i < NonZerosCount && j < otherSparse.NonZerosCount && _nonZeroIndices[i] == otherSparse._nonZeroIndices[j])
{
_nonZeroValues[i++] += otherSparse._nonZeroValues[j++];
}
else if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] < otherSparse._nonZeroIndices[j])
{
_nonZeroValues[i] += otherSparse.At(_nonZeroIndices[i]);
i++;
}
else
{
var otherValue = otherSparse._nonZeroValues[j];
if (otherValue != Complex32.Zero)
{
InsertAtUnchecked(i++, otherSparse._nonZeroIndices[j], otherValue);
}
j++;
}
}
} }
else else
{ {
for (var index = 0; index < Count; index++) result.Clear();
int i = 0, j = 0, last = -1;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{ {
result.At(index, At(index) + other.At(index)); if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] <= otherSparse._nonZeroIndices[j])
{
var next = _nonZeroIndices[i];
if (next != last)
{
last = next;
result.At(next, _nonZeroValues[i] + otherSparse.At(next));
}
i++;
}
else
{
var next = otherSparse._nonZeroIndices[j];
if (next != last)
{
last = next;
result.At(next, At(next) + otherSparse._nonZeroValues[j]);
}
j++;
}
} }
} }
} }

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

@ -351,18 +351,73 @@ namespace MathNet.Numerics.LinearAlgebra.Double
/// </param> /// </param>
protected override void DoAdd(Vector<double> other, Vector<double> result) protected override void DoAdd(Vector<double> other, Vector<double> result)
{ {
if (ReferenceEquals(this, result)) var otherSparse = other as SparseVector;
if (otherSparse == null)
{ {
CommonParallel.For( base.DoAdd(other, result);
0, return;
NonZerosCount, }
index => _nonZeroValues[index] += _nonZeroValues[index]);
var resultSparse = result as SparseVector;
if (resultSparse == null)
{
base.DoAdd(other, result);
return;
}
// TODO (ruegg, 2011-10-11): Options to optimize?
if (ReferenceEquals(this, resultSparse))
{
int i = 0, j = 0;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{
if (i < NonZerosCount && j < otherSparse.NonZerosCount && _nonZeroIndices[i] == otherSparse._nonZeroIndices[j])
{
_nonZeroValues[i++] += otherSparse._nonZeroValues[j++];
}
else if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] < otherSparse._nonZeroIndices[j])
{
_nonZeroValues[i] += otherSparse.At(_nonZeroIndices[i]);
i++;
}
else
{
var otherValue = otherSparse._nonZeroValues[j];
if (otherValue != 0.0)
{
InsertAtUnchecked(i++, otherSparse._nonZeroIndices[j], otherValue);
}
j++;
}
}
} }
else else
{ {
for (var index = 0; index < Count; index++) result.Clear();
int i = 0, j = 0, last = -1;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{ {
result.At(index, At(index) + other.At(index)); if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] <= otherSparse._nonZeroIndices[j])
{
var next = _nonZeroIndices[i];
if (next != last)
{
last = next;
result.At(next, _nonZeroValues[i] + otherSparse.At(next));
}
i++;
}
else
{
var next = otherSparse._nonZeroIndices[j];
if (next != last)
{
last = next;
result.At(next, At(next) + otherSparse._nonZeroValues[j]);
}
j++;
}
} }
} }
} }

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

@ -381,18 +381,73 @@ namespace MathNet.Numerics.LinearAlgebra.Single
/// </param> /// </param>
protected override void DoAdd(Vector<float> other, Vector<float> result) protected override void DoAdd(Vector<float> other, Vector<float> result)
{ {
if (ReferenceEquals(this, result)) var otherSparse = other as SparseVector;
if (otherSparse == null)
{ {
CommonParallel.For( base.DoAdd(other, result);
0, return;
NonZerosCount, }
index => _nonZeroValues[index] += _nonZeroValues[index]);
var resultSparse = result as SparseVector;
if (resultSparse == null)
{
base.DoAdd(other, result);
return;
}
// TODO (ruegg, 2011-10-11): Options to optimize?
if (ReferenceEquals(this, resultSparse))
{
int i = 0, j = 0;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{
if (i < NonZerosCount && j < otherSparse.NonZerosCount && _nonZeroIndices[i] == otherSparse._nonZeroIndices[j])
{
_nonZeroValues[i++] += otherSparse._nonZeroValues[j++];
}
else if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] < otherSparse._nonZeroIndices[j])
{
_nonZeroValues[i] += otherSparse.At(_nonZeroIndices[i]);
i++;
}
else
{
var otherValue = otherSparse._nonZeroValues[j];
if (otherValue != 0.0)
{
InsertAtUnchecked(i++, otherSparse._nonZeroIndices[j], otherValue);
}
j++;
}
}
} }
else else
{ {
for (var index = 0; index < Count; index++) result.Clear();
int i = 0, j = 0, last = -1;
while (i < NonZerosCount || j < otherSparse.NonZerosCount)
{ {
result.At(index, At(index) + other.At(index)); if (j >= otherSparse.NonZerosCount || i < NonZerosCount && _nonZeroIndices[i] <= otherSparse._nonZeroIndices[j])
{
var next = _nonZeroIndices[i];
if (next != last)
{
last = next;
result.At(next, _nonZeroValues[i] + otherSparse.At(next));
}
i++;
}
else
{
var next = otherSparse._nonZeroIndices[j];
if (next != last)
{
last = next;
result.At(next, At(next) + otherSparse._nonZeroValues[j]);
}
j++;
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save