Changeset 2161 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/AlgorithmBase.cs

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)

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/AlgorithmBase.cs (modified) (4 diffs)

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

@@ -65 +65 @@
 
     public virtual IOperator ProblemInjector {
-      get { return algorithm.SubOperators[0]; }
+      get { return algorithm.SubOperators[1]; }
       set {
         value.Name = "ProblemInjector";
-        algorithm.RemoveSubOperator(0);
-        algorithm.AddSubOperator(value, 0);
+        algorithm.RemoveSubOperator(1);
+        algorithm.AddSubOperator(value, 1);
       }
     }
@@ -155 +155 @@
       MeanSquaredErrorEvaluator evaluator = new MeanSquaredErrorEvaluator();
       evaluator.GetVariableInfo("MSE").ActualName = "Quality";
-      evaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-      evaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+      evaluator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+      evaluator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
       evaluator.Name = "Evaluator";
 
@@ -165 +165 @@
       LeftReducer cleanUp = new LeftReducer();
 
+      seq.AddSubOperator(randomInjector);
       seq.AddSubOperator(problemInjector);
-      seq.AddSubOperator(randomInjector);
       seq.AddSubOperator(globalInjector);
       seq.AddSubOperator(funLibInjector);
@@ -465 +465 @@
       // SequentialProcessor in GP
       algorithm = (SequentialProcessor)co1.OperatorGraph.InitialOperator;
-      return (RandomInjector)algorithm.SubOperators[1];
+      return (RandomInjector)algorithm.SubOperators[0];
     }