Fixed error when multiply complex matrix

dotchris90 · dotchris90 · commit 00df28b1bfc7 · 2018-11-04T20:44:43.000+01:00
diff --git a/src/NumSharp/Shared/Operation.MatrixMultiplication.Complex.cs b/src/NumSharp/Shared/Operation.MatrixMultiplication.Complex.cs
@@ -17,12 +17,15 @@ internal static Complex[] MatrixMultiplyComplexMatrix(Complex[]np1, Complex[]np2
 
             for (int idx = 0; idx < result.Length;idx++)
             {
-                int line = idx % dimNp1[0];
-                int column = idx / dimNp2[1];
+                int line = idx / dimNp1[0];
+                int column = idx % dimNp2[1];
                 
                 for (int kdx = 0; kdx < iterator;kdx++)
                 {
-                    result[idx] += np1[line + kdx * dimNp1[0]] * np2[column * dimNp2[0] + kdx];    
+                    int index1 = line * dimNp1[1] + kdx;
+                    int index2 = dimNp2[1] * kdx + column;
+
+                    result[idx] += np1[index1] * np2[index2];    
                 }
             }
 
diff --git a/src/NumSharp/Shared/Operation.ScalarProduct1D.Complex.cs b/src/NumSharp/Shared/Operation.ScalarProduct1D.Complex.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using System.Linq;
+using System.Text;
+
+namespace NumSharp.Shared
+{
+   internal static partial class ScalarProduct1D
+   {
+        //start 1 
+        internal static Complex[] MuliplyScalarProd1DComplex(Complex[] np1, Complex[]np2)
+        {
+            Complex sum = new Complex(0,0);
+            for (int idx = 0; idx < np1.Length;idx++)
+                sum += np1[idx] * np2[idx];
+                
+            return new Complex[]{sum};
+        }
+        //end 1
+   }
+}
diff --git a/src/NumSharp/Shared/Operation.ScalarProduct1D.Quaternion.cs b/src/NumSharp/Shared/Operation.ScalarProduct1D.Quaternion.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using System.Linq;
+using System.Text;
+
+namespace NumSharp.Shared
+{
+   internal static partial class ScalarProduct1D
+   {
+        //start 1 
+        internal static Quaternion[] MuliplyScalarProd1DQuaternion(Quaternion[] np1, Quaternion[]np2)
+        {
+            Quaternion sum = new Quaternion(0,0,0,0);
+
+            for (int idx = 0; idx < np1.Length;idx++)
+                sum += np1[idx] * np2[idx];
+            
+            return new Quaternion[]{sum};
+        }
+        //end 1
+   }
+}
diff --git a/test/NumSharp.UnitTest/Extensions/NdArray.Dot.Test.cs b/test/NumSharp.UnitTest/Extensions/NdArray.Dot.Test.cs
@@ -86,15 +86,15 @@ public void MatrixMultiplyComplex()
             var matrix3 = matrix1.Dot(matrix2);
 
             var matrix4 = new Complex[9];
-            matrix4[0] = new Complex(39,-7);
-            matrix4[1] = new Complex(54,-14);
-            matrix4[2] = new Complex(69,0);
-            matrix4[3] = new Complex(49,-49);
-            matrix4[4] = new Complex(68,-68);
-            matrix4[5] = new Complex(87,-60);
-            matrix4[6] = new Complex(59,-59);
-            matrix4[7] = new Complex(82,-82);
-            matrix4[8] = new Complex(105,-72);
+            matrix4[0] = new Complex(7,-47);
+            matrix4[1] = new Complex(30,-30);
+            matrix4[2] = new Complex(9,-57);
+            matrix4[3] = new Complex(61,-40);
+            matrix4[4] = new Complex(68,0);
+            matrix4[5] = new Complex(75,-48);
+            matrix4[6] = new Complex(95,-60);
+            matrix4[7] = new Complex(106,0);
+            matrix4[8] = new Complex(117,-72);
 
             Assert.IsTrue(Enumerable.SequenceEqual(matrix4,matrix3.Data));
         }

Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,15 @@ internal static Complex[] MatrixMultiplyComplexMatrix(Complex[]np1, Complex[]np2`
`17`	`17`
`18`	`18`	`for (int idx = 0; idx < result.Length;idx++)`
`19`	`19`	`{`
`20`		`- int line = idx % dimNp1[0];`
`21`		`- int column = idx / dimNp2[1];`
	`20`	`+ int line = idx / dimNp1[0];`
	`21`	`+ int column = idx % dimNp2[1];`
`22`	`22`
`23`	`23`	`for (int kdx = 0; kdx < iterator;kdx++)`
`24`	`24`	`{`
`25`		`- result[idx] += np1[line + kdx * dimNp1[0]] * np2[column * dimNp2[0] + kdx];`
	`25`	`+ int index1 = line * dimNp1[1] + kdx;`
	`26`	`+ int index2 = dimNp2[1] * kdx + column;`
	`27`	`+`
	`28`	`+ result[idx] += np1[index1] * np2[index2];`
`26`	`29`	`}`
`27`	`30`	`}`
`28`	`31`