Changeset 5509 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators
- Timestamp:
- 02/17/11 13:22:49 (14 years ago)
- Location:
- branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators/SymbolicDataAnalysisEvaluator.cs
r5500 r5509 33 33 34 34 namespace HeuristicLab.Problems.DataAnalysis.Symbolic { 35 public abstract class SymbolicDataAnalysisEvaluator : SingleSuccessorOperator, 36 ISymbolicDataAnalysisEvaluator, ISymbolicDataAnalysisBoundedEvaluator, ISymbolicDataAnalysisInterpreterOperator { 35 public abstract class SymbolicDataAnalysisEvaluator<T> : SingleSuccessorOperator, 36 ISymbolicDataAnalysisBoundedEvaluator<T>, ISymbolicDataAnalysisInterpreterOperator 37 where T : class, IDataAnalysisProblemData { 37 38 private const string RandomParameterName = "Random"; 38 39 private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree"; … … 55 56 get { return (ILookupParameter<ISymbolicDataAnalysisTreeInterpreter>)Parameters[SymbolicExpressionTreeInterpreterParameterName]; } 56 57 } 57 public ILookupParameter< IDataAnalysisProblemData> ProblemDataParameter {58 get { return (ILookupParameter< IDataAnalysisProblemData>)Parameters[ProblemDataParameterName]; }58 public ILookupParameter<T> ProblemDataParameter { 59 get { return (ILookupParameter<T>)Parameters[ProblemDataParameterName]; } 59 60 } 60 61 … … 79 80 80 81 #region properties 81 public IDataAnalysisProblemDataProblemData {82 public T ProblemData { 82 83 get { return ProblemDataParameter.ActualValue; } 83 84 } … … 102 103 [StorableConstructor] 103 104 protected SymbolicDataAnalysisEvaluator(bool deserializing) : base(deserializing) { } 104 protected SymbolicDataAnalysisEvaluator(SymbolicDataAnalysisEvaluator original, Cloner cloner)105 protected SymbolicDataAnalysisEvaluator(SymbolicDataAnalysisEvaluator<T> original, Cloner cloner) 105 106 : base(original, cloner) { 106 107 } … … 108 109 : base() { 109 110 Parameters.Add(new LookupParameter<IRandom>(RandomParameterName, "The random generator to use.")); 110 Parameters.Add(new LookupParameter<ISymbolicDataAnalysisTreeInterpreter>(SymbolicExpressionTreeInterpreterParameterName, "The interpreter that should be used to calculate the output values of the symbolic expressiontree."));111 Parameters.Add(new LookupParameter<SymbolicExpressionTree>(SymbolicExpressionTreeInterpreterParameterName, "The symbolic regressionsolution encoded as a symbolic expression tree."));112 Parameters.Add(new LookupParameter< IDataAnalysisProblemData>(ProblemDataParameterName, "The problem data on which the symbolic regressionsolution should be evaluated."));113 Parameters.Add(new ValueLookupParameter<IntValue>(SamplesStartParameterName, "The start index of the dataset partition on which the symbolic regressionsolution should be evaluated."));114 Parameters.Add(new ValueLookupParameter<IntValue>(SamplesEndParameterName, "The end index of the dataset partition on which the symbolic regressionsolution should be evaluated."));115 Parameters.Add(new ValueLookupParameter<DoubleValue>(UpperEstimationLimitParameterName, "The upper limit that should be used as cut off value for the output values of symbolic expressiontrees."));116 Parameters.Add(new ValueLookupParameter<DoubleValue>(LowerEstimationLimitParameterName, "The lower limit that should be used as cut off value for the output values of symbolic expressiontrees."));111 Parameters.Add(new LookupParameter<ISymbolicDataAnalysisTreeInterpreter>(SymbolicExpressionTreeInterpreterParameterName, "The interpreter that should be used to calculate the output values of the symbolic data analysis tree.")); 112 Parameters.Add(new LookupParameter<SymbolicExpressionTree>(SymbolicExpressionTreeInterpreterParameterName, "The symbolic data analysis solution encoded as a symbolic expression tree.")); 113 Parameters.Add(new LookupParameter<T>(ProblemDataParameterName, "The problem data on which the symbolic data analysis solution should be evaluated.")); 114 Parameters.Add(new ValueLookupParameter<IntValue>(SamplesStartParameterName, "The start index of the dataset partition on which the symbolic data analysis solution should be evaluated.")); 115 Parameters.Add(new ValueLookupParameter<IntValue>(SamplesEndParameterName, "The end index of the dataset partition on which the symbolic data analysis solution should be evaluated.")); 116 Parameters.Add(new ValueLookupParameter<DoubleValue>(UpperEstimationLimitParameterName, "The upper limit that should be used as cut off value for the output values of symbolic data analysis trees.")); 117 Parameters.Add(new ValueLookupParameter<DoubleValue>(LowerEstimationLimitParameterName, "The lower limit that should be used as cut off value for the output values of symbolic data analysis trees.")); 117 118 Parameters.Add(new ValueParameter<PercentValue>(RelativeNumberOfEvaluatedSamplesParameterName, "The relative number of samples of the dataset partition, which should be randomly chosen for evaluation between the start and end index.", new PercentValue(1))); 118 119 } -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators/SymbolicDataAnalysisMultiObjectiveEvaluator.cs
r5507 r5509 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic { 30 public abstract class SymbolicDataAnalysisMultiObjectiveEvaluator : SymbolicDataAnalysisEvaluator, ISymbolicDataAnalysisMultiObjectiveEvaluator { 30 public abstract class SymbolicDataAnalysisMultiObjectiveEvaluator<T> : SymbolicDataAnalysisEvaluator<T>, ISymbolicDataAnalysisMultiObjectiveEvaluator<T> 31 where T : class, IDataAnalysisProblemData { 31 32 private const string QualitiesParameterName = "Qualities"; 32 33 public ILookupParameter<DoubleArray> QualitiesParameter { … … 38 39 [StorableConstructor] 39 40 protected SymbolicDataAnalysisMultiObjectiveEvaluator(bool deserializing) : base(deserializing) { } 40 protected SymbolicDataAnalysisMultiObjectiveEvaluator(SymbolicDataAnalysisMultiObjectiveEvaluator original, Cloner cloner)41 protected SymbolicDataAnalysisMultiObjectiveEvaluator(SymbolicDataAnalysisMultiObjectiveEvaluator<T> original, Cloner cloner) 41 42 : base(original, cloner) { 42 43 } -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators/SymbolicDataAnalysisSingleObjectiveEvaluator.cs
r5500 r5509 27 27 28 28 namespace HeuristicLab.Problems.DataAnalysis.Symbolic { 29 public abstract class SymbolicDataAnalysisSingleObjectiveEvaluator : SymbolicDataAnalysisEvaluator, ISymbolicDataAnalysisSingleObjectiveEvaluator { 29 public abstract class SymbolicDataAnalysisSingleObjectiveEvaluator<T> : SymbolicDataAnalysisEvaluator<T>, ISymbolicDataAnalysisSingleObjectiveEvaluator<T> 30 where T : class, IDataAnalysisProblemData { 30 31 private const string QualityParameterName = "Quality"; 31 32 public ILookupParameter<DoubleValue> QualityParameter { … … 37 38 [StorableConstructor] 38 39 protected SymbolicDataAnalysisSingleObjectiveEvaluator(bool deserializing) : base(deserializing) { } 39 protected SymbolicDataAnalysisSingleObjectiveEvaluator(SymbolicDataAnalysisSingleObjectiveEvaluator original, Cloner cloner)40 protected SymbolicDataAnalysisSingleObjectiveEvaluator(SymbolicDataAnalysisSingleObjectiveEvaluator<T> original, Cloner cloner) 40 41 : base(original, cloner) { 41 42 }
Note: See TracChangeset
for help on using the changeset viewer.