Changeset 2130 for trunk/sources/HeuristicLab.CEDMA.Server

Timestamp:

07/02/09 13:17:14 (15 years ago)

Author:

gkronber

Message:

• Removed "AutoRegressive" parameter for GP completely. User is responsible to set allowed features correctly (including the target variable for auto regression)
• Setting allowed features correctly in the CEDMA dispatcher (this fixes the problem of incorrect input variables in SVM)

#683 (nu-SVR engine doesn't filter allowed features to remove the target variable)

File:

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

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

@@ -167 +167 @@
       algo.ProblemInjector.GetVariable("TestSamplesEnd").GetValue<IntData>().Data = problem.TestSamplesEnd;
       ItemList<IntData> allowedFeatures = algo.ProblemInjector.GetVariable("AllowedFeatures").GetValue<ItemList<IntData>>();
-      foreach (int inputVariable in inputVariables) allowedFeatures.Add(new IntData(inputVariable));
+      foreach (int inputVariable in inputVariables) {
+        if (inputVariable != targetVariable) {
+          allowedFeatures.Add(new IntData(inputVariable));
+        }
+      }
 
       if (problem.LearningTask == LearningTask.TimeSeries) {
@@ -173 +177 @@
         algo.ProblemInjector.GetVariable("MinTimeOffset").GetValue<IntData>().Data = problem.MinTimeOffset;
         algo.ProblemInjector.GetVariable("MaxTimeOffset").GetValue<IntData>().Data = problem.MaxTimeOffset;
+        if (problem.AutoRegressive) {
+          allowedFeatures.Add(new IntData(targetVariable));
+        }
       } else if (problem.LearningTask == LearningTask.Classification) {
         ItemList<DoubleData> classValues = algo.ProblemInjector.GetVariable("TargetClassValues").GetValue<ItemList<DoubleData>>();