From cfe807fe52fbf464770397a4a20a2db36bf45dd4 Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Sat, 23 Feb 2013 13:41:46 +0100
Subject: [PATCH] LA: Vectors should override DoX instead of X: Conjugate #95

---
 .../LinearAlgebra/Complex/SparseVector.cs     | 43 +++++++------------
 .../LinearAlgebra/Complex32/SparseVector.cs   | 43 +++++++------------
 src/Numerics/LinearAlgebra/Generic/Vector.cs  |  2 +-
 3 files changed, 33 insertions(+), 55 deletions(-)

diff --git a/src/Numerics/LinearAlgebra/Complex/SparseVector.cs b/src/Numerics/LinearAlgebra/Complex/SparseVector.cs
index cba3033c..76bdeba8 100644
--- a/src/Numerics/LinearAlgebra/Complex/SparseVector.cs
+++ b/src/Numerics/LinearAlgebra/Complex/SparseVector.cs
@@ -208,50 +208,39 @@ namespace MathNet.Numerics.LinearAlgebra.Complex
             return new SparseVector(size);
         }
 
+        #region Operators and supplementary functions
+
         /// <summary>
         /// Conjugates vector and save result to <paramref name="target"/>
         /// </summary>
         /// <param name="target">Target vector</param>
-        public override void Conjugate(Vector<Complex> target)
+        protected override void DoConjugate(Vector<Complex> target)
         {
-            if (target == null)
-            {
-                throw new ArgumentNullException("target");
-            }
-
-            if (Count != target.Count)
-            {
-                throw new ArgumentException(Resources.ArgumentVectorsSameLength, "target");
-            }
-
             if (ReferenceEquals(this, target))
             {
                 var tmp = CreateVector(Count);
-                Conjugate(tmp);
+                DoConjugate(tmp);
                 tmp.CopyTo(target);
             }
 
-            var otherVector = target as SparseVector;
-            if (otherVector == null)
+            var targetSparse = target as SparseVector;
+            if (targetSparse == null)
             {
                 base.Conjugate(target);
+                return;
             }
-            else
-            {
-                // Lets copy only needed data. Portion of needed data is determined by NonZerosCount value
-                otherVector._storage.Values = new Complex[_storage.ValueCount];
-                otherVector._storage.Indices = new int[_storage.ValueCount];
-                otherVector._storage.ValueCount = _storage.ValueCount;
 
-                if (_storage.ValueCount != 0)
-                {
-                    CommonParallel.For(0, _storage.ValueCount, index => otherVector._storage.Values[index] = _storage.Values[index].Conjugate());
-                    Buffer.BlockCopy(_storage.Indices, 0, otherVector._storage.Indices, 0, _storage.ValueCount * Constants.SizeOfInt);
-                }
+            // Lets copy only needed data. Portion of needed data is determined by NonZerosCount value
+            targetSparse._storage.Values = new Complex[_storage.ValueCount];
+            targetSparse._storage.Indices = new int[_storage.ValueCount];
+            targetSparse._storage.ValueCount = _storage.ValueCount;
+
+            if (_storage.ValueCount != 0)
+            {
+                CommonParallel.For(0, _storage.ValueCount, index => targetSparse._storage.Values[index] = _storage.Values[index].Conjugate());
+                Buffer.BlockCopy(_storage.Indices, 0, targetSparse._storage.Indices, 0, _storage.ValueCount * Constants.SizeOfInt);
             }
         }
-        
-        #region Operators and supplementary functions
 
         /// <summary>
         /// Adds a scalar to each element of the vector and stores the result in the result vector.
diff --git a/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs b/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs
index 783389f4..ef9d6139 100644
--- a/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs
+++ b/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs
@@ -208,50 +208,39 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32
             return new SparseVector(size);
         }
 
+        #region Operators and supplementary functions
+
         /// <summary>
         /// Conjugates vector and save result to <paramref name="target"/>
         /// </summary>
         /// <param name="target">Target vector</param>
-        public override void Conjugate(Vector<Complex32> target)
+        protected override void DoConjugate(Vector<Complex32> target)
         {
-            if (target == null)
-            {
-                throw new ArgumentNullException("target");
-            }
-
-            if (Count != target.Count)
-            {
-                throw new ArgumentException(Resources.ArgumentVectorsSameLength, "target");
-            }
-
             if (ReferenceEquals(this, target))
             {
                 var tmp = CreateVector(Count);
-                Conjugate(tmp);
+                DoConjugate(tmp);
                 tmp.CopyTo(target);
             }
 
-            var otherVector = target as SparseVector;
-            if (otherVector == null)
+            var targetSparse = target as SparseVector;
+            if (targetSparse == null)
             {
                 base.Conjugate(target);
+                return;
             }
-            else
-            {
-                // Lets copy only needed data. Portion of needed data is determined by NonZerosCount value
-                otherVector._storage.Values = new Complex32[_storage.ValueCount];
-                otherVector._storage.Indices = new int[_storage.ValueCount];
-                otherVector._storage.ValueCount = _storage.ValueCount;
 
-                if (_storage.ValueCount != 0)
-                {
-                    CommonParallel.For(0, _storage.ValueCount, index => otherVector._storage.Values[index] = _storage.Values[index].Conjugate());
-                    Buffer.BlockCopy(_storage.Indices, 0, otherVector._storage.Indices, 0, _storage.ValueCount * Constants.SizeOfInt);
-                }
+            // Lets copy only needed data. Portion of needed data is determined by NonZerosCount value
+            targetSparse._storage.Values = new Complex32[_storage.ValueCount];
+            targetSparse._storage.Indices = new int[_storage.ValueCount];
+            targetSparse._storage.ValueCount = _storage.ValueCount;
+
+            if (_storage.ValueCount != 0)
+            {
+                CommonParallel.For(0, _storage.ValueCount, index => targetSparse._storage.Values[index] = _storage.Values[index].Conjugate());
+                Buffer.BlockCopy(_storage.Indices, 0, targetSparse._storage.Indices, 0, _storage.ValueCount * Constants.SizeOfInt);
             }
         }
-       
-        #region Operators and supplementary functions
 
         /// <summary>
         /// Adds a scalar to each element of the vector and stores the result in the result vector.
diff --git a/src/Numerics/LinearAlgebra/Generic/Vector.cs b/src/Numerics/LinearAlgebra/Generic/Vector.cs
index f97c041c..73dfa7cb 100644
--- a/src/Numerics/LinearAlgebra/Generic/Vector.cs
+++ b/src/Numerics/LinearAlgebra/Generic/Vector.cs
@@ -1246,7 +1246,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic
         /// Conjugates vector and save result to <paramref name="target"/>
         /// </summary>
         /// <param name="target">Target vector</param>
-        public virtual void Conjugate(Vector<T> target)
+        public void Conjugate(Vector<T> target)
         {
             if (target == null)
             {