Changeset 2375 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3

Timestamp:

09/21/09 20:23:47 (15 years ago)

Author:

gkronber

Message:

Refactored CEDMA dispatcher and CEDMA server view to allow different modeling scenarios for each variable. #754

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3

Files:

• OffspringSelectionGPRegression.cs (modified) (2 diffs)
• StandardGPRegression.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/OffspringSelectionGPRegression.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using HeuristicLab.Core;
@@ -54 +55 @@
           return CreateGPModel();
       }
+    }
+    public IEnumerable<int> AllowedVariables {
+      get {
+        ItemList<IntData> allowedVariables = ProblemInjector.GetVariableValue<ItemList<IntData>>("AllowedFeatures", null, false);
+        return allowedVariables.Select(x => x.Data);
+      }
+      set {
+        ItemList<IntData> allowedVariables = ProblemInjector.GetVariableValue<ItemList<IntData>>("AllowedFeatures", null, false);
+        foreach (int x in value) allowedVariables.Add(new IntData(x));
+      }
+    }
+
+    public int TrainingSamplesStart {
+      get { return ProblemInjector.GetVariableValue<IntData>("TrainingSamplesStart", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("TrainingSamplesStart", null, false).Data = value; }
+    }
+
+    public int TrainingSamplesEnd {
+      get { return ProblemInjector.GetVariableValue<IntData>("TrainingSamplesEnd", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("TrainingSamplesEnd", null, false).Data = value; }
+    }
+
+    public int ValidationSamplesStart {
+      get { return ProblemInjector.GetVariableValue<IntData>("ValidationSamplesStart", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("ValidationSamplesStart", null, false).Data = value; }
+    }
+
+    public int ValidationSamplesEnd {
+      get { return ProblemInjector.GetVariableValue<IntData>("ValidationSamplesEnd", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("ValidationSamplesEnd", null, false).Data = value; }
+    }
+
+    public int TestSamplesStart {
+      get { return ProblemInjector.GetVariableValue<IntData>("TestSamplesStart", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("TestSamplesStart", null, false).Data = value; }
+    }
+
+    public int TestSamplesEnd {
+      get { return ProblemInjector.GetVariableValue<IntData>("TestSamplesEnd", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("TestSamplesEnd", null, false).Data = value; }
     }
 

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/StandardGPRegression.cs

@@ -29 +29 @@
 using System.Collections.Generic;
 using System;
+using System.Linq;
 using HeuristicLab.DataAnalysis;
 using HeuristicLab.Operators.Programmable;
@@ -54 +55 @@
           return CreateGPModel();
       }
+    }
+
+    public IEnumerable<int> AllowedVariables {
+      get {
+        ItemList<IntData> allowedVariables = ProblemInjector.GetVariableValue<ItemList<IntData>>("AllowedFeatures", null, false);
+        return allowedVariables.Select(x => x.Data);
+      }
+      set {
+        ItemList<IntData> allowedVariables = ProblemInjector.GetVariableValue<ItemList<IntData>>("AllowedFeatures", null, false);
+        foreach (int x in value) allowedVariables.Add(new IntData(x));
+      }
+    }
+
+    public int TrainingSamplesStart {
+      get { return ProblemInjector.GetVariableValue<IntData>("TrainingSamplesStart", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("TrainingSamplesStart", null, false).Data = value; }
+    }
+
+    public int TrainingSamplesEnd {
+      get { return ProblemInjector.GetVariableValue<IntData>("TrainingSamplesEnd", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("TrainingSamplesEnd", null, false).Data = value; }
+    }
+
+    public int ValidationSamplesStart {
+      get { return ProblemInjector.GetVariableValue<IntData>("ValidationSamplesStart", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("ValidationSamplesStart", null, false).Data = value; }
+    }
+
+    public int ValidationSamplesEnd {
+      get { return ProblemInjector.GetVariableValue<IntData>("ValidationSamplesEnd", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("ValidationSamplesEnd", null, false).Data = value; }
+    }
+
+    public int TestSamplesStart {
+      get { return ProblemInjector.GetVariableValue<IntData>("TestSamplesStart", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("TestSamplesStart", null, false).Data = value; }
+    }
+
+    public int TestSamplesEnd {
+      get { return ProblemInjector.GetVariableValue<IntData>("TestSamplesEnd", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("TestSamplesEnd", null, false).Data = value; }
     }