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

Timestamp:

07/09/09 14:22:30 (15 years ago)

Author:

gkronber

Message:

Changed CEDMA dispatcher to allow different input variable sets for each target variable. #676 (Cockpit for the CEDMA Server to control algorithm settings)

File:

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

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

@@ -57 +57 @@
     }
 
-    public override IAlgorithm SelectAndConfigureAlgorithm(int[] targetVariables, int[] inputVariables, Problem problem) {
-      int targetVariable = SelectTargetVariable(targetVariables);
-
+    public override IAlgorithm SelectAndConfigureAlgorithm(int targetVariable, int[] inputVariables, Problem problem) {
       DiscoveryService ds = new DiscoveryService();
       IAlgorithm[] algos = ds.GetInstances<IAlgorithm>();
@@ -102 +100 @@
       if (stochasticAlgos.Count() == 0) return null;
       return stochasticAlgos.ElementAt(random.Next(stochasticAlgos.Count()));
-    }
-
-    public int SelectTargetVariable(int[] targetVariables) {
-      return targetVariables[random.Next(targetVariables.Length)];
     }