Merge d9ec140 into faf4d5a

gyrdym · May 17, 2020 · a2ae6f8 · a2ae6f8
2 parents faf4d5a + d9ec140
commit a2ae6f8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 12.8.2
+- `fromMatrixJson`: dynamic type support added to parsing
+
 ## 12.8.1
 - `DType`:
     - `dTypeToJson` helper function added to public API

diff --git a/lib/src/matrix/serialization/from_matrix_json.dart b/lib/src/matrix/serialization/from_matrix_json.dart
@@ -4,12 +4,19 @@ import 'package:ml_linalg/src/matrix/serialization/matrix_json_keys.dart';
 
 /// Restores a matrix instance from given [json]
 Matrix fromMatrixJson(Map<String, dynamic> json) {
-  final list = json[matrixDataJsonKey] as List<List<double>>;
+  final matrixSource = json[matrixDataJsonKey] as List<dynamic>;
 
-  if (list == null) {
+  if (matrixSource == null) {
     throw Exception('Provided json is missing `$matrixDataJsonKey` field');
   }
 
+  final double2dList = matrixSource
+      .map(
+          (dynamic row) => (row as List<dynamic>)
+              .map((dynamic element) => double.parse(element.toString()))
+              .toList(growable: false))
+      .toList(growable: false);
+
   final encodedDType = json[matrixDTypeJsonKey] as String;
 
   if (encodedDType == null) {
@@ -18,5 +25,5 @@ Matrix fromMatrixJson(Map<String, dynamic> json) {
 
   final dType = fromDTypeJson(encodedDType);
 
-  return Matrix.fromList(list, dtype: dType);
+  return Matrix.fromList(double2dList, dtype: dType);
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: ml_linalg
 description: SIMD-based linear algebra and statistics for data science
-version: 12.8.1
+version: 12.8.2
 homepage: https://github.com/gyrdym/ml_linalg
 
 environment:

diff --git a/test/unit_test/matrix/serialization/from_matrix_json_test.dart b/test/unit_test/matrix/serialization/from_matrix_json_test.dart
@@ -13,6 +13,11 @@ void main() {
       [33, -987, 90, 732],
     ];
 
+    final dataWithNull = <List<double>>[
+      [123.0009863, null, 11.777209, 90003.112],
+      [-93.5678, 12, null, -10e2],
+    ];
+
     final emptyData = <List<double>>[];
     final dataWithEmptyRow = <List<double>>[[]];
 
@@ -44,6 +49,11 @@ void main() {
       matrixDataJsonKey: dataWithEmptyRow,
     };
 
+    final validFloat32JsonWithNullInData = {
+      matrixDTypeJsonKey: dTypeFloat32EncodedValue,
+      matrixDataJsonKey: dataWithNull,
+    };
+
     test('should throw an error if data key is absent', () {
       final actual = () => fromMatrixJson(jsonWithoutData);
       expect(actual, throwsException);
@@ -76,5 +86,10 @@ void main() {
       final matrix = fromMatrixJson(validFloat32JsonWithEmptyRow);
       expect(matrix, emptyData);
     });
+
+    test('should throw an error if there are nulls in the data', () {
+      final actual = () => fromMatrixJson(validFloat32JsonWithNullInData);
+      expect(actual, throwsFormatException);
+    });
   });
 }