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

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.Classification/3.3

Files:

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

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

@@ -34 +34 @@
 namespace HeuristicLab.GP.StructureIdentification.Classification {
   public class OffspringSelectionGP : HeuristicLab.GP.StructureIdentification.OffspringSelectionGP, IClassificationAlgorithm {
-    protected override IOperator CreateProblemInjector() {
-      return new ProblemInjector();
-    }
 
     protected override IOperator CreateBestSolutionProcessor() {

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

@@ -35 +35 @@
 namespace HeuristicLab.GP.StructureIdentification.Classification {
   public class StandardGP : HeuristicLab.GP.StructureIdentification.StandardGP, IClassificationAlgorithm {
-    protected override IOperator CreateProblemInjector() {
-      return new ProblemInjector();
-    }
-
     protected override IOperator CreateBestSolutionProcessor() {
       IOperator seq = base.CreateBestSolutionProcessor();
@@ -50 +46 @@
         AccuracyEvaluator trainingAccuracy = new AccuracyEvaluator();
         trainingAccuracy.GetVariableInfo("Accuracy").ActualName = "TrainingAccuracy";
-        trainingAccuracy.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-        trainingAccuracy.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+        trainingAccuracy.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+        trainingAccuracy.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
 
         AccuracyEvaluator validationAccuracy = new AccuracyEvaluator();
@@ -65 +61 @@
         ConfusionMatrixEvaluator trainingConfusionMatrix = new ConfusionMatrixEvaluator();
         trainingConfusionMatrix.GetVariableInfo("ConfusionMatrix").ActualName = "TrainingConfusionMatrix";
-        trainingConfusionMatrix.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-        trainingConfusionMatrix.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+        trainingConfusionMatrix.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+        trainingConfusionMatrix.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
 
         ConfusionMatrixEvaluator validationConfusionMatrix = new ConfusionMatrixEvaluator();