Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/30/11 13:14:12 (14 years ago)
Author:
gkronber
Message:

#1418 renamed parameter and updated all validation analyzers to leave out test samples if the validation partition overlaps with the test partition.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveOverfittingAnalyzer.cs

    r5858 r5882  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using System.Collections.Generic;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
     
    7677      double[] trainingQuality = QualityParameter.ActualValue.Select(x => x.Value).ToArray();
    7778      // evaluate on validation partition
    78       int start = ValidationPartitionParameter.ActualValue.Start;
    79       int end = ValidationPartitionParameter.ActualValue.End;
    80       var rows = Enumerable.Range(start, end - start);
    81       if (!rows.Any()) return base.Apply();
     79      IEnumerable<int> rows = GenerateRowsToEvaluate();
     80      if (rows.Count() <= 0) return base.Apply();
    8281
    8382      IExecutionContext childContext = (IExecutionContext)ExecutionContext.CreateChildOperation(EvaluatorParameter.ActualValue);
    84       double[] validationQuality = (from tree in SymbolicExpressionTrees
     83      double[] validationQuality = (from tree in SymbolicExpressionTree
    8584                                    select EvaluatorParameter.ActualValue.Evaluate(childContext, tree, ProblemDataParameter.ActualValue, rows))
    8685                                   .ToArray();
Note: See TracChangeset for help on using the changeset viewer.