Changeset 17901


Ignore:
Timestamp:
03/16/21 14:00:33 (16 months ago)
Author:
gkronber
Message:

#3076: prepare for trunk reintegration

Location:
branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

    r17892 r17901  
    165165  </ItemGroup>
    166166  <ItemGroup>
     167    <Compile Include="MultiObjective\NMSEConstraintsEvaluator.cs" />
    167168    <Compile Include="MultiObjective\PearsonRSquaredNestedTreeSizeEvaluator.cs" />
    168169    <Compile Include="MultiObjective\PearsonRSquaredNumberOfVariablesEvaluator.cs" />
    169170    <Compile Include="MultiObjective\PearsonRSquaredAverageSimilarityEvaluator.cs" />
    170171    <Compile Include="MultiObjective\PearsonRSquaredTreeComplexityEvaluator.cs" />
    171     <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator.cs" />
    172172    <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveValidationBestSolutionAnalyzer.cs" />
    173173    <Compile Include="Plugin.cs" />
     174    <Compile Include="ShapeConstraintsAnalyzer.cs" />
    174175    <Compile Include="SingleObjective\ConstantOptimizationAnalyzer.cs" />
     176    <Compile Include="SingleObjective\Evaluators\NMSEConstraintsEvaluator.cs" />
    175177    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionMeanRelativeErrorEvaluator.cs" />
    176     <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveConstraintEvaluator.cs" />
    177178    <Compile Include="SingleObjective\SymbolicRegressionSolutionsAnalyzer.cs" />
    178     <Compile Include="SymbolicRegressionConstraintAnalyzer.cs" />
    179179    <Compile Include="SymbolicRegressionPhenotypicDiversityAnalyzer.cs" />
    180180    <Compile Include="SymbolicRegressionPruningAnalyzer.cs" />
  • branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ShapeConstraintsAnalyzer.cs

    r17900 r17901  
    3232  [StorableType("4318C6BD-E0A1-45FE-AC30-96E7F73B51FB")]
    3333  [Item("Shape-constraints analyser", "Analyzes the number of shape-constraint violations of symbolic regression models.")]
    34   public class SymbolicRegressionConstraintAnalyzer : SymbolicDataAnalysisAnalyzer, ISymbolicExpressionTreeAnalyzer {
     34  public class ShapeConstraintsAnalyzer : SymbolicDataAnalysisAnalyzer, ISymbolicExpressionTreeAnalyzer {
    3535    private const string ProblemDataParameterName = "ProblemData";
    3636    private const string ConstraintViolationsParameterName = "ConstraintViolations";
     
    5959
    6060    [StorableConstructor]
    61     protected SymbolicRegressionConstraintAnalyzer(StorableConstructorFlag _) : base(_) { }
     61    protected ShapeConstraintsAnalyzer(StorableConstructorFlag _) : base(_) { }
    6262
    63     protected SymbolicRegressionConstraintAnalyzer(SymbolicRegressionConstraintAnalyzer original, Cloner cloner) :
     63    protected ShapeConstraintsAnalyzer(ShapeConstraintsAnalyzer original, Cloner cloner) :
    6464      base(original, cloner) { }
    6565
    6666    public override IDeepCloneable Clone(Cloner cloner) {
    67       return new SymbolicRegressionConstraintAnalyzer(this, cloner);
     67      return new ShapeConstraintsAnalyzer(this, cloner);
    6868    }
    6969
    70     public SymbolicRegressionConstraintAnalyzer() {
     70    public ShapeConstraintsAnalyzer() {
    7171      Parameters.Add(new LookupParameter<IRegressionProblemData>(ProblemDataParameterName,
    7272        "The problem data of the symbolic data analysis problem."));
  • branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

    r17892 r17901  
    9292      }
    9393
    94       if (!Operators.OfType<SymbolicRegressionConstraintAnalyzer>().Any()) {
    95         Operators.Add(new SymbolicRegressionConstraintAnalyzer());
     94      if (!Operators.OfType<ShapeConstraintsAnalyzer>().Any()) {
     95        Operators.Add(new ShapeConstraintsAnalyzer());
    9696        changed = true;
    9797      }
     
    118118      Operators.Add(new SymbolicRegressionSolutionsAnalyzer());
    119119      Operators.Add(new SymbolicExpressionTreePhenotypicSimilarityCalculator());
    120       Operators.Add(new SymbolicRegressionConstraintAnalyzer());
     120      Operators.Add(new ShapeConstraintsAnalyzer());
    121121      Operators.Add(new SymbolicRegressionPhenotypicDiversityAnalyzer(Operators.OfType<SymbolicExpressionTreePhenotypicSimilarityCalculator>()) { DiversityResultName = "Phenotypic Diversity" });
    122122      ParameterizeOperators();
Note: See TracChangeset for help on using the changeset viewer.