Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/11/11 15:03:46 (14 years ago)
Author:
gkronber
Message:

Merged changes from trunk to data analysis exploration branch and added fractional distance metric evaluator. #1142

Location:
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/MultiObjectiveSymbolicVectorRegressionEvaluator.cs

    r4401 r5275  
    3232using HeuristicLab.Problems.DataAnalysis.Symbolic;
    3333using HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression.Symbolic.Interfaces;
     34using HeuristicLab.Common;
    3435
    3536namespace HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression.Symbolic.Evaluators {
    … …  
    4243    }
    4344    #endregion
    44     public MultiObjectiveSymbolicVectorRegressionEvaluator(bool deserializing) : base(deserializing) { }
     45    [StorableConstructor]
     46    protected MultiObjectiveSymbolicVectorRegressionEvaluator(bool deserializing) : base(deserializing) { }
     47    protected MultiObjectiveSymbolicVectorRegressionEvaluator(MultiObjectiveSymbolicVectorRegressionEvaluator original, Cloner cloner)
     48      : base(original, cloner) {
     49    }
    4550    public MultiObjectiveSymbolicVectorRegressionEvaluator()
    4651      : base() {

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/PartialDerivativeEvaluator.cs

    r4197 r5275  
    3939  public class PartialDerivativeEvaluator : SingleObjectiveSymbolicVectorRegressionEvaluator {
    4040
    41     public PartialDerivativeEvaluator(bool deserializing) : base(deserializing) { }
     41    [StorableConstructor]
     42    protected PartialDerivativeEvaluator(bool deserializing) : base(deserializing) { }
     43    protected PartialDerivativeEvaluator(PartialDerivativeEvaluator original, Cloner cloner)
     44      : base(original, cloner) {
     45    }
    4246    public PartialDerivativeEvaluator()
    4347      : base() {
    4448    }
    45 
     49    public override IDeepCloneable Clone(Cloner cloner) {
     50      return new PartialDerivativeEvaluator(this, cloner);
     51    }
    4652    public override double Evaluate(SymbolicExpressionTree tree, ISymbolicExpressionTreeInterpreter interpreter, MultiVariateDataAnalysisProblemData problemData, IEnumerable<string> targetVariables, IEnumerable<int> rows, DoubleArray lowerEstimationBound, DoubleArray upperEstimationBound) {
    4753

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/SingleObjectiveSymbolicVectorRegressionEvaluator.cs

    r4401 r5275  
    3232using HeuristicLab.Problems.DataAnalysis.Symbolic;
    3333using HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression.Symbolic.Interfaces;
     34using HeuristicLab.Common;
    3435
    3536namespace HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression.Symbolic.Evaluators {
    … …  
    4243    }
    4344    #endregion
    44     public SingleObjectiveSymbolicVectorRegressionEvaluator(bool deserializing) : base(deserializing) { }
     45    [StorableConstructor]
     46    protected SingleObjectiveSymbolicVectorRegressionEvaluator(bool deserializing) : base(deserializing) { }
     47    protected SingleObjectiveSymbolicVectorRegressionEvaluator(SingleObjectiveSymbolicVectorRegressionEvaluator original, Cloner cloner)
     48      : base(original, cloner) {
     49    }
    4550    public SingleObjectiveSymbolicVectorRegressionEvaluator()
    4651      : base() {
    4752      Parameters.Add(new LookupParameter<DoubleValue>(QualityParameterName, "The quality of the symbolic vector regression solution."));
    4853    }
    49 
    5054
    5155    public override IOperation Apply() {

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/SymbolicRegressionNormalizedMeanSquaredErrorEvaluator.cs

    r4194 r5275  
    2929using HeuristicLab.Problems.DataAnalysis.Evaluators;
    3030using HeuristicLab.Problems.DataAnalysis.Symbolic;
     31using HeuristicLab.Common;
    3132
    3233namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic {
    … …  
    3435  [StorableClass]
    3536  public class SymbolicRegressionNormalizedMeanSquaredErrorEvaluator : SingleObjectiveSymbolicRegressionEvaluator {
     37    [StorableConstructor]
     38    protected SymbolicRegressionNormalizedMeanSquaredErrorEvaluator(bool deserializing) : base(deserializing) { }
     39    protected SymbolicRegressionNormalizedMeanSquaredErrorEvaluator(SymbolicRegressionNormalizedMeanSquaredErrorEvaluator original, Cloner cloner)
     40      : base(original, cloner) {
     41    }
    3642    public SymbolicRegressionNormalizedMeanSquaredErrorEvaluator()
    3743      : base() {
    3844    }
    39 
     45    public override IDeepCloneable Clone(Cloner cloner) {
     46      return new SymbolicRegressionNormalizedMeanSquaredErrorEvaluator(this, cloner);
     47    }
    4048    public override double Evaluate(ISymbolicExpressionTreeInterpreter interpreter, SymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, Dataset dataset, string targetVariable, IEnumerable<int> rows) {
    4149      double nmse = Calculate(interpreter, solution, lowerEstimationLimit, upperEstimationLimit, dataset, targetVariable, rows);

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/SymbolicVectorRegressionEvaluator.cs

    r4401 r5275  
    3131using HeuristicLab.Problems.DataAnalysis.Regression;
    3232using HeuristicLab.Problems.DataAnalysis.Symbolic;
     33using HeuristicLab.Common;
    3334
    3435namespace HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression.Symbolic.Evaluators {
    … …  
    105106    #endregion
    106107
    107     public SymbolicVectorRegressionEvaluator(bool deserializing) : base(deserializing) { }
     108    [StorableConstructor]
     109    protected SymbolicVectorRegressionEvaluator(bool deserializing) : base(deserializing) { }
     110    protected SymbolicVectorRegressionEvaluator(SymbolicVectorRegressionEvaluator original, Cloner cloner)
     111      : base(original, cloner) {
     112    }
    108113    public SymbolicVectorRegressionEvaluator()
    109114      : base() {
    … …  
    118123      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)));
    119124    }
    120 
    121125    public static IEnumerable<int> GenerateRowsToEvaluate(int seed, double relativeAmount, int start, int end) {
    122126      if (end < start) throw new ArgumentException("Start value is larger than end value.");

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/SymbolicVectorRegressionNormalizedMseEvaluator.cs

    r4194 r5275  
    3030using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic;
    3131using HeuristicLab.Problems.DataAnalysis.Symbolic;
     32using HeuristicLab.Common;
    3233
    3334namespace HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression.Symbolic.Evaluators {
    … …  
    3738
    3839
    39     public SymbolicVectorRegressionNormalizedMseEvaluator(bool deserializing) : base(deserializing) { }
     40    [StorableConstructor]
     41    protected SymbolicVectorRegressionNormalizedMseEvaluator(bool deserializing) : base(deserializing) { }
     42    protected SymbolicVectorRegressionNormalizedMseEvaluator(SymbolicVectorRegressionNormalizedMseEvaluator original, Cloner cloner)
     43      : base(original, cloner) {
     44    }
    4045    public SymbolicVectorRegressionNormalizedMseEvaluator()
    4146      : base() {
     47    }
     48    public override IDeepCloneable Clone(Cloner cloner) {
     49      return new SymbolicVectorRegressionNormalizedMseEvaluator(this, cloner);
    4250    }
    4351

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/SymbolicVectorRegressionScaledMseEvaluator.cs

    r4194 r5275  
    3030using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic;
    3131using HeuristicLab.Problems.DataAnalysis.Symbolic;
     32using HeuristicLab.Common;
    3233
    3334namespace HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression.Symbolic.Evaluators {
    … …  
    4849    #endregion
    4950
     51    [StorableConstructor]
     52    protected SymbolicVectorRegressionScaledMseEvaluator(bool deserializing) : base(deserializing) { }
     53    protected SymbolicVectorRegressionScaledMseEvaluator(SymbolicVectorRegressionScaledMseEvaluator original, Cloner cloner)
     54      : base(original, cloner) {
     55    }
    5056    public SymbolicVectorRegressionScaledMseEvaluator()
    5157      : base() {
    … …  
    5359      Parameters.Add(new LookupParameter<DoubleArray>(BetaParameterName, "The beta parameter for linear scaling."));
    5460    }
    55 
     61    public override IDeepCloneable Clone(Cloner cloner) {
     62      return new SymbolicVectorRegressionScaledMseEvaluator(this, cloner);
     63    }
    5664    public override double[] Evaluate(SymbolicExpressionTree tree, ISymbolicExpressionTreeInterpreter interpreter, MultiVariateDataAnalysisProblemData problemData, IEnumerable<string> targetVariables, IEnumerable<int> rows, DoubleArray lowerEstimationBound, DoubleArray upperEstimationBound) {
    5765      List<string> targetVariablesList = targetVariables.ToList();

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/SymbolicVectorRegressionScaledNormalizedMseEvaluator.cs

    r4194 r5275  
    3030using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic;
    3131using HeuristicLab.Problems.DataAnalysis.Symbolic;
     32using HeuristicLab.Common;
    3233
    3334namespace HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression.Symbolic.Evaluators {
    … …  
    4849    #endregion
    4950
     51    [StorableConstructor]
     52    protected SymbolicVectorRegressionScaledNormalizedMseEvaluator(bool deserializing) : base(deserializing) { }
     53    protected SymbolicVectorRegressionScaledNormalizedMseEvaluator(SymbolicVectorRegressionScaledNormalizedMseEvaluator original, Cloner cloner)
     54      : base(original, cloner) {
     55    }
    5056    public SymbolicVectorRegressionScaledNormalizedMseEvaluator()
    5157      : base() {
    … …  
    5359      Parameters.Add(new LookupParameter<DoubleArray>(BetaParameterName, "The beta parameter for linear scaling."));
    5460    }
    55 
     61    public override IDeepCloneable Clone(Cloner cloner) {
     62      return new SymbolicVectorRegressionScaledNormalizedMseEvaluator(this, cloner);
     63    }
    5664    public override double Evaluate(SymbolicExpressionTree tree, ISymbolicExpressionTreeInterpreter interpreter, MultiVariateDataAnalysisProblemData problemData, IEnumerable<string> targetVariables, IEnumerable<int> rows, DoubleArray lowerEstimationBound, DoubleArray upperEstimationBound) {
    5765      List<string> targetVariablesList = targetVariables.ToList();
Note: See TracChangeset for help on using the changeset viewer.