Changeset 18084 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Timestamp:
- 11/18/21 15:55:41 (2 years ago)
- Location:
- branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj
r18061 r18084 258 258 <Private>False</Private> 259 259 </ProjectReference> 260 <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.DataAnalysis\3.3\HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj"> 261 <Project>{94C7714E-29D4-4D6D-B213-2C18D627AB75}</Project> 262 <Name>HeuristicLab.Problems.Instances.DataAnalysis-3.3</Name> 263 </ProjectReference> 260 264 <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj"> 261 265 <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project> -
branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs
r18081 r18084 13 13 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 14 14 using HeuristicLab.PluginInfrastructure; 15 using HeuristicLab.Problems.Instances.DataAnalysis.Regression.Asadzadeh; 16 using HeuristicLab.Problems.Instances.DataAnalysis; 15 17 16 18 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression { … … 74 76 #region Constructors & Cloning 75 77 public StructuredSymbolicRegressionSingleObjectiveProblem() { 76 var problemData = new ShapeConstrainedRegressionProblemData(); 77 var targetInterval = problemData.VariableRanges.GetInterval(problemData.TargetVariable); 78 var provider = new AsadzadehProvider(); 79 var descriptor = new Asadzadeh1(); 80 var problemData = provider.LoadData(descriptor); 81 var shapeConstraintProblemData = new ShapeConstrainedRegressionProblemData(problemData); 82 83 84 var targetInterval = shapeConstraintProblemData.VariableRanges.GetInterval(shapeConstraintProblemData.TargetVariable); 78 85 var estimationWidth = targetInterval.Width * 10; 79 86 … … 93 100 Parameters.Add(new ValueParameter<IRegressionProblemData>( 94 101 ProblemDataParameterName, 95 problemData));102 shapeConstraintProblemData)); 96 103 ProblemDataParameter.ValueChanged += ProblemDataParameterValueChanged; 97 104 … … 119 126 Operators.Add(new SymbolicDataAnalysisVariableFrequencyAnalyzer()); 120 127 Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer()); 121 //TODO change to value lookup122 //Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());123 128 Operators.Add(new SymbolicExpressionSymbolFrequencyAnalyzer()); 124 129 130 StructureTemplate.Template = 131 "(" + 132 "(210000 / (210000 + h)) * ((sigma_y * t * t) / (wR * Rt * t)) + " + 133 "PlasticHardening(_) - Elasticity(_)" + 134 ")" + 135 " * C(_)"; 125 136 } 126 137
Note: See TracChangeset
for help on using the changeset viewer.