DI logic: conditional dependency registering added (#162)

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 15.3.4
+- `DI logic`: 
+    - conditional dependency registering added
+
 ## 15.3.3
 - FUNDING.yml created
 

lib/src/classifier/decision_tree_classifier/_init_module.dart

@@ -4,6 +4,7 @@ import 'package:ml_algo/src/classifier/decision_tree_classifier/decision_tree_cl
 import 'package:ml_algo/src/common/distribution_calculator/distribution_calculator_factory.dart';
 import 'package:ml_algo/src/common/distribution_calculator/distribution_calculator_factory_impl.dart';
 import 'package:ml_algo/src/di/common/init_common_module.dart';
+import 'package:ml_algo/src/extensions/injector.dart';
 import 'package:ml_algo/src/tree_trainer/leaf_detector/leaf_detector_factory.dart';
 import 'package:ml_algo/src/tree_trainer/leaf_detector/leaf_detector_factory_impl.dart';
 import 'package:ml_algo/src/tree_trainer/leaf_label/leaf_label_factory_factory.dart';
@@ -25,50 +26,49 @@ void initDecisionTreeModule() {
   initCommonModule();
 
   decisionTreeInjector
-    ..clearAll()
-    ..registerSingleton<DistributionCalculatorFactory>(
+    ..registerSingletonIf<DistributionCalculatorFactory>(
             () => const DistributionCalculatorFactoryImpl())
 
-    ..registerSingleton<NominalTreeSplitterFactory>(
+    ..registerSingletonIf<NominalTreeSplitterFactory>(
             () => const NominalTreeSplitterFactoryImpl())
 
-    ..registerSingleton<NumericalTreeSplitterFactory>(
+    ..registerSingletonIf<NumericalTreeSplitterFactory>(
             () => const NumericalTreeSplitterFactoryImpl())
 
-    ..registerSingleton<TreeSplitAssessorFactory>(
+    ..registerSingletonIf<TreeSplitAssessorFactory>(
             () => const TreeSplitAssessorFactoryImpl())
 
-    ..registerSingleton<TreeSplitterFactory>(
+    ..registerSingletonIf<TreeSplitterFactory>(
             () => TreeSplitterFactoryImpl(
           decisionTreeInjector.get<TreeSplitAssessorFactory>(),
           decisionTreeInjector.get<NominalTreeSplitterFactory>(),
           decisionTreeInjector.get<NumericalTreeSplitterFactory>(),
         ))
 
-    ..registerSingleton<TreeSplitSelectorFactory>(
+    ..registerSingletonIf<TreeSplitSelectorFactory>(
             () => TreeSplitSelectorFactoryImpl(
           decisionTreeInjector.get<TreeSplitAssessorFactory>(),
           decisionTreeInjector.get<TreeSplitterFactory>(),
         ))
 
-    ..registerSingleton<TreeLeafDetectorFactory>(
+    ..registerSingletonIf<TreeLeafDetectorFactory>(
             () => TreeLeafDetectorFactoryImpl(
           decisionTreeInjector.get<TreeSplitAssessorFactory>(),
         ))
 
-    ..registerSingleton<TreeLeafLabelFactoryFactory>(
+    ..registerSingletonIf<TreeLeafLabelFactoryFactory>(
             () => TreeLeafLabelFactoryFactoryImpl(
           decisionTreeInjector
               .get<DistributionCalculatorFactory>(),
         ))
 
-    ..registerSingleton<TreeTrainerFactory>(
+    ..registerSingletonIf<TreeTrainerFactory>(
             () => TreeTrainerFactoryImpl(
           decisionTreeInjector.get<TreeLeafDetectorFactory>(),
           decisionTreeInjector.get<TreeLeafLabelFactoryFactory>(),
           decisionTreeInjector.get<TreeSplitSelectorFactory>(),
         ))
 
-    ..registerSingleton<DecisionTreeClassifierFactory>(
+    ..registerSingletonIf<DecisionTreeClassifierFactory>(
             () => const DecisionTreeClassifierFactoryImpl());
 }

lib/src/classifier/knn_classifier/_init_module.dart

@@ -2,6 +2,7 @@ import 'package:ml_algo/src/classifier/knn_classifier/_injector.dart';
 import 'package:ml_algo/src/classifier/knn_classifier/knn_classifier_factory.dart';
 import 'package:ml_algo/src/classifier/knn_classifier/knn_classifier_factory_impl.dart';
 import 'package:ml_algo/src/di/common/init_common_module.dart';
+import 'package:ml_algo/src/extensions/injector.dart';
 import 'package:ml_algo/src/knn_kernel/kernel_factory.dart';
 import 'package:ml_algo/src/knn_kernel/kernel_factory_impl.dart';
 import 'package:ml_algo/src/knn_solver/knn_solver_factory.dart';
@@ -13,17 +14,16 @@ void initKnnClassifierModule() {
   initCommonModule();
 
   knnClassifierInjector
-    ..clearAll()
-    ..registerSingleton<KernelFactory>(
+    ..registerSingletonIf<KernelFactory>(
             () => const KernelFactoryImpl())
 
-    ..registerDependency<KnnSolverFactory>(
+    ..registerSingletonIf<KnnSolverFactory>(
             () => const KnnSolverFactoryImpl())
 
-    ..registerSingleton<KnnClassifierFactory>(
+    ..registerSingletonIf<KnnClassifierFactory>(
             () => const KnnClassifierFactoryImpl())
 
-    ..registerSingleton<KnnRegressorFactory>(
+    ..registerSingletonIf<KnnRegressorFactory>(
             () => KnnRegressorFactoryImpl(
           knnClassifierInjector.get<KernelFactory>(),
           knnClassifierInjector.get<KnnSolverFactory>(),

lib/src/classifier/logistic_regressor/_init_module.dart

@@ -1,5 +1,6 @@
 import 'package:ml_algo/src/classifier/logistic_regressor/_injector.dart';
 import 'package:ml_algo/src/di/common/init_common_module.dart';
+import 'package:ml_algo/src/extensions/injector.dart';
 import 'package:ml_algo/src/link_function/link_function.dart';
 import 'package:ml_algo/src/link_function/link_function_dependency_tokens.dart';
 import 'package:ml_algo/src/link_function/logit/float32_inverse_logit_function.dart';
@@ -9,12 +10,11 @@ void initLogisticRegressorModule() {
   initCommonModule();
 
   logisticRegressorInjector
-    ..clearAll()
-    ..registerSingleton<LinkFunction>(
+    ..registerSingletonIf<LinkFunction>(
             () => const Float32InverseLogitLinkFunction(),
         dependencyName: float32InverseLogitLinkFunctionToken)
 
-    ..registerSingleton<LinkFunction>(
+    ..registerSingletonIf<LinkFunction>(
             () => const Float64InverseLogitLinkFunction(),
         dependencyName: float64InverseLogitLinkFunctionToken);
 }

lib/src/classifier/softmax_regressor/_init_module.dart

@@ -2,6 +2,7 @@ import 'package:ml_algo/src/classifier/softmax_regressor/_injector.dart';
 import 'package:ml_algo/src/classifier/softmax_regressor/softmax_regressor_factory.dart';
 import 'package:ml_algo/src/classifier/softmax_regressor/softmax_regressor_factory_impl.dart';
 import 'package:ml_algo/src/di/common/init_common_module.dart';
+import 'package:ml_algo/src/extensions/injector.dart';
 import 'package:ml_algo/src/link_function/link_function.dart';
 import 'package:ml_algo/src/link_function/link_function_dependency_tokens.dart';
 import 'package:ml_algo/src/link_function/softmax/float32_softmax_link_function.dart';
@@ -11,15 +12,14 @@ void initSoftmaxRegressorModule() {
   initCommonModule();
 
   softmaxRegressorInjector
-    ..clearAll()
-    ..registerSingleton<LinkFunction>(
+    ..registerSingletonIf<LinkFunction>(
             () => const Float32SoftmaxLinkFunction(),
         dependencyName: float32SoftmaxLinkFunctionToken)
 
-    ..registerSingleton<LinkFunction>(
+    ..registerSingletonIf<LinkFunction>(
             () => const Float64SoftmaxLinkFunction(),
         dependencyName: float64SoftmaxLinkFunctionToken)
 
-    ..registerSingleton<SoftmaxRegressorFactory>(
+    ..registerSingletonIf<SoftmaxRegressorFactory>(
             () => const SoftmaxRegressorFactoryImpl());
 }

lib/src/di/common/init_common_module.dart

@@ -3,6 +3,7 @@ import 'package:ml_algo/src/cost_function/cost_function_factory.dart';
 import 'package:ml_algo/src/cost_function/cost_function_factory_impl.dart';
 import 'package:ml_algo/src/di/dependency_keys.dart';
 import 'package:ml_algo/src/di/injector.dart';
+import 'package:ml_algo/src/extensions/injector.dart';
 import 'package:ml_algo/src/helpers/features_target_split.dart';
 import 'package:ml_algo/src/helpers/features_target_split_interface.dart';
 import 'package:ml_algo/src/helpers/normalize_class_labels.dart';
@@ -30,40 +31,39 @@ typedef EncoderFactory = Encoder Function(DataFrame, Iterable<String>);
 
 void initCommonModule() {
   injector
-    ..clearAll()
-    ..registerSingleton<EncoderFactory>(
+    ..registerSingletonIf<EncoderFactory>(
             () => (DataFrame data, Iterable<String> targetNames) =>
             Encoder.oneHot(data, featureNames: targetNames),
         dependencyName: oneHotEncoderFactoryKey)
 
-    ..registerSingleton<RandomizerFactory>(
+    ..registerSingletonIf<RandomizerFactory>(
             () => const RandomizerFactoryImpl())
 
-    ..registerDependency<FeaturesTargetSplit>(
+    ..registerSingletonIf<FeaturesTargetSplit>(
             () => featuresTargetSplit)
 
-    ..registerSingleton<MetricFactory>(
+    ..registerSingletonIf<MetricFactory>(
             () => const MetricFactoryImpl())
 
-    ..registerDependency<NormalizeClassLabels>(
+    ..registerSingletonIf<NormalizeClassLabels>(
             () => normalizeClassLabels)
 
-    ..registerSingleton<LinearOptimizerFactory>(
+    ..registerSingletonIf<LinearOptimizerFactory>(
             () => const LinearOptimizerFactoryImpl())
 
-    ..registerSingleton<LearningRateGeneratorFactory>(
+    ..registerSingletonIf<LearningRateGeneratorFactory>(
             () => const LearningRateGeneratorFactoryImpl())
 
-    ..registerSingleton<InitialCoefficientsGeneratorFactory>(
+    ..registerSingletonIf<InitialCoefficientsGeneratorFactory>(
             () => const InitialCoefficientsGeneratorFactoryImpl())
 
-    ..registerDependency<ConvergenceDetectorFactory>(
+    ..registerSingletonIf<ConvergenceDetectorFactory>(
             () => const ConvergenceDetectorFactoryImpl())
 
-    ..registerSingleton<CostFunctionFactory>(
+    ..registerSingletonIf<CostFunctionFactory>(
             () => const CostFunctionFactoryImpl())
 
-    ..registerSingleton<ModelAssessor<Classifier>>(() =>
+    ..registerSingletonIf<ModelAssessor<Classifier>>(() =>
         ClassifierAssessor(
             injector.get<MetricFactory>(),
             injector.get<EncoderFactory>(
@@ -72,7 +72,7 @@ void initCommonModule() {
             normalizeClassLabels,
         ))
 
-    ..registerSingleton<ModelAssessor<Predictor>>(() =>
+    ..registerSingletonIf<ModelAssessor<Predictor>>(() =>
         RegressorAssessor(
           injector.get<MetricFactory>(),
           featuresTargetSplit,

lib/src/extensions/injector.dart

@@ -0,0 +1,19 @@
+import 'package:injector/injector.dart';
+
+extension InjectorExtension on Injector {
+  /// Registers a dependency only if it doesn't exist
+  void registerSingletonIf<T>(Builder<T> builder, {
+    bool override = false,
+    String dependencyName = '',
+  }) {
+    if (exists<T>(dependencyName: dependencyName)) {
+      return;
+    }
+
+    registerSingleton<T>(
+      builder,
+      override: override,
+      dependencyName: dependencyName,
+    );
+  }
+}

lib/src/regressor/knn_regressor/_init_module.dart

@@ -1,4 +1,5 @@
 import 'package:ml_algo/src/di/common/init_common_module.dart';
+import 'package:ml_algo/src/extensions/injector.dart';
 import 'package:ml_algo/src/knn_kernel/kernel_factory.dart';
 import 'package:ml_algo/src/knn_kernel/kernel_factory_impl.dart';
 import 'package:ml_algo/src/knn_solver/knn_solver_factory.dart';
@@ -11,14 +12,13 @@ void initKnnRegressorModule() {
   initCommonModule();
 
   knnRegressorInjector
-    ..clearAll()
-    ..registerSingleton<KernelFactory>(
+    ..registerSingletonIf<KernelFactory>(
             () => const KernelFactoryImpl())
 
-    ..registerDependency<KnnSolverFactory>(
+    ..registerSingletonIf<KnnSolverFactory>(
             () => const KnnSolverFactoryImpl())
 
-    ..registerSingleton<KnnRegressorFactory>(
+    ..registerSingletonIf<KnnRegressorFactory>(
             () => KnnRegressorFactoryImpl(
           knnRegressorInjector.get<KernelFactory>(),
           knnRegressorInjector.get<KnnSolverFactory>(),

pubspec.yaml

@@ -1,6 +1,6 @@
 name: ml_algo
 description: Machine learning algorithms, Machine learning models performance evaluation functionality
-version: 15.3.3
+version: 15.3.4
 homepage: https://github.com/gyrdym/ml_algo
 
 environment: