ml_linalg entities json converters added (#167)

Author: gyrdym

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 15.4.1
+- `DTypeJsonConverter` added
+- `MatrixJsonConverter` added
+- `VectorJsonConverter` added
+- `DistanceTypeJsonConverter` added
+
 ## 15.4.0
 - `KnnClassifier`:
     - serialization/deserialization functionality added with possibility to save the model into a json file

lib/src/classifier/decision_tree_classifier/decision_tree_classifier_impl.dart

@@ -2,21 +2,21 @@ import 'package:json_annotation/json_annotation.dart';
 import 'package:ml_algo/src/classifier/_mixins/assessable_classifier_mixin.dart';
 import 'package:ml_algo/src/classifier/decision_tree_classifier/decision_tree_classifier.dart';
 import 'package:ml_algo/src/classifier/decision_tree_classifier/decision_tree_json_keys.dart';
+import 'package:ml_algo/src/common/json_converter/dtype_json_converter.dart';
 import 'package:ml_algo/src/common/serializable/serializable_mixin.dart';
 import 'package:ml_algo/src/tree_trainer/leaf_label/leaf_label.dart';
 import 'package:ml_algo/src/tree_trainer/tree_node/_helper/from_tree_node_json.dart';
 import 'package:ml_algo/src/tree_trainer/tree_node/_helper/tree_node_to_json.dart';
 import 'package:ml_algo/src/tree_trainer/tree_node/tree_node.dart';
 import 'package:ml_dataframe/ml_dataframe.dart';
 import 'package:ml_linalg/dtype.dart';
-import 'package:ml_linalg/dtype_to_json.dart';
-import 'package:ml_linalg/from_dtype_json.dart';
 import 'package:ml_linalg/matrix.dart';
 import 'package:ml_linalg/vector.dart';
 
 part 'decision_tree_classifier_impl.g.dart';
 
 @JsonSerializable()
+@DTypeJsonConverter()
 class DecisionTreeClassifierImpl
     with
         AssessableClassifierMixin,
@@ -37,11 +37,7 @@ class DecisionTreeClassifierImpl
   Map<String, dynamic> toJson() => _$DecisionTreeClassifierImplToJson(this);
 
   @override
-  @JsonKey(
-    name: dTypeJsonKey,
-    toJson: dTypeToJson,
-    fromJson: fromDTypeJson,
-  )
+  @JsonKey(name: dTypeJsonKey)
   final DType dtype;
 
   @JsonKey(name: targetColumnNameJsonKey)

lib/src/classifier/decision_tree_classifier/decision_tree_classifier_impl.g.dart

@@ -2,6 +2,7 @@ import 'package:json_annotation/json_annotation.dart';
 import 'package:ml_algo/src/classifier/_mixins/assessable_classifier_mixin.dart';
 import 'package:ml_algo/src/classifier/knn_classifier/knn_classifier.dart';
 import 'package:ml_algo/src/classifier/knn_classifier/knn_classifier_json_keys.dart';
+import 'package:ml_algo/src/common/json_converter/dtype_json_converter.dart';
 import 'package:ml_algo/src/common/serializable/serializable_mixin.dart';
 import 'package:ml_algo/src/helpers/validate_class_label_list.dart';
 import 'package:ml_algo/src/helpers/validate_test_features.dart';
@@ -12,8 +13,6 @@ import 'package:ml_algo/src/knn_solver/knn_solver_json_converter.dart';
 import 'package:ml_algo/src/knn_solver/neigbour.dart';
 import 'package:ml_dataframe/ml_dataframe.dart';
 import 'package:ml_linalg/dtype.dart';
-import 'package:ml_linalg/dtype_to_json.dart';
-import 'package:ml_linalg/from_dtype_json.dart';
 import 'package:ml_linalg/matrix.dart';
 import 'package:ml_linalg/vector.dart';
 
@@ -22,6 +21,7 @@ part 'knn_classifier_impl.g.dart';
 @JsonSerializable()
 @KnnSolverJsonConverter()
 @KernelJsonConverter()
+@DTypeJsonConverter()
 class KnnClassifierImpl
     with
         AssessableClassifierMixin,
@@ -49,11 +49,7 @@ class KnnClassifierImpl
   final String targetColumnName;
 
   @override
-  @JsonKey(
-    name: knnClassifierDTypeJsonKey,
-    toJson: dTypeToJson,
-    fromJson: fromDTypeJson,
-  )
+  @JsonKey(name: knnClassifierDTypeJsonKey)
   final DType dtype;
 
   @override

lib/src/classifier/knn_classifier/knn_classifier_impl.dart

@@ -3,6 +3,8 @@ import 'package:ml_algo/src/classifier/_mixins/assessable_classifier_mixin.dart'
 import 'package:ml_algo/src/classifier/_mixins/linear_classifier_mixin.dart';
 import 'package:ml_algo/src/classifier/logistic_regressor/logistic_regressor.dart';
 import 'package:ml_algo/src/classifier/logistic_regressor/logistic_regressor_json_keys.dart';
+import 'package:ml_algo/src/common/json_converter/dtype_json_converter.dart';
+import 'package:ml_algo/src/common/json_converter/matrix_json_converter.dart';
 import 'package:ml_algo/src/common/serializable/serializable_mixin.dart';
 import 'package:ml_algo/src/helpers/validate_class_labels.dart';
 import 'package:ml_algo/src/helpers/validate_coefficients_matrix.dart';
@@ -12,15 +14,13 @@ import 'package:ml_algo/src/link_function/helpers/link_function_to_json.dart';
 import 'package:ml_algo/src/link_function/link_function.dart';
 import 'package:ml_dataframe/ml_dataframe.dart';
 import 'package:ml_linalg/dtype.dart';
-import 'package:ml_linalg/dtype_to_json.dart';
-import 'package:ml_linalg/from_dtype_json.dart';
-import 'package:ml_linalg/from_matrix_json.dart';
 import 'package:ml_linalg/matrix.dart';
-import 'package:ml_linalg/matrix_to_json.dart';
 
 part 'logistic_regressor_impl.g.dart';
 
 @JsonSerializable()
+@DTypeJsonConverter()
+@MatrixJsonConverter()
 class LogisticRegressorImpl
     with
         LinearClassifierMixin,
@@ -64,11 +64,7 @@ class LogisticRegressorImpl
   /// N x 1 matrix, where N - number of features. It has only one column since
   /// in case of Logistic Regression only one class is used
   @override
-  @JsonKey(
-    name: logisticRegressorCoefficientsByClassesJsonKey,
-    toJson: matrixToJson,
-    fromJson: fromMatrixJson,
-  )
+  @JsonKey(name: logisticRegressorCoefficientsByClassesJsonKey)
   final Matrix coefficientsByClasses;
 
   @override
@@ -84,11 +80,7 @@ class LogisticRegressorImpl
   final num interceptScale;
 
   @override
-  @JsonKey(
-    name: logisticRegressorDTypeJsonKey,
-    toJson: dTypeToJson,
-    fromJson: fromDTypeJson,
-  )
+  @JsonKey(name: logisticRegressorDTypeJsonKey)
   final DType dtype;
 
   @JsonKey(name: logisticRegressorProbabilityThresholdJsonKey)

lib/src/classifier/knn_classifier/knn_classifier_impl.g.dart

@@ -3,6 +3,8 @@ import 'package:ml_algo/src/classifier/_mixins/assessable_classifier_mixin.dart'
 import 'package:ml_algo/src/classifier/_mixins/linear_classifier_mixin.dart';
 import 'package:ml_algo/src/classifier/softmax_regressor/softmax_regressor.dart';
 import 'package:ml_algo/src/classifier/softmax_regressor/softmax_regressor_json_keys.dart';
+import 'package:ml_algo/src/common/json_converter/dtype_json_converter.dart';
+import 'package:ml_algo/src/common/json_converter/matrix_json_converter.dart';
 import 'package:ml_algo/src/common/serializable/serializable_mixin.dart';
 import 'package:ml_algo/src/helpers/validate_class_labels.dart';
 import 'package:ml_algo/src/helpers/validate_coefficients_matrix.dart';
@@ -11,12 +13,14 @@ import 'package:ml_algo/src/link_function/helpers/link_function_to_json.dart';
 import 'package:ml_algo/src/link_function/link_function.dart';
 import 'package:ml_dataframe/ml_dataframe.dart';
 import 'package:ml_linalg/dtype.dart';
-import 'package:ml_linalg/linalg.dart';
 import 'package:ml_linalg/matrix.dart';
+import 'package:ml_linalg/vector.dart';
 
 part 'softmax_regressor_impl.g.dart';
 
 @JsonSerializable()
+@DTypeJsonConverter()
+@MatrixJsonConverter()
 class SoftmaxRegressorImpl
     with
         LinearClassifierMixin,
@@ -67,19 +71,11 @@ class SoftmaxRegressorImpl
   final num interceptScale;
 
   @override
-  @JsonKey(
-    name: softmaxRegressorCoefficientsByClassesJsonKey,
-    toJson: matrixToJson,
-    fromJson: fromMatrixJson,
-  )
+  @JsonKey(name: softmaxRegressorCoefficientsByClassesJsonKey)
   final Matrix coefficientsByClasses;
 
   @override
-  @JsonKey(
-    name: softmaxRegressorDTypeJsonKey,
-    toJson: dTypeToJson,
-    fromJson: fromDTypeJson,
-  )
+  @JsonKey(name: softmaxRegressorDTypeJsonKey)
   final DType dtype;
 
   @override

lib/src/classifier/logistic_regressor/logistic_regressor_impl.dart

@@ -0,0 +1,14 @@
+import 'package:json_annotation/json_annotation.dart';
+import 'package:ml_linalg/distance.dart';
+import 'package:ml_linalg/distance_type_to_json.dart';
+import 'package:ml_linalg/from_distance_type_json.dart';
+
+class DistanceTypeJsonConverter implements JsonConverter<Distance, String> {
+  const DistanceTypeJsonConverter();
+
+  @override
+  Distance fromJson(String json) => fromDistanceTypeJson(json);
+
+  @override
+  String toJson(Distance distance) => distanceTypeToJson(distance);
+}