Changeset 17547


Ignore:
Timestamp:
05/20/20 08:52:25 (6 months ago)
Author:
chaider
Message:

#2971 Removed constraint related parts from branch

Location:
branches/2971_named_intervals
Files:
4 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

    r17510 r17547  
    197197    <Compile Include="SingleObjective\ConstantOptimizationAnalyzer.cs" />
    198198    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionMeanRelativeErrorEvaluator.cs" />
    199     <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs" />
    200     <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs" />
    201     <Compile Include="SymbolicRegressionConstraintAnalyzer.cs" />
    202199    <Compile Include="SingleObjective\SymbolicRegressionSolutionsAnalyzer.cs" />
    203200    <Compile Include="SymbolicRegressionPhenotypicDiversityAnalyzer.cs" />
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

    r17206 r17547  
    9191        changed = true;
    9292      }
    93       if (!Operators.OfType<SymbolicRegressionConstraintAnalyzer>().Any()) {
    94         Operators.Add(new SymbolicRegressionConstraintAnalyzer());
    95         changed = true;
    96       }
    9793      if (changed) {
    9894        ParameterizeOperators();
     
    117113      Operators.Add(new SymbolicRegressionSolutionsAnalyzer());
    118114      Operators.Add(new SymbolicExpressionTreePhenotypicSimilarityCalculator());
    119       Operators.Add(new SymbolicRegressionConstraintAnalyzer());
    120115      Operators.Add(new SymbolicRegressionPhenotypicDiversityAnalyzer(Operators.OfType<SymbolicExpressionTreePhenotypicSimilarityCalculator>()) { DiversityResultName = "Phenotypic Diversity" });
    121116      ParameterizeOperators();
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r17501 r17547  
    327327      <DependentUpon>ModifiableDatasetView.cs</DependentUpon>
    328328    </Compile>
    329     <Compile Include="ProblemDataConstraintView.cs">
    330       <SubType>UserControl</SubType>
    331     </Compile>
    332     <Compile Include="ProblemDataConstraintView.designer.cs">
    333       <DependentUpon>ProblemDataConstraintView.cs</DependentUpon>
    334     </Compile>
    335329    <Compile Include="Plugin.cs" />
    336330    <Compile Include="ProblemDataView.cs">
     
    575569    <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionErrorCharacteristicsCurveView.Designer.cs">
    576570      <DependentUpon>TimeSeriesPrognosisSolutionErrorCharacteristicsCurveView.cs</DependentUpon>
    577     </Compile>
    578     <Compile Include="IntervalConstraintView.cs">
    579       <SubType>UserControl</SubType>
    580     </Compile>
    581     <Compile Include="IntervalConstraintView.Designer.cs">
    582       <DependentUpon>IntervalConstraintView.cs</DependentUpon>
    583571    </Compile>
    584572    <None Include="HeuristicLab.snk" />
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r17501 r17547  
    191191    <Compile Include="Implementation\Interval\Interval.cs" />
    192192    <Compile Include="Implementation\Interval\IntervalCollection.cs" />
    193     <Compile Include="Implementation\Interval\IntervalConstraint.cs" />
    194     <Compile Include="Implementation\Interval\IntervalConstraintsParser.cs" />
    195193    <Compile Include="Implementation\Regression\ConfidenceBoundRegressionSolution.cs" />
    196194    <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" />
     
    297295    <Compile Include="OnlineCalculators\OnlineWeightedDirectionalSymmetryCalculator.cs" />
    298296    <Compile Include="OnlineCalculators\OnlineWeightedClassificationMeanSquaredErrorCalculator.cs" />
    299     <Compile Include="ProblemDataConstraint.cs" />
    300297    <Compile Include="Plugin.cs" />
    301298    <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs

    r17542 r17547  
    263263
    264264      return new Interval(Math.Pow(a.LowerBound, 1.0 / higher), Math.Pow(a.UpperBound, 1.0 / lower));
     265     
    265266    }
    266267
     
    285286      if (a.Contains(0.0)) {
    286287        min = 0.0;
    287     }
     288      }
    288289
    289290      return new Interval(min, max);
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r17506 r17547  
    9494      problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
    9595      problemData.Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, "", new IntervalCollection()));
    96       problemData.Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, "", new ProblemDataConstraint(problemData)));
    9796      emptyProblemData = problemData;
    9897    }
     
    107106    public IntervalCollection VariableRanges {
    108107      get => VariableRangesParameter.Value;
    109     }
    110 
    111 
    112     public IFixedValueParameter<ProblemDataConstraint> IntervalConstraintsParameter => (IFixedValueParameter<ProblemDataConstraint>)Parameters[IntervalConstraintsParameterName];
    113 
    114     public ProblemDataConstraint IntervalConstraints {
    115       get => IntervalConstraintsParameter.Value;
    116108    }
    117109
     
    148140        Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, intervalCollection));
    149141      }
    150       if (!Parameters.ContainsKey(IntervalConstraintsParameterName)) {
    151         Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
    152       }
    153142      RegisterParameterEvents();
    154143    }
     
    180169      var intervalCollection = CalculateDatasetIntervals(this.Dataset);
    181170      Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, intervalCollection));
    182       Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
    183171      RegisterParameterEvents();
    184172    }
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

    r17210 r17547  
    2929
    3030    IntervalCollection VariableRanges { get;}
    31     ProblemDataConstraint IntervalConstraints { get; }
    3231
    3332    IEnumerable<double> TargetVariableValues { get; }
Note: See TracChangeset for help on using the changeset viewer.