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

Timestamp:

09/16/09 13:13:52 (15 years ago)

Author:

gkronber

Message:

Fixed problems with classification algorithms. #746 (CEDMA server is not compatible with new data-modeling algorithms)

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3

Files:

• DefaultStructureIdentificationOperators.cs (modified) (1 diff)
• OffspringSelectionGPRegression.cs (modified) (1 diff)
• StandardGPRegression.cs (modified) (3 diffs)

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

@@ -156 +156 @@
 
     public static void PopulateAnalyzerModel(IScope bestModelScope, IAnalyzerModel model) {
-      model.SetMetaData("EvaluatedSolutions", bestModelScope.GetVariableValue<DoubleData>("EvaluatedSolutions", false).Data);
+      model.SetMetaData("EvaluatedSolutions", bestModelScope.GetVariableValue<IntData>("EvaluatedSolutions", false).Data);
       IGeneticProgrammingModel gpModel = bestModelScope.GetVariableValue<IGeneticProgrammingModel>("FunctionTree", false);
       model.SetMetaData("TreeSize", gpModel.Size);

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

@@ -34 +34 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class OffspringSelectionGPRegression : HeuristicLab.GP.Algorithms.OffspringSelectionGP, IAlgorithm {
+  public class OffspringSelectionGPRegression : HeuristicLab.GP.Algorithms.OffspringSelectionGP, IStochasticAlgorithm {
     public override string Name { get { return "OffspringSelectionGP - StructureIdentification"; } }
 

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

@@ -33 +33 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class StandardGPRegression : HeuristicLab.GP.Algorithms.StandardGP, IAlgorithm {
+  public class StandardGPRegression : HeuristicLab.GP.Algorithms.StandardGP, IStochasticAlgorithm {
 
     public override string Name { get { return "StandardGP - StructureIdentification"; } }
@@ -96 +96 @@
 
     protected override IOperator CreateGenerationStepHook() {
-      return DefaultStructureIdentificationOperators.CreateGenerationStepHook();
+      IOperator op = DefaultStructureIdentificationOperators.CreateGenerationStepHook();
+      op.AddSubOperator(CreateBestSolutionProcessor());
+      return op;
     }
+
+    private IOperator CreateBestSolutionProcessor() {
+      CombinedOperator op = new CombinedOperator();
+      op.Name = "BestSolutionProcessor";
+      SequentialProcessor seq = new SequentialProcessor();
+
+      ProgrammableOperator evaluatedSolutionsStorer = new ProgrammableOperator();
+      evaluatedSolutionsStorer.RemoveVariableInfo("Result");
+      evaluatedSolutionsStorer.AddVariableInfo(new VariableInfo("Input", "Value to copy", typeof(IntData), VariableKind.In));
+      evaluatedSolutionsStorer.AddVariableInfo(new VariableInfo("Output", "Value to write", typeof(IntData), VariableKind.New));
+      evaluatedSolutionsStorer.GetVariableInfo("Input").ActualName = "EvaluatedSolutions";
+      evaluatedSolutionsStorer.GetVariableInfo("Output").ActualName = "EvaluatedSolutions";
+      evaluatedSolutionsStorer.Code = "Output.Data = Input.Data;";
+
+      seq.AddSubOperator(evaluatedSolutionsStorer);
+
+      op.OperatorGraph.AddOperator(seq);
+      op.OperatorGraph.InitialOperator = seq;
+      return op;
+    }
+
 
     protected override VariableInjector CreateGlobalInjector() {
@@ -150 +173 @@
     }
 
-    private IOperator CreateBestSolutionProcessor() {
-      CombinedOperator op = new CombinedOperator();
-      op.Name = "BestSolutionProcessor";
-      SequentialProcessor seq = new SequentialProcessor();
-
-      ProgrammableOperator evaluatedSolutionsStorer = new ProgrammableOperator();
-      evaluatedSolutionsStorer.RemoveVariableInfo("Result");
-      evaluatedSolutionsStorer.AddVariableInfo(new VariableInfo("Input", "Value to copy", typeof(IntData), VariableKind.In));
-      evaluatedSolutionsStorer.AddVariableInfo(new VariableInfo("Output", "Value to write", typeof(IntData), VariableKind.New));
-      evaluatedSolutionsStorer.GetVariableInfo("Input").ActualName = "EvaluatedSolutions";
-      evaluatedSolutionsStorer.GetVariableInfo("Output").ActualName = "EvaluatedSolutions";
-      evaluatedSolutionsStorer.Code = "Output.Data = Input.Data;";
-
-      seq.AddSubOperator(evaluatedSolutionsStorer);
-
-      op.OperatorGraph.AddOperator(seq);
-      op.OperatorGraph.InitialOperator = seq;
-      return op;
-    }
-
-
     protected virtual IOperator CreateModelAnalyzerOperator() {
       return DefaultRegressionOperators.CreatePostProcessingOperator();