Changeset 5775
- Timestamp:
- 03/21/11 10:34:23 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs
r5770 r5775 50 50 private const string RelativeNumberOfEvaluatedSamplesParameterName = "RelativeNumberOfEvaluatedSamples"; 51 51 private const string FitnessCalculationPartitionParameterName = "FitnessCalculationPartition"; 52 private const string ModelSelectionPartitionParameterName = "ModelSelectionPartition";52 private const string ValidationPartitionParameterName = "ValidationPartition"; 53 53 54 54 private const string ProblemDataParameterDescription = ""; … … 61 61 private const string RelativeNumberOfEvaluatedSamplesParameterDescription = "The relative number of samples of the dataset partition, which should be randomly chosen for evaluation."; 62 62 private const string FitnessCalculationPartitionParameterDescription = "The partition of the problem data training partition, that should be used to calculate the fitness of an individual."; 63 private const string ModelSelectionPartitionParameterDescription = "The partition of the problem data training partition, that should be used the select the best model from (optional).";63 private const string ValidationPartitionParameterDescription = "The partition of the problem data training partition, that should be used the select the best model from (optional)."; 64 64 #endregion 65 65 … … 95 95 get { return (IFixedValueParameter<IntRange>)Parameters[FitnessCalculationPartitionParameterName]; } 96 96 } 97 public IFixedValueParameter<IntRange> ModelSelectionPartitionParamater {98 get { return (IFixedValueParameter<IntRange>)Parameters[ ModelSelectionPartitionParameterName]; }97 public IFixedValueParameter<IntRange> ValidationPartitionParamater { 98 get { return (IFixedValueParameter<IntRange>)Parameters[ValidationPartitionParameterName]; } 99 99 } 100 100 #endregion … … 140 140 get { return FitnessCalculationPartitionParameter.Value; } 141 141 } 142 public IntRange ModelSelectionPartition {143 get { return ModelSelectionPartitionParamater.Value; }142 public IntRange ValidationPartition { 143 get { return ValidationPartitionParamater.Value; } 144 144 } 145 145 #endregion … … 166 166 Parameters.Add(new FixedValueParameter<IntValue>(MaximumFunctionArgumentsParameterName, MaximumFunctionArgumentsParameterDescription, new IntValue())); 167 167 Parameters.Add(new FixedValueParameter<IntRange>(FitnessCalculationPartitionParameterName, FitnessCalculationPartitionParameterDescription, new IntRange())); 168 Parameters.Add(new FixedValueParameter<IntRange>( ModelSelectionPartitionParameterName, ModelSelectionPartitionParameterDescription, new IntRange()));168 Parameters.Add(new FixedValueParameter<IntRange>(ValidationPartitionParameterName, ValidationPartitionParameterDescription, new IntRange())); 169 169 Parameters.Add(new FixedValueParameter<PercentValue>(RelativeNumberOfEvaluatedSamplesParameterName, RelativeNumberOfEvaluatedSamplesParameterDescription, new PercentValue(1))); 170 170 … … 286 286 foreach (var op in operators.OfType<ISymbolicDataAnalysisValidationAnalyzer<U, T>>()) { 287 287 op.RelativeNumberOfEvaluatedSamplesParameter.ActualName = RelativeNumberOfEvaluatedSamplesParameter.Name; 288 op.ValidationPartitionParameter.ActualName = ModelSelectionPartitionParamater.Name;288 op.ValidationPartitionParameter.ActualName = ValidationPartitionParamater.Name; 289 289 } 290 290 foreach (var op in operators.OfType<ISymbolicDataAnalysisInterpreterOperator>()) {
Note: See TracChangeset
for help on using the changeset viewer.