Changeset 16874


Ignore:
Timestamp:
04/29/19 15:06:11 (4 months ago)
Author:
abeham
Message:

#2521: separated single-objective and multi-objective categories

Location:
branches/2521_ProblemRefactoring
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs

    r16723 r16874  
    4040      public const string GeneticProgrammingProblems = Problems + SplitToken + "2" + OrderToken + "Genetic Programming";
    4141      public const string ExternalEvaluationProblems = Problems + SplitToken + "3" + OrderToken + "External Evaluation";
     42      public const string ExternalEvaluationProblemsSingleObjective = ExternalEvaluationProblems + SplitToken + "1" + OrderToken + "Single-Objective";
     43      public const string ExternalEvaluationProblemsMultiObjective = ExternalEvaluationProblems + SplitToken + "2" + OrderToken + "Multi-Objective";
    4244      public const string ProgrammableProblems = Problems + SplitToken + "4" + OrderToken + "Programmable";
    43       public const string ProgrammableProblemsSingleObjective = ProgrammableProblems + SplitToken + "1" + OrderToken + "Single Objective";
    44       public const string ProgrammableProblemsMultiObjective = ProgrammableProblems + SplitToken + "2" + OrderToken + "Multi Objective";
     45      public const string ProgrammableProblemsSingleObjective = ProgrammableProblems + SplitToken + "1" + OrderToken + "Single-Objective";
     46      public const string ProgrammableProblemsMultiObjective = ProgrammableProblems + SplitToken + "2" + OrderToken + "Multi-Objective";
    4547
    4648      public const string DataAnalysis = "3" + OrderToken + "Data Analysis";
  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblemInstances.cs

    r16816 r16874  
    3838  #region single-objective
    3939  [Item("Binary Vector External Evaluation Problem (single-objective)", "Represents a binary vector single-objective problem that is evaluated by a separate process.")]
    40   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 100)]
     40  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsSingleObjective, Priority = 100)]
    4141  [StorableType("4ea0ded8-4451-4011-b88e-4d0680721b01")]
    4242  public sealed class SingleObjectiveBinaryVectorExternalEvaluationProblem : ExternalEvaluationProblem<BinaryVectorEncoding, BinaryVector> {
     
    6161
    6262  [Item("Integer Vector External Evaluation Problem (single-objective)", "Represents an integer vector single-objective problem that is evaluated by a separate process.")]
    63   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 101)]
     63  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsSingleObjective, Priority = 101)]
    6464  [StorableType("46465e8c-11d8-4d02-8c45-de41a08db7fa")]
    6565  public sealed class SingleObjectiveIntegerVectorExternalEvaluationProblem : ExternalEvaluationProblem<IntegerVectorEncoding, IntegerVector> {
     
    8484
    8585  [Item("Real Vector External Evaluation Problem (single-objective)", "Represents a real vector single-objective problem that is evaluated by a separate process.")]
    86   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 102)]
     86  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsSingleObjective, Priority = 102)]
    8787  [StorableType("637f091f-6601-494e-bafb-2a8ea474210c")]
    8888  public sealed class SingleObjectiveRealVectorExternalEvaluationProblem : ExternalEvaluationProblem<RealVectorEncoding, RealVector> {
     
    107107
    108108  [Item("Permutation External Evaluation Problem (single-objective)", "Represents a permutation single-objective problem that is evaluated by a separate process.")]
    109   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 103)]
     109  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsSingleObjective, Priority = 103)]
    110110  [StorableType("ad9d45f8-b97e-49a7-b3d2-487d9a2cbdf9")]
    111111  public sealed class SingleObjectivePermutationExternalEvaluationProblem : ExternalEvaluationProblem<PermutationEncoding, Permutation> {
     
    130130
    131131  [Item("Symbolic Expression Tree External Evaluation Problem (single-objective)", "Represents a symbolic expression tree single-objective problem that is evaluated by a separate process.")]
    132   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 104)]
     132  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsSingleObjective, Priority = 104)]
    133133  [StorableType("9b3ee4a8-7076-4edd-ae7e-4188bc49aaa3")]
    134134  public sealed class SingleObjectiveSymbolicExpressionTreeExternalEvaluationProblem : ExternalEvaluationProblem<SymbolicExpressionTreeEncoding, ISymbolicExpressionTree> {
     
    156156
    157157  [Item("Linear Linkage External Evaluation Problem (single-objective)", "Represents a linear linkage single-objective problem that is evaluated by a separate process.")]
    158   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 105)]
     158  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsSingleObjective, Priority = 105)]
    159159  [StorableType("945a35d9-89a8-4423-9ea0-21829ac68887")]
    160160  public sealed class SingleObjectiveLinearLinkageExternalEvaluationProblem : ExternalEvaluationProblem<LinearLinkageEncoding, LinearLinkage> {
     
    179179
    180180  [Item("Combined Encoding External Evaluation Problem (single-objective)", "Represents a combined encoding single-objective problem that is evaluated by a separate process.")]
    181   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 1000)]
     181  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsSingleObjective, Priority = 1000)]
    182182  [StorableType("0effb975-c1ff-4485-afc9-5f4cf30ac62b")]
    183183  public sealed class SingleObjectiveCombinedEncodingExternalEvaluationProblem : ExternalEvaluationProblem<CombinedEncoding, CombinedSolution> {
     
    196196  #region multi-objective
    197197  [Item("Binary Vector External Evaluation Problem (multi-objective)", "Represents a binary vector multi-objective problem that is evaluated by a separate process.")]
    198   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 100)]
     198  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsMultiObjective, Priority = 100)]
    199199  [StorableType("f14c7e88-b74d-4cad-ae55-83daf7b4c288")]
    200200  public sealed class MultiObjectiveBinaryVectorExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<BinaryVectorEncoding, BinaryVector> {
     
    219219
    220220  [Item("Integer Vector External Evaluation Problem (multi-objective)", "Represents an integer vector multi-objective problem that is evaluated by a separate process.")]
    221   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 101)]
     221  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsMultiObjective, Priority = 101)]
    222222  [StorableType("90a82c2f-6c37-4ffd-8495-bee278c583d3")]
    223223  public sealed class MultiObjectiveIntegerVectorExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<IntegerVectorEncoding, IntegerVector> {
     
    242242
    243243  [Item("Real Vector External Evaluation Problem (multi-objective)", "Represents a real vector multi-objective problem that is evaluated by a separate process.")]
    244   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 102)]
     244  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsMultiObjective, Priority = 102)]
    245245  [StorableType("38e1d068-d569-48c5-bad6-cbdd685b7c6b")]
    246246  public sealed class MultiObjectiveRealVectorExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<RealVectorEncoding, RealVector> {
     
    265265
    266266  [Item("Permutation External Evaluation Problem (multi-objective)", "Represents a permutation multi-objective problem that is evaluated by a separate process.")]
    267   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 103)]
     267  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsMultiObjective, Priority = 103)]
    268268  [StorableType("f1b265b0-ac7c-4c36-b346-5b3f2c37694b")]
    269269  public sealed class MultiObjectivePermutationExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<PermutationEncoding, Permutation> {
     
    288288
    289289  [Item("Symbolic Expression Tree External Evaluation Problem (multi-objective)", "Represents a symbolic expression tree multi-objective problem that is evaluated by a separate process.")]
    290   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 104)]
     290  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsMultiObjective, Priority = 104)]
    291291  [StorableType("fb6834e2-2d56-4711-a3f8-5e0ab55cd040")]
    292292  public sealed class MultiObjectiveSymbolicExpressionTreeExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<SymbolicExpressionTreeEncoding, ISymbolicExpressionTree> {
     
    314314
    315315  [Item("Linear Linkage External Evaluation Problem (multi-objective)", "Represents a linear linkage multi-objective problem that is evaluated by a separate process.")]
    316   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 105)]
     316  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsMultiObjective, Priority = 105)]
    317317  [StorableType("ed0c1129-651d-465f-87b0-f412f3e3b3d1")]
    318318  public sealed class MultiObjectiveLinearLinkageExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<LinearLinkageEncoding, LinearLinkage> {
     
    337337
    338338  [Item("Combined Encoding External Evaluation Problem (multi-objective)", "Represents a combined encoding multi-objective problem that is evaluated by a separate process.")]
    339   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 1000)]
     339  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblemsMultiObjective, Priority = 1000)]
    340340  [StorableType("5f136869-1750-4d96-ba7e-b25edd2bcab1")]
    341341  public sealed class MultiObjectiveCombinedEncodingExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<CombinedEncoding, CombinedSolution> {
Note: See TracChangeset for help on using the changeset viewer.