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

Timestamp:

10/20/09 11:20:13 (15 years ago)

Author:

gkronber

Message:

Fixed #784 (ProblemInjector should be changed to read variable names instead of indexes for input and target variables)

Location:

trunk/sources/HeuristicLab.CEDMA.Server/3.3

Files:

• GridExecuter.cs (modified) (1 diff)
• SimpleDispatcher.cs (modified) (4 diffs)

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

@@ -137 +137 @@
         int i = 0;
         foreach (HeuristicLab.Modeling.IAlgorithm a in activeAlgorithms.Values) {
-          retVal[i++] = a.Name + " " + a.Dataset.GetVariableName(a.TargetVariable);
+          retVal[i++] = a.Name + " " + a.TargetVariable;
         }
         return retVal;

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

@@ -172 +172 @@
     private void SetProblemParameters(HeuristicLab.Modeling.IAlgorithm algo, ProblemSpecification spec) {
       algo.Dataset = spec.Dataset;
-      algo.TargetVariable = spec.Dataset.GetVariableIndex(spec.TargetVariable);
+      algo.TargetVariable = spec.TargetVariable;
       algo.TrainingSamplesStart = spec.TrainingSamplesStart;
       algo.TrainingSamplesEnd = spec.TrainingSamplesEnd;
@@ -179 +179 @@
       algo.TestSamplesStart = spec.TestSamplesStart;
       algo.TestSamplesEnd = spec.TestSamplesEnd;
-      List<int> allowedFeatures = new List<int>();
+      List<string> allowedFeatures = new List<string>();
       foreach (string inputVariable in spec.InputVariables) {
         if (inputVariable != spec.TargetVariable) {
-          allowedFeatures.Add(spec.Dataset.GetVariableIndex(inputVariable));
+          allowedFeatures.Add(inputVariable);
         }
       }
@@ -192 +192 @@
         timeSeriesAlgo.TrainingSamplesStart = spec.TrainingSamplesStart - spec.MinTimeOffset + 1; // first possible index is 1 because of differential symbol
         if (spec.AutoRegressive) {
-          allowedFeatures.Add(spec.Dataset.GetVariableIndex(spec.TargetVariable));
+          allowedFeatures.Add(spec.TargetVariable);
         }
       }
@@ -240 +240 @@
       return problemSpecifications[targetVariable];
     }
-
-    //internal void EnableInputVariable(string target, string name) {
-    //  problemSpecifications[target].AddInputVariable(name);
-    //}
-
-    //internal void DisableInputVariable(string target, string name) {
-    //  problemSpecifications[target].RemoveInputVariable(name);
-    //}
-
-    //internal void SetLearningTask(string target, LearningTask task) {
-    //  problemSpecifications[target].LearningTask = task;
-    //}
-
-    //internal void SetDatasetBoundaries(
-    //  string target,
-    //  int trainingStart, int trainingEnd,
-    //  int validationStart, int validationEnd,
-    //  int testStart, int testEnd) {
-    //  problemSpecifications[target].TrainingSamplesStart = trainingStart;
-    //  problemSpecifications[target].TrainingSamplesEnd = trainingEnd;
-    //  problemSpecifications[target].ValidationSamplesStart = validationStart;
-    //  problemSpecifications[target].ValidationSamplesEnd = validationEnd;
-    //  problemSpecifications[target].TestSamplesStart = testStart;
-    //  problemSpecifications[target].TestSamplesEnd = testEnd;
-    //}
 
     private ProblemSpecification CreateDefaultProblemSpecification(string targetVariable) {