Changeset 2591 for trunk/sources/HeuristicLab.CEDMA.Server/3.3/SimpleDispatcher.cs

Timestamp:

01/05/10 10:31:40 (15 years ago)

Author:

gkronber

Message:

Copied refactored plugin infrastructure from branch and merged changeset r2586:2589 from branch into the trunk. #799

File:

• trunk/sources/HeuristicLab.CEDMA.Server/3.3/SimpleDispatcher.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/3.3/SimpleDispatcher.cs

@@ -117 +117 @@
       finishedAndDispatchedRuns = new Dictionary<string, List<AlgorithmConfiguration>>();
 
-      DiscoveryService ds = new DiscoveryService();
-      defaultAlgorithms = ds.GetInstances<HeuristicLab.Modeling.IAlgorithm>();
+      
+      defaultAlgorithms = ApplicationManager.Manager.GetInstances<HeuristicLab.Modeling.IAlgorithm>().ToArray();
 
       // PopulateFinishedRuns();
@@ -208 +208 @@
 
     private IOperator SelectRandomFunctionLibrary() {
-      DiscoveryService ds = new DiscoveryService();
-      var injectors = from injector in ds.GetInstances<FunctionLibraryInjectorBase>()
+      var injectors = from injector in ApplicationManager.Manager.GetInstances<FunctionLibraryInjectorBase>()
                       where injector.GetType().GetCustomAttributes(typeof(SymbolicRegressionFunctionLibraryInjectorAttribute), true).Count() > 0
                       select injector;