Changeset 2161 for trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries

Timestamp:

07/15/09 16:23:29 (15 years ago)

Author:

gkronber

Message:

Implemented #704 (Shuffling of training data (only) in (non-timeseries) modeling algorithms)

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3

Files:

• OffspringSelectionGP.cs (modified) (1 diff)
• StandardGP.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/OffspringSelectionGP.cs

@@ -35 +35 @@
 namespace HeuristicLab.GP.StructureIdentification.TimeSeries {
   public class OffspringSelectionGP : HeuristicLab.GP.StructureIdentification.OffspringSelectionGP, ITimeSeriesAlgorithm {
+    public override IOperator ProblemInjector {
+      get {
+        CombinedOperator algo = (CombinedOperator)Engine.OperatorGraph.InitialOperator;
+        return algo.OperatorGraph.InitialOperator.SubOperators[1];
+      }
+      set {
+        CombinedOperator algo = (CombinedOperator)Engine.OperatorGraph.InitialOperator;
+        algo.OperatorGraph.InitialOperator.RemoveSubOperator(1);
+        value.Name = "ProblemInjector";
+        algo.OperatorGraph.InitialOperator.AddSubOperator(value, 1);
+      }
+    }
+
     protected override IOperator CreateFunctionLibraryInjector() {
       return new FunctionLibraryInjector();

trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/StandardGP.cs

@@ -35 +35 @@
 namespace HeuristicLab.GP.StructureIdentification.TimeSeries {
   public class StandardGP : HeuristicLab.GP.StructureIdentification.StandardGP, ITimeSeriesAlgorithm {
+    public override IOperator ProblemInjector {
+      get {
+        CombinedOperator algo = (CombinedOperator)Engine.OperatorGraph.InitialOperator;
+        return algo.OperatorGraph.InitialOperator.SubOperators[1];
+      }
+      set {
+        CombinedOperator algo = (CombinedOperator)Engine.OperatorGraph.InitialOperator;
+        algo.OperatorGraph.InitialOperator.RemoveSubOperator(1);
+        value.Name = "ProblemInjector";
+        algo.OperatorGraph.InitialOperator.AddSubOperator(value, 1);
+      }
+    }
+    
     protected override IOperator CreateFunctionLibraryInjector() {
       return new FunctionLibraryInjector();
@@ -61 +74 @@
         SequentialProcessor seq = new SequentialProcessor();
         TheilInequalityCoefficientEvaluator trainingTheil = new TheilInequalityCoefficientEvaluator();
-        trainingTheil.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-        trainingTheil.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+        trainingTheil.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+        trainingTheil.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
         trainingTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TrainingTheilInequalityCoefficient";
         trainingTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "TrainingTheilInequalityCoefficientBias";
@@ -69 +82 @@
 
         TheilInequalityCoefficientEvaluator validationTheil = new TheilInequalityCoefficientEvaluator();
-        validationTheil.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
-        validationTheil.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
+        validationTheil.GetVariableInfo("SamplesStart").ActualName = "ActualValidationSamplesStart";
+        validationTheil.GetVariableInfo("SamplesEnd").ActualName = "ActualValidationSamplesEnd";
         validationTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "ValidationTheilInequalityCoefficient";
         validationTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "ValidationTheilInequalityCoefficientBias";
@@ -77 +90 @@
 
         TheilInequalityCoefficientEvaluator testTheil = new TheilInequalityCoefficientEvaluator();
-        testTheil.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
-        testTheil.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
+        testTheil.GetVariableInfo("SamplesStart").ActualName = "ActualTestSamplesStart";
+        testTheil.GetVariableInfo("SamplesEnd").ActualName = "ActualTestSamplesEnd";
         testTheil.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TestTheilInequalityCoefficient";
         testTheil.GetVariableInfo("TheilInequalityCoefficientBias").ActualName = "TestTheilInequalityCoefficientBias";
@@ -85 +98 @@
 
         SimpleEvaluator trainingEvaluator = new SimpleEvaluator();
-        trainingEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-        trainingEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+        trainingEvaluator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+        trainingEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
         trainingEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";