Free cookie consent management tool by TermsFeed Policy Generator

Changeset 17334


Ignore:
Timestamp:
10/17/19 11:55:58 (5 years ago)
Author:
mkommend
Message:

#2521: Moved IStorableContent from generic problem implementation to IProblem.

Location:
branches/2521_ProblemRefactoring
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB/3.3/RunCreation/MultiObjectiveOKBProblem.cs

    r17226 r17334  
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Optimization;
    26 using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Clients.OKB.RunCreation {
     
    3030  [Creatable(CreatableAttribute.Categories.TestingAndAnalysisOKB, Priority = 120)]
    3131  [StorableType("BB74E220-F721-4129-9A50-374647B16B97")]
    32   public sealed class MultiObjectiveOKBProblem : OKBProblem, IMultiObjectiveHeuristicOptimizationProblem, IStorableContent {
    33     public string Filename { get; set; }
    34 
     32  public sealed class MultiObjectiveOKBProblem : OKBProblem, IMultiObjectiveHeuristicOptimizationProblem {
    3533    public override Type ProblemType {
    3634      get { return typeof(IMultiObjectiveHeuristicOptimizationProblem); }
  • branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBProblem.cs

    r17226 r17334  
    2020#endregion
    2121
    22 using HeuristicLab.Common;
    23 using HeuristicLab.Core;
    24 using HeuristicLab.Optimization;
    25 using HEAL.Attic;
    26 using HeuristicLab.Persistence.Default.Xml;
    2722using System;
    2823using System.Collections.Generic;
     
    3025using System.IO;
    3126using System.Linq;
     27using HEAL.Attic;
     28using HeuristicLab.Common;
     29using HeuristicLab.Core;
     30using HeuristicLab.Optimization;
     31using HeuristicLab.Persistence.Default.Xml;
    3232
    3333namespace HeuristicLab.Clients.OKB.RunCreation {
     
    3535  [StorableType("041DC8A8-2987-4045-B24A-CBA7EAD47316")]
    3636  public abstract class OKBProblem : Item, IHeuristicOptimizationProblem {
     37    public string Filename { get; set; }
    3738    public virtual Type ProblemType {
    3839      get { return typeof(IHeuristicOptimizationProblem); }
  • branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB/3.3/RunCreation/SingleObjectiveOKBProblem.cs

    r17226 r17334  
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Optimization;
    26 using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Clients.OKB.RunCreation {
     
    3030  [Creatable(CreatableAttribute.Categories.TestingAndAnalysisOKB, Priority = 110)]
    3131  [StorableType("1A1DF6E8-4A3F-4D91-9B1D-6FF6EC8D1055")]
    32   public sealed class SingleObjectiveOKBProblem : OKBProblem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent {
    33     public string Filename { get; set; }
     32  public sealed class SingleObjectiveOKBProblem : OKBProblem, ISingleObjectiveHeuristicOptimizationProblem {
    3433
    3534    public override Type ProblemType {
  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

    r17226 r17334  
    3636    where TEncodedSolution : class, IEncodedSolution
    3737    where TEvaluator : class, IEvaluator {
    38     public string Filename { get; set; } // TODO: Really okay here? should be in Problem (non-generic)
     38   
    3939
    4040    //TODO remove parameter for encoding?
  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs

    r17257 r17334  
    2323using System.Collections.Generic;
    2424using HEAL.Attic;
     25using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    2627
     
    3031  /// Interface to represent an optimization problem.
    3132  /// </summary>
    32   public interface IProblem : IParameterizedNamedItem {
     33  public interface IProblem : IParameterizedNamedItem , IStorableContent{
    3334    IEnumerable<IItem> Operators { get; }
    3435
  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems/Problem.cs

    r17226 r17334  
    3434  [StorableType("6DC97432-9BD1-4304-802A-1FC48A0E0468")]
    3535  public abstract class Problem : ParameterizedNamedItem, IProblem {
     36    public string Filename { get; set; }
     37
    3638    private const string OperatorsParameterName = "Operators";
    3739    public IFixedValueParameter<ItemCollection<IItem>> OperatorsParameter {
Note: See TracChangeset for help on using the changeset viewer.