Merge pull request #999 from jkalias/matrix-0-by-1

Bug in string description for mx0 and 0xn matrices

Author: cdrnet

RELEASENOTES.md

@@ -11,7 +11,7 @@
 * Random: xoshiro256StarStar fix out of range exception *~Charlie Turndorf*
 * Precision: Perf: pre-compute negative powers *~Febin*
 * Optimizations: Remove static properties in LevenbergMarquardtMinimizer *~Jong Hyun Kim*
-* Root Finding: Newton-Raphson better handling of zero-evaluations
+* Root Finding: Newton-Raphson better handling of zero-evaluations *~jkalias*
 * Fit.Curve and FindMinimum extended to accept two more parameters
 * Fixed an index out of bounds issue when calculating BFGS minimizer with one variable *~Shiney*
 * Fixed Sparse COO NormalizeDuplicates *~Mohamed Moussa*

src/Numerics.Tests/LinearAlgebraTests/Double/DenseMatrixTests.cs

@@ -95,6 +95,43 @@ public void MatrixFrom1DArrayIsReference()
             Assert.AreEqual(10.0, data[0]);
         }
 
+        [Test]
+        public void DescriptionForMatrixWithRowsButNoColumns()
+        {
+            var matrix = GetMatrixWithRowsButNoColumns();
+            Assert.AreEqual("DenseMatrix 3x0-Double\r\n[empty]\r\n[empty]\r\n[empty]\r\n", matrix.ToString());
+        }
+
+        [Test]
+        public void DescriptionForMatrixWithColumnsButNoRows()
+        {
+            var matrix = GetMatrixWithColumnsButNoRows();
+            Assert.AreEqual("DenseMatrix 0x3-Double\r\n[empty]  [empty]  [empty]", matrix.ToString());
+        }
+
+        [Test]
+        public void DescriptionForMatrixWithNoRowsAndNoColumns()
+        {
+            var matrix = TestMatrices["Wide2x3"];
+            matrix = matrix.RemoveRow(matrix.RowCount - 1);
+            matrix = matrix.RemoveRow(matrix.RowCount - 1);
+
+            matrix = matrix.RemoveColumn(matrix.ColumnCount - 1);
+            matrix = matrix.RemoveColumn(matrix.ColumnCount - 1);
+            matrix = matrix.RemoveColumn(matrix.ColumnCount - 1);
+
+            Assert.AreEqual("DenseMatrix 0x0-Double\r\n[empty]", matrix.ToString());
+        }
+
+        [Test]
+        public void MatrixMultiplicationWhenMatricesHaveNoRowsAndColumns()
+        {
+            var a = GetMatrixWithRowsButNoColumns();
+            var b = GetMatrixWithColumnsButNoRows();
+            var result = a * b;
+            Assert.AreEqual(new DenseMatrix(3), result);
+        }
+
         /// <summary>
         /// Matrix from two-dimensional array is a copy.
         /// </summary>
@@ -209,5 +246,21 @@ public void MatrixToMatrixString()
                 }
             }
         }
+
+        private Matrix<double> GetMatrixWithRowsButNoColumns()
+        {
+            var matrix = TestMatrices["Tall3x2"];
+            matrix = matrix.RemoveColumn(matrix.ColumnCount - 1);
+            matrix = matrix.RemoveColumn(matrix.ColumnCount - 1);
+            return matrix;
+        }
+
+        private Matrix<double> GetMatrixWithColumnsButNoRows()
+        {
+            var matrix = TestMatrices["Wide2x3"];
+            matrix = matrix.RemoveRow(matrix.RowCount - 1);
+            matrix = matrix.RemoveRow(matrix.RowCount - 1);
+            return matrix;
+        }
     }
 }

src/Numerics/LinearAlgebra/Matrix.BCL.cs

@@ -279,7 +279,10 @@ Tuple<int, string[]> FormatColumn(int column, int height, int upper, int lower,
             {
                 c[index++] = formatValue(At(row, column));
             }
-            int w = c.Max(x => x.Length);
+
+            int w = height != 0
+                ? c.Max(x => x.Length)
+                : 0;
             if (withEllipsis)
             {
                 c[upper] = ellipsis;
@@ -289,6 +292,7 @@ Tuple<int, string[]> FormatColumn(int column, int height, int upper, int lower,
 
         static string FormatStringArrayToString(string[,] array, string columnSeparator, string rowSeparator)
         {
+            const string emptyString = "[empty]";
             var rows = array.GetLength(0);
             var cols = array.GetLength(1);
 
@@ -302,35 +306,89 @@ static string FormatStringArrayToString(string[,] array, string columnSeparator,
             }
 
             var sb = new StringBuilder();
-            for (int i = 0; i < rows; i++)
+            if (rows > 0)
             {
-                sb.Append(array[i, 0].PadLeft(widths[0]));
-                for (int j = 1; j < cols; j++)
+                for (int i = 0; i < rows; i++)
                 {
-                    sb.Append(columnSeparator);
-                    sb.Append(array[i, j].PadLeft(widths[j]));
+                    if (cols > 0)
+                    {
+                        sb.Append(array[i, 0].PadLeft(widths[0]));
+                        for (int j = 1; j < cols; j++)
+                        {
+                            sb.Append(columnSeparator);
+                            sb.Append(array[i, j].PadLeft(widths[j]));
+                        }
+                    }
+                    else
+                    {
+                        sb.Append(emptyString);
+                    }
+
+                    sb.Append(rowSeparator);
                 }
-                sb.Append(rowSeparator);
             }
+            else
+            {
+                if (cols > 0)
+                {
+                    for (int j = 0; j < cols; j++)
+                    {
+                        sb.Append(emptyString);
+                        if (j != cols - 1)
+                        {
+                            sb.Append(columnSeparator);
+                        }
+                    }
+                }
+                else
+                {
+                    sb.Append(emptyString);
+                }
+            }
+
             return sb.ToString();
         }
 
         public string ToMatrixString(int upperRows, int lowerRows, int leftColumns, int rightColumns,
             string horizontalEllipsis, string verticalEllipsis, string diagonalEllipsis,
             string columnSeparator, string rowSeparator, Func<T, string> formatValue)
         {
+            var array = ToMatrixStringArray(
+                upperRows,
+                lowerRows,
+                leftColumns,
+                rightColumns,
+                horizontalEllipsis,
+                verticalEllipsis,
+                diagonalEllipsis,
+                formatValue);
+
             return FormatStringArrayToString(
-                ToMatrixStringArray(upperRows, lowerRows, leftColumns, rightColumns, horizontalEllipsis, verticalEllipsis, diagonalEllipsis, formatValue),
-                columnSeparator, rowSeparator);
+                array,
+                columnSeparator,
+                rowSeparator);
         }
 
         public string ToMatrixString(int upperRows, int lowerRows, int minLeftColumns, int rightColumns, int maxWidth,
             string horizontalEllipsis, string verticalEllipsis, string diagonalEllipsis,
             string columnSeparator, string rowSeparator, Func<T, string> formatValue)
         {
+            var array = ToMatrixStringArray(
+                upperRows,
+                lowerRows,
+                minLeftColumns,
+                rightColumns,
+                maxWidth,
+                columnSeparator.Length,
+                horizontalEllipsis,
+                verticalEllipsis,
+                diagonalEllipsis,
+                formatValue);
+
             return FormatStringArrayToString(
-                ToMatrixStringArray(upperRows, lowerRows, minLeftColumns, rightColumns, maxWidth, columnSeparator.Length, horizontalEllipsis, verticalEllipsis, diagonalEllipsis, formatValue),
-                columnSeparator, rowSeparator);
+                array,
+                columnSeparator,
+                rowSeparator);
         }
 
         /// <summary>