Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/23/11 01:09:38 (14 years ago)
Author:
mkommend
Message:

#1418: Reintegrated branch into trunk.

Location:
trunk/sources
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression

    • Property svn:mergeinfo deleted

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3

    • Property svn:ignore

      •  

        old new  
        33HeuristicLabProblemsDataAnalysisRegressionPlugin.cs
        44obj
         5*.vs10x

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/MultiObjectiveSymbolicRegressionProblem.cs

    r5445 r5809  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.PluginInfrastructure;
    2930
    3031namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic {
    3132  [Item("Symbolic Regression Problem (multi objective)", "Represents a multi objective symbolic regression problem.")]
    32   [Creatable("Problems")]
    3333  [StorableClass]
    34   public class MultiObjectiveSymbolicRegressionProblem : SymbolicRegressionProblemBase, IMultiObjectiveProblem {
     34  [NonDiscoverableType]
     35  public class MultiObjectiveSymbolicRegressionProblem : SymbolicRegressionProblemBase, IMultiObjectiveHeuristicOptimizationProblem {
    3536
    3637    #region Parameter Properties
    … …  
    3839      get { return (ValueParameter<BoolArray>)Parameters["Maximization"]; }
    3940    }
    40     IParameter IMultiObjectiveProblem.MaximizationParameter {
     41    IParameter IMultiObjectiveHeuristicOptimizationProblem.MaximizationParameter {
    4142      get { return MaximizationParameter; }
    4243    }
    … …  
    4445      get { return (ValueParameter<IMultiObjectiveSymbolicRegressionEvaluator>)Parameters["Evaluator"]; }
    4546    }
    46     IParameter IProblem.EvaluatorParameter {
     47    IParameter IHeuristicOptimizationProblem.EvaluatorParameter {
    4748      get { return EvaluatorParameter; }
    4849    }
    … …  
    5455      set { EvaluatorParameter.Value = value; }
    5556    }
    56     IMultiObjectiveEvaluator IMultiObjectiveProblem.Evaluator {
     57    IMultiObjectiveEvaluator IMultiObjectiveHeuristicOptimizationProblem.Evaluator {
    5758      get { return EvaluatorParameter.Value; }
    5859    }
    59     IEvaluator IProblem.Evaluator {
     60    IEvaluator IHeuristicOptimizationProblem.Evaluator {
    6061      get { return EvaluatorParameter.Value; }
    6162    }

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs

    r5445 r5809  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Analyzers;
     31using HeuristicLab.PluginInfrastructure;
    3132
    3233namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic {
    3334  [Item("Symbolic Regression Problem (single objective)", "Represents a single objective symbolic regression problem.")]
    34   [Creatable("Problems")]
    3535  [StorableClass]
     36  [NonDiscoverableType]
    3637  public sealed class SymbolicRegressionProblem : SymbolicRegressionProblemBase, ISingleObjectiveDataAnalysisProblem {
    3738
    … …  
    4041      get { return (ValueParameter<BoolValue>)Parameters["Maximization"]; }
    4142    }
    42     IParameter ISingleObjectiveProblem.MaximizationParameter {
     43    IParameter ISingleObjectiveHeuristicOptimizationProblem.MaximizationParameter {
    4344      get { return MaximizationParameter; }
    4445    }
    … …  
    4647      get { return (ValueParameter<ISymbolicRegressionEvaluator>)Parameters["Evaluator"]; }
    4748    }
    48     IParameter IProblem.EvaluatorParameter {
     49    IParameter IHeuristicOptimizationProblem.EvaluatorParameter {
    4950      get { return EvaluatorParameter; }
    5051    }
    … …  
    5253      get { return (OptionalValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
    5354    }
    54     IParameter ISingleObjectiveProblem.BestKnownQualityParameter {
     55    IParameter ISingleObjectiveHeuristicOptimizationProblem.BestKnownQualityParameter {
    5556      get { return BestKnownQualityParameter; }
    5657    }
    … …  
    6263      set { EvaluatorParameter.Value = value; }
    6364    }
    64     ISingleObjectiveEvaluator ISingleObjectiveProblem.Evaluator {
     65    ISingleObjectiveEvaluator ISingleObjectiveHeuristicOptimizationProblem.Evaluator {
    6566      get { return EvaluatorParameter.Value; }
    6667    }
    67     IEvaluator IProblem.Evaluator {
     68    IEvaluator IHeuristicOptimizationProblem.Evaluator {
    6869      get { return EvaluatorParameter.Value; }
    6970    }

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblemBase.cs

    r5467 r5809  
    3939namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic {
    4040  [StorableClass]
    41   public abstract class SymbolicRegressionProblemBase : DataAnalysisProblem, IProblem {
     41  public abstract class SymbolicRegressionProblemBase : DataAnalysisProblem, IHeuristicOptimizationProblem {
    4242
    4343    #region Parameter Properties
    … …  
    4545      get { return (ValueParameter<SymbolicExpressionTreeCreator>)Parameters["SolutionCreator"]; }
    4646    }
    47     IParameter IProblem.SolutionCreatorParameter {
     47    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter {
    4848      get { return SolutionCreatorParameter; }
    4949    }
    … …  
    9595      set { SolutionCreatorParameter.Value = value; }
    9696    }
    97     ISolutionCreator IProblem.SolutionCreator {
     97    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator {
    9898      get { return SolutionCreatorParameter.Value; }
    9999    }
Note: See TracChangeset for help on using the changeset viewer.