Changeset 17695 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs
- Timestamp:
- 07/23/20 16:21:55 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs
r17226 r17695 21 21 22 22 using System.Linq; 23 using HEAL.Attic; 23 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; … … 26 27 using HeuristicLab.Optimization; 27 28 using HeuristicLab.Parameters; 28 using HEAL.Attic;29 29 30 30 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression { … … 32 32 [StorableType("4A8D3658-66B3-48B4-B983-D46409045DBE")] 33 33 [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 110)] 34 public class SymbolicRegressionMultiObjectiveProblem : SymbolicDataAnalysisMultiObjectiveProblem<IRegressionProblemData, ISymbolicRegressionMultiObjectiveEvaluator , ISymbolicDataAnalysisSolutionCreator>, IRegressionProblem {34 public class SymbolicRegressionMultiObjectiveProblem : SymbolicDataAnalysisMultiObjectiveProblem<IRegressionProblemData, ISymbolicRegressionMultiObjectiveEvaluator>, IRegressionProblem { 35 35 private const double PunishmentFactor = 10; 36 36 private const int InitialMaximumTreeDepth = 8; … … 61 61 62 62 public SymbolicRegressionMultiObjectiveProblem() 63 : base(new RegressionProblemData(), new SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator() , new SymbolicDataAnalysisExpressionTreeCreator()) {63 : base(new RegressionProblemData(), new SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator()) { 64 64 Parameters.Add(new FixedValueParameter<DoubleLimit>(EstimationLimitsParameterName, EstimationLimitsParameterDescription)); 65 65 … … 127 127 128 128 foreach (var op in Operators.OfType<ISolutionSimilarityCalculator>()) { 129 op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;129 //op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName; 130 130 op.QualityVariableName = Evaluator.QualitiesParameter.ActualName; 131 131
Note: See TracChangeset
for help on using the changeset viewer.