Changeset 17695 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisProblem.cs

Timestamp:

07/23/20 16:21:55 (4 years ago)

Author:

abeham

Message:

#2521:

• Moving solution creator parameter from problems to algorithms (breaking wiring in some HeuristicOptimizationProblems)
• Disallowing evaluator or encoding changes in encoding-specific base problems (to avoid confusion in derived problems whether this needs to be handled or not)
• Added private set to ReferenceParameter property (serialization)

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisProblem.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisProblem.cs

@@ -26 +26 @@
 using System.Drawing;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
@@ -34 +35 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.DataAnalysis;
@@ -43 +43 @@
 namespace HeuristicLab.Problems.GrammaticalEvolution {
   [StorableType("E31AC1E8-590D-4D65-883F-3113544B6C91")]
-  public abstract class GESymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, IDataAnalysisProblem<T>,
+  public abstract class GESymbolicDataAnalysisProblem<T, U> : HeuristicOptimizationProblem<U>, IDataAnalysisProblem<T>,
                                                                  IGESymbolicDataAnalysisProblem, IStorableContent,
                                                                  IProblemInstanceConsumer<T>, IProblemInstanceExporter<T>
     where T : class, IDataAnalysisProblemData
-    where U : class, IGESymbolicDataAnalysisEvaluator<T>
-    where V : class, IIntegerVectorCreator {
+    where U : class, IGESymbolicDataAnalysisEvaluator<T> {
 
     #region parameter names & descriptions
@@ -152 +151 @@
       RegisterEventHandlers();
     }
-    protected GESymbolicDataAnalysisProblem(GESymbolicDataAnalysisProblem<T, U, V> original, Cloner cloner)
+    protected GESymbolicDataAnalysisProblem(GESymbolicDataAnalysisProblem<T, U> original, Cloner cloner)
       : base(original, cloner) {
       RegisterEventHandlers();
     }
 
-    protected GESymbolicDataAnalysisProblem(T problemData, U evaluator, V solutionCreator)
-      : base(evaluator, solutionCreator) {
+    protected GESymbolicDataAnalysisProblem(T problemData, U evaluator)
+      : base(evaluator) {
       Parameters.Add(new ValueParameter<T>(ProblemDataParameterName, ProblemDataParameterDescription, problemData));
       Parameters.Add(new ValueParameter<ISymbolicDataAnalysisGrammar>(SymbolicExpressionTreeGrammarParameterName, SymbolicExpressionTreeGrammarParameterDescription));
@@ -267 +266 @@
         op.RelativeNumberOfEvaluatedSamplesParameter.ActualName = RelativeNumberOfEvaluatedSamplesParameter.Name;
         op.ApplyLinearScalingParameter.ActualName = ApplyLinearScalingParameter.Name;
-        op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.Name;
+        //op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.Name;
         op.GenotypeToPhenotypeMapperParameter.ActualName = GenotypeToPhenotypeMapperParameter.Name;
         op.SymbolicExpressionTreeGrammarParameter.ActualName = SymbolicExpressionTreeGrammarParameter.Name;
       }
       foreach (var op in operators.OfType<IIntegerVectorCrossover>()) {
-        op.ParentsParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
-        op.ChildParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        //op.ParentsParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        //op.ChildParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
       }
       foreach (var op in operators.OfType<IIntegerVectorManipulator>()) {
-        op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        //op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
       }
       foreach (var op in operators.OfType<IIntegerVectorCreator>()) {