Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6739


Ignore:
Timestamp:
09/12/11 11:20:10 (11 years ago)
Author:
mkommend
Message:

#1579: Readded SymbolicRegressionTournamentPruning-Analyzer to Problems.DataAnalysis.Regression-3.3 for backwards compatibility reassons.

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj

    r5253 r6739  
    121121    <Compile Include="SupportVectorRegression\SupportVectorRegressionSolution.cs" />
    122122    <Compile Include="Symbolic\Analyzers\BestSymbolicRegressionSolutionAnalyzer.cs" />
     123    <Compile Include="Symbolic\Analyzers\SymbolicRegressionTournamentPruning.cs">
     124      <SubType>Code</SubType>
     125    </Compile>
    123126    <Compile Include="Symbolic\Analyzers\TrainingBestScaledSymbolicRegressionSolutionAnalyzer.cs" />
    124127    <Compile Include="Symbolic\Analyzers\SymbolicRegressionValidationAnalyzer.cs" />
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/SymbolicRegressionTournamentPruning.cs

    r6717 r6739  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Data;
     
    201202    }
    202203
     204    protected SymbolicRegressionTournamentPruning(SymbolicRegressionTournamentPruning original, Cloner cloner)
     205      : base(original, cloner) {
     206    }
     207
     208    public override IDeepCloneable Clone(Cloner cloner) {
     209      return new SymbolicRegressionTournamentPruning(this, cloner);
     210    }
     211
    203212    [StorableHook(HookType.AfterDeserialization)]
    204213    private void AfterDeserialization() {
     
    241250      double lowerEstimationLimit, double upperEstimationLimit,
    242251      double maxPruningRatio, double qualityGainWeight) {
    243         IEnumerable<int> rows = Enumerable.Range(samplesStart, samplesEnd - samplesStart)
    244           .Where(i => i < problemData.TestSamplesStart.Value || problemData.TestSamplesEnd.Value <= i);
     252      IEnumerable<int> rows = Enumerable.Range(samplesStart, samplesEnd - samplesStart)
     253        .Where(i => i < problemData.TestSamplesStart.Value || problemData.TestSamplesEnd.Value <= i);
    245254      int originalSize = tree.Size;
    246255      double originalQuality = evaluator.Evaluate(interpreter, tree,
Note: See TracChangeset for help on using the changeset viewer.