From 5d4c296a74c2aeaf8df08d4a0863a96d762f2a92 Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Sun, 3 Mar 2013 15:05:55 +0100 Subject: [PATCH] LA: Result should be called 'result' not 'target' --- .../LinearAlgebra/Complex/DenseVector.cs | 36 +++++++-------- .../LinearAlgebra/Complex/SparseVector.cs | 28 ++++++------ src/Numerics/LinearAlgebra/Complex/Vector.cs | 16 +++---- .../LinearAlgebra/Complex32/DenseVector.cs | 36 +++++++-------- .../LinearAlgebra/Complex32/SparseVector.cs | 28 ++++++------ .../LinearAlgebra/Complex32/Vector.cs | 16 +++---- .../LinearAlgebra/Double/DenseVector.cs | 10 ++--- .../LinearAlgebra/Double/SparseVector.cs | 14 +++--- src/Numerics/LinearAlgebra/Double/Vector.cs | 18 ++++---- src/Numerics/LinearAlgebra/Generic/Vector.cs | 44 +++++++++---------- .../LinearAlgebra/Single/DenseVector.cs | 10 ++--- .../LinearAlgebra/Single/SparseVector.cs | 14 +++--- src/Numerics/LinearAlgebra/Single/Vector.cs | 18 ++++---- 13 files changed, 142 insertions(+), 146 deletions(-) diff --git a/src/Numerics/LinearAlgebra/Complex/DenseVector.cs b/src/Numerics/LinearAlgebra/Complex/DenseVector.cs index b6c98443..a44eafcc 100644 --- a/src/Numerics/LinearAlgebra/Complex/DenseVector.cs +++ b/src/Numerics/LinearAlgebra/Complex/DenseVector.cs @@ -369,15 +369,15 @@ namespace MathNet.Numerics.LinearAlgebra.Complex } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { - var denseResult = target as DenseVector; + var denseResult = result as DenseVector; if (denseResult == null) { - base.DoNegate(target); + base.DoNegate(result); } else { @@ -863,24 +863,22 @@ namespace MathNet.Numerics.LinearAlgebra.Complex #endregion /// - /// Conjugates vector and save result to + /// Conjugates vector and save result to /// - /// Target vector - protected override void DoConjugate(Vector target) + /// Target vector + protected override void DoConjugate(Vector result) { - var denseTarget = target as DenseVector; - - if (denseTarget == null) + var resultDense = result as DenseVector; + if (resultDense == null) { - base.DoConjugate(target); - } - else - { - CommonParallel.For( - 0, - _length, - index => denseTarget._values[index] = _values[index].Conjugate()); + base.DoConjugate(result); + return; } + + CommonParallel.For( + 0, + _length, + index => resultDense._values[index] = _values[index].Conjugate()); } } } diff --git a/src/Numerics/LinearAlgebra/Complex/SparseVector.cs b/src/Numerics/LinearAlgebra/Complex/SparseVector.cs index 4cb560a9..f753b2ef 100644 --- a/src/Numerics/LinearAlgebra/Complex/SparseVector.cs +++ b/src/Numerics/LinearAlgebra/Complex/SparseVector.cs @@ -174,22 +174,22 @@ namespace MathNet.Numerics.LinearAlgebra.Complex } /// - /// Conjugates vector and save result to + /// Conjugates vector and save result to /// - /// Target vector - protected override void DoConjugate(Vector target) + /// Target vector + protected override void DoConjugate(Vector result) { - if (ReferenceEquals(this, target)) + if (ReferenceEquals(this, result)) { var tmp = CreateVector(Count); DoConjugate(tmp); - tmp.CopyTo(target); + tmp.CopyTo(result); } - var targetSparse = target as SparseVector; + var targetSparse = result as SparseVector; if (targetSparse == null) { - base.DoConjugate(target); + base.DoConjugate(result); return; } @@ -448,23 +448,23 @@ namespace MathNet.Numerics.LinearAlgebra.Complex } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { - var sparseResult = target as SparseVector; + var sparseResult = result as SparseVector; if (sparseResult == null) { - target.Clear(); + result.Clear(); for (var index = 0; index < _storage.ValueCount; index++) { - target.At(_storage.Indices[index], -_storage.Values[index]); + result.At(_storage.Indices[index], -_storage.Values[index]); } } else { - if (!ReferenceEquals(this, target)) + if (!ReferenceEquals(this, result)) { sparseResult._storage.ValueCount = _storage.ValueCount; sparseResult._storage.Indices = new int[_storage.ValueCount]; diff --git a/src/Numerics/LinearAlgebra/Complex/Vector.cs b/src/Numerics/LinearAlgebra/Complex/Vector.cs index 186b3882..1da687e1 100644 --- a/src/Numerics/LinearAlgebra/Complex/Vector.cs +++ b/src/Numerics/LinearAlgebra/Complex/Vector.cs @@ -327,26 +327,26 @@ namespace MathNet.Numerics.LinearAlgebra.Complex } /// - /// Conjugates vector and save result to + /// Conjugates vector and save result to /// - /// Target vector - protected override void DoConjugate(Vector target) + /// Target vector + protected override void DoConjugate(Vector result) { for (var index = 0; index < Count; index++) { - target.At(index, At(index).Conjugate()); + result.At(index, At(index).Conjugate()); } } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { for (var index = 0; index < Count; index++) { - target.At(index, -At(index)); + result.At(index, -At(index)); } } diff --git a/src/Numerics/LinearAlgebra/Complex32/DenseVector.cs b/src/Numerics/LinearAlgebra/Complex32/DenseVector.cs index 084cc5f0..2c22bdb0 100644 --- a/src/Numerics/LinearAlgebra/Complex32/DenseVector.cs +++ b/src/Numerics/LinearAlgebra/Complex32/DenseVector.cs @@ -369,15 +369,15 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { - var denseResult = target as DenseVector; + var denseResult = result as DenseVector; if (denseResult == null) { - base.DoNegate(target); + base.DoNegate(result); } else { @@ -863,24 +863,22 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 #endregion /// - /// Conjugates vector and save result to + /// Conjugates vector and save result to /// - /// Target vector - protected override void DoConjugate(Vector target) + /// Target vector + protected override void DoConjugate(Vector result) { - var denseTarget = target as DenseVector; - - if (denseTarget == null) + var resultDense = result as DenseVector; + if (resultDense == null) { - base.DoConjugate(target); - } - else - { - CommonParallel.For( - 0, - _length, - index => denseTarget._values[index] = _values[index].Conjugate()); + base.DoConjugate(result); + return; } + + CommonParallel.For( + 0, + _length, + index => resultDense._values[index] = _values[index].Conjugate()); } } } diff --git a/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs b/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs index 0f337cc3..25ef6a77 100644 --- a/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs +++ b/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs @@ -174,22 +174,22 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 } /// - /// Conjugates vector and save result to + /// Conjugates vector and save result to /// - /// Target vector - protected override void DoConjugate(Vector target) + /// Target vector + protected override void DoConjugate(Vector result) { - if (ReferenceEquals(this, target)) + if (ReferenceEquals(this, result)) { var tmp = CreateVector(Count); DoConjugate(tmp); - tmp.CopyTo(target); + tmp.CopyTo(result); } - var targetSparse = target as SparseVector; + var targetSparse = result as SparseVector; if (targetSparse == null) { - base.DoConjugate(target); + base.DoConjugate(result); return; } @@ -448,23 +448,23 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { - var sparseResult = target as SparseVector; + var sparseResult = result as SparseVector; if (sparseResult == null) { - target.Clear(); + result.Clear(); for (var index = 0; index < _storage.ValueCount; index++) { - target.At(_storage.Indices[index], -_storage.Values[index]); + result.At(_storage.Indices[index], -_storage.Values[index]); } } else { - if (!ReferenceEquals(this, target)) + if (!ReferenceEquals(this, result)) { sparseResult._storage.ValueCount = _storage.ValueCount; sparseResult._storage.Indices = new int[_storage.ValueCount]; diff --git a/src/Numerics/LinearAlgebra/Complex32/Vector.cs b/src/Numerics/LinearAlgebra/Complex32/Vector.cs index 36a45140..fc1a2b7c 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Vector.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Vector.cs @@ -327,26 +327,26 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 } /// - /// Conjugates vector and save result to + /// Conjugates vector and save result to /// - /// Target vector - protected override void DoConjugate(Vector target) + /// Target vector + protected override void DoConjugate(Vector result) { for (var index = 0; index < Count; index++) { - target.At(index, At(index).Conjugate()); + result.At(index, At(index).Conjugate()); } } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { for (var index = 0; index < Count; index++) { - target.At(index, -At(index)); + result.At(index, -At(index)); } } diff --git a/src/Numerics/LinearAlgebra/Double/DenseVector.cs b/src/Numerics/LinearAlgebra/Double/DenseVector.cs index 82fdc5b4..573a51a2 100644 --- a/src/Numerics/LinearAlgebra/Double/DenseVector.cs +++ b/src/Numerics/LinearAlgebra/Double/DenseVector.cs @@ -379,15 +379,15 @@ namespace MathNet.Numerics.LinearAlgebra.Double } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { - var denseResult = target as DenseVector; + var denseResult = result as DenseVector; if (denseResult == null) { - base.DoNegate(target); + base.DoNegate(result); } else { diff --git a/src/Numerics/LinearAlgebra/Double/SparseVector.cs b/src/Numerics/LinearAlgebra/Double/SparseVector.cs index 6233399d..2984effd 100644 --- a/src/Numerics/LinearAlgebra/Double/SparseVector.cs +++ b/src/Numerics/LinearAlgebra/Double/SparseVector.cs @@ -416,23 +416,23 @@ namespace MathNet.Numerics.LinearAlgebra.Double } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { - var sparseResult = target as SparseVector; + var sparseResult = result as SparseVector; if (sparseResult == null) { - target.Clear(); + result.Clear(); for (var index = 0; index < _storage.ValueCount; index++) { - target.At(_storage.Indices[index], -_storage.Values[index]); + result.At(_storage.Indices[index], -_storage.Values[index]); } } else { - if (!ReferenceEquals(this, target)) + if (!ReferenceEquals(this, result)) { sparseResult._storage.ValueCount = _storage.ValueCount; sparseResult._storage.Indices = new int[_storage.ValueCount]; diff --git a/src/Numerics/LinearAlgebra/Double/Vector.cs b/src/Numerics/LinearAlgebra/Double/Vector.cs index 5c7a16e3..a52a2d8b 100644 --- a/src/Numerics/LinearAlgebra/Double/Vector.cs +++ b/src/Numerics/LinearAlgebra/Double/Vector.cs @@ -329,28 +329,28 @@ namespace MathNet.Numerics.LinearAlgebra.Double } /// - /// Conjugates vector and save result to + /// Conjugates vector and save result to /// - /// Target vector - protected override void DoConjugate(Vector target) + /// Target vector + protected override void DoConjugate(Vector result) { - if (ReferenceEquals(this, target)) + if (ReferenceEquals(this, result)) { return; } - CopyTo(target); + CopyTo(result); } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { for (var index = 0; index < Count; index++) { - target.At(index, -At(index)); + result.At(index, -At(index)); } } diff --git a/src/Numerics/LinearAlgebra/Generic/Vector.cs b/src/Numerics/LinearAlgebra/Generic/Vector.cs index b61285a9..93eb8d07 100644 --- a/src/Numerics/LinearAlgebra/Generic/Vector.cs +++ b/src/Numerics/LinearAlgebra/Generic/Vector.cs @@ -161,16 +161,16 @@ namespace MathNet.Numerics.LinearAlgebra.Generic /// - /// Negates vector and save result to + /// Negates vector and save result to /// - /// Target vector - protected abstract void DoNegate(Vector target); + /// Target vector + protected abstract void DoNegate(Vector result); /// - /// Complex conjugates vector and save result to + /// Complex conjugates vector and save result to /// - /// Target vector - protected abstract void DoConjugate(Vector target); + /// Target vector + protected abstract void DoConjugate(Vector result); /// /// Adds a scalar to each element of the vector and stores the result in the result vector. @@ -405,22 +405,22 @@ namespace MathNet.Numerics.LinearAlgebra.Generic } /// - /// Negates vector and save result to + /// Negates vector and save result to /// - /// Target vector - public void Negate(Vector target) + /// Target vector + public void Negate(Vector result) { - if (target == null) + if (result == null) { - throw new ArgumentNullException("target"); + throw new ArgumentNullException("result"); } - if (Count != target.Count) + if (Count != result.Count) { - throw new ArgumentException(Resources.ArgumentVectorsSameLength, "target"); + throw new ArgumentException(Resources.ArgumentVectorsSameLength, "result"); } - DoNegate(target); + DoNegate(result); } /// @@ -483,22 +483,22 @@ namespace MathNet.Numerics.LinearAlgebra.Generic } /// - /// Complex conjugates vector and save result to + /// Complex conjugates vector and save result to /// - /// Target vector - public void Conjugate(Vector target) + /// Target vector + public void Conjugate(Vector result) { - if (target == null) + if (result == null) { - throw new ArgumentNullException("target"); + throw new ArgumentNullException("result"); } - if (Count != target.Count) + if (Count != result.Count) { - throw new ArgumentException(Resources.ArgumentVectorsSameLength, "target"); + throw new ArgumentException(Resources.ArgumentVectorsSameLength, "result"); } - DoConjugate(target); + DoConjugate(result); } /// diff --git a/src/Numerics/LinearAlgebra/Single/DenseVector.cs b/src/Numerics/LinearAlgebra/Single/DenseVector.cs index 8e877062..c41e24c0 100644 --- a/src/Numerics/LinearAlgebra/Single/DenseVector.cs +++ b/src/Numerics/LinearAlgebra/Single/DenseVector.cs @@ -369,15 +369,15 @@ namespace MathNet.Numerics.LinearAlgebra.Single } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { - var denseResult = target as DenseVector; + var denseResult = result as DenseVector; if (denseResult == null) { - base.DoNegate(target); + base.DoNegate(result); } else { diff --git a/src/Numerics/LinearAlgebra/Single/SparseVector.cs b/src/Numerics/LinearAlgebra/Single/SparseVector.cs index 589e5bcf..2ec7207f 100644 --- a/src/Numerics/LinearAlgebra/Single/SparseVector.cs +++ b/src/Numerics/LinearAlgebra/Single/SparseVector.cs @@ -417,23 +417,23 @@ namespace MathNet.Numerics.LinearAlgebra.Single } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { - var sparseResult = target as SparseVector; + var sparseResult = result as SparseVector; if (sparseResult == null) { - target.Clear(); + result.Clear(); for (var index = 0; index < _storage.ValueCount; index++) { - target.At(_storage.Indices[index], -_storage.Values[index]); + result.At(_storage.Indices[index], -_storage.Values[index]); } } else { - if (!ReferenceEquals(this, target)) + if (!ReferenceEquals(this, result)) { sparseResult._storage.ValueCount = _storage.ValueCount; sparseResult._storage.Indices = new int[_storage.ValueCount]; diff --git a/src/Numerics/LinearAlgebra/Single/Vector.cs b/src/Numerics/LinearAlgebra/Single/Vector.cs index 14dab23c..53154b2b 100644 --- a/src/Numerics/LinearAlgebra/Single/Vector.cs +++ b/src/Numerics/LinearAlgebra/Single/Vector.cs @@ -329,28 +329,28 @@ namespace MathNet.Numerics.LinearAlgebra.Single } /// - /// Conjugates vector and save result to + /// Conjugates vector and save result to /// - /// Target vector - protected override void DoConjugate(Vector target) + /// Target vector + protected override void DoConjugate(Vector result) { - if (ReferenceEquals(this, target)) + if (ReferenceEquals(this, result)) { return; } - CopyTo(target); + CopyTo(result); } /// - /// Negates vector and saves result to + /// Negates vector and saves result to /// - /// Target vector - protected override void DoNegate(Vector target) + /// Target vector + protected override void DoNegate(Vector result) { for (var index = 0; index < Count; index++) { - target.At(index, -At(index)); + result.At(index, -At(index)); } }