Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/01/11 15:07:18 (14 years ago)
Author:
mkommend
Message:

#1418: Added single and multi-objective SymbolicDataAnalysisProblem classes and adapted generic type parameter.

Location:
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/ArithmeticExpressionGrammar.cs

    r5574 r5580  
    2929  [StorableClass]
    3030  [Item("ArithmeticExpressionGrammar", "Represents a grammar for functional expressions using only arithmetic operations.")]
    31   public class ArithmeticExpressionGrammar : DefaultSymbolicExpressionGrammar {
     31  public class ArithmeticExpressionGrammar : DefaultSymbolicExpressionGrammar, ISymbolicDataAnalysisGrammar {
    3232
    3333    [StorableConstructor]
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/FullFunctionalExpressionGrammar.cs

    r5574 r5580  
    2929  [StorableClass]
    3030  [Item("FullFunctionalExpressionGrammar", "Represents a grammar for functional expressions using all available functions.")]
    31   public class FullFunctionalExpressionGrammar : DefaultSymbolicExpressionGrammar {
     31  public class FullFunctionalExpressionGrammar : DefaultSymbolicExpressionGrammar, ISymbolicDataAnalysisGrammar {
    3232    [StorableConstructor]
    3333    protected FullFunctionalExpressionGrammar(bool deserializing) : base(deserializing) { }
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs

    r5574 r5580  
    2929  [StorableClass]
    3030  [Item("TypeCoherentExpressionGrammar", "Represents a grammar for functional expressions in which special syntactic constraints are enforced so that boolean and real-valued expressions are not mixed.")]
    31   public class TypeCoherentExpressionGrammar : DefaultSymbolicExpressionGrammar {
     31  public class TypeCoherentExpressionGrammar : DefaultSymbolicExpressionGrammar, ISymbolicDataAnalysisGrammar {
    3232
    3333    [StorableConstructor]
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r5577 r5580  
    116116    </Compile>
    117117    <Compile Include="Analyzers\SymbolicDataAnalysisVariableFrequencyAnalyzer.cs" />
     118    <Compile Include="MultiObjectiveSymbolicDataAnalysisProblem.cs" />
    118119    <Compile Include="Grammars\ArithmeticExpressionGrammar.cs" />
    119120    <Compile Include="Grammars\FullFunctionalExpressionGrammar.cs" />
     
    123124    <Compile Include="Interfaces\ISymbolicDataAnalysisValidatingAnalyzer.cs" />
    124125    <Compile Include="Interfaces\ISymbolicDataAnalysisAnalyzer.cs" />
     126    <Compile Include="SingleObjectiveSymbolicDataAnalysisProblem.cs" />
    125127    <Compile Include="SymbolicDataAnalysisExpressionTreeInterpreter.cs" />
    126128    <Compile Include="SymbolicDataAnalysisExpressionTreeSimplifier.cs" />
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

    r5578 r5580  
    3030using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131
    32 // TODO add evaluator and solution creator parameter
    33 
    3432namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    3533  [StorableClass]
    36   public abstract class SymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<V, U>, ISymbolicDataAnalysisProblem, IStorableContent
     34  public abstract class SymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, ISymbolicDataAnalysisProblem, IStorableContent
    3735    where T : class,IDataAnalysisProblemData
    38     where U : class, ISymbolicDataAnalysisSolutionCreator
    39     where V : class, ISymbolicDataAnalysisEvaluator<T> {
     36    where U : class, ISymbolicDataAnalysisEvaluator<T>
     37    where V : class, ISymbolicDataAnalysisSolutionCreator {
    4038    #region parameter names & descriptions
    4139    private const string ProblemDataParameterName = "ProblemData";
     
    5957    private const string MaximumFunctionArgumentsParameterDescription = "Maximal number of arguments of automatically defined functions.";
    6058    #endregion
    61 
    6259
    6360    #region parameter properties
Note: See TracChangeset for help on using the changeset viewer.