Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/23/12 16:05:57 (12 years ago)
Author:
mkommend
Message:

#1682: Integrated new gp crossovers into the trunk and corrected the parameter wiring.

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers
Files:
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionCrossover.cs

    r7503 r7506  
    3535    private const string SymbolicDataAnalysisTreeInterpreterParameterName = "SymbolicExpressionTreeInterpreter";
    3636    private const string ProblemDataParameterName = "ProblemData";
    37     private const string EstimationLimitsParameterName = "EstimationLimits";
    3837    private const string EvaluatorParameterName = "Evaluator";
    39     private const string SymbolicDataAnalysisEvaluationPartitionParameterName = "EvaluationPartition";
     38    private const string EvaluationPartitionParameterName = "EvaluationPartition";
    4039    private const string RelativeNumberOfEvaluatedSamplesParameterName = "RelativeNumberOfEvaluatedSamples";
    4140    private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";
     
    5453      get { return (ILookupParameter<ISymbolicDataAnalysisSingleObjectiveEvaluator<T>>)Parameters[EvaluatorParameterName]; }
    5554    }
    56     public IValueLookupParameter<IntRange> SymbolicDataAnalysisEvaluationPartitionParameter {
    57       get { return (IValueLookupParameter<IntRange>)Parameters[SymbolicDataAnalysisEvaluationPartitionParameterName]; }
    58     }
    59     public IValueLookupParameter<DoubleLimit> EstimationLimitsParameter {
    60       get { return (IValueLookupParameter<DoubleLimit>)Parameters[EstimationLimitsParameterName]; }
     55    public IValueLookupParameter<IntRange> EvaluationPartitionParameter {
     56      get { return (IValueLookupParameter<IntRange>)Parameters[EvaluationPartitionParameterName]; }
    6157    }
    6258    public IValueLookupParameter<PercentValue> RelativeNumberOfEvaluatedSamplesParameter {
     
    9086      Parameters.Add(new LookupParameter<ISymbolicDataAnalysisSingleObjectiveEvaluator<T>>(EvaluatorParameterName, "The single objective solution evaluator"));
    9187      Parameters.Add(new ValueLookupParameter<T>(ProblemDataParameterName, "The problem data on which the symbolic data analysis solution should be evaluated."));
    92       Parameters.Add(new ValueLookupParameter<IntRange>(SymbolicDataAnalysisEvaluationPartitionParameterName, "The start index of the dataset partition on which the symbolic data analysis solution should be evaluated."));
    93       Parameters.Add(new ValueLookupParameter<DoubleLimit>(EstimationLimitsParameterName, "The upper and lower limit that should be used as cut off value for the output values of symbolic data analysis trees."));
     88      Parameters.Add(new ValueLookupParameter<IntRange>(EvaluationPartitionParameterName, "The start index of the dataset partition on which the symbolic data analysis solution should be evaluated."));
    9489      Parameters.Add(new ValueLookupParameter<PercentValue>(RelativeNumberOfEvaluatedSamplesParameterName, "The relative number of samples of the dataset partition, which should be randomly chosen for evaluation between the start and end index."));
    9590      Parameters.Add(new ValueLookupParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, "The maximum tree depth."));
     
    9792
    9893      EvaluatorParameter.Hidden = true;
    99       EstimationLimitsParameter.Hidden = true;
    100       SymbolicDataAnalysisEvaluationPartitionParameter.Hidden = true;
     94      EvaluationPartitionParameter.Hidden = true;
    10195      SymbolicDataAnalysisTreeInterpreterParameter.Hidden = true;
    10296      ProblemDataParameter.Hidden = true;
     
    131125    protected IEnumerable<int> GenerateRowsToEvaluate(double percentageOfRows) {
    132126      IEnumerable<int> rows;
    133       int samplesStart = SymbolicDataAnalysisEvaluationPartitionParameter.ActualValue.Start;
    134       int samplesEnd = SymbolicDataAnalysisEvaluationPartitionParameter.ActualValue.End;
     127      int samplesStart = EvaluationPartitionParameter.ActualValue.Start;
     128      int samplesEnd = EvaluationPartitionParameter.ActualValue.End;
    135129      int testPartitionStart = ProblemDataParameter.ActualValue.TestPartition.Start;
    136130      int testPartitionEnd = ProblemDataParameter.ActualValue.TestPartition.End;
Note: See TracChangeset for help on using the changeset viewer.