Merge branch 'master' into residualstopcriterion-crash-zero-vector

Author: cdrnet

.config/dotnet-tools.json

@@ -9,7 +9,7 @@
       ]
     },
     "fsharp.formatting.commandtool": {
-      "version": "11.4.1",
+      "version": "11.5.1",
       "commands": [
         "fsdocs"
       ]

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*

data/Matlab/cell-array-nested.mat

@@ -25,7 +25,7 @@ Random: NextBigIngegerSequence ~Silver-Fang
 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
@@ -56,13 +56,14 @@ Control.Describe now includes CPU architecture and family identifier if know</Pa
         <ProjectReference Include="..\Numerics\Numerics.csproj" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0">
+        <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="OneOf" Version="3.0.223" />
     </ItemGroup>
 </Project>

data/Matlab/struct-nested.mat

@@ -70,6 +70,18 @@ public static Matrix<T> Unpack<T>(MatlabMatrix matrixData)
             return Parser.ParseMatrix<T>(matrixData.Data);
         }
 
+        /// <summary>
+        /// Unpacks a MATLAB object that cannot be mapped to a MathNet.Numerics matrix. This could be any nesting of cell matrices and structures.
+        /// The nesting must bottom out on either a MathNet.Numerics matrix (if the lowest level values here are matrices of a numeric type) or a character mattrix (if the lowest level value is a matrix of a char type)
+        /// Since structures and cell matrices can have different data types in different fields and can even be nested the type of the field value cannot be more specific than a nested object
+        /// </summary>
+        /// <returns></returns>
+        public static NestedObject NonNumeric(MatlabMatrix structData)
+        {
+            return Parser.ParseNonNumeric(structData.Data);
+        }
+
+
         /// <summary>
         /// Read the first or a specific matrix from a MATLAB file stream.
         /// </summary>

src/Data.Matlab/Data.Matlab.csproj

@@ -0,0 +1,92 @@
+// <copyright file="MatlabStructure.cs" company="Math.NET">
+// Math.NET Numerics, part of the Math.NET Project
+// https://numerics.mathdotnet.com
+// https://github.com/mathnet/mathnet-numerics
+//
+// Copyright (c) 2009-$CURRENT_YEAR$ Math.NET
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+// </copyright>
+
+using MathNet.Numerics.LinearAlgebra;
+using OneOf;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MathNet.Numerics.Data.Matlab
+{
+    public class MatlabStructure : Dictionary<string, NestedObject>
+    {
+    }
+
+    public class MatlabCellMatrix
+    {
+        public NestedObject[,] Data { get; private set; }
+
+        public MatlabCellMatrix(int rows, int cols)
+        {
+            Data = new NestedObject[rows, cols];
+        }
+    }
+
+    public class MatlabCharMatrix
+    {
+        /// <summary>
+        /// Typically not that relevant, for UTF32 encoding however each single char is actually 2 chars (hence the string type)
+        /// </summary>
+        public Encoding Encoding { get; private set; }
+        public string[,] Data { get; private set; }
+
+        public MatlabCharMatrix(int rows, int cols, Encoding encoding)
+        {
+            Encoding = encoding;
+
+            Data = new string[rows, cols];
+        }
+
+        /// <summary>
+        /// Returns each row as a single string
+        /// </summary>
+        /// <returns></returns>
+        public string[] ConcatRows()
+        {
+            string[] result = new string[Data.GetLength(0)];
+            for (int col = 0; col < Data.GetLength(1); col++)
+            {
+                for (int row = 0; row < Data.GetLength(0); row++)
+
+                {
+                    result[row] += Data[row, col];
+                }
+            }
+
+            return result;
+        }
+    }
+
+    public class NestedObject : OneOfBase<MatlabStructure, MatlabCellMatrix, MatlabCharMatrix, MatlabMatrix>
+    {
+        public NestedObject(OneOf<MatlabStructure, MatlabCellMatrix, MatlabCharMatrix, MatlabMatrix> input) : base(input)
+        {
+        }
+    }
+}