Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5514 for branches


Ignore:
Timestamp:
02/18/11 11:32:25 (14 years ago)
Author:
mkommend
Message:

#1418: Fixed compilation errors in Problems.DataAnalysis.*.

Location:
branches/DataAnalysis Refactoring
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveMeanSquaredErrorTreeSizeEvaluator.cs

    r5505 r5514  
    4242    public SymbolicClassificationMultiObjectiveMeanSquaredErrorTreeSizeEvaluator() : base() { }
    4343
     44    public override IEnumerable<bool> Maximization { get { return new bool[2] { false, false }; } }
     45
    4446    public override IOperation Apply() {
    4547      IEnumerable<int> rows = GenerateRowsToEvaluate();
    46       double[] qualities = Calculate(SymbolicExpressionTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
     48      double[] qualities = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
    4749      QualitiesParameter.ActualValue = new DoubleArray(qualities);
    4850      return base.Apply();

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectivePearsonRSquaredTreeSizeEvaluator.cs

    r5505 r5514  
    2121    public SymbolicClassificationMultiObjectivePearsonRSquaredTreeSizeEvaluator() : base() { }
    2222
     23    public override IEnumerable<bool> Maximization { get { return new bool[2] { true, false }; } }
     24
    2325    public override IOperation Apply() {
    2426      IEnumerable<int> rows = GenerateRowsToEvaluate();
    25       double[] qualities = Calculate(SymbolicExpressionTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
     27      double[] qualities = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
    2628      QualitiesParameter.ActualValue = new DoubleArray(qualities);
    2729      return base.Apply();

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator.cs

    r5505 r5514  
    4242    public SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator() : base() { }
    4343
     44    public override bool Maximization { get { return false; } }
     45
    4446    public override IOperation Apply() {
    4547      IEnumerable<int> rows = GenerateRowsToEvaluate();
    46       double quality = Calculate(SymbolicExpressionTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
     48      double quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
    4749      QualityParameter.ActualValue = new DoubleValue(quality);
    4850      return base.Apply();

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator.cs

    r5505 r5514  
    4242    public SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator() : base() { }
    4343
     44    public override bool Maximization { get { return true; } }
     45
    4446    public override IOperation Apply() {
    4547      IEnumerable<int> rows = GenerateRowsToEvaluate();
    46       double quality = Calculate(SymbolicExpressionTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
     48      double quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
    4749      QualityParameter.ActualValue = new DoubleValue(quality);
    4850      return base.Apply();

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveMeanSquaredErrorTreeSizeEvaluator.cs

    r5505 r5514  
    4242    public SymbolicRegressionMultiObjectiveMeanSquaredErrorSolutionSizeEvaluator() : base() { }
    4343
     44    public override IEnumerable<bool> Maximization { get { return new bool[2] { false, false }; } }
     45
    4446    public override Core.IOperation Apply() {
    4547      IEnumerable<int> rows = GenerateRowsToEvaluate();
    46       double[] qualities = Calculate(SymbolicExpressionTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
     48      double[] qualities = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
    4749      QualitiesParameter.ActualValue = new DoubleArray(qualities);
    4850      return base.Apply();

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator.cs

    r5505 r5514  
    4242    public SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator() : base() { }
    4343
     44    public override IEnumerable<bool> Maximization { get { return new bool[2] { true, false }; } }
     45
    4446    public override IOperation Apply() {
    4547      IEnumerable<int> rows = GenerateRowsToEvaluate();
    46       double[] qualities = Calculate(SymbolicExpressionTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
     48      double[] qualities = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
    4749      QualitiesParameter.ActualValue = new DoubleArray(qualities);
    4850      return base.Apply();

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.cs

    r5505 r5514  
    4242    public SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator() : base() { }
    4343
     44    public override bool Maximization { get { return false; } }
     45
    4446    public override IOperation Apply() {
    4547      IEnumerable<int> rows = GenerateRowsToEvaluate();
    46       double quality = Calculate(SymbolicExpressionTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
     48      double quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
    4749      QualityParameter.ActualValue = new DoubleValue(quality);
    4850      return base.Apply();

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs

    r5505 r5514  
    4242    public SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator() : base() { }
    4343
     44    public override bool Maximization { get { return true; } }
     45
    4446    public override IOperation Apply() {
    4547      IEnumerable<int> rows = GenerateRowsToEvaluate();
    46       double quality = Calculate(SymbolicExpressionTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
     48      double quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, SymbolicExpressionTreeParameter.ActualValue, LowerEstimationLimit.Value, UpperEstimationLimit.Value, ProblemData, rows);
    4749      QualityParameter.ActualValue = new DoubleValue(quality);
    4850      return base.Apply();

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators/SymbolicDataAnalysisEvaluator.cs

    r5509 r5514  
    3838    private const string RandomParameterName = "Random";
    3939    private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree";
    40     private const string SymbolicExpressionTreeInterpreterParameterName = "SymbolicExpressionTreeInterpreter";
     40    private const string SymbolicDataAnalysisTreeInterpreterParameterName = "SymbolicExpressionTreeInterpreter";
    4141    private const string ProblemDataParameterName = "ProblemData";
    4242    private const string UpperEstimationLimitParameterName = "UpperEstimationLimit";
    … …  
    4747
    4848    #region parameter properties
    49     public ILookupParameter<IRandom> RandomParameter {
    50       get { return (ILookupParameter<IRandom>)Parameters[RandomParameterName]; }
     49    public IValueLookupParameter<IRandom> RandomParameter {
     50      get { return (IValueLookupParameter<IRandom>)Parameters[RandomParameterName]; }
    5151    }
    5252    public ILookupParameter<ISymbolicExpressionTree> SymbolicExpressionTreeParameter {
    5353      get { return (ILookupParameter<ISymbolicExpressionTree>)Parameters[SymbolicExpressionTreeParameterName]; }
    5454    }
    55     public ILookupParameter<ISymbolicDataAnalysisTreeInterpreter> SymbolicExpressionTreeInterpreterParameter {
    56       get { return (ILookupParameter<ISymbolicDataAnalysisTreeInterpreter>)Parameters[SymbolicExpressionTreeInterpreterParameterName]; }
     55    public IValueLookupParameter<ISymbolicDataAnalysisTreeInterpreter> SymbolicDataAnalysisTreeInterpreterParameter {
     56      get { return (IValueLookupParameter<ISymbolicDataAnalysisTreeInterpreter>)Parameters[SymbolicDataAnalysisTreeInterpreterParameterName]; }
    5757    }
    58     public ILookupParameter<T> ProblemDataParameter {
    59       get { return (ILookupParameter<T>)Parameters[ProblemDataParameterName]; }
     58    public IValueLookupParameter<T> ProblemDataParameter {
     59      get { return (IValueLookupParameter<T>)Parameters[ProblemDataParameterName]; }
    6060    }
    6161
    … …  
    108108    public SymbolicDataAnalysisEvaluator()
    109109      : base() {
    110       Parameters.Add(new LookupParameter<IRandom>(RandomParameterName, "The random generator to use."));
    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."));
     110      Parameters.Add(new ValueLookupParameter<IRandom>(RandomParameterName, "The random generator to use."));
     111      Parameters.Add(new ValueLookupParameter<ISymbolicDataAnalysisTreeInterpreter>(SymbolicDataAnalysisTreeInterpreterParameterName, "The interpreter that should be used to calculate the output values of the symbolic data analysis tree."));
     112      Parameters.Add(new LookupParameter<SymbolicExpressionTree>(SymbolicDataAnalysisTreeInterpreterParameterName, "The symbolic data analysis solution encoded as a symbolic expression tree."));
     113      Parameters.Add(new ValueLookupParameter<T>(ProblemDataParameterName, "The problem data on which the symbolic data analysis solution should be evaluated."));
    114114      Parameters.Add(new ValueLookupParameter<IntValue>(SamplesStartParameterName, "The start index of the dataset partition on which the symbolic data analysis solution should be evaluated."));
    115115      Parameters.Add(new ValueLookupParameter<IntValue>(SamplesEndParameterName, "The end index of the dataset partition on which the symbolic data analysis solution should be evaluated."));

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisEvaluator.cs

    r5509 r5514  
    2525  public interface ISymbolicDataAnalysisEvaluator<T> : IDataAnalysisEvaluator<T>
    2626   where T : class, IDataAnalysisProblemData {
    27     ILookupParameter<SymbolicExpressionTree> SymbolicExpressionTreeParameter { get; }
     27    ILookupParameter<ISymbolicExpressionTree> SymbolicExpressionTreeParameter { get; }
    2828    IValueLookupParameter<IntValue> SamplesStartParameter { get; }
    2929    IValueLookupParameter<IntValue> SamplesEndParameter { get; }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisGrammar.cs

    r5495 r5514  
    2323
    2424namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    25   public interface ISymbolicDataAnalysisGrammar : ISymbolicExpressionGrammar {
     25  public interface ISymbolicDataAnalysisGrammar : ISymbolicExpressionTreeGrammar {
    2626  }
    2727}

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisInterpreterOperator.cs

    r5500 r5514  
    2424namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2525  public interface ISymbolicDataAnalysisInterpreterOperator : IOperator {
    26     IValueLookupParameter<ISymbolicDataAnalysisTreeInterpreter> Interpreter;
     26    IValueLookupParameter<ISymbolicDataAnalysisTreeInterpreter> SymbolicDataAnalysisTreeInterpreterParameter { get; }
    2727  }
    2828}

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisModel.cs

    r5507 r5514  
    2323namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2424  public interface ISymbolicDataAnalysisModel : IDataAnalysisModel {
    25     ISymbolicExpressionTree SymbolicExpressionTree;
    26     ISymbolicDataAnalysisTreeInterpreter Interpreter;
     25    ISymbolicExpressionTree SymbolicExpressionTree { get; }
     26    ISymbolicDataAnalysisTreeInterpreter Interpreter { get; }
    2727  }
    2828}

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisProblem.cs

    r5495 r5514  
    2121
    2222namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    23   public interface ISymbolicDataAnalysisProblem : IDataAnalysisProblem {
     23  public interface ISymbolicDataAnalysisProblem<T> : IDataAnalysisProblem<T>
     24  where T : class, IDataAnalysisProblemData {
    2425    ISymbolicDataAnalysisGrammar Grammar { get; }
    25     new ISymbolicDataAnalysisEvaluator Evaluator { get; }
    26     new ISymbolicDataAnalysisSolutionCreator SolutionCreator { get; }
     26    new ISymbolicDataAnalysisEvaluator<T> Evaluator { get; }
     27    new ISymbolicDataAnalysisSolutionCreator<T> SolutionCreator { get; }
    2728  }
    2829}
Note: See TracChangeset for help on using the changeset viewer.