Changeset 7506 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionCrossover.cs

Timestamp:

02/23/12 16:05:57 (13 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:

• . (copied) (copied from branches/HeuristicLab.Crossovers/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers)
• SymbolicDataAnalysisExpressionCrossover.cs (copied) (copied from branches/HeuristicLab.Crossovers/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionCrossover.cs) (5 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionCrossover.cs

@@ -35 +35 @@
     private const string SymbolicDataAnalysisTreeInterpreterParameterName = "SymbolicExpressionTreeInterpreter";
     private const string ProblemDataParameterName = "ProblemData";
-    private const string EstimationLimitsParameterName = "EstimationLimits";
     private const string EvaluatorParameterName = "Evaluator";
-    private const string SymbolicDataAnalysisEvaluationPartitionParameterName = "EvaluationPartition";
+    private const string EvaluationPartitionParameterName = "EvaluationPartition";
     private const string RelativeNumberOfEvaluatedSamplesParameterName = "RelativeNumberOfEvaluatedSamples";
     private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";
@@ -54 +53 @@
       get { return (ILookupParameter<ISymbolicDataAnalysisSingleObjectiveEvaluator<T>>)Parameters[EvaluatorParameterName]; }
     }
-    public IValueLookupParameter<IntRange> SymbolicDataAnalysisEvaluationPartitionParameter {
-      get { return (IValueLookupParameter<IntRange>)Parameters[SymbolicDataAnalysisEvaluationPartitionParameterName]; }
-    }
-    public IValueLookupParameter<DoubleLimit> EstimationLimitsParameter {
-      get { return (IValueLookupParameter<DoubleLimit>)Parameters[EstimationLimitsParameterName]; }
+    public IValueLookupParameter<IntRange> EvaluationPartitionParameter {
+      get { return (IValueLookupParameter<IntRange>)Parameters[EvaluationPartitionParameterName]; }
     }
     public IValueLookupParameter<PercentValue> RelativeNumberOfEvaluatedSamplesParameter {
@@ -90 +86 @@
       Parameters.Add(new LookupParameter<ISymbolicDataAnalysisSingleObjectiveEvaluator<T>>(EvaluatorParameterName, "The single objective solution evaluator"));
       Parameters.Add(new ValueLookupParameter<T>(ProblemDataParameterName, "The problem data on which the symbolic data analysis solution should be evaluated."));
-      Parameters.Add(new ValueLookupParameter<IntRange>(SymbolicDataAnalysisEvaluationPartitionParameterName, "The start index of the dataset partition on which the symbolic data analysis solution should be evaluated."));
-      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."));
+      Parameters.Add(new ValueLookupParameter<IntRange>(EvaluationPartitionParameterName, "The start index of the dataset partition on which the symbolic data analysis solution should be evaluated."));
       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."));
       Parameters.Add(new ValueLookupParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, "The maximum tree depth."));
@@ -97 +92 @@
 
       EvaluatorParameter.Hidden = true;
-      EstimationLimitsParameter.Hidden = true;
-      SymbolicDataAnalysisEvaluationPartitionParameter.Hidden = true;
+      EvaluationPartitionParameter.Hidden = true;
       SymbolicDataAnalysisTreeInterpreterParameter.Hidden = true;
       ProblemDataParameter.Hidden = true;
@@ -131 +125 @@
     protected IEnumerable<int> GenerateRowsToEvaluate(double percentageOfRows) {
       IEnumerable<int> rows;
-      int samplesStart = SymbolicDataAnalysisEvaluationPartitionParameter.ActualValue.Start;
-      int samplesEnd = SymbolicDataAnalysisEvaluationPartitionParameter.ActualValue.End;
+      int samplesStart = EvaluationPartitionParameter.ActualValue.Start;
+      int samplesEnd = EvaluationPartitionParameter.ActualValue.End;
       int testPartitionStart = ProblemDataParameter.ActualValue.TestPartition.Start;
       int testPartitionEnd = ProblemDataParameter.ActualValue.TestPartition.End;