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

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

Location:

trunk/sources/HeuristicLab.CEDMA.Server/3.3

Files:

• HeuristicLabCedmaServerPlugin.cs (modified) (1 diff)
• ServerApplication.cs (modified) (1 diff)
• SimpleDispatcher.cs (modified) (2 diffs)

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

@@ -26 +26 @@
 
 namespace HeuristicLab.CEDMA.Server {
-  [ClassInfo(Name = "HeuristicLab.CEDMA.Server-3.3")]
-  [PluginFile(Filename = "HeuristicLab.CEDMA.Server-3.3.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Grid-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Grid.HiveBridge-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Data-3.2")]
-  [Dependency(Dependency = "HeuristicLab.DataAnalysis-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Modeling-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Modeling.Database-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Modeling.Database.SQLServerCompact-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Tracing-3.2")]
+  [Plugin("HeuristicLab.CEDMA.Server-3.3")]
+  [PluginFile("HeuristicLab.CEDMA.Server-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Grid-3.2")]
+  [PluginDependency("HeuristicLab.Grid.HiveBridge-3.2")]
+  [PluginDependency("HeuristicLab.Core-3.2")]
+  [PluginDependency("HeuristicLab.Data-3.2")]
+  [PluginDependency("HeuristicLab.DataAnalysis-3.2")]
+  [PluginDependency("HeuristicLab.Modeling-3.2")]
+  [PluginDependency("HeuristicLab.Modeling.Database-3.2")]
+  [PluginDependency("HeuristicLab.Modeling.Database.SQLServerCompact-3.2")]
+  [PluginDependency("HeuristicLab.Tracing-3.2")]
   public class HeuristicLabCedmaServerPlugin : PluginBase {
   }

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

@@ -27 +27 @@
 
 namespace HeuristicLab.CEDMA.Server {
-  [ClassInfo(Name = "CEDMA", Description = "Cooperative Evolutionary Data Mining.", AutoRestart = true)]
+  [Application("CEDMA", "Cooperative Evolutionary Data Mining.", true)]
   class ServerApplication : ApplicationBase {
     public override void Run() {

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;